fix(状态模块,培训、工作交接): 修改阅知格式的修改

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/AgainStorageBillServiceImpl.java

@@ -68,7 +68,7 @@ public class AgainStorageBillServiceImpl implements AgainStorageBillService {
         List<DeviceLibrary> deviceLibraries=  deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(transitionOfLifeVo.getIds());
         AgainStorageBill againStorageBill= againStorageBillDao.save(new AgainStorageBill(StringUtils.ListToString(transitionOfLifeVo.getIds()),transitionOfLifeVo.getType()));
         String typeName;
-        List<String> seqList = deviceLibraries.stream().map(DeviceLibrary::getSeqNumber).collect(Collectors.toList());
+        List<String> models = deviceLibraries.stream().map(DeviceLibrary::getModel).distinct().collect(Collectors.toList());
         switch (transitionOfLifeVo.getType()){
             case 0:
 //                deviceLibraryDao.upDateLeftStatus(DeviceLifeStatus.IN_LIBRARY.id,transitionOfLifeVo.getIds());
@@ -79,19 +79,19 @@ public class AgainStorageBillServiceImpl implements AgainStorageBillService {
             case 1:
 //                deviceLibraryDao.upDateLeftStatus(DeviceLifeStatus.TO_BE_SCRAPPED.id,transitionOfLifeVo.getIds());
                 deviceLibraryService.upDateLeftStatus(DeviceLifeStatus.TO_BE_SCRAPPED.id,transitionOfLifeVo.getIds());
-                typeName="转为待报废设备";
+                typeName="待报废";
                 break;
 
             case 2:
 //                deviceLibraryDao.upDateLeftStatus(DeviceLifeStatus.TO_BE_DESTROYED.id,transitionOfLifeVo.getIds());
                 deviceLibraryService.upDateLeftStatus(DeviceLifeStatus.TO_BE_DESTROYED.id,transitionOfLifeVo.getIds());
-                typeName="转为待销毁设备";
+                typeName="待销毁";
                 break;
 
             case 3:
 //                deviceLibraryDao.upDateLeftStatus(DeviceLifeStatus.REPEL.id,transitionOfLifeVo.getIds());
                 deviceLibraryService.upDateLeftStatus(DeviceLifeStatus.REPEL.id,transitionOfLifeVo.getIds());
-                typeName="转为待退役设备";
+                typeName="待退役";
                 break;
 
                 default:
@@ -99,8 +99,7 @@ public class AgainStorageBillServiceImpl implements AgainStorageBillService {
 
         }
         TaskBto taskBto=againStorageTask(securityUser.getCurrentUserInfo().getUnitsId(),againStorageBill.getId(),securityUser.getCurrentUserInfo().getUserId(),typeName);
-        addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"修改装备状态为"+typeName+":【"+seqList.stream()
-                .collect(Collectors.joining(","))+"】",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
+        addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"修改 装备状态"+typeName+":【型号:"+String.join(",",models)+"共"+transitionOfLifeVo.getIds().size()+ "件】",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
         devLogAdd(deviceLibraries,typeName,securityUser.getCurrentUserInfo().getUserId());
     }
 

dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java

@@ -178,12 +178,12 @@ public class TrainJobController {
         if (securityUser.getCurrentUserInfo().getUnits().getLevel()==1){
             List<Integer> userIds=userService.findAllByUnite(securityUser.getCurrentUserInfo().getUnitsId()).stream().map(User::getUserId).collect(Collectors.toList());
             userIds.remove(securityUser.getCurrentUserInfo().getUserId());
-            messageService.add(new MessageBto(task.getId(),BusinessEnum.TRAIN.id,"发起培训业务:"+trainTheme.getName(),userIds,trainTheme.getTrainId().toString()));
+            messageService.add(new MessageBto(task.getId(),BusinessEnum.TRAIN.id,"发起"+(trainTheme.getTrainType()==0 ? "线上" : "线下")+ "培训业务:【"+messageToString(trainTheme)+"】",userIds,trainTheme.getTrainId().toString()));
         }else {
             List<Integer> userIds=userService.findAllByUnite(securityUser.getCurrentUserInfo().getUnitsId()).stream().map(User::getUserId).collect(Collectors.toList());
             userIds.remove(securityUser.getCurrentUserInfo().getUserId());
             userIds.addAll(userService.findAllByUnite(1).stream().map(User::getUserId).collect(Collectors.toList()));
-            messageService.add(new MessageBto(task.getId(),BusinessEnum.TRAIN.id,"发起培训业务:"+trainTheme.getName(),userIds,trainTheme.getTrainId().toString()));
+            messageService.add(new MessageBto(task.getId(),BusinessEnum.TRAIN.id,"发起"+(trainTheme.getTrainType()==0 ? "线上" : "线下")+ "培训业务:【"+messageToString(trainTheme)+"】",userIds,trainTheme.getTrainId().toString()));
         }
         return ResponseEntity.ok(trainThemeService.save(trainTheme));
     }
@@ -236,10 +236,14 @@ public class TrainJobController {
 //        taskBto.setCreateUserId(securityUser.getCurrentUserInfo().getUserId());
 //        taskBto = taskService.moveToEnd(taskBto);
         trainUnitDao.save(trainUnit);
-        messageService.add(new MessageBto(0, BusinessEnum.TRAIN_SIGN_UP.id, securityUser.getCurrentUserInfo().getName()+"帮你报名["+trainTheme.getName()+"]培训,培训地点："+trainTheme.getTrainLocation(), userIds, trainTheme.getTrainId().toString()));
+        messageService.add(new MessageBto(0, BusinessEnum.TRAIN_SIGN_UP.id, "帮你 报名"+(trainTheme.getTrainType()==0 ? "线上" : "线下")+"培训:["+messageToString(trainTheme)+"]", userIds, trainTheme.getTrainId().toString()));
         return ResponseEntity.ok(taskBto);
     }
 
+    private String messageToString(TrainTheme trainTheme){
+      return   "培训名称:"+trainTheme.getName()+",时间:"+trainTheme.getStartTime()+
+                ",培训地点:"+trainTheme.getTrainLocation();
+    }
 
     /**
      * 拒绝报名
@@ -257,7 +261,7 @@ public class TrainJobController {
         taskBto = taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1002, 0);
         List<Integer> userIds = userService.findAllByUnite(securityUser.getCurrentUserInfo().getUnitsId()).stream().map(User::getUserId).collect(Collectors.toList());
         userIds.addAll(userService.findAllByUnite(trainTheme.getUnitsId()).stream().filter(user -> !user.getUserId().equals(securityUser.getCurrentUserInfo().getUserId())).map(User::getUserId).collect(Collectors.toList()));
-        messageService.add(new MessageBto(0, BusinessEnum.TRAIN.id, securityUser.getCurrentUserInfo().getName()+"让"+units.getName()+"重新培训报名", userIds, trainTheme.getTrainId().toString()));
+        messageService.add(new MessageBto(0, BusinessEnum.TRAIN.id, "让 重新培训报名:【"+units.getName()+"】", userIds, trainTheme.getTrainId().toString()));
         return ResponseEntity.ok(taskBto);
     }
 
@@ -635,7 +639,7 @@ public class TrainJobController {
                     trainUnit -> userIds.addAll(trainUserDao.findAllByUnitsIdAndTrainId(trainUnit.getUnitId(),trainId).stream().filter(trainUser -> trainUser.getIsSignUp()==1).map(TrainUser::getUserId).collect(Collectors.toList()))
             );
         }
-        messageService.add(new MessageBto(0, BusinessEnum.TRAIN.id, securityUser.getCurrentUserInfo().getName()+"终止了["+trainTheme.getName()+"]培训业务,本次培训作废", userIds, trainTheme.getTrainId().toString()));
+        messageService.add(new MessageBto(0, BusinessEnum.TRAIN.id, "终止 培训:["+messageToString(trainTheme)+"]", userIds, trainTheme.getTrainId().toString()));
         //查询所有的task 同送至中止
         //查询出所有以报名的单位人员
         //给人员推送阅知

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/WorkHandoverServiceImpl.java

@@ -13,6 +13,7 @@ import com.tykj.dev.device.train.entity.vo.WorkHandoverEndAddVo;
 import com.tykj.dev.device.train.entity.vo.WorkHandoverUserVo;
 import com.tykj.dev.device.train.service.TrainTaskService;
 import com.tykj.dev.device.train.service.WorkHandoverService;
+import com.tykj.dev.device.user.cache.UserCache;
 import com.tykj.dev.device.user.read.service.MessageService;
 import com.tykj.dev.device.user.read.subject.bto.MessageBto;
 import com.tykj.dev.device.user.subject.entity.SecurityUser;
@@ -71,6 +72,9 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
     @Autowired
     WorkHandoverDevDao workHandoverDevDao;
 
+    @Autowired
+    UserCache userCache;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public WorkHandover createWorkHandover(WorkHandoverAddVo workHandoverAddVo, SecurityUser securityUser) {
@@ -92,7 +96,9 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
         List<Integer> integers = new ArrayList<>();
         integers.add(securityUser.getCurrentUserInfo().getUserId());
         TaskBto taskBto= taskService.start(new TaskBto(StatusEnum.WORKHANDOVER1011.id, "工作交接", null, null, workHandover.getWorkHandoverId(), BusinessEnum.WORK_HANDOVER.id, securityUser.getCurrentUserInfo().getUnitsId(), 0, null, integers));
-        addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起工作交接业务",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId()),workHandover.getWorkHandoverId().toString()));
+        Integer userId= workHandoverAddVo.getWorkHandoverUserVoList().get(0).getHandoverUserIds().get(0);
+        User user= userCache.findById(userId);
+        addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起 工作交接业务:【接交人:"+user.getName()+"】",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId()),workHandover.getWorkHandoverId().toString()));
         return workHandover;
     }
 
@@ -146,6 +152,7 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
         );
         workHandoverDevDao.saveAll(workHandoverDevs);
         userService.saveAll(users);
+
         return workHandover;
     }