健康小屋- 新增字典

common/common-request-mapping/src/main/java/com/yihu/jw/rm/health/house/HealthyHouseMapping.java

@@ -50,6 +50,8 @@ public class HealthyHouseMapping {
            public static final String COUNT_FACILITIES = "/count/facilities";
            public static final String UPDATE_FACILITIE_STATE = "/update/facilitieState";
            public static final String COUNT_FACILITIES_BY_TIME = "/count/facilitiesByTime";
            public static final String NEARBY_FACILITY = "/nearbyFacility";
        }
        //设施服务

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wlyy/HouseUserContant.java

@@ -5,8 +5,8 @@ package com.yihu.jw.restmodel.wlyy;
 * @created 2018/9/18 20:19
 */
public class HouseUserContant {
    public static Integer activated_del=-1;
    public static Integer activated_lock=0;
    public static Integer activated_active =1;
    public static Integer activated_offline=2;
    public static Integer activated_del = -1;//删除
    public static Integer activated_lock = 0;//冻结
    public static Integer activated_active = 1;//在线
    public static Integer activated_offline = 2;//离线
}

common/common-util/src/main/java/com/yihu/jw/util/common/IdCardUtil.java

@@ -140,7 +140,7 @@ public class IdCardUtil {
//        error.put("cardId", "身份证号码长度必须等于15或18位");
//    }
    private boolean cardCodeVerifySimple(String cardcode) {
    public static boolean cardCodeVerifySimple(String cardcode) {
        //第一代身份证正则表达式(15位)
        String isIDCard1 = "^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$";
        //第二代身份证正则表达式(18位)

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/constant/UserConstant.java

@@ -0,0 +1,12 @@
package com.yihu.jw.healthyhouse.constant;
/**
 * @author HZY
 * @created 2018/9/19 9:10
 */
public class UserConstant {
    public static final String UNAUTHORIZED = "0";
    public static final String AUTHORIZED = "1";
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/LoginController.java

@@ -41,7 +41,7 @@ public class LoginController extends EnvelopRestEndpoint {
    @ApiOperation(value = "发送短信验证码")
    @GetMapping(value = "/captcha/send")
    public ResponseEntity<HashMap> captcha(
            @ApiParam(name = "clientId", value = "应用id", required = true)@RequestParam(required = true, name = "clientId") String clientId,
            @ApiParam(name = "clientId", value = "应用id",defaultValue = "EwC0iRSrcS", required = true)@RequestParam(required = true, name = "clientId") String clientId,
            @ApiParam(name = "msgType", value = "消息类型（login：登录验证，checkPhone：验证安全手机，resetPhone：重设安全手机", required = true)@RequestParam(required = true, name = "msgType") String msgType,
            @ApiParam(name = "username", value = "手机账号", required = true)@RequestParam(required = true, name = "username") String username ) throws  Exception{
        if (StringUtils.isEmpty(clientId)) {
@@ -60,7 +60,7 @@ public class LoginController extends EnvelopRestEndpoint {
    }
    @GetMapping("/mobile/login")
    @PostMapping("/mobile/login")
    @ApiOperation(value = "【普通用户】-手机登录注册")
    public ObjEnvelop mobileLogin(
            HttpServletRequest request,
@@ -116,7 +116,7 @@ public class LoginController extends EnvelopRestEndpoint {
    /***************************  管理员相关 **************************************/
    @GetMapping("/mobile/manage/login")
    @PostMapping("/mobile/manage/login")
    @ApiOperation(value = "【管理员】-手机验证登录")
    public ObjEnvelop administratorMobileLogin(
            HttpServletRequest request,

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/facilities/FacilitiesController.java

@@ -280,4 +280,20 @@ public class FacilitiesController extends EnvelopRestEndpoint {
    }
//    @ApiOperation(value = "搜索附近的小屋", responseContainer = "List")
//    @GetMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.NEARBY_FACILITY)
//    public PageEnvelop<Facility> nearbyFacility(
//            @ApiParam(name = "lng", value = "当前经度", defaultValue = "")
//            @RequestParam(value = "lng", required = false) String lng,
//            @ApiParam(name = "lat", value = "当前纬度", defaultValue = "")
//            @RequestParam(value = "lat", required = false) String lat,
//            @ApiParam(name = "page", value = "页码", defaultValue = "1")
//            @RequestParam(value = "page", required = false) Integer page,
//            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
//            @RequestParam(value = "size", required = false) Integer size) throws Exception {
//        List<Facility> facilityList = facilityService.search(fields, filters, sorts, page, size);
//        return success(facilityList, (null == facilityList) ? 0 : facilityList.size(), page, size);
//    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/UserController.java

@@ -29,6 +29,7 @@ import java.io.OutputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
/**
 *  用户相关 接口
@@ -45,6 +46,7 @@ public class UserController  extends EnvelopRestEndpoint {
    @Autowired
    private WlyyRedisVerifyCodeService wlyyRedisVerifyCodeService;
    @GetMapping("/userList")
    @ApiOperation(value = "获取用户列表")
    public PageEnvelop userList(
@@ -75,8 +77,7 @@ public class UserController  extends EnvelopRestEndpoint {
    @GetMapping("/usedFacilityCount")
    @ApiOperation(value = "获取用户统计信息")
    public ObjEnvelop usedFacilityCount(
            @ApiParam(name = "userId", value = "用户id", required = true)@RequestParam(required = true, name = "userId") String userId ) {
    public ObjEnvelop usedFacilityCount() {
        Map<String, Long> userStatistics = userService.findUserStatistics();
        return ObjEnvelop.getSuccess("获取成功",userStatistics);
    }
@@ -103,16 +104,6 @@ public class UserController  extends EnvelopRestEndpoint {
    }
    @PostMapping("/facilityUseUpdate")
    @ApiOperation(value = "更新设施使用次数")
    public Envelop facilityUseUpdate(
            @ApiParam(name = "userId", value = "用户Id", required = true)@RequestParam(required = true, name = "userId") String userId ,
            @ApiParam(name = "facilityId", value = "设施Id", required = true)@RequestParam(required = true, name = "facilityId") String facilityId ) throws ManageException {
        userService.updateFacilityUse(userId,facilityId);
        return ObjEnvelop.getSuccess("更新用户使用设施次数成功");
    }
    @PostMapping("/updatePwd")
    @ApiOperation(value = "更新密码")
    public Envelop updatePwd(
@@ -141,6 +132,16 @@ public class UserController  extends EnvelopRestEndpoint {
        }
    }
    @PostMapping("/checkIdCardNo")
    @ApiOperation(value = "用户身份证号码认证")
    public Envelop checkIdCardNo(
            @ApiParam(name = "userId", value = "用户Id", required = true)@RequestParam(required = true, name = "userId") String userId ,
            @ApiParam(name = "idCardNo", value = "身份证号码", required = true)@RequestParam(required = true, name = "idCardNo") String idCardNo ) throws ManageException {
        userService.checkIdCardNo(userId, idCardNo);
        return ObjEnvelop.getSuccess("身份证认证完成！");
    }
    @GetMapping("/exportToExcel")
    @ApiOperation(value = "用户列表导出excel")
@@ -163,9 +164,4 @@ public class UserController  extends EnvelopRestEndpoint {
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/user/FacilityUsedRecordDao.java

@@ -12,5 +12,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
public interface FacilityUsedRecordDao extends JpaRepository<FacilityUsedRecord, Long> {
    FacilityUsedRecord findById(String id);
    Long countByUserId(String userId);
    Long countAllByUserIdIsNotNull();
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/user/User.java

@@ -59,6 +59,13 @@ public class User extends UuidIdentityEntityWithOperator {
    @Column(name = "facility_used_count")
    private Integer facilityUsedCount;//设施使用次数
    @Column(name = "realname_authentication")
    private String realnameAuthentication;//实名认证
    @Column(name = "phone_authentication")
    private String phoneAuthentication;//手机认证
    @Column(name = "ijk_authentication")
    private String ijkAuthentication;//i健康认证
    public String getLoginCode() {
        return loginCode;
@@ -220,6 +227,30 @@ public class User extends UuidIdentityEntityWithOperator {
        this.street = street;
    }
    public String getRealnameAuthentication() {
        return realnameAuthentication;
    }
    public void setRealnameAuthentication(String realnameAuthentication) {
        this.realnameAuthentication = realnameAuthentication;
    }
    public String getPhoneAuthentication() {
        return phoneAuthentication;
    }
    public void setPhoneAuthentication(String phoneAuthentication) {
        this.phoneAuthentication = phoneAuthentication;
    }
    public String getIjkAuthentication() {
        return ijkAuthentication;
    }
    public void setIjkAuthentication(String ijkAuthentication) {
        this.ijkAuthentication = ijkAuthentication;
    }
    @Transient
    public String getAddress(){
        String address ="";

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/user/FacilityUsedRecordService.java

@@ -25,4 +25,12 @@ public class FacilityUsedRecordService extends BaseJpaService<FacilityUsedRecord
        return  facilityUsedRecordDao.findById(id);
    }
    public Long countByUserId(String userId){
        return facilityUsedRecordDao.countByUserId(userId);
    }
    public Long countAll(){
        return facilityUsedRecordDao.countAllByUserIdIsNotNull();
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/user/LoginService.java

@@ -3,6 +3,7 @@ package com.yihu.jw.healthyhouse.service.user;
import com.yihu.jw.exception.business.ManageException;
import com.yihu.jw.healthyhouse.cache.WlyyRedisVerifyCodeService;
import com.yihu.jw.healthyhouse.constant.LoginInfo;
import com.yihu.jw.healthyhouse.constant.UserConstant;
import com.yihu.jw.healthyhouse.model.user.User;
import com.yihu.jw.restmodel.wlyy.HouseUserContant;
import com.yihu.jw.util.security.MD5;
@@ -56,11 +57,12 @@ public class LoginService {
            user.setLoginCode(loginCode);
            user.setName(loginCode);
            user.setTelephone(loginCode);
            // 更新身份证验证字段
            user.setPhoneAuthentication(UserConstant.AUTHORIZED);
            user.setPassword(LoginInfo.DEFAULT_PASSWORD);
        } else {
            //已注册用户更改用户状态
            user.setActivated(HouseUserContant.activated_active);
        }
        //已注册用户更改用户状态
        user.setActivated(HouseUserContant.activated_active);
        request.getSession().setAttribute(LoginInfo.IS_LOGIN, true);
        request.getSession().setAttribute(LoginInfo.TOKEN, ""); //TODO token是否添加
        request.getSession().setAttribute(LoginInfo.LOGIN_NAME, user.getName());

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/user/UserService.java

@@ -2,11 +2,13 @@ package com.yihu.jw.healthyhouse.service.user;
import com.yihu.jw.exception.business.ManageException;
import com.yihu.jw.healthyhouse.constant.LoginInfo;
import com.yihu.jw.healthyhouse.constant.UserConstant;
import com.yihu.jw.healthyhouse.dao.user.UserDao;
import com.yihu.jw.healthyhouse.model.user.User;
import com.yihu.jw.healthyhouse.util.poi.ExcelUtils;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.wlyy.HouseUserContant;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.security.MD5;
import jxl.write.Colour;
@@ -28,6 +30,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.transaction.Transactional;
import java.io.OutputStream;
import java.util.*;
import java.util.regex.Pattern;
/**
 * @author HZY
@@ -38,6 +41,8 @@ public class UserService {
    @Autowired
    private UserDao userDao;
    @Autowired
    private FacilityUsedRecordService facilityUsedRecordService;
    public User findById(String id) {
        return userDao.findById(id);
@@ -192,22 +197,6 @@ public class UserService {
        }
    }
    /**
     * 更新设施使用次数
     * @param userId            用户id
     * @param facilityId    设施id
     * @throws ManageException
     */
    @Transactional
    public void updateFacilityUse(String userId, String facilityId) throws ManageException {
        User user1 = findById(userId);
        if (user1==null) {
            throw new ManageException("该账号不存在");
        }
        user1.setFacilityUsedCount(user1.getFacilityUsedCount()+1);
        userDao.save(user1);
        //TODO 设施的使用次数更新
    }
    @Transactional
    public void updatePwd(String userId, String oldPwd,String newPwd) throws ManageException {
@@ -254,7 +243,7 @@ public class UserService {
        //在线用户数
        Long activeCount = userDao.countAllByActivated(HouseUserContant.activated_active);
        //用户设施使用总次数
        Long usePricilityCount = sumFacilityCount();
        Long usePricilityCount = facilityUsedRecordService.countAll();
        result.put("totalCount",totalCount);
        result.put("newCount",newCount);
        result.put("activeCount",activeCount);
@@ -263,15 +252,24 @@ public class UserService {
    }
    /**
     * 用户使用设施次数总和
     * @return
     *  用户身份证认证
     * @param userId    用户ID
     * @param idCardNo  身份证
     * @throws ManageException
     */
    public Long sumFacilityCount(){
        Long aLong = userDao.sumFacilityUseCout();
        return aLong;
    public void checkIdCardNo(String userId, String idCardNo) throws ManageException {
        User user1 = findById(userId);
        if (user1==null) {
            throw new ManageException("该账号不存在");
        }
        if(!IdCardUtil.cardCodeVerifySimple(idCardNo)){
            throw new ManageException("身份证号格式有误");
        }
        // 更新身份证验证字段
        user1.setRealnameAuthentication(UserConstant.AUTHORIZED);
        userDao.save(user1);
    }
   
    //excel中添加固定内容
    private void addStaticCell(Sheet sheet){

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/util/MapUtil.java

@@ -0,0 +1,34 @@
package com.yihu.jw.healthyhouse.util;
/**
 *
 *  经纬度距离计算 - 摘抄网络
 * @author HZY
 * @created 2018/9/26 21:02
 */
public class MapUtil {
    private static double EARTH_RADIUS = 6371.393;
    public static double getDistance(double lng1,double lat1,double lng2,double lat2){
        double radLat1 = rad(lat1);
        double radLat2 = rad(lat2);
        double a = radLat1 - radLat2;
        double b = rad(lng1) - rad(lng2);
        double s = 2 * Math.asin(Math.sqrt(Math.abs(Math.pow(Math.sin(a/2),2) + Math.cos(radLat1)*Math.cos(radLat2)*Math.pow(Math.sin(b/2),2))));
        s = s * EARTH_RADIUS;
        s = Math.round(s * 1000);
        return s;
    }
    private static double rad(double d)
    {
        return d * Math.PI / 180.0;
    }
    public static void main(String[] args) {
        double distance = getDistance(118.191839, 24.49555, 118.15639977090478000000, 24.48613312327105300000);
        System.out.println(distance);
    }
}

svr/svr-healthy-house/src/main/resources/application.yml

@@ -72,11 +72,15 @@ spring:
    url: jdbc:mysql://172.19.103.77:3306/healthy_house?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
  redis:
    host: 172.19.103.47
    port: 6379
    password: redis!@456
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
# 短信发送地址
jw:
  smsUrl: http://svr-base:10020/sms_gateway/send
  smsUrl: http://svr-base-hzy:10020/sms_gateway/send
---
spring:
@@ -85,6 +89,10 @@ spring:
    url: jdbc:mysql://172.19.103.77:3306/healthy_house?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
  redis:
    host: 172.19.103.47
    port: 6379
    password: redis!@456
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
jw:
@@ -93,6 +101,14 @@ jw:
---
spring:
  profiles: jwprod
  datasource:
    url: jdbc:mysql://172.19.103.77:3306/healthy_house?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
  redis:
    host: 172.19.103.47
    port: 6379
    password: redis!@456
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
jw: