fix(装备模块): 修改下级设备的型号，需要发送阅知

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -18,9 +18,15 @@ import com.tykj.dev.device.library.subject.model.vo.UpdateXyzVo;
 import com.tykj.dev.device.library.subject.vo.*;
 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.device.user.read.service.MessageService;
+import com.tykj.dev.device.user.read.subject.bto.MessageBto;
+import com.tykj.dev.device.user.subject.dao.UserDao;
 import com.tykj.dev.device.user.subject.entity.Units;
+import com.tykj.dev.device.user.subject.entity.User;
 import com.tykj.dev.device.user.subject.service.UnitStoreLocationService;
 import com.tykj.dev.device.user.subject.service.UnitsService;
+import com.tykj.dev.device.user.subject.service.UserService;
 import com.tykj.dev.device.user.util.UserUtils;
 //import com.tykj.dev.misc.base.DeviceLifeStatus;
 import com.tykj.dev.misc.exception.ApiException;
@@ -97,6 +103,18 @@ public class DeviceLibraryController {
     @Resource
     private DeviceLibraryPositionService deviceLibraryPositionService;
 
+    @Resource
+    private UnitsCache unitsCache;
+
+    @Resource
+    private UserCache userCache;
+
+    @Resource
+    private MessageService messageService;
+
+    @Resource
+    private UserService userService;
+
     @ApiOperation(value = "修改装备备注", notes = "修改装备备注")
     @PostMapping("/setRecord")
     @CacheEvict(value = "devicesLibraryList",key = "'device'",allEntries = true)
@@ -693,6 +711,8 @@ public class DeviceLibraryController {
         }
     }
 
+    @Resource
+    private UserDao userDao;
     @ApiOperation(value = "更新装备库", notes = "可以通过这个接口更新装备库")
     @PostMapping("/updateDeviceLibrary")
     @Transactional(rollbackFor = Exception.class)
@@ -868,8 +888,29 @@ public class DeviceLibraryController {
                     }
                     String lastRemark = (remarkModel+remarkType+remarkName+remarkMatchingRange).replaceAll("\\\"", "");
                     DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), lastRemark, null,null,null);
+                    //发阅知
+                   //如果该装备的所属所在不一样
+                    if (!deviceLibraryEntity.getOwnUnit().equals(deviceLibraryEntity.getLocationUnit())){
+                        //根据单位名称查询单位id以及的单位id的所有用户id
+                        Units units1 = unitsService.findbyName(deviceLibraryEntity.getOwnUnit());
+                        Units units2 = unitsService.findbyName(deviceLibraryEntity.getLocationUnit());
+                        List<Integer> list = new ArrayList<>();
+                        list.add(units1.getUnitId());
+                        list.add(units2.getUnitId());
+                        List<Integer> userList = userCache.findAllByUnitsIdIn(list).stream().map(User::getUserId).collect(Collectors.toList());
+                        MessageBto messageBto = new MessageBto(0, 0,userUtils.getCurrentUserUnitName()+lastRemark,
+                                userList,1,1);
+                        messageService.add(messageBto);
+                    }else {
+                        Units units1 = unitsService.findbyName(deviceLibraryEntity.getOwnUnit());
+                        List<Integer> list = new ArrayList<>();
+                        list.add(units1.getUnitId());
+                        List<Integer> userList = userCache.findAllByUnitsIdIn(list).stream().map(User::getUserId).collect(Collectors.toList());
+                        MessageBto messageBto = new MessageBto(0, 0,userUtils.getCurrentUserUnitName()+lastRemark,
+                                userList,1,1);
+                        messageService.add(messageBto);
+                    }
                     deviceLogService.addLog(deviceLogDto);
-
                 }
             }
             deviceLibraryService.update(deviceLibraryEntity);