0307v3.3

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

@@ -52,8 +52,6 @@ public class HealthService implements IHealthService{
         //1、获取健康信息和userId
         HealthDto.healthInfo healthInfo = params.getParam();
         Long userId = params.getUserId();
-//        //2、通过userId获取成员id
-//        Employee employee = userService.getEmployeeByUserId(userId);
         //3、保存健康信息
         HealthRecords healthRecords = new HealthRecords();
         healthRecords.setId(snowflake.nextId());
@@ -61,7 +59,7 @@ public class HealthService implements IHealthService{
         healthRecords.setUserId(userId);
         BeanUtil.copyProperties(healthInfo,healthRecords);
         healthRecordsDao.insertSelective(healthRecords);
-        //4、生成健康码，返回地址
+        //TODO 4、生成健康码，返回地址
         String qrcodeInfo = WebConstant.QRCODE_HEALTH + "?token=" + healthInfo.getToken() + "&scene=1011";
         String path = QrCodeUtil.urlToQRCode(qrcodeInfo,WebConstant.UPLOAD_PATH_BASE);
         String qrcodePath = WebConstant.TEST_URL_BASE_HEALTH + path;

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

@@ -62,8 +62,7 @@ public class UserService implements IUserService{
             BeanUtil.copyProperties(realNameAuthList.get(0),userInfoVo);
         }
 
-//        //查询健康码
-//        Employee employee = getEmployeeByUserId(Long.valueOf(userId));
+        //查询健康码
         List<UserVo.HealthCode> healthCodeList = healthRecordsDao.getHealthQrCodeByEmployeeId(Long.valueOf(userId),startTime,endTime);
 
         userInfoVo.setHealthCodeList(healthCodeList);
@@ -89,7 +88,7 @@ public class UserService implements IUserService{
             //如果不为空代表已经认证过，直接返回认证信息
             throw new BaseException(CodeEnum.ALREADY_REAL_AUTH);
         }
-        //实名认证，检查是否属于该学校的学生
+        //TODO 实名认证，检查是否属于该学校的学生
         //保存信息
         RealNameAuth realNameAuth = new RealNameAuth();
         realNameAuth.setId(snowflake.nextId());

health/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test

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

@@ -12,7 +12,7 @@
     <select id="selectHealthInfoByDate" resultMap="resultMap_siteClick" parameterType="java.util.Map">
         select
             s.id as sId,
-            c.user_id as sSiteName,
+            s.site_name as sSiteName,
             c.time as sTime,
             s.longitude as sLongitude,
             s.latitude as sLatitude
@@ -21,7 +21,7 @@
         where
             c.rec_status = 0
         and
-            c.user_id = #{employeeId}
+            c.user_id = #{employee}
         and
             c.time &lt;= #{endTime}
         and