更新

dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java

@@ -158,6 +158,7 @@ public class TaskController {
                             List<Integer> ids = StringSplitUtil.userIdSplit(userRecord.getCountryTaskIds());
                             userRecord.setCountryTaskIds(StringSplitUtil.idListToString(taskIds));
                             taskIds.removeAll(ids);
+                            userRecord.setNewCountryTaskIds(StringSplitUtil.idListToString(taskIds));
                             userRecordService.save(userRecord);
                         }
                     }

dev-user/src/main/java/com/tykj/dev/device/user/read/controller/MessageController.java

@@ -60,6 +60,7 @@ public class MessageController {
         Boolean hasContentDim = messageSelectVo.getContentDim()!=null;
         Boolean hasOperatorDim = messageSelectVo.getOperatorDim()!=null;
         List<MessageUserVo> messageUserVos = messageService.getAllList(messageSelectVo);
+        //模糊查询筛选
         if (hasContentDim||hasOperatorDim) {
             messageUserVos = messageUserVos.stream().filter(messageUserVo -> {
                 Boolean containContentDim = !hasContentDim||messageUserVo.getContent().contains(messageSelectVo.getContentDim());
@@ -67,11 +68,16 @@ public class MessageController {
                 return containContentDim&&containOperatorDim;
             }).collect(Collectors.toList());
         }
+        //分页
         Page<MessageUserVo> taskUserVos1 = PageUtil.getPerPage(messageSelectVo.getPage(), messageSelectVo.getSize(), messageUserVos, messageSelectVo.getPageable());
+        //返回对象map
         Map<String,Object> map = new HashMap<>();
         Map<Integer,String> businessMap = GlobalMap.getBusinessMap();
+        //存在的业务类型
         Set<Integer> businessType = messageUserVos.stream().map(MessageUserVo::getBusinessType).collect(Collectors.toSet());
+        //分页数据
         map.put("pages",taskUserVos1);
+        //存在的业务类型
         map.put("businessTypes",businessType.stream().map(integer -> new BusinessTypeVo(integer,businessMap.get(integer))).collect(Collectors.toList()));
         return ResponseEntity.ok(map);
     }

dev-user/src/main/java/com/tykj/dev/device/user/read/service/impl/MessageServiceImpl.java

@@ -97,25 +97,35 @@ public class MessageServiceImpl implements MessageService {
                 .sorted(Comparator.comparing(MessageUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed())
                 .collect(Collectors.toList());
         List<Integer> ids = messageUserVos.stream().map(MessageUserVo::getId).collect(Collectors.toList());
-        UserRecord userRecord = userRecordDao.findByUserId(userId);
-        if (userRecord==null){
-            UserRecord userRecord2 = new UserRecord();
-            userRecord2.setUserId(userId);
-            userRecord2.setReadIds(StringSplitUtil.idListToString(ids));
-            userRecord2.setNewReadIds(userRecord2.getReadIds());
-            userRecordService.save(userRecord2);
+        //休眠100ms保证用户第一次登录不会创建二条userRecord
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
         }
-        else {
-            if (userRecord.getReadIds() == null) {
-                userRecord.setReadIds(StringSplitUtil.idListToString(ids));
-                userRecord.setNewReadIds(userRecord.getReadIds());
-                userRecordService.save(userRecord);
+        finally {
+            UserRecord userRecord = userRecordDao.findByUserId(userId);
+            if (userRecord == null) {
+                UserRecord userRecord2 = new UserRecord();
+                userRecord2.setUserId(userId);
+                userRecord2.setReadIds(StringSplitUtil.idListToString(ids));
+                userRecord2.setNewReadIds(userRecord2.getReadIds());
+                userRecordService.save(userRecord2);
             } else {
-                List<Integer> integerList = StringSplitUtil.userIdSplit(userRecord.getReadIds());
-                userRecord.setReadIds(StringSplitUtil.idListToString(ids));
-                ids.removeAll(integerList);
-                userRecord.setNewReadIds(StringSplitUtil.idListToString(ids));
-                userRecordService.save(userRecord);
+                if (userRecord.getReadIds() == null) {
+                    //更新阅知id
+                    userRecord.setReadIds(StringSplitUtil.idListToString(ids));
+                    userRecord.setNewReadIds(userRecord.getReadIds());
+                    userRecordService.save(userRecord);
+                } else {
+                    List<Integer> integerList = StringSplitUtil.userIdSplit(userRecord.getReadIds());
+                    //更新阅知id
+                    userRecord.setReadIds(StringSplitUtil.idListToString(ids));
+                    //和上一次比新增的id
+                    ids.removeAll(integerList);
+                    userRecord.setNewReadIds(StringSplitUtil.idListToString(ids));
+                    userRecordService.save(userRecord);
+                }
             }
         }
         return messageUserVos;
@@ -131,9 +141,11 @@ public class MessageServiceImpl implements MessageService {
         }
         else {
             List<Integer> newTaskIds = StringSplitUtil.userIdSplit(userRecord.getNewReadIds());
+            //筛选出新id的阅知
             messageUserVos = messageDao.findAll().stream()
                     .map(Message::parse2Bto)
-                    .filter(messageBto -> messageBto.getInvolveUserIdList().contains(userId) && !messageBto.getCompleteUserIdList().contains(userId) && newTaskIds.contains(messageBto.getId()))
+                    .filter(messageBto -> messageBto.getInvolveUserIdList().contains(userId) &&
+                            !messageBto.getCompleteUserIdList().contains(userId) && newTaskIds.contains(messageBto.getId()))
                     .map(MessageBto::toVo)
                     .sorted(Comparator.comparing(MessageUserVo::getCreateTime, Comparator.nullsLast(Date::compareTo)).reversed())
                     .collect(Collectors.toList());

dev-usereport/src/main/java/com/tykj/dev/device/usereport/controller/DeviceUseReportController.java

@@ -81,10 +81,11 @@ public class DeviceUseReportController {
     @ApiOperation(value = "装备使用报告下载", notes = "装备使用报告下载")
     @GetMapping("/download/{id}")
     public ResponseEntity getDownloadUrl(@PathVariable("id") int id, HttpServletResponse response, HttpServletRequest httpServletRequest) throws IOException {
+        //获取详情
         ResultObj resultObj = (ResultObj) selectDetail(id).getBody();
         DeviceUseReportDetailVo deviceUseReportDetailVo = (DeviceUseReportDetailVo) resultObj.getData();
+        //新建word模板
         WrodParameter wrodParameter = new WrodParameter();
-
         Instant instant = deviceUseReportDetailVo.getCreateTime().toInstant();
         ZoneId zone = ZoneId.systemDefault();
         LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone);

dev-usereport/src/main/java/com/tykj/dev/device/usereport/service/DeviceUseReportService.java

@@ -15,6 +15,10 @@ import java.util.List;
  */
 public interface DeviceUseReportService {
 
+    /**
+     * @param deviceUseReportEntity 实体
+     * 添加实体
+     */
     DeviceUseReport addEntity(DeviceUseReport deviceUseReportEntity);
 
     /**
@@ -22,12 +26,29 @@ public interface DeviceUseReportService {
      */
     void sendHash(List<DeviceUseReport> deviceUseReports);
 
+    /**
+     * @param deviceUseReportSelectVo 查询vo
+     * @param pageable 分页
+     * 获取使用报告分页
+     */
     Page<DeviceUseReport> getPage(DeviceUseReportSelectVo deviceUseReportSelectVo, Pageable pageable);
 
+    /**
+     * @param id 报告id
+     * 根据id获取使用报告
+     */
     DeviceUseReport getOne(Integer id);
 
+    /**
+     * @param deviceUseReportEntity 实体
+     * 更新实体
+     */
     DeviceUseReport update(DeviceUseReport deviceUseReportEntity);
 
+    /**
+     * @param deviceUseReportCreateVo 创建vo
+     * 生成装备使用报告
+     */
     DeviceUseReport createReport(DeviceUseReportCreateVo deviceUseReportCreateVo);
 
     /**

dev-usereport/src/main/java/com/tykj/dev/device/usereport/service/impl/DeviceUseReportServiceImpl.java

@@ -384,26 +384,13 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
     }
 
     /**
-     * 按型号，名称，类型组合
+     * 按型号组合统计
      */
     private List<DeviceStatistics> getDeviceStatistics(List<DeviceLibrary> deviceLibraries) {
         List<DeviceStatistics> deviceStatisticsList = new ArrayList<>();
+        //按型号组合成map
         Map<String, List<DeviceLibrary>> map = deviceLibraries.stream().collect(groupingBy(DeviceLibrary::getModel));
-//        map.forEach((s, deviceLibraries1) -> {
-//            String[] strings = s.split("Ǵ");
-//            if (strings.length == 2) {
-//                DeviceStatistics deviceStatistics = new DeviceStatistics();
-//                deviceStatistics.setModel(strings[0]);
-////                deviceStatistics.setName(strings[1]);
-//                deviceStatistics.setType(Integer.valueOf(strings[1]));
-//                deviceStatistics.setNum(deviceLibraries1.size());
-//                deviceStatisticsList.add(deviceStatistics);
-//            }
-//            DeviceStatistics deviceStatistics = new DeviceStatistics();
-//            deviceStatistics.setModel(s);
-//            deviceStatistics.setNum(deviceLibraries1.size());
-//            deviceStatisticsList.add(deviceStatistics);
-//        });
+        //不同型号生成统计vo
         for (String s:map.keySet()) {
             DeviceStatistics deviceStatistics = new DeviceStatistics();
             deviceStatistics.setModel(s);