0308.2

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

@@ -36,8 +36,8 @@ public class DebugController {
         color.r = "243";
         color.g = "139";
         color.b = "0";
-        WxXcxUtil.getWxCode("pages/user-code/user-code"
-                ,"d=1217647686598135808",color,"/home/cloud/tall/uploads/qrCode/2020-03-07/158357267174.png");
+        WxXcxUtil.getWxCode("pages/sign/sign"
+                ,"1011&d=1217647686598135808&t=0",color,"/home/cloud/tall/uploads/qrCode/2020-03-07/158357267174.png");
 //        WxXcxUtil.getWxCodeTest("pages/user-code/user-code?d=1217647686598135808"
 //                ,"d=1217647686598135808",color,"/home/cloud/tall/uploads/qrCode/2020-03-07/158357267174.png");
 

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

@@ -30,9 +30,9 @@ public class UserController {
     @MustLogin
     @ApiOperation(value = "查询个人信息", notes = "")
     @RequestMapping(value = "info", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<UserVo.UserInfo> getUserInfo(@ApiParam @Validated @RequestBody QueryDto<JourneyDto.SelectDate> params) throws Exception {
+    public JsonResponse<UserVo.UserInfo> getUserInfo(@ApiParam @Validated @RequestBody QueryDto<JourneyDto.SelectUser> params) throws Exception {
         log.info("查询个人信息：{}",params);
-        UserVo.UserInfo  userInfo = userService.getUserInfo(params);
+        UserVo.UserInfo userInfo = userService.getUserInfo(params);
         return JsonResponse.newInstance().ok(userInfo);
     }
 

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

@@ -42,6 +42,19 @@ public class JourneyDto {
         private Long endTime;
     }
 
+    @Data
+    @ApiModel("查询个人信息")
+    public static class SelectUser{
+        @ApiModelProperty("userId")
+        private Long userId;
+        @ApiModelProperty("token")
+        private String token;
+        @ApiModelProperty("开始时间 默认今天零点")
+        private Long startTime;
+        @ApiModelProperty("结束时间 默认当前时间")
+        private Long endTime;
+    }
+
     @Data
     @ApiModel("统计时的日期")
     public static class StatisticsDate{

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

@@ -7,7 +7,7 @@ import com.ccsens.health.bean.vo.UserVo;
 import com.ccsens.util.bean.dto.QueryDto;
 
 public interface IUserService {
-    UserVo.UserInfo getUserInfo(QueryDto<JourneyDto.SelectDate> params) throws Exception;
+    UserVo.UserInfo getUserInfo(QueryDto<JourneyDto.SelectUser> params) throws Exception;
 
     UserVo.UserInfo addUserInfo(QueryDto<UserDto.UserInfo> params);
 

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

@@ -3,6 +3,7 @@ package com.ccsens.health.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ccsens.cloudutil.feign.TallFeignClient;
 import com.ccsens.health.bean.dto.JourneyDto;
@@ -43,19 +44,28 @@ public class UserService implements IUserService{
      * @return
      */
     @Override
-    public UserVo.UserInfo getUserInfo(QueryDto<JourneyDto.SelectDate> params) throws Exception {
+    public UserVo.UserInfo getUserInfo(QueryDto<JourneyDto.SelectUser> params) throws Exception {
         //1、获取查询时间和被查询成员的userId
-        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();
-        String userId = tallFeignClient.getUserId(selectDate.getToken());
-        if(StrUtil.isEmpty(userId)){
-            throw new BaseException(CodeEnum.NOT_LOGIN);
+        JourneyDto.SelectUser selectUser = params.getParam();
+        Long startTime = selectUser.getStartTime() == null ? DateUtil.getZeroTime(new Date()) : selectUser.getStartTime();
+        Long endTime = selectUser.getEndTime() == null ? System.currentTimeMillis() : selectUser.getEndTime();
+        Long userId = null;
+        if(ObjectUtil.isNotNull(selectUser.getUserId())){
+            userId = selectUser.getUserId();
+        }else {
+            String id = tallFeignClient.getUserId(selectUser.getToken());
+            if(StrUtil.isNotEmpty(id)){
+                userId = Long.valueOf(id);
+            }
+        }
+
+        if(ObjectUtil.isNull(userId)){
+            throw new BaseException(CodeEnum.NOT_EMPLOYEE);
         }
         //查询信息
         UserVo.UserInfo userInfoVo = new UserVo.UserInfo();
         RealNameAuthExample realNameAuthExample = new RealNameAuthExample();
-        realNameAuthExample.createCriteria().andUserIdEqualTo(Long.valueOf(userId));
+        realNameAuthExample.createCriteria().andUserIdEqualTo(userId);
         List<RealNameAuth> realNameAuthList = realNameAuthDao.selectByExample(realNameAuthExample);
         if(CollectionUtil.isNotEmpty(realNameAuthList)){
             userInfoVo = new UserVo.UserInfo();
@@ -63,7 +73,7 @@ public class UserService implements IUserService{
         }
 
         //查询健康码
-        List<UserVo.HealthCode> healthCodeList = healthRecordsDao.getHealthQrCodeByEmployeeId(Long.valueOf(userId),startTime,endTime);
+        List<UserVo.HealthCode> healthCodeList = healthRecordsDao.getHealthQrCodeByEmployeeId(userId,startTime,endTime);
 
         userInfoVo.setHealthCodeList(healthCodeList);