Merge branch 'master' of gitee.com:ccsens_s/ccsenscloud

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

@@ -117,7 +117,7 @@ public class HealthVo {
         @ApiModelProperty("体温")
         private BigDecimal animalHeat;
         @ApiModelProperty("健康状态code")
-        private Byte code;
+        private String code;
         @ApiModelProperty("健康状态名字")
         private String name;
         private String quarantine;

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

@@ -67,9 +67,9 @@ public class MemberVo {
         private int touchSick;
         @ApiModelProperty("体温")
         private BigDecimal animalHeat;
-        @ApiModelProperty("状态 0:健康 1:治愈 2:隔离 3:疑似 4:确诊")
-        private Byte healthType;
-        @ApiModelProperty("名字")
+        @ApiModelProperty("状态")
+        private String healthType;
+        @ApiModelProperty("状态对应：名字")
         private String healthTypeName;
         @ApiModelProperty("就诊医院")
         private String hospital;

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

@@ -1,15 +1,24 @@
 package com.ccsens.health.util;
 
+import cn.hutool.core.date.DateUtil;
+import org.springframework.beans.factory.annotation.Value;
+
 /**
  * 健康码项目常量类
  * @author whj
  */
 public class HealthConstant {
 
+    public static String school;
+    @Value("${health.school:}")
+    public void setSchool(String school) {
+        HealthConstant.school = school;
+    }
+
     /*** redis key: 总人数*/
-    public static final String MEMBER_TOTAL_REDIS = "health_member_total_redis";
+    public static final String MEMBER_TOTAL_REDIS = school + "health_member_total_redis";
     /** redis key: 返校行程总人数*/
-    public static final String BACK_SCHOOL_TOTAL_REDIS = "health_back_school_total_redis";
+    public static final String BACK_SCHOOL_TOTAL_REDIS = school + "health_back_school_total_redis";
     /** redis有效时长：30天 */
     public static final long REDIS_TIME = 30 * 24 * 60 * 60;
 
@@ -41,4 +50,13 @@ public class HealthConstant {
     public static String getHealthTypeKey(long healthTypeId) {
         return "health_type_" + healthTypeId;
     }
+
+    /**
+     * 查询学校今天健康记录key
+     *
+     * @return
+     */
+    public static String getHealthRecordNow() {
+        return school + "health_record_" + DateUtil.today();
+    }
 }

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

@@ -35,3 +35,5 @@ file:
   domain: http://localhost:7080/
   imgDomain: http://localhost:7080/uploads
   qrCode: https://localhost:7080/gateway/health/uploads/
+health:
+  school: sxdx

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

@@ -37,3 +37,5 @@ file:
   domain: https://sd.tall.com/gateway/health/
   imgDomain: https://sd.tall.com/gateway/health/uploads
   qrCode: https://www.tall.wiki/gateway/health/uploads/
+health:
+  school: sxdx

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

@@ -37,3 +37,5 @@ file:
   domain: https://test.tall.wiki/gateway/health/
   imgDomain: https://test.tall.wiki/gateway/health/uploads
   qrCode: https://test.tall.wiki/gateway/health/uploads/
+health:
+  school: sxdx

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

@@ -62,7 +62,7 @@
         select t1.department as className, t1.totalNum, ifNull(t2.backNum,0) as backNum, t1.totalNum-IFNULL(t2.backNum,0) as noBackNum from
         (select department, count(id) as totalNum from t_member where type in (0,1)
         <if test="className != null and className != ''">
-            and department = #{className}
+            and department like concat('%',#{className},'%')
         </if>
         group by department) t1
         left join

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

@@ -15,7 +15,6 @@
     <resultMap id="BaseResultMap" type="com.ccsens.health.bean.po.SiteClockIn">
         <id column="id" jdbcType="BIGINT" property="id" />
         <result column="site_id" jdbcType="BIGINT" property="siteId" />
-        <result column="qrcode_id" jdbcType="BIGINT" property="qrcodeId" />
         <result column="time" jdbcType="BIGINT" property="time" />
         <result column="location_longitude" jdbcType="DECIMAL" property="locationLongitude" />
         <result column="location_latitude" jdbcType="DECIMAL" property="locationLatitude" />