更新

dev-config/src/main/java/com/tykj/dev/config/controller/ConfigController.java

@@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -63,7 +64,7 @@ public class ConfigController {
     @GetMapping(value = "/select")
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity select() {
-        Map<String, List<SystemConfig>> map = systemConfigDao.findAllByDeleteTag(0).stream().collect(groupingBy(SystemConfig::getChineseName));
+        Map<String, List<SystemConfig>> map = systemConfigDao.findAllByDeleteTag(0).stream().sorted(Comparator.comparing(SystemConfig::getValue)).collect(groupingBy(SystemConfig::getChineseName));
 //        Map<String,List<String>> resultMap = new HashMap<>();
 //        for (String s:map.keySet()) {
 //            resultMap.put(s,map.get(s).stream().map(SystemConfig::getLabel).collect(Collectors.toList()));

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

@@ -13,10 +13,7 @@ import com.tykj.dev.device.library.subject.vo.DeviceStatisticsVo;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.exception.ApiException;
-import com.tykj.dev.misc.utils.DeviceSeqUtil;
-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;
@@ -190,6 +187,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                 if (strings.length == 2) {
                     DeviceStatisticsVo deviceStatisticsVo = new DeviceStatisticsVo();
                     List<Integer> deviceIds = new ArrayList<>();
+                    List<String> devSeqs = new ArrayList<>();
                     deviceStatisticsVo.setModel(strings[0]);
                     deviceStatisticsVo.setName(strings[1]);
 //                    deviceStatisticsVo.setDeviceNumber(map.get(s).size());
@@ -212,6 +210,9 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                     //遍历核心装备，按照相同型号的装备生命状态统计
                     for (DeviceLibrary d2 : map.get(s)) {
                         deviceIds.add(d2.getId());
+                        if (d2.getSeqNumber()!=null) {
+                            devSeqs.add(d2.getSeqNumber());
+                        }
                         num++;
                         switch (d2.getLifeStatus()) {
                             case 2:
@@ -278,6 +279,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                         deviceStatisticsVo.setScrappedNum(scrappedNum);
                         deviceStatisticsVo.setRetiredNum(retiredNum);
                         deviceStatisticsVo.setUseNum(useNum);
+                        deviceStatisticsVo.setSeqs(StringSplitUtil.stringListToString(DeviceSeqUtil.getContinuousSeqs(devSeqs)));
                         deviceStatisticsVos.add(deviceStatisticsVo);
                     }
                 }

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

@@ -71,4 +71,6 @@ public class DeviceStatisticsVo {
     @ApiModelProperty(value = "该型号使用中装备Id列表")
     private List<Integer> useIds = new ArrayList<>();
 
+    @ApiModelProperty(value = "序列号区间")
+    public String seqs;
 }