feat(维修模块): 新增了清退终止维修

dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryDao.java

@@ -170,6 +170,7 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
 
     List<DeviceLibrary> findAllByModel(String model);
 
+    @Transactional
     @Modifying
     @Query("update DeviceLibrary d set d.ownUnit = d.locationUnit ,d.lifeStatus = 2 where d.id in :deviceIds")
     int updateDevicesOwnUnit(@Param("deviceIds") List<Integer> deviceIds);

dev-repair/src/main/java/com/tykj/dev/device/repair/service/RepairDetailService.java

@@ -2,6 +2,7 @@ package com.tykj.dev.device.repair.service;
 
 
 import com.tykj.dev.device.repair.subject.domin.RepairDetail;
+import com.tykj.dev.device.repair.subject.vo.BillVo;
 import com.tykj.dev.device.repair.subject.vo.ClearTaskVo;
 import com.tykj.dev.device.repair.subject.vo.SetDevicesOwnUnit;
 
@@ -51,8 +52,8 @@ public interface RepairDetailService extends RepairPublicService<RepairDetail> {
     List<ClearTaskVo> getClearTaskVo(List<Integer> deviceIds);
 
     /**
-     * @param setDevicesOwnUnits
+     * @param billVos
      */
-    void setDevicesOwnUnit(List<SetDevicesOwnUnit> setDevicesOwnUnits);
+    void setDevicesOwnUnit(List<BillVo> billVos);
 
 }

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairDetailServiceImpl.java

@@ -147,9 +147,12 @@ public class RepairDetailServiceImpl implements RepairDetailService {
         List<BillVo> billVos = new ArrayList<>();
         repairDetails.forEach(repairDetail -> {
             BillVo billVo = new BillVo();
-            billVo.setBillId(repairDetail.getDeviceRepairBillId());
+            billVo.setRepairBillId(repairDetail.getDeviceRepairBillId());
             billVo.setDevicesId(repairDetail.getDeviceId());
             billVo.setRepairDetailId(repairDetail.getId());
+            //根据装备id查询装备
+            DeviceLibrary library = deviceLibraryService.getOne(repairDetail.getDeviceId());
+            BeanUtils.copyProperties(library,billVo);
             billVos.add(billVo);
             //通过账单id和businessType查询task对象
             //过滤出状态是 StatusEnum.REVOKEALLOTTASK.id
@@ -163,21 +166,52 @@ public class RepairDetailServiceImpl implements RepairDetailService {
         return clearTaskVos;
     }
 
+//    @Override
+//    public void setDevicesOwnUnit(List<SetDevicesOwnUnit> setDevicesOwnUnits) {
+//        //修改装备的所属以及备注
+//        //1 通过装备id修改装备的所属
+//        //1.2 获取装备的id
+//        List<Integer> deviceIds = setDevicesOwnUnits.stream().map(SetDevicesOwnUnit::getDeviceId).collect(Collectors.toList());
+//        //修改装备的所属和装备的状态
+//        deviceLibraryService.updateDevicesOwnUnit(deviceIds);
+//        //修改维修单的remark
+//        List<Integer> repairBillIds = setDevicesOwnUnits.stream().map(SetDevicesOwnUnit::getRepairBillId).collect(Collectors.toList());
+//        //根据sendBill查询
+////        List<RepairSendBill> repairBills = new ArrayList<>();
+//        String remark = "装备正在进行清退处理,维修任务终止";
+//        repairBillIds.forEach(integer -> {
+//           RepairSendBill sendBill = repairSendBillDao.findByDeviceRepairBillId(integer);
+//            String scriptJson = sendBill.getScriptJson();
+//            List<ScriptSaveVo> scriptSaveVos = JacksonUtil.readValueToList(scriptJson, ScriptSaveVo.class);
+//            for (ScriptSaveVo scriptSaveVo : scriptSaveVos) {
+//                scriptSaveVo.setRemark(remark);
+//                sendBill.setScriptJson(JacksonUtil.toJSon(scriptJson));
+//                repairSendBillDao.save(sendBill);
+//            }
+//        });
+//        List<Integer> repairDetailIds = setDevicesOwnUnits.stream().map(SetDevicesOwnUnit::getRepairDetailId).collect(Collectors.toList());
+//        //删除维修详情
+//        repairDetailIds.forEach(integer -> {
+//            deviceRepairDetailDao.deleteById(integer);
+//        });
+//
+//    }
+
     @Override
-    public void setDevicesOwnUnit(List<SetDevicesOwnUnit> setDevicesOwnUnits) {
+    public void setDevicesOwnUnit(List<BillVo> billVos) {
         //修改装备的所属以及备注
         //1 通过装备id修改装备的所属
         //1.2 获取装备的id
-        List<Integer> deviceIds = setDevicesOwnUnits.stream().map(SetDevicesOwnUnit::getDeviceId).collect(Collectors.toList());
-        //修改装备的所属
+        List<Integer> deviceIds = billVos.stream().map(BillVo::getDevicesId).collect(Collectors.toList());
+        //修改装备的所属和装备的状态
         deviceLibraryService.updateDevicesOwnUnit(deviceIds);
         //修改维修单的remark
-        List<Integer> repairBillIds = setDevicesOwnUnits.stream().map(SetDevicesOwnUnit::getRepairBillId).collect(Collectors.toList());
+        List<Integer> repairBillIds = billVos.stream().map(BillVo::getRepairBillId).collect(Collectors.toList());
         //根据sendBill查询
 //        List<RepairSendBill> repairBills = new ArrayList<>();
         String remark = "装备正在进行清退处理,维修任务终止";
         repairBillIds.forEach(integer -> {
-           RepairSendBill sendBill = repairSendBillDao.findByDeviceRepairBillId(integer);
+            RepairSendBill sendBill = repairSendBillDao.findByDeviceRepairBillId(integer);
             String scriptJson = sendBill.getScriptJson();
             List<ScriptSaveVo> scriptSaveVos = JacksonUtil.readValueToList(scriptJson, ScriptSaveVo.class);
             for (ScriptSaveVo scriptSaveVo : scriptSaveVos) {
@@ -186,7 +220,7 @@ public class RepairDetailServiceImpl implements RepairDetailService {
                 repairSendBillDao.save(sendBill);
             }
         });
-        List<Integer> repairDetailIds = setDevicesOwnUnits.stream().map(SetDevicesOwnUnit::getRepairDetailId).collect(Collectors.toList());
+        List<Integer> repairDetailIds = billVos.stream().map(BillVo::getRepairDetailId).collect(Collectors.toList());
         //删除维修详情
         repairDetailIds.forEach(integer -> {
             deviceRepairDetailDao.deleteById(integer);

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/BillVo.java

@@ -11,11 +11,30 @@ import java.util.List;
 public class BillVo {
 
     @ApiModelProperty(value = "业务id", example = "1")
-    private Integer billId;
+    private Integer repairBillId;
 
     @ApiModelProperty(value = "维修单详情id", example = "1")
     private Integer repairDetailId;
 
     @ApiModelProperty(value = "装备id", example = "1")
     private Integer devicesId;
+
+    @ApiModelProperty(value = "型号")
+    private String model;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "装备名称")
+    private String name;
+
+    @ApiModelProperty(value = "装备序列号")
+    private String seqNumber;
+
+    @ApiModelProperty(value = "密级")
+    private String secretLevel;
+
+    @ApiModelProperty(value = "可见范围")
+    private String invisibleRange;
+
 }