0409.1

health/src/main/java/com/ccsens/health/api/HealthController.java

@@ -52,7 +52,7 @@ public class HealthController {
     @RequestMapping(value = "info", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<List<HealthVo.HealthInfo>> getHealthInfo(@ApiParam @Validated @RequestBody QueryDto<JourneyDto.SelectDate> params) throws Exception {
         log.info("获取个人健康打卡记录：{}",params);
-        List<HealthVo.HealthInfo> healthInfoList = healthService.getHealthInfo(params);
+        List<HealthVo.HealthInfo> healthInfoList = healthService.getHealthInfo(params.getParam(),params.getUserId());
         return JsonResponse.newInstance().ok(healthInfoList);
     }
 

health/src/main/java/com/ccsens/health/bean/dto/MemberDto.java

@@ -22,8 +22,8 @@ public class MemberDto {
         private Long startTime;
         @ApiModelProperty("结束时间")
         private Long endTime;
-        @ApiModelProperty("健康状态 0发烧 1其他")
+        @ApiModelProperty("健康状态id")
-        private int type;
+        private Long typeId;
     }
 
     @Data

health/src/main/java/com/ccsens/health/bean/vo/AbnormalVo.java

@@ -20,7 +20,7 @@ public class AbnormalVo {
         @ApiModelProperty("异常状态名称")
         private String abnormalName;
         @ApiModelProperty("异常状态code")
-        private Integer code;
+        private String code;
         @ApiModelProperty("数量")
         private int number;
 //        public String getAbnormalName(){

health/src/main/java/com/ccsens/health/bean/vo/HealthVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -179,4 +180,25 @@ public class HealthVo {
         private int independent;
         private int number;
     }
+
+    @Data
+    public static class HealthRecordRedis{
+        private Long id;
+        private Long userId;
+        private Long time;
+        private String district;
+        private String address;
+        private Long healthTypeId;
+        private BigDecimal animalHeat;
+        private String hospital;
+        private Byte touchHubei;
+        private Byte touchSick;
+        private Byte touchOverseas;
+        private Byte schoolLocation;
+        private String emergencyName;
+        private String emergencyPhone;
+        private String remark;
+        private int healthLevel;
+        private String healthTypeName;
+    }
 }

health/src/main/java/com/ccsens/health/persist/dao/MemberDao.java

@@ -30,10 +30,10 @@ public interface MemberDao extends MemberMapper {
      * @param department
      * @param startTime
      * @param endTime
-     * @param type
+     * @param typeId
      * @return
      */
     List<MemberVo.StudentHealthVo> selectHealthInfo(@Param("name")String name, @Param("wkno")String wkno,
                                                     @Param("department")String department,@Param("startTime")Long startTime,
-                                                    @Param("endTime")Long endTime, @Param("type")int type);
+                                                    @Param("endTime")Long endTime, @Param("typeId")Long typeId);
 }

health/src/main/java/com/ccsens/health/service/AbnormalService.java

@@ -78,6 +78,7 @@ public class AbnormalService implements IAbnormalService {
                         AbnormalVo.AbnormalOverview abnormalOverview = new AbnormalVo.AbnormalOverview();
                         abnormalOverview.setAbnormalType(0);
                         abnormalOverview.setAbnormalName(healthTypeNumber.getName());
+                        abnormalOverview.setCode("FS");
                         abnormalOverview.setNumber(healthTypeNumber.getNumber());
                         abnormalOverviewList.add(abnormalOverview);
                     }
@@ -86,6 +87,7 @@ public class AbnormalService implements IAbnormalService {
             AbnormalVo.AbnormalOverview abnormalOverview = new AbnormalVo.AbnormalOverview();
             abnormalOverview.setAbnormalType(0);
             abnormalOverview.setAbnormalName("其他");
+            abnormalOverview.setCode("QT");
             abnormalOverview.setNumber(other);
             abnormalOverviewList.add(abnormalOverview);
         }
@@ -95,6 +97,7 @@ public class AbnormalService implements IAbnormalService {
         AbnormalVo.AbnormalOverview abnormalOverview = new AbnormalVo.AbnormalOverview();
         abnormalOverview.setAbnormalType(2);
         abnormalOverview.setAbnormalName("出行异常");
+        abnormalOverview.setCode("CXYC");
         abnormalOverview.setNumber(journeyNumber);
         abnormalOverviewList.add(abnormalOverview);
         //未上报

health/src/main/java/com/ccsens/health/service/AsyncService.java

@@ -1,9 +1,16 @@
 package com.ccsens.health.service;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.ccsens.health.bean.po.HealthRecords;
+import com.ccsens.health.bean.vo.HealthVo;
+import com.ccsens.health.util.HealthConstant;
 import com.ccsens.util.PropUtil;
+import com.ccsens.util.RedisUtil;
 import com.ccsens.util.WebConstant;
 import com.ccsens.util.wx.WxXcxUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.stereotype.Service;
@@ -11,6 +18,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Calendar;
 import java.util.concurrent.Future;
 
 @Slf4j
@@ -18,12 +26,14 @@ import java.util.concurrent.Future;
 @Service
 @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 public class AsyncService implements IAsyncService {
-
+    @Resource
+    private RedisUtil redisUtil;
     @Resource
     private IStudentService studentService;
     @Resource
     private IJourneyService journeyService;
 
+
     @Override
     public Future<String> generateQRCode(String scene, WxXcxUtil.LineColor color) throws Exception {
         log.info("生成二维码：{}, {}", scene, color);
@@ -45,4 +55,18 @@ public class AsyncService implements IAsyncService {
     public void updateStudentNum() {
         studentService.updateStudentNum();
     }
+
+    @Override
+    public void saveHealthRecordWithRedis(HealthVo.HealthInfo healthRecords) {
+        HealthVo.HealthRecordRedis healthRecordRedis = new HealthVo.HealthRecordRedis();
+        BeanUtil.copyProperties(healthRecords,healthRecordRedis);
+        String key = HealthConstant.getHealthRecordKey(healthRecordRedis.getUserId());
+        //过期时间
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(calendar.get(Calendar.YEAR),calendar.get(Calendar.MONTH),calendar.get(Calendar.DAY_OF_MONTH),23,59,59);
+        long tt = calendar.getTime().getTime()/1000;
+        long seconds = tt - System.currentTimeMillis();
+
+        redisUtil.set(key, JSONObject.toJSONString(healthRecordRedis),seconds);
+    }
 }

health/src/main/java/com/ccsens/health/service/ClockService.java

@@ -5,6 +5,7 @@ import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.ccsens.cloudutil.feign.TallFeignClient;
 import com.ccsens.health.bean.dto.ClockDto;
 import com.ccsens.health.bean.dto.HealthDto;
@@ -50,6 +51,10 @@ public class ClockService implements IClockService {
     @Autowired
     private RealNameAuthDao realNameAuthDao;
     @Autowired
+    private RedisUtil redisUtil;
+    @Autowired
+    private HealthService healthService;
+    @Autowired
     private IUserService userService;
     @Autowired
     private TallFeignClient tallFeignClient;
@@ -60,7 +65,7 @@ public class ClockService implements IClockService {
      * @param params
      */
     @Override
-    public void siteClockIn(QueryDto<ClockDto.SiteDto> params) {
+    public void siteClockIn(QueryDto<ClockDto.SiteDto> params) throws Exception {
         //1、获取打卡信息和userId
         ClockDto.SiteDto clickIn = params.getParam();
         Long userId = params.getUserId();
@@ -84,16 +89,32 @@ public class ClockService implements IClockService {
         }
 
         //判断经纬度是否正确
-        boolean inCircle = DistanceUtil.isInCircle(site.getLongitude(), site.getLatitude(), clickIn.getLocationLongitude(), clickIn.getLocationLatitude(), "1");
+        boolean inCircle = DistanceUtil.isInCircle(site.getLongitude(), site.getLatitude(), clickIn.getLocationLongitude(), clickIn.getLocationLatitude(), "0.1");
         log.info("是否在半径内：{}", inCircle);
         if (!inCircle) {
             throw new BaseException(CodeEnum.LOCATION_LONG);
         }
+        //判断该学生健康状态
+        String key = HealthConstant.getHealthRecordKey(userId);
+        Object o = redisUtil.get(key);
+        log.info("redis读取健康状态：{},{}", userId, o);
+        if(o == null || StrUtil.isEmpty((String)o)){
+            //如果redis为空，查询数据库
+            JourneyDto.SelectDate selectDate = new JourneyDto.SelectDate();
+            List<HealthVo.HealthInfo> healthInfoList = healthService.getHealthInfo(selectDate,userId);
+            if(CollectionUtil.isEmpty(healthInfoList)){
+                throw new BaseException(CodeEnum.NOT_HEALTH_RECORD);
+            }
+            if(healthInfoList.get(0).getHealthLevel() != 0){
+                throw new BaseException(CodeEnum.HEALTH_TYPE_ERROR);
+            }
+        }
+        HealthVo.HealthRecordRedis healthRecordRedis = JSONObject.parseObject((String)o, HealthVo.HealthRecordRedis.class);
+        if(healthRecordRedis.getHealthLevel() != 0){
+            throw new BaseException(CodeEnum.HEALTH_TYPE_ERROR);
+        }
 
-//        //2、通过userId获取成员id
-//        Employee employee = userService.getEmployeeByUserId(userId);
         //添加打卡记录
-
         SiteClockIn prevClockIn = siteClockInDao.getPrevClockIn(userId);
         log.info("上一条打卡:{}", prevClockIn);
         if (prevClockIn == null) {

health/src/main/java/com/ccsens/health/service/HealthService.java

@@ -109,13 +109,11 @@ public class HealthService implements IHealthService {
         //健康码颜色（默认绿色）
         Future<String> future = null;
 
+        //检查上报人员是否是已确诊
+        Boolean flag = isAbnormal(userId);
 
         log.info("active:{}", active);
         if ("prod".equals(active)) {
-
-            //检查上报人员是否是已确诊
-            Boolean flag = isAbnormal(userId);
-
             WxXcxUtil.LineColor color = getLineColor(healthType,healthInfo,flag);
             future = asyncService.generateQRCode("d=" + userId, color);
             log.info("调用微信生成二维码");
@@ -133,6 +131,12 @@ public class HealthService implements IHealthService {
         healthRecordsDao.insertSelective(healthRecords);
 
         healthInfoVo.setHealthLevel(0);
+        if(healthInfo.getTouchHubei() == 1 || healthInfo.getTouchOverseas() == 1 || healthInfo.getTouchSick() == 1){
+            healthInfoVo.setHealthLevel(1);
+        }
+        if(flag){
+            healthInfoVo.setHealthLevel(2);
+        }
         //获取健康状态
 //        HealthType healthType = healthTypeDao.selectByPrimaryKey(healthInfo.getHealthTypeId());
         if(ObjectUtil.isNotNull(healthType)){
@@ -150,7 +154,8 @@ public class HealthService implements IHealthService {
             }
             healthInfoVo.setHealthTypeName(healthType.getName());
         }
-        Long aa2 = System.currentTimeMillis();
+
+//        Long aa2 = System.currentTimeMillis();
         //TODO 4、生成健康码，返回地址
 //        String fileName = "/qrCode/" + cn.hutool.core.date.DateUtil.today() + "/" + System.currentTimeMillis() + ".png";
 //        String path = WebConstant.UPLOAD_PATH_BASE+fileName;
@@ -198,6 +203,8 @@ public class HealthService implements IHealthService {
         healthInfoVo.setUserId(userId);
         healthInfoVo.setHealthCode(qrcodePath);
         healthInfoVo.setFilePath(filePath);
+        //健康上报信息储存redis
+        asyncService.saveHealthRecordWithRedis(healthInfoVo);
 
         return healthInfoVo;
     }
@@ -239,16 +246,16 @@ public class HealthService implements IHealthService {
     /**
      * 获取个人健康信息
      *
-     * @param params
+     * @param selectDate
      * @return
      */
     @Override
-    public List<HealthVo.HealthInfo> getHealthInfo(QueryDto<JourneyDto.SelectDate> params) throws Exception {
+    public List<HealthVo.HealthInfo> getHealthInfo(JourneyDto.SelectDate selectDate,Long userId) throws Exception {
         //1、获取查询时间和userId
-        JourneyDto.SelectDate selectDate = params.getParam();
+//        JourneyDto.SelectDate selectDate = params.getParam();
         Long startTime = selectDate.getStartTime() == null ? DateUtil.getZeroTime(new Date()) : selectDate.getStartTime();
         Long endTime = selectDate.getEndTime() == null ? System.currentTimeMillis() : selectDate.getEndTime();
-        Long userId = params.getUserId();
+//        Long userId = params.getUserId();
         log.info("获取个人健康打卡记录 userid：{}", userId);
 
         //3、查询该成员符合时间的记录

health/src/main/java/com/ccsens/health/service/IAsyncService.java

@@ -1,5 +1,7 @@
 package com.ccsens.health.service;
 
+import com.ccsens.health.bean.po.HealthRecords;
+import com.ccsens.health.bean.vo.HealthVo;
 import com.ccsens.util.CodeEnum;
 import com.ccsens.util.wx.WxXcxUtil;
 
@@ -27,4 +29,10 @@ public interface IAsyncService {
      * @return
      */
     Future<String> generateQRCode(String scene, WxXcxUtil.LineColor color) throws Exception;
+
+    /**
+     * 健康上报信息储存redis
+     * @param healthRecords
+     */
+    void saveHealthRecordWithRedis(HealthVo.HealthInfo healthRecords);
 }

health/src/main/java/com/ccsens/health/service/IClockService.java

@@ -11,7 +11,7 @@ import java.io.IOException;
 import java.util.List;
 
 public interface IClockService {
-    void siteClockIn(QueryDto<ClockDto.SiteDto> params);
+    void siteClockIn(QueryDto<ClockDto.SiteDto> params) throws Exception;
 
     List<ClockVo.SiteClockInfo> getSiteClock(QueryDto<JourneyDto.SelectDate> params) throws Exception;
 

health/src/main/java/com/ccsens/health/service/IHealthService.java

@@ -12,7 +12,7 @@ import java.util.List;
 public interface IHealthService {
     HealthVo.HealthInfo addHealthInfo(QueryDto<HealthDto.healthInfo> params) throws Exception;
 
-    List<HealthVo.HealthInfo>  getHealthInfo(QueryDto<JourneyDto.SelectDate> params) throws Exception;
+    List<HealthVo.HealthInfo>  getHealthInfo(JourneyDto.SelectDate selectDate,Long userId) throws Exception;
 
     List<HealthVo.HealthTypeVo> getHealthType();
 

health/src/main/java/com/ccsens/health/service/StudentService.java

@@ -70,7 +70,7 @@ public class StudentService implements IStudentService{
         MemberDto.StudentHealth studentHealth = params.getParam();
         List<MemberVo.StudentHealthVo> studentHealthVoList =
                 memberDao.selectHealthInfo(studentHealth.getName(),studentHealth.getWkno(),studentHealth.getDepartment(),
-                        studentHealth.getStartTime(),studentHealth.getEndTime(),studentHealth.getType());
+                        studentHealth.getStartTime(),studentHealth.getEndTime(),studentHealth.getTypeId());
         return studentHealthVoList;
     }
 

health/src/main/java/com/ccsens/health/util/HealthConstant.java

@@ -59,4 +59,13 @@ public class HealthConstant {
     public static String getHealthRecordNow() {
         return school + "health_record_" + DateUtil.today();
     }
+
+    /**
+     * 健康上报key
+     * @param healthTypeId
+     * @return
+     */
+    public static String getHealthRecordKey(long healthTypeId) {
+        return "health_record_" + healthTypeId;
+    }
 }

health/src/main/resources/application-prod.yml

@@ -1,11 +1,11 @@
 server:
-  port: 7081
+  port: 7080
   servlet:
     context-path:
 spring:
   snowflake:
-    datacenterId: 2
+    datacenterId: 1
-    workerId: 2
+    workerId: 1
   application:
     name: health
   datasource:

health/src/main/resources/mapper_dao/HealthAbnormalDao.xml

@@ -18,6 +18,7 @@
     <resultMap id="resultMap_abnormal_overview" type="com.ccsens.health.bean.vo.AbnormalVo$AbnormalOverview">
         <id column="id" property="id"/>
         <result column="abnormalName" property="abnormalName"/>
+        <result column="code" property="code"/>
         <result column="number" property="number"/>
     </resultMap>
 
@@ -58,6 +59,7 @@
     <select id="abnormalOverview" resultMap="resultMap_abnormal_overview" parameterType="java.util.Map">
         SELECT
         t.`name` as abnormalName,
+        t.code as code,
         count(ha.id) as number
         FROM
         t_health_type t LEFT JOIN t_health_abnormal ha on ha.health_status = t.id

health/src/main/resources/mapper_dao/MemberDao.xml

@@ -79,6 +79,10 @@
                 <if test="startTime != null">
                     and
                     hr.time &gt;= #{startTime}
+                </if>
+                <if test="typeId != null">
+                    and
+                    hr.health_type_id = #{typeId}
                 </if>
 				ORDER BY hr.time DESC
 				limit 99999

tall/src/main/java/com/ccsens/tall/service/UserService.java

@@ -1198,7 +1198,9 @@ public class UserService implements IUserService {
                 //将以前的余额添加至此账号
                 SysUser oldUser = userDao.selectByPrimaryKey(userId);
                 SysUser newUser = userDao.selectByPrimaryKey(currentUserId);
-                updateBalance(oldUser, newUser);
+                if(ObjectUtil.isNotNull(oldUser) && ObjectUtil.isNotNull(newUser)) {
+                    updateBalance(oldUser, newUser);
+                }
                 //将以前的user删除
                 oldUser.setRecStatus((byte) 2);
                 userDao.updateByPrimaryKeySelective(oldUser);
@@ -1268,7 +1270,9 @@ public class UserService implements IUserService {
         //将以前的余额添加至此账号
         SysUser oldUser = userDao.selectByPrimaryKey(uselessId);
         SysUser newUser = userDao.selectByPrimaryKey(userId);
-        updateBalance(oldUser, newUser);
+        if(ObjectUtil.isNotNull(oldUser) && ObjectUtil.isNotNull(newUser)) {
+            updateBalance(oldUser, newUser);
+        }
         //将以前的user删除
         oldUser.setRecStatus((byte) 2);
         userDao.updateByPrimaryKeySelective(oldUser);

tall/src/main/resources/application-prod.yml

@@ -4,8 +4,8 @@ server:
     context-path: /v1.0
 spring:
   snowflake:
-    datacenterId: 1
+    datacenterId: 2
-    workerId: 1
+    workerId: 2
   application:
     name: tall
   datasource:
@@ -17,7 +17,7 @@ spring:
     username: admin
   redis:
     database: 0
-    host: 127.0.0.1
+    host: www.tall.wiki
     jedis:
       pool:
         max-active: 200
@@ -32,7 +32,7 @@ swagger:
 eureka:
   instance:
     # www.tall.wiki
-    ip-address: 140.143.228.3
+#    ip-address: 140.143.228.3
-#    ip-address: 192.144.182.42
+    ip-address: 192.144.182.42
 
 gatewayUrl: https://www.tall.wiki/gateway/

tall/src/main/resources/druid-prod.yml

@@ -3,7 +3,7 @@ spring:
     druid:
       connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
       driverClassName: com.mysql.cj.jdbc.Driver
-      dynamicUrl: jdbc:mysql://127.0.0.1:3306/${schema}
+      dynamicUrl: jdbc:mysql://api.ccsens.com:3306/${schema}
       filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
       filterName: druidFilter
       filterProfileEnable: true
@@ -15,7 +15,7 @@ spring:
       maxWait: 60000
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
-      password:
+      password: 7cdefb88e0b8c8a401b66a83ee0cf80387461268074d1c3dcb146ab485318633
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -27,7 +27,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://api.ccsens.com/tall?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_HEALTH

util/src/main/java/com/ccsens/util/CodeEnum.java

@@ -102,13 +102,15 @@ public enum CodeEnum {
     NOT_BUSINESS(85,"未找到商户信息",true),
     SITE_EXCEED(86,"您所添加的场所数量已超出上限，请联系客服提高场所上限",true),
     SITE_NAME_REPETITION(86,"场所名重复",true),
-    LOCATION_LONG(87,"对不起，您的距离太远了，请靠近目的地后重试。",true),
+    LOCATION_LONG(87,"对不起，您的距离太远了，请靠近目的地或打开定位后重试。",true),
     NO_IMPORT_DATA(88,"没有有效的数据，请检查您的导入文件。",true),
     FILL_ERROR(89,"您的信息填写有误，请检查您的信息。",true),
     ACCOUNT_BIND(90,"您的帐号已经绑定了，请重新进入小程序。",true),
     RECORDER_NOT(91, "对不起，您不是该信息的录入者，不能修改信息。", true),
     REPORT_HAD_COMPLETED(92, "报告单已经完成，不能再修改答题记录。", true),
-    NOT_REAL_AUTH(93,"您尚未认证，请认证后再试。",true),
+    NOT_REAL_AUTH(93,"您尚未填写基本信息，请补全信息后再试。",true),
+    HEALTH_TYPE_ERROR(94,"您的健康状态异常，打卡失败。",true),
+    NOT_HEALTH_RECORD(94,"您今天还未上报健康信息，请上报后再试。",true),
     ;
 
     public CodeEnum addMsg(String msg){

util/src/main/java/com/ccsens/util/DateUtil.java

@@ -153,7 +153,7 @@ public class DateUtil extends cn.hutool.core.date.DateUtil {
         calendar.set(Calendar.MILLISECOND, 0);
         return calendar.getTime().getTime();
     }
-
+//
 //    public static void main(String[] args) throws Exception {
 //
 //        System.out.println(getZeroTime(new Date()));