fix(日常检查模块): 解决了数据为空的原因

dev-misc/src/main/java/com/tykj/dev/misc/qrcode/QrCodeBillUtil.java

@@ -69,6 +69,7 @@ public class QrCodeBillUtil {
         for (int i = 0; i < collect.size(); i++) {
             flag =  deviceDataUtil.addString(collect.get(i));
         }
+        log.info("collect:{}",collect);
         if (!flag){
             throw new ApiException("没有扫完");
         }

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/DailyCheckController.java

@@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StopWatch;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -136,23 +137,26 @@ public class DailyCheckController {
     @PostMapping(value = "/summary")
     public ResponseEntity selectSelfExaminationBill(@RequestBody DailyCheckSelectVo dailyCheckSelectVo) {
         Page<DailyCheckBill> page = dailyCheckBillService.getDailyCheckPage(dailyCheckSelectVo);
-        for (DailyCheckBill dailyCheckBill : page.getContent()) {
-            if (dailyCheckBill.getCreateUnitId()!=null) {
-                dailyCheckBill.setCreateUnit(unitsCache.findById(dailyCheckBill.getId()).getName());
-            }
-            if (dailyCheckBill.getUseraId()!=null) {
-                dailyCheckBill.setCheckUser(userCache.findById(dailyCheckBill.getUseraId()).getName());
-            }
-            if (dailyCheckBill.getUserbId()!=null) {
-                dailyCheckBill.setCheckUser(userCache.findById(dailyCheckBill.getUseraId()).getName());
-            }
-            if (dailyCheckBill.getCreateUserId()!=null) {
-                dailyCheckBill.setCreateUser(userCache.findById(dailyCheckBill.getUseraId()).getName());
-            }
-            if (dailyCheckBill.getId()!=null){
-                dailyCheckBill.setTaskId(taskService.get(dailyCheckBill.getId(),32).getId());
-            }
-        }
+
+//        for (DailyCheckBill dailyCheckBill : page.getContent()) {
+//            if (dailyCheckBill.getCreateUnitId()!=null) {
+//                dailyCheckBill.setCreateUnit(unitsCache.findById(dailyCheckBill.getId()).getName());
+//            }
+//            if (dailyCheckBill.getUseraId()!=null) {
+//                dailyCheckBill.setCheckUser(userCache.findById(dailyCheckBill.getUseraId()).getName());
+//            }
+//            if (dailyCheckBill.getUserbId()!=null) {
+//                dailyCheckBill.setCheckUser(userCache.findById(dailyCheckBill.getUserbId()).getName());
+//            }
+//            if (dailyCheckBill.getCreateUserId()!=null) {
+//                dailyCheckBill.setCreateUser(userCache.findById(dailyCheckBill.getUseraId()).getName());
+//            }
+////            if (dailyCheckBill.getId()!=null){
+////                dailyCheckBill.setTaskId(taskService.get(dailyCheckBill.getId(),32).getId());
+////            }
+//        }
+//        stopWatch1.stop();
+//        log.info("转换时间:{}",stopWatch1.getTotalTimeMillis());
         return ResultUtil.success(page);
     }
 

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/service/impl/DailyCheckBillServiceImpl.java

@@ -28,6 +28,7 @@ import com.tykj.dev.misc.qrcode.QrCodeBillUtil;
 import com.tykj.dev.misc.qrcode.vo.DeviceCodeVO;
 import com.tykj.dev.misc.qrcode.vo.TaskData;
 import com.tykj.dev.misc.utils.DateUtil;
+import com.tykj.dev.misc.utils.PageUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.Page;
@@ -74,8 +75,6 @@ public class DailyCheckBillServiceImpl implements DailyCheckBillService {
     @Resource
     private RemindCheckService remindCheckService;
 
-
-
     @Override
     public DailyCheckBill getOne(Integer id) {
         return dailyCheckBillDao.findById(id).orElseThrow(() -> new ApiException(String.format("查询的%d不存在",id)));
@@ -217,6 +216,8 @@ public class DailyCheckBillServiceImpl implements DailyCheckBillService {
             Date taskCreateDate = taskData.getTaskCreateDate();
             LocalDate taskDate = DateUtil.getLocalDate(taskCreateDate);
             if (!todayDate.equals(taskDate)){
+                log.info("当前时间:{}",todayDate);
+                log.info("任务时间:{}",taskDate);
                 throw new ApiException("扫描任务与当前的任务时间不一致");
             }
             List<DeviceCodeVO> deviceLibraryList = taskData.getDeviceLibraries();
@@ -314,9 +315,11 @@ public class DailyCheckBillServiceImpl implements DailyCheckBillService {
         if (checkBill.getUserbId() != null){
             checkBill.setConfirmUser(userCache.findById(checkBill.getUserbId()).getName());
         }
-        map.put("checkBill", checkBill);
+//        map.put("checkBill", checkBill);
         //根据业务id查询任务日志
         TaskBto taskBto = taskService.get(billId, BusinessEnum.DAILY_SELF_CHECK.id);
+        checkBill.setTaskId(taskBto.getId());
+        map.put("checkBill", checkBill);
         List<TaskLogUserVo> taskLogUserVoList = taskLogService.getByTaskId(taskBto.getId());
         map.put("taskLogUserVoList", taskLogUserVoList);
         //查询任务
@@ -334,8 +337,17 @@ public class DailyCheckBillServiceImpl implements DailyCheckBillService {
 
     @Override
     public Page<DailyCheckBill> getDailyCheckPage(DailyCheckSelectVo dailyCheckSelectVo) {
-        return dailyCheckBillDao.findAll(getSelectSpecification(dailyCheckSelectVo),
-                dailyCheckSelectVo.getPageable());
+        List<DailyCheckBill> dailyCheckBills = dailyCheckBillDao.findAll(getSelectSpecification(dailyCheckSelectVo),
+                dailyCheckSelectVo.getPageable().getSort());
+        long l = System.currentTimeMillis();
+        dailyCheckBills.forEach(dailyCheckBill -> {
+            dailyCheckBill.setConfigName();
+//            dailyCheckBill.setTaskId(taskService.get(dailyCheckBill.getId(),BusinessEnum.DAILY_SELF_CHECK.id).getId());
+        });
+        long l1 = System.currentTimeMillis();
+        log.info("时间:{}",l1-l);
+        return PageUtil.getPerPage(dailyCheckSelectVo.getPage(),dailyCheckSelectVo.getSize(),
+                dailyCheckBills,dailyCheckSelectVo.getPageable());
     }
 
     @Override

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/subject/domin/DailyCheckBill.java

 package com.tykj.dev.device.selfcheck.subject.domin;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tykj.dev.config.cache.ConfigCache;
 import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
+import com.tykj.dev.device.user.cache.StoreCache;
+import com.tykj.dev.device.user.cache.UnitsCache;
+import com.tykj.dev.device.user.cache.UserCache;
+import com.tykj.dev.misc.utils.SpringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -199,4 +204,22 @@ public class DailyCheckBill {
     @ApiModelProperty("0和1")
     private List<HistoryDailyDeviceBill> historyDailyDeviceBills;
 
+
+    public DailyCheckBill setConfigName(){
+        UserCache userCache = SpringUtils.getBean("initUserCache");
+        UnitsCache unitsCache = SpringUtils.getBean("initUnitCache");
+        if (userCache!=null && unitsCache != null) {
+            if (this.useraId != null){
+                setCheckUser(userCache.findById(this.useraId).getName());
+            }
+            if (this.createUnitId != null){
+                setCreateUnit(unitsCache.findById(this.createUnitId).getName());
+            }
+            if (this.userbId != null){
+                setConfirmUser(userCache.findById(this.userbId).getName());
+            }
+        }
+        return this;
+    }
+
 }