feat(dev pull master 冲突): 解决合并冲突

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

@@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.Min;
 import java.util.*;
 import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.groupingBy;
@@ -318,23 +319,12 @@ public class PackingController {
     @ApiOperation(value = "查询父子结构列装")
     @PostMapping("/select")
     public ResponseEntity selectPack(@RequestBody SelectPack selectPack){
-        List<PackingLibrary> resultList;
-         resultList = packingLibraryService.getInsertList(selectPack);
         Map<String,Object> map = new HashMap<>();
-        //进行过滤 退装的目录下面 回收站
-        List<Integer> statuses = new ArrayList<>(Arrays.asList(3, 4));
-        //先过滤出child为空的
-        List<PackingLibrary> childs = resultList.stream().filter(packingLibrary -> packingLibrary.getChilds() == null || packingLibrary.getChilds().size() == 0).collect(Collectors.toList());
-        //取出不为空的
-        resultList.removeAll(childs);
-        childs.forEach(packingLibrary -> {
-            List<PackingLibrary> in = packingLibraryDao.findAllByPartParentIdAndPackingStatusIn(packingLibrary.getId(), statuses);
-            if (in == null || in.size() == 0) {
-                resultList.add(packingLibrary);
-            }
-        });
-        resultList.sort(Comparator.comparing(PackingLibrary::getShowOrder,Comparator.nullsLast(Integer::compareTo)).thenComparing(Comparator.comparing(PackingLibrary::getModel)));
-        Page<PackingLibrary> packingLibraries = PageUtil.getPerPage(selectPack.getPage(), selectPack.getSize(), resultList, selectPack.getPageable());
+        List<PackingLibrary> resultList = getAllPackingExceptNull(selectPack);
+        AtomicInteger sortNum = new AtomicInteger();
+        List<PackingLibrary> orderNumbers = setOrderNumber(sortNum, resultList);
+//        Page<PackingLibrary> packingLibraries = PageUtil.getPerPage(selectPack.getPage(), selectPack.getSize(), resultList, selectPack.getPageable());
+        Page<PackingLibrary> packingLibraries = PageUtil.getPerPage(selectPack.getPage(), selectPack.getSize(), orderNumbers, selectPack.getPageable());
         map.put("pages",packingLibraries);
         List<String> models = new ArrayList<>(resultList.stream().filter(packingLibrary -> packingLibrary.getIsRoot() == 1).map(PackingLibrary::getModel).collect(Collectors.toList()));
         //去重
@@ -533,6 +523,7 @@ public class PackingController {
             map.put("error", "型号" + packingModelEdit.getModel() + "已存在");
             return ResponseEntity.ok(map);
         }
+
         packingLibrary.setShowOrder(packingModelEdit.getShowOrder());
         if (packingLibrary.getIsRoot() == 1) {
             if (packingModelEdit.getModel() != null && !packingModelEdit.getModel().equals(packingLibrary.getModel())) {
@@ -555,7 +546,6 @@ public class PackingController {
                 packingLibrary.setModel(packingModelEdit.getModel());
                 packingLibrary.setName(packingModelEdit.getModel());
                 packingLibraryService.changeAllModel(packingLibrary.getId(), packingModelEdit.getModel());
-
             }
             BeanUtils.copyProperties(packingModelEdit, packingLibrary);
             packingLibraryService.update(packingLibrary);
@@ -568,6 +558,17 @@ public class PackingController {
         }
         //更新缓存
         packingLibraryService.getSortMap();
+        if (packingModelEdit.getShowOrder() != null){
+            //重新排序
+            List<PackingLibrary> allPackingExceptNull = getAllPackingExceptNull(new SelectPack());
+            AtomicInteger sortNum = new AtomicInteger();
+            List<PackingLibrary> orderNumbers = setOrderNumber(sortNum, allPackingExceptNull);
+            orderNumbers.forEach(packingLibrary1 -> {
+                if (packingLibrary1.getId().equals(packingModelEdit.getPackingId())){
+                    packingModelEdit.setSeqOrderNumber(packingLibrary1.getSeqOrderNumber());
+                }
+            });
+        }
         return ResponseEntity.ok(ResponseEntity.ok(packingModelEdit));
     }
 //    @ApiOperation(value = "编辑列装型号")
@@ -860,9 +861,42 @@ public class PackingController {
         ));
     }
 
-//    public void setSeqNumber(){
-//        //拿到所有的列装
-//        ResponseEntity responseEntity = selectPack(new SelectPack());
-//    }
 
+    /**
+     * 设置排序
+     * @param sortNum 数字
+     * @param packingLibraries 列装集合
+     * @return
+     */
+    private List<PackingLibrary> setOrderNumber(AtomicInteger sortNum,List<PackingLibrary> packingLibraries) {
+        packingLibraries.forEach(
+                packingLibrary -> {
+                    packingLibrary.setSeqOrderNumber(sortNum.incrementAndGet());
+                }
+        );
+        return packingLibraries;
+    }
+
+    /**
+     * 获取所有列装(除去只有列装目录的)
+     */
+    public List<PackingLibrary> getAllPackingExceptNull(SelectPack selectPack){
+        List<PackingLibrary> resultList;
+        resultList = packingLibraryService.getInsertList(selectPack);
+//        Map<String,Object> map = new HashMap<>();
+        //进行过滤 退装的目录下面 回收站
+        List<Integer> statuses = new ArrayList<>(Arrays.asList(3, 4));
+        //先过滤出child为空的
+        List<PackingLibrary> childs = resultList.stream().filter(packingLibrary -> packingLibrary.getChilds() == null || packingLibrary.getChilds().size() == 0).collect(Collectors.toList());
+        //取出不为空的
+        resultList.removeAll(childs);
+        childs.forEach(packingLibrary -> {
+            List<PackingLibrary> in = packingLibraryDao.findAllByPartParentIdAndPackingStatusIn(packingLibrary.getId(), statuses);
+            if (in == null || in.size() == 0) {
+                resultList.add(packingLibrary);
+            }
+        });
+        resultList.sort(Comparator.comparing(PackingLibrary::getShowOrder,Comparator.nullsLast(Integer::compareTo)).thenComparing(Comparator.comparing(PackingLibrary::getModel)));
+        return resultList;
+    }
 }

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

@@ -308,12 +308,12 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
                     throw new ApiException(ResponseEntity.status(20000).body("该列装型号目录下存在列装装备"));
                 }
                 Integer order = packingLibrary.getShowOrder();
-                getInsertList(new SelectPack()).forEach(packingLibrary1 -> {
-                    if (packingLibrary1.getShowOrder() > order) {
-                        packingLibrary1.setShowOrder(packingLibrary1.getShowOrder() - 1);
-                        update(packingLibrary1);
-                    }
-                });
+//                getInsertList(new SelectPack()).forEach(packingLibrary1 -> {
+//                    if (packingLibrary1.getShowOrder() > order) {
+//                        packingLibrary1.setShowOrder(packingLibrary1.getShowOrder() - 1);
+//                        update(packingLibrary1);
+//                    }
+//                });
             }
             List<Integer> ids = packingLibraryDao.findAllByPartParentId(id).stream().map(PackingLibrary::getId).collect(Collectors.toList());
             delete(id);

dev-packing/src/main/java/com/tykj/dev/device/packing/subject/domin/PackingLibrary.java

@@ -278,6 +278,10 @@ public class PackingLibrary {
     @ApiModelProperty(value = "装备的数量")
     private Integer deviceNum;
 
+    @Transient
+    @ApiModelProperty(value = "序号")
+    private Integer seqOrderNumber;
+
 
     public void addChildNode(PackingLibrary packingLibraryEntity) {
         childs.add(packingLibraryEntity);

dev-packing/src/main/java/com/tykj/dev/device/packing/subject/vo/PackingModelEdit.java

@@ -38,4 +38,7 @@ public class PackingModelEdit {
     @ApiModelProperty(value = "列装装备id", example = "1")
     @NotNull(message = "packingId不能为空")
     private Integer packingId;
+
+    @ApiModelProperty(value = "序号")
+    private Integer seqOrderNumber;
 }

dev-statistical/src/main/java/com/tykj/dev/statistical/controller/StatisticalController.java

@@ -334,7 +334,7 @@ public class StatisticalController {
         map.put("names",names);
         List<String> models = destroyedRetiredVoList.stream().map(ScrappedDestroyedRetiredVo::getModel).distinct().collect(Collectors.toList());
         List<String> modelToSort = DeviceModelSort.modelToSort(models);
-        map.put("modelToSort",modelToSort);
+        map.put("models",modelToSort);
         return ResponseEntity.ok(map);
     }
 

dev-union/src/main/resources/application-test.properties

-spring.jpa.hibernate.ddl-auto=update
-spring.datasource.url=jdbc:mysql://124.70.145.101:3306/device?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.username=device
-spring.datasource.password=Qwer1234
-file.path=C:/Users/dengdiyi/Documents/file/
-preview.path=http://124.70.145.101:8087/equip/file/
\ No newline at end of file
+spring.datasource.driver-class-name=com.oscar.Driver
+#spring.datasource.url=jdbc:oscar://10.153.4.10:2003/OSRDB
+spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB
+spring.datasource.username=SYSDBA
+spring.datasource.password=szoscar55
+spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
+file.path=/opt/zb/
+#preview.path=http://10.153.4.11:8088/equip/file/
+preview.path=http://192.168.0.80:8088/equip/file/
\ No newline at end of file

dev-zxing/src/main/java/com/tykj/dev/device/zxing/entity/PackageVersion.java

@@ -23,10 +23,8 @@ public class PackageVersion {
     @ApiModelProperty("id主键")
     private Integer id;
 
-    @ApiModelProperty("测试版版本")
-    private String version;
 
-//    @ApiModelProperty("当前版本号")
-//    private String formalVersion;
+    @ApiModelProperty("当前版本号")
+    private String version;
 
 }