diff --git a/health/src/main/java/com/ccsens/health/bean/dto/HealthDto.java b/health/src/main/java/com/ccsens/health/bean/dto/HealthDto.java index d422d5c3..05c94e2a 100644 --- a/health/src/main/java/com/ccsens/health/bean/dto/HealthDto.java +++ b/health/src/main/java/com/ccsens/health/bean/dto/HealthDto.java @@ -4,9 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import javax.validation.constraints.*; import java.math.BigDecimal; import java.util.List; @@ -19,15 +17,20 @@ public class HealthDto { public static class healthInfo{ @ApiModelProperty("token") private String token; + @Size(max = 128,min = 0,message = "信息格式错误") @ApiModelProperty("当前所在地区") private String district; + @Size(max = 128,min = 0,message = "信息格式错误") @ApiModelProperty("当前所在详细地址") private String address; @NotNull @ApiModelProperty("当前身体状态") private Long healthTypeId; + @DecimalMax(value = "45",message = "体温输入异常") + @DecimalMin(value = "30",message = "体温输入异常") @ApiModelProperty("体温") private BigDecimal animalHeat; + @Size(max = 32,min = 0,message = "信息格式错误") @ApiModelProperty("就诊医院") private String hospital; @ApiModelProperty("有无湖北武汉接触史 0没有 1有") @@ -38,10 +41,12 @@ public class HealthDto { private int touchOverseas; @ApiModelProperty("是否在学校所在地 0无 1有") private int schoolLocation; + @Size(max = 6,min = 0,message = "信息格式错误") @ApiModelProperty("紧急联系人姓名") private String emergencyName; @ApiModelProperty("紧急联系人电话") private String emergencyPhone; + @Size(max = 144,min = 0,message = "信息格式错误") @ApiModelProperty("备注信息") private String remark; @Min(value = 1) diff --git a/health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java b/health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java index 5e3ae808..f80124b9 100644 --- a/health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java +++ b/health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java @@ -6,10 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.beans.BeanUtils; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import javax.validation.constraints.*; import java.math.BigDecimal; @Data @@ -20,6 +17,7 @@ public class JourneyDto { public static class JourneyInfo{ @ApiModelProperty("出行方式 0铁路 1飞机 2客运车辆 3自驾 4船 5其他") private int tripMode; + @Size(max = 12,min = 0,message = "信息格式错误") @ApiModelProperty("车次号") private String carNo; @ApiModelProperty("行程类型 0未填写 1返校行程 2日常外出") @@ -28,6 +26,7 @@ public class JourneyDto { private Long startTime; @ApiModelProperty("到达时间") private Long endTime; + @Size(max = 255,min = 0,message = "信息格式错误") @ApiModelProperty("同行人员") private String together; @Min(value = 1) diff --git a/health/src/main/java/com/ccsens/health/bean/dto/UserDto.java b/health/src/main/java/com/ccsens/health/bean/dto/UserDto.java index 66c075f2..7d09d39f 100644 --- a/health/src/main/java/com/ccsens/health/bean/dto/UserDto.java +++ b/health/src/main/java/com/ccsens/health/bean/dto/UserDto.java @@ -4,18 +4,22 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.Size; + @Data public class UserDto { @Data @ApiModel("保存的信息") public static class UserInfo{ + @Size(max = 6,min = 0,message = "信息格式错误") @ApiModelProperty("姓名") private String name; // @ApiModelProperty("身份证号") // private String idCard; @ApiModelProperty("身份 0学生 1老师 2工作人员") private int post; + @Size(max = 16,min = 0,message = "信息格式错误") @ApiModelProperty("学号") private String no; @ApiModelProperty("手机号") diff --git a/health/src/main/java/com/ccsens/health/bean/vo/UserVo.java b/health/src/main/java/com/ccsens/health/bean/vo/UserVo.java index e1a74b74..aa850372 100644 --- a/health/src/main/java/com/ccsens/health/bean/vo/UserVo.java +++ b/health/src/main/java/com/ccsens/health/bean/vo/UserVo.java @@ -33,6 +33,12 @@ public class UserVo { private String phone; @ApiModelProperty("健康码") private List healthCodeList; + public String getPhone(){ + if(phone == null){ + return null; + } + return phone.substring(0, 3) + "****" + phone.substring(7, phone.length()); + } } @Data @ApiModel("个人健康码信息") diff --git a/health/src/main/java/com/ccsens/health/service/HealthService.java b/health/src/main/java/com/ccsens/health/service/HealthService.java index 4bd0a717..7e0cf9d8 100644 --- a/health/src/main/java/com/ccsens/health/service/HealthService.java +++ b/health/src/main/java/com/ccsens/health/service/HealthService.java @@ -121,6 +121,13 @@ public class HealthService implements IHealthService { if(ObjectUtil.isNotNull(healthType)){ //如果健康状态异常，健康码为橙色 if(healthType.getQuarantine() != 0){ + //如果选择其他状态，检查温度是否正常（36.0°~37.3°） + BigDecimal minAnimalHeat = BigDecimal.valueOf(30.0); + BigDecimal maxAnimalHeat = BigDecimal.valueOf(45.0); + if (healthInfo.getAnimalHeat().compareTo(minAnimalHeat) == -1 || + healthInfo.getAnimalHeat().compareTo(maxAnimalHeat) == 1) { + throw new BaseException(CodeEnum.ANIMAL_HEAT_ERROR); + } healthInfoVo.setHealthLevel(1); } else { //如果选择状态正常，检查温度是否正常（36.0°~37.3°） diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java index 8f0dd98d..1fbe25bb 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java @@ -291,7 +291,8 @@ public class UserService implements IUserService { accountAuth.setUserId(user.getId()); accountAuth.setIdentifyType((byte) WebConstant.IDENTIFY_TYPE.Account.value); accountAuth.setIdentifier("USER_" + accountName); - accountAuth.setCredential("123456"); + accountAuth.setSalt(ShiroKit.getRandomSalt(6)); + accountAuth.setCredential(ShiroKit.md5("123456", accountAuth.getSalt())); authDao.insertSelective(accountAuth); } } @@ -409,7 +410,6 @@ public class UserService implements IUserService { * @return */ private UserVo.UserSign getUserSign(String openId, String unionId, - byte identifyType, String redirect) { UserVo.UserSign userSignVo;//1.查找对应账户,不存在则注册 List authList = null; @@ -460,7 +460,8 @@ public class UserService implements IUserService { accountAuth.setUserId(user.getId()); accountAuth.setIdentifyType((byte) WebConstant.IDENTIFY_TYPE.Account.value); accountAuth.setIdentifier("USER_" + accountName); - accountAuth.setCredential("123456"); + accountAuth.setSalt(ShiroKit.getRandomSalt(6)); + accountAuth.setCredential(ShiroKit.md5("123456", accountAuth.getSalt())); authDao.insertSelective(accountAuth); } // theAuth = wxRegist(openid, unionId,WebConstant.IDENTIFY_TYPE.Wxmp);