feat(装备模块,配套设备模块): 新增了修改单位名称修改配套设备库的创建单位的名称

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

@@ -1190,21 +1190,21 @@ public class DeviceLibraryController {
 
 
 
-    @ApiOperation(value = "修改单位名称", notes = "修改单位名称")
-    @PostMapping("/updateDeviceLocationAndOwnUnit")
-    @Transactional(rollbackFor = Exception.class)
-    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("修改成功");
-    }
+//    @ApiOperation(value = "修改单位名称", notes = "修改单位名称")
+//    @PostMapping("/updateDeviceLocationAndOwnUnit")
+//    @Transactional(rollbackFor = Exception.class)
+//    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("修改成功");
+//    }
 
     public List<DeviceLibrary> getAllListAndParent(){
         DeviceLibrarySelectVo deviceLibrarySelectVo = new DeviceLibrarySelectVo();

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java

@@ -26,8 +26,11 @@ import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.domin.Task;
+import com.tykj.dev.device.user.cache.UnitsCache;
 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.Units;
+import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.base.BusinessEnum;
@@ -51,9 +54,11 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.constraints.Min;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -112,6 +117,11 @@ public class MatchingDeviceController {
     @Autowired
     private MatchingDeviceModelService matchingDeviceModelService;
 
+    @Resource
+    private UnitsCache unitsCache;
+
+    @Resource
+    private UnitsService unitsService;
 
     @ApiOperation(value = "将设备进行拆分", notes = "将设备进行拆分")
     @PostMapping(value = "/matchingDeviceSplit")
@@ -816,6 +826,28 @@ public class MatchingDeviceController {
         MatchingDeviceLibrary matchingDeviceLibrary = matchingDeviceLibraryService.printRfid(id);
         return ResponseEntity.ok(matchingDeviceLibrary.getRfidCardId());
     }
+
+//    @ApiOperation(value = "修改单位名称从而修改配套设备的创建单位", notes = "修改单位名称从而修改配套设备的创建单位")
+//    @PostMapping("/updateMatchingDeviceCreateUnitName")
+//    @Transactional(rollbackFor = Exception.class)
+//    public ResponseEntity<String> updateMatchingDeviceCreateUnitName(@RequestBody Units units) {
+//        String name = unitsCache.findById(units.getUnitId()).getName();
+//        UpdateUnitVo updateUnitVo = new UpdateUnitVo();
+//        MatchingUnitVo matchingUnitVo = new MatchingUnitVo();
+//        //调用单位
+//        unitsService.updateUnit(units);
+//        if (!name.equals(units.getName())){
+//            updateUnitVo.setOriginUnitName(name);
+//            updateUnitVo.setUpdateUnitName(units.getName());
+//            matchingUnitVo.setOriginUnitName(name);
+//            matchingUnitVo.setUpdateUnitName(units.getName());
+//            CompletableFuture.runAsync(()->deviceLibraryService.updateDeviceLocationAndOwnUnit(updateUnitVo));
+//            CompletableFuture.runAsync(()->matchingDeviceLibraryService.updateMatchingDeviceCreateUnitNameByUnitName(matchingUnitVo));
+//        }
+//        return ResponseEntity.ok("修改成功");
+//    }
+
+
     /**
      * @return 生成配套设备附件的序列号
      */

dev-matching/src/main/java/com/tykj/dev/device/matching/repository/MatchingDeviceLibraryDao.java

@@ -3,7 +3,11 @@ package com.tykj.dev.device.matching.repository;
 import com.tykj.dev.device.matching.subject.domin.MatchingDeviceLibrary;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 /**
@@ -17,4 +21,10 @@ public interface MatchingDeviceLibraryDao extends JpaRepository<MatchingDeviceLi
 
         List<MatchingDeviceLibrary>  findAllByCreateUnitIdIn(List<Integer> unitIds);
 
+        @Transactional
+        @Modifying
+        @Query("update MatchingDeviceLibrary m set m.createUnit = :updateUnitName where m.createUnit = :originUnitName")
+        int updateCreateUnitName(@Param("originUnitName") String originUnitName,
+                               @Param("updateUnitName") String updateUnitName);
+
 }

dev-matching/src/main/java/com/tykj/dev/device/matching/service/MatchingDeviceLibraryService.java

 package com.tykj.dev.device.matching.service;
 
-import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
-import com.tykj.dev.device.library.subject.vo.DeviceLibrarySelectVo;
 import com.tykj.dev.device.matching.subject.domin.MatchingDeviceLibrary;
+import com.tykj.dev.device.matching.subject.vo.MatchingUnitVo;
 import com.tykj.dev.device.matching.subject.vo.MatchingDeviceSelectVo;
 import com.tykj.dev.device.matching.subject.vo.RelationDeviceVo;
 import com.tykj.dev.rfid.entity.vo.RfidPrintVo;
@@ -107,4 +106,10 @@ public interface MatchingDeviceLibraryService {
      * @return
      */
     List<String> getAllMatchingDeviceLibraryListSeqNumberList();
+
+    /**
+     * 修改单位名称从而修改配套设备库装备的创建单位的名称
+     * @param matchingUnitVo 修改单位名称的vo
+     */
+    void updateMatchingDeviceCreateUnitNameByUnitName(MatchingUnitVo matchingUnitVo);
 }

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/MatchingDeviceLibraryServiceImpl.java

@@ -5,13 +5,12 @@ import com.github.wenhao.jpa.Specifications;
 import com.tykj.dev.blockcha.subject.entity.BcHash;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.config.TaskBeanConfig;
-import com.tykj.dev.device.library.service.DeviceLibraryService;
 import com.tykj.dev.device.library.service.DeviceLogService;
 import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
-import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.matching.repository.MatchingDeviceLibraryDao;
 import com.tykj.dev.device.matching.service.MatchingDeviceLibraryService;
 import com.tykj.dev.device.matching.subject.domin.MatchingDeviceLibrary;
+import com.tykj.dev.device.matching.subject.vo.MatchingUnitVo;
 import com.tykj.dev.device.matching.subject.vo.MatchingDeviceSelectVo;
 import com.tykj.dev.device.matching.subject.vo.RelationDeviceVo;
 import com.tykj.dev.device.user.subject.entity.Units;
@@ -26,14 +25,11 @@ import com.tykj.dev.rfid.entity.vo.PrintVo;
 import com.tykj.dev.rfid.entity.vo.RfidPrintVo;
 import com.tykj.dev.rfid.service.RfidService;
 import com.tykj.dev.rfid.service.impl.RfidServiceImpl;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
 
 import javax.persistence.Transient;
 import java.lang.reflect.Field;
@@ -338,6 +334,11 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public void updateMatchingDeviceCreateUnitNameByUnitName(MatchingUnitVo matchingUnitVo) {
+        matchingDeviceLibraryDao.updateCreateUnitName(matchingUnitVo.getOriginUnitName(),matchingUnitVo.getUpdateUnitName());
+    }
+
 
     /**
      * @param matchingDeviceSelectVo 配套设备查询vo

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/vo/MatchingUnitVo.java

+package com.tykj.dev.device.matching.subject.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("修改配套设备的vo")
+public class MatchingUnitVo {
+
+    @ApiModelProperty(name = "原始的单位名称")
+    private String originUnitName;
+
+    @ApiModelProperty(name = "修改后的单位名称")
+    private String updateUnitName;
+}

dev-union/src/main/java/com/tykj/dev/union/RunController.java

-//package com.tykj.dev.union;
-//
-///**
-// * @author zjm
-// * @version 1.0.0
-// * @ClassName AreaController.java
-// * @Description TODO
-// * @createTime 2020年09月04日 13:34:00
-// */
-//
-//import com.tykj.dev.config.swagger.AutoDocument;
-//import com.tykj.dev.device.user.subject.dao.AreaDao;
-//import com.tykj.dev.device.user.subject.entity.Area;
-//import com.tykj.dev.device.user.subject.entity.SecurityUser;
-//import com.tykj.dev.device.user.subject.service.AreaService;
-//import com.tykj.dev.misc.exception.ApiException;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.http.ResponseEntity;
-//import org.springframework.security.core.annotation.AuthenticationPrincipal;
-//import org.springframework.web.bind.annotation.*;
-//import springfox.documentation.annotations.ApiIgnore;
-//
-//import java.util.Optional;
-//
-///**
-// * 区域视图层
-// */
-//@RestController
-//@RequestMapping("/run")
-//public class RunController {
-//   @Autowired
-//   DataInit dataInit;
-//    @GetMapping(value = "/init2")
-//    public ResponseEntity addPermissions(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser) {
-//        dataInit.init2();
-//        return ResponseEntity.ok("ok");
-//    }
-//
-//
-//}
+package com.tykj.dev.union;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName AreaController.java
+ * @Description TODO
+ * @createTime 2020年09月04日 13:34:00
+ */
+
+import com.tykj.dev.config.swagger.AutoDocument;
+import com.tykj.dev.device.library.service.DeviceLibraryService;
+import com.tykj.dev.device.library.subject.vo.UpdateUnitVo;
+import com.tykj.dev.device.matching.service.MatchingDeviceBillService;
+import com.tykj.dev.device.matching.service.MatchingDeviceLibraryService;
+import com.tykj.dev.device.matching.subject.vo.MatchingUnitVo;
+import com.tykj.dev.device.user.cache.UnitsCache;
+import com.tykj.dev.device.user.subject.dao.AreaDao;
+import com.tykj.dev.device.user.subject.entity.Area;
+import com.tykj.dev.device.user.subject.entity.SecurityUser;
+import com.tykj.dev.device.user.subject.entity.Units;
+import com.tykj.dev.device.user.subject.service.AreaService;
+import com.tykj.dev.device.user.subject.service.UnitsService;
+import com.tykj.dev.misc.exception.ApiException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * 区域视图层
+ */
+@RestController
+public class RunController {
+
+    @Resource
+    UnitsCache unitsCache;
+
+    @Resource
+    UnitsService unitsService;
+
+    @Autowired
+    private DeviceLibraryService deviceLibraryService;
+
+    @Autowired
+    private MatchingDeviceLibraryService matchingDeviceLibraryService;
+
+    @ApiOperation(value = "修改单位名称从而修改配套设备的创建单位", notes = "修改单位名称从而修改配套设备的创建单位")
+    @PostMapping("/device/updateDeviceLocationAndOwnUnit")
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseEntity<String> updateMatchingDeviceCreateUnitName(@RequestBody Units units) {
+        String name = unitsCache.findById(units.getUnitId()).getName();
+        UpdateUnitVo updateUnitVo = new UpdateUnitVo();
+        MatchingUnitVo matchingUnitVo = new MatchingUnitVo();
+        //调用单位
+        unitsService.updateUnit(units);
+        if (!name.equals(units.getName())){
+            updateUnitVo.setOriginUnitName(name);
+            updateUnitVo.setUpdateUnitName(units.getName());
+            matchingUnitVo.setOriginUnitName(name);
+            matchingUnitVo.setUpdateUnitName(units.getName());
+            CompletableFuture.runAsync(()->deviceLibraryService.updateDeviceLocationAndOwnUnit(updateUnitVo));
+            CompletableFuture.runAsync(()->matchingDeviceLibraryService.updateMatchingDeviceCreateUnitNameByUnitName(matchingUnitVo));
+        }
+        return ResponseEntity.ok("修改成功");
+    }
+
+
+}