[装备]更新序号

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

@@ -15,6 +15,7 @@ import com.tykj.dev.device.library.subject.domin.DeviceLog;
 import com.tykj.dev.device.library.subject.vo.*;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.exception.ApiException;
+import com.tykj.dev.misc.utils.DeviceModelSort;
 import com.tykj.dev.misc.utils.GetTreeUtils;
 import com.tykj.dev.misc.utils.PageUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
@@ -312,7 +313,8 @@ public class DeviceLibraryController {
             locationUnits.add(deviceVo.getLocationUnit());
             matchingRanges.add(deviceVo.getMatchingRange());
         });
-        map.put("models",models);
+        Set<String> modelToSort = DeviceModelSort.modelToSort(models);
+        map.put("models",modelToSort);
         map.put("names",names);
         map.put("ownUnits",ownUnits);
         map.put("locationUnits",locationUnits);

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

@@ -16,8 +16,7 @@ public class DeviceModelSort {
     public static Map<String,Integer> mapModelSort;
 
     public static Set<String> modelToSort(Set<String> modelList){
-
-                modelList.stream().sorted(Comparator.comparing(DeviceModelSort::toSort));
+                modelList.stream().sorted(Comparator.comparing(DeviceModelSort::toSort).reversed());
                 return modelList;
     }
 

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

@@ -14,7 +14,7 @@ import java.util.List;
 /**
  * @author dengdiyi
  */
-public interface PackingLibraryService {
+public interface PackingLibraryService{
 
     /**
      * @param packingLibraryEntity 添加列装
@@ -179,4 +179,6 @@ public interface PackingLibraryService {
      * @param packingLibraryEntity 添加配发使用
      */
     Boolean addAllotPacking(PackingLibrary packingLibraryEntity);
+
+    void  getSortMap();
 }

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

@@ -41,6 +41,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toMap;
 
 /**
  * @author dengdiyi
@@ -150,6 +151,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
     @Override
     public List<String> getModelList() {
         List<PackingLibrary> list = packingLibraryDao.findAllByIsRootAndPackingStatus(1,2).stream().sorted(Comparator.comparing(PackingLibrary::getShowOrder)).collect(Collectors.toList());
+
         List<String> s = new ArrayList<>();
         for (PackingLibrary d : list) {
             s.add(d.getModel());
@@ -719,6 +721,11 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
 
     }
 
+    @Override
+    public void getSortMap() {
+        DeviceModelSort.mapModelSort = packingLibraryDao.findAllByIsRootAndPackingStatus(1,2).stream().collect(toMap(PackingLibrary::getModel,PackingLibrary::getShowOrder));
+    }
+
     private Specification<PackingLibrary> getSelectSpecification(PackingLibrarySelectVo packingLibrarySelectVo) {
         PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
         Integer level = userUtils.getCurrentUnitLevel();

dev-packing/src/main/java/com/tykj/dev/device/packing/task/PackingSortService.java

+package com.tykj.dev.device.packing.task;
+
+import com.tykj.dev.device.packing.service.PackingLibraryService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Service;
+
+/**
+ * DATE:2021-7-14
+ * Author:zsp
+ */
+
+@Service
+@Slf4j
+public class PackingSortService implements CommandLineRunner {
+    @Autowired
+    private PackingLibraryService packingLibraryService;
+
+    @Override
+    public void run(String... args) throws Exception {
+        packingLibraryService.getSortMap();
+        log.info("初始化更新型号和排序号的对应map");
+    }
+}