更新

dev-apply/src/main/java/com/tykj/dev/device/apply/controller/DeviceApplyController.java

@@ -141,7 +141,7 @@ public class DeviceApplyController {
         TaskBto taskBto1 = taskService.start(taskBto);
         //发送阅知信息
         List<Integer> userIds = userPublicService.findOtherUser(userId);
-        if (userUtils.getCurrentUnitLevel()==1) {
+        if (userUtils.getCurrentUnitLevel()!=1) {
             userIds.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(deviceApplyBillEntity.getReplyUnit())).stream()
                     .map(User::getUserId)
                     .collect(Collectors.toList()));

dev-library/src/main/java/com/tykj/dev/device/library/service/DeviceLibraryService.java

@@ -146,4 +146,5 @@ public interface DeviceLibraryService {
     void isInStockOrRepairing(List<Integer> ids);
 
     int getDeviceCount();
+
 }

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/Script.java

+package com.tykj.dev.device.library.subject.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("单据显示类")
+public class Script {
+
+    @ApiModelProperty(value = "型号")
+    private String model;
+
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+
+    @ApiModelProperty(value = "装备名称")
+    private String name;
+
+    @ApiModelProperty(value = "装备序列号")
+    private String seqNumber;
+
+    @ApiModelProperty(value = "密级")
+    private Integer secretLevel;
+
+    @ApiModelProperty(value = "可见范围")
+    private Integer invisibleRange;
+
+    @ApiModelProperty(value = "数量")
+    private Integer num;
+
+}

dev-misc/src/main/java/com/tykj/dev/misc/utils/DeviceSeqUtil.java

@@ -18,12 +18,15 @@ public class DeviceSeqUtil {
 
     public static void main(String[] args) {
         List<String> list=new ArrayList<>();
-        list.add("a2");
-        list.add("c4");
-        list.add("d6");
-        list.add("c5");
-        list.add("a3");
-        list.add("a1");
+        list.add("30338343766");
+        list.add("30338343767");
+        list.add("30338343768");
+        list.add("30338343769");
+        list.add("30338343770");
+        list.add("30338343771");
+        list.add("30338343772");
+        list.add("30338343773");
+        list.add("30338343775");
         System.out.println(getContinuousSeqs(list));
     }
 
@@ -235,52 +238,58 @@ public class DeviceSeqUtil {
      */
     public static List<String> getContinuousSeqs(List<String> strings){
         List<String> results = new ArrayList<>();
-        List<String> sortedString = strings.stream().sorted().collect(Collectors.toList());
-        String lastSeq = sortedString.get(0);
-        String first = null;
-        for (int i = 1 ;i<sortedString.size();i++){
-            String index = sortedString.get(i);
-            if (getFirstString(lastSeq).equals(getFirstString(index))) {
-                Long num1 = getLastNum(lastSeq);
-                Long num2 = getLastNum(index);
-                if (num2 == num1 + 1) {
-                    if (first==null){
-                        first = lastSeq;
-                    }
-                    if (i==sortedString.size()-1){
-                        StringBuffer stringBuffer = new StringBuffer();
-                        stringBuffer.append(first).append("-").append(lastSeq);
-                        results.add(stringBuffer.toString());
-                        first =null;
+        if (strings.size()==1){
+            results.add(strings.get(0));
+        }
+        else  {
+            List<String> sortedString = strings.stream().sorted().collect(Collectors.toList());
+            String lastSeq = sortedString.get(0);
+            String first = null;
+            for (int i = 1; i < sortedString.size(); i++) {
+                String index = sortedString.get(i);
+                if (getFirstString(lastSeq).equals(getFirstString(index))) {
+                    Long num1 = getLastNum(lastSeq);
+                    Long num2 = getLastNum(index);
+                    if (num2 == num1 + 1) {
+                        if (first == null) {
+                            first = lastSeq;
+                        }
+                        if (i == sortedString.size()-1) {
+                            StringBuffer stringBuffer = new StringBuffer();
+                            stringBuffer.append(first).append("-").append(index);
+                            results.add(stringBuffer.toString());
+                            first = null;
+                        }
+                    } else {
+                        if (first == null) {
+                            results.add(lastSeq);
+                        } else {
+                            StringBuffer stringBuffer = new StringBuffer();
+                            stringBuffer.append(first).append("-").append(lastSeq);
+                            results.add(stringBuffer.toString());
+                            first = null;
+                        }
+                        if (i == sortedString.size() - 1) {
+                            results.add(index);
+                        }
                     }
                 } else {
-                    if (first==null) {
+                    if (first == null) {
                         results.add(lastSeq);
-                    }
-                    else {
+                    } else {
                         StringBuffer stringBuffer = new StringBuffer();
                         stringBuffer.append(first).append("-").append(lastSeq);
                         results.add(stringBuffer.toString());
-                        first =null;
+                        first = null;
+                    }
+                    if (i == sortedString.size() - 1) {
+                        results.add(index);
                     }
                 }
+                lastSeq = index;
             }
-            else {
-                if (first==null) {
-                    results.add(lastSeq);
-                }
-                else {
-                    StringBuffer stringBuffer = new StringBuffer();
-                    stringBuffer.append(first).append("-").append(lastSeq);
-                    results.add(stringBuffer.toString());
-                    first =null;
-                }
-            }
-            if (i==sortedString.size()-1){
-                results.add(index);
-            }
-            lastSeq = index;
         }
+
         return results;
     }
 

dev-misc/src/main/java/com/tykj/dev/misc/utils/StringSplitUtil.java

@@ -93,6 +93,17 @@ public class StringSplitUtil {
         return stringBuffer.toString();
     }
 
+    public static String stringListToString(List<String> stringList){
+        StringBuffer stringBuffer=new StringBuffer();
+        stringList.forEach(
+                i->stringBuffer.append(",").append(i)
+        );
+        if (stringBuffer.length()>0) {
+            stringBuffer.deleteCharAt(0);
+        }
+        return stringBuffer.toString();
+    }
+
     public static List<Integer> stringToList(String idStirng){
         if (idStirng!=null) {
             List<String> idStringList = Arrays.asList(idStirng.split(","));

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingLibraryController.java

@@ -41,6 +41,12 @@ public class PackingLibraryController {
     @Autowired
     DeviceLibraryService deviceLibraryService;
 
+    @ApiOperation(value = "获取装备单据显示", notes = "获取装备单据显示")
+    @PostMapping("/getScript")
+    public ResponseEntity setRecord(@RequestBody List<Integer> ids){
+        return ResponseEntity.ok(packingLibraryService.getDevcieScript(ids));
+    }
+
     @ApiOperation(value = "列装库分页查询", notes = "可以通过这个接口进行列装查询")
     @PostMapping("/serve/summary")
     public ResponseEntity getPage(@RequestBody PackingLibrarySelectVo packingLibrarySelectVo) {

dev-packing/src/main/java/com/tykj/dev/device/packing/service/PackingLibraryService.java

 package com.tykj.dev.device.packing.service;
 
+import com.tykj.dev.device.library.subject.vo.Script;
 import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
 import com.tykj.dev.device.packing.subject.vo.PackingLibrarySelectVo;
 import com.tykj.dev.device.packing.subject.vo.SelectPack;
@@ -102,4 +103,6 @@ public interface PackingLibraryService {
      * 设置顺序的排序
      */
     List<PackingLibrary> setOrder(List<PackingLibrary> packingLibraries);
+
+    List<Script> getDevcieScript(List<Integer> ids);
 }

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -6,6 +6,9 @@ import com.tykj.dev.blockcha.subject.entity.BcHash;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.config.GlobalMap;
 import com.tykj.dev.config.TaskBeanConfig;
+import com.tykj.dev.device.library.service.DeviceLibraryService;
+import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
+import com.tykj.dev.device.library.subject.vo.Script;
 import com.tykj.dev.device.packing.repository.PackingLibraryDao;
 import com.tykj.dev.device.packing.service.PackingLibraryService;
 import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
@@ -13,9 +16,7 @@ import com.tykj.dev.device.packing.subject.vo.PackingLibrarySelectVo;
 import com.tykj.dev.device.packing.subject.vo.SelectPack;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.exception.ApiException;
-import com.tykj.dev.misc.utils.GetTreeUtils;
-import com.tykj.dev.misc.utils.JacksonUtil;
-import com.tykj.dev.misc.utils.ResultUtil;
+import com.tykj.dev.misc.utils.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -29,6 +30,8 @@ import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
+import static java.util.stream.Collectors.groupingBy;
+
 /**
  * @author dengdiyi
  */
@@ -44,6 +47,9 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
     @Autowired
     private BlockChainUtil blockChainUtil;
 
+    @Autowired
+    private DeviceLibraryService deviceLibraryService;
+
     @Override
     public PackingLibrary addEntity(PackingLibrary packingLibraryEntity) {
         PackingLibrary packingLibrary = packingLibraryDao.save(packingLibraryEntity);
@@ -253,6 +259,28 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         return packingLibraryList;
     }
 
+    @Override
+    public List<Script> getDevcieScript(List<Integer> ids) {
+        List<Script> scripts = new ArrayList<>();
+        List<DeviceLibrary> deviceLibraries = new ArrayList<>();
+        ids.forEach(integer -> deviceLibraries.add(deviceLibraryService.getOne(integer)));
+        Map<Integer, List<DeviceLibrary>> map = deviceLibraries.stream().collect(groupingBy(DeviceLibrary::getPackingId));
+        for (Integer packingId:map.keySet()){
+            List<DeviceLibrary> deviceLibraryList = map.get(packingId);
+            PackingLibrary packingLibrary = getOne(packingId);
+            Script script = new Script();
+            script.setInvisibleRange(packingLibrary.getInvisibleRange());
+            script.setModel(packingLibrary.getModel());
+            script.setName(packingLibrary.getName());
+            script.setSecretLevel(packingLibrary.getSecretLevel());
+            script.setType(packingLibrary.getType());
+            script.setNum(deviceLibraryList.size());
+            script.setSeqNumber(StringSplitUtil.stringListToString(DeviceSeqUtil.getContinuousSeqs(deviceLibraryList.stream().map(DeviceLibrary::getSeqNumber).collect(Collectors.toList()))));
+            scripts.add(script);
+        }
+        return scripts;
+    }
+
     private Specification<PackingLibrary> getSelectSpecification(PackingLibrarySelectVo packingLibrarySelectVo) {
         PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
         Integer level = userUtils.getCurrentUnitLevel();

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -1365,6 +1365,7 @@ public class RepairController {
                 }
                 //获取维修详情
                 List<RepairDetail> repairDetails = getRepairDetail(repairBill.getId());
+                repairDetails.forEach(repairDetail -> repairDetail.setLocationUnit(deviceLibraryService.getOne(repairDetail.getDeviceId()).getLocationUnit()));
                 repairBillDetailVo.setRepairDetails(repairDetails);
                 //设置装备备注
                 deviceLibraries.forEach(deviceLibrary -> {
@@ -1498,7 +1499,6 @@ public class RepairController {
             List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatus(1);
             repairDetails.forEach(repairDetail -> {
                 repairDetail.setLocationUnit(deviceLibraryService.getOne(repairDetail.getDeviceId()).getLocationUnit());
-                deviceRepairDetailService.update(repairDetail);
             });
             return ResponseEntity.ok(repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).sorted(Comparator.comparing(RepairDetail::getOwnUnit,Comparator.nullsLast(String::compareTo))).collect(Collectors.toList()));
         }
@@ -1510,7 +1510,6 @@ public class RepairController {
             repairDetails1.removeAll(repairDetails);
             repairDetails1.forEach(repairDetail -> {
                 repairDetail.setLocationUnit(deviceLibraryService.getOne(repairDetail.getDeviceId()).getLocationUnit());
-                deviceRepairDetailService.update(repairDetail);
             });
             return ResponseEntity.ok(repairDetails1.stream().filter(repairDetail -> userPublicService.findUnitsNameByUserId(repairDetail.getCreateUserId()).equals(unitName)).sorted(Comparator.comparing(RepairDetail::getOwnUnit,Comparator.nullsLast(String::compareTo))).collect(Collectors.toList()));
         }
@@ -1519,7 +1518,6 @@ public class RepairController {
             List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatus(2);
             repairDetails.forEach(repairDetail -> {
                 repairDetail.setLocationUnit(deviceLibraryService.getOne(repairDetail.getDeviceId()).getLocationUnit());
-                deviceRepairDetailService.update(repairDetail);
             });
             return ResponseEntity.ok(repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).sorted(Comparator.comparing(RepairDetail::getOwnUnit,Comparator.nullsLast(String::compareTo))).collect(Collectors.toList()));
         }