feat(装备模块): 修改单位名称从而修改装备的所属所在

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

@@ -15,6 +15,9 @@ import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.domin.DeviceLog;
 import com.tykj.dev.device.library.subject.vo.*;
+import com.tykj.dev.device.user.cache.UnitsCache;
+import com.tykj.dev.device.user.subject.entity.Units;
+import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.device.user.util.UserUtils;
 //import com.tykj.dev.misc.base.DeviceLifeStatus;
 import com.tykj.dev.misc.exception.ApiException;
@@ -38,6 +41,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.Min;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
@@ -81,6 +85,12 @@ public class DeviceLibraryController {
     @Autowired
     private DeviceLibraryCacheService cacheLibraryService;
 
+    @Autowired
+    private UnitsService unitsService;
+
+    @Autowired
+    private UnitsCache unitsCache;
+
     @ApiOperation(value = "修改装备备注", notes = "修改装备备注")
     @PostMapping("/setRecord")
     @CacheEvict(value = "devicesLibraryList",key = "'device'",allEntries = true)
@@ -1170,11 +1180,21 @@ public class DeviceLibraryController {
         return deviceLibraryService.getDevicesForWorkUse();
     }
 
+
+
     @ApiOperation(value = "修改单位名称", notes = "修改单位名称")
     @PostMapping("/updateDeviceLocationAndOwnUnit")
     @Transactional(rollbackFor = Exception.class)
-    public ResponseEntity<String> updateDeviceLocationAndOwnUnit(@RequestBody UpdateUnitVo updateUnitVo){
-        deviceLibraryService.updateDeviceLocationAndOwnUnit(updateUnitVo);
+    public ResponseEntity<String> updateDeviceLocationAndOwnUnit(@RequestBody Units units){
+        String name = unitsCache.findById(units.getUnitId()).getName();
+        UpdateUnitVo updateUnitVo = new UpdateUnitVo();
+        //调用单位
+        unitsService.updateUnit(units);
+        if (!name.equals(units.getName())){
+            updateUnitVo.setOriginUnitName(name);
+            updateUnitVo.setUpdateUnitName(units.getName());
+            CompletableFuture.runAsync(()->deviceLibraryService.updateDeviceLocationAndOwnUnit(updateUnitVo));
+        }
         return ResponseEntity.ok("修改成功");
     }