diff --git a/health/src/main/java/com/ccsens/health/api/DebugController.java b/health/src/main/java/com/ccsens/health/api/DebugController.java index 7a66cbf2..3545f2c7 100644 --- a/health/src/main/java/com/ccsens/health/api/DebugController.java +++ b/health/src/main/java/com/ccsens/health/api/DebugController.java @@ -37,7 +37,7 @@ public class DebugController { color.g = "139"; color.b = "0"; WxXcxUtil.getWxCode("pages/index/index" - ,"d=1218855229722857472",color,"/home/cloud/tall/uploads/qrCode/0011.png"); + ,"d=1218855229722857472",color,"/home/cloud/tall/uploads/qrCode/00112.png"); // WxXcxUtil.getWxCodeTest("pages/index/index?t=eyJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1ODM4MDc3MzcsInN1YiI6IjEyMTg4NTUyMjk3MjI4NTc0NzIiLCJhdXRoSWQiOiIxMTc3MDQwNjY" // ,"d=1217647686598135808",color,"/home/cloud/tall/uploads/qrCode/158357267174.png"); 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 40702ace..2b56afde 100644 --- a/health/src/main/java/com/ccsens/health/service/HealthService.java +++ b/health/src/main/java/com/ccsens/health/service/HealthService.java @@ -26,6 +26,7 @@ import org.springframework.stereotype.Service; import java.io.File; import java.io.IOException; +import java.math.BigDecimal; import java.util.*; @Service @@ -55,6 +56,7 @@ public class HealthService implements IHealthService{ //1、获取健康信息和userId HealthDto.healthInfo healthInfo = params.getParam(); Long userId = params.getUserId(); + //3、保存健康信息 HealthRecords healthRecords = new HealthRecords(); healthRecords.setId(snowflake.nextId()); @@ -78,6 +80,14 @@ public class HealthService implements IHealthService{ color.g = "139"; color.b = "0"; healthInfoVo.setHealthLevel(1); + }else { + //如果选择状态正常,检查温度是否正常(36.0°~37.3°) + BigDecimal minAnimalHeat = BigDecimal.valueOf(36.0); + BigDecimal maxAnimalHeat = BigDecimal.valueOf(37.3); + if(healthInfo.getAnimalHeat().compareTo(minAnimalHeat) == -1 || + healthInfo.getAnimalHeat().compareTo(maxAnimalHeat) == 1){ + throw new BaseException(CodeEnum.ANIMAL_HEAT_ERROR); + } } healthInfoVo.setHealthTypeName(healthType.getName()); } diff --git a/health/src/main/resources/application.yml b/health/src/main/resources/application.yml index 5889ff7f..5c2cd5c4 100644 --- a/health/src/main/resources/application.yml +++ b/health/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test \ No newline at end of file + active: dev + include: common, util-dev \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index bb107377..a71dc944 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -98,6 +98,7 @@ public enum CodeEnum { NOT_SITE(81,"未找到该场所",true), ALREADY_REAL_AUTH(82,"您已经完成认证",true), LACK_CONFIG(83,"缺少配置",true), + ANIMAL_HEAT_ERROR(84,"体温异常,请选择正确的健康状态",true), ; public CodeEnum addMsg(String msg){