合并分支 'bug' 到 'master'

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

@@ -163,10 +163,10 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
 
     List<DeviceLibrary> findAllByPackingIdIn(List<Integer> packingIds);
 
-    @Transactional
+
     @Modifying
-    @Query("update DeviceLibrary o set o.model = :model where o.id in :ids")
-    int batchUpdateDevices(String model, List<Integer> ids);
+    @Query("update DeviceLibrary d set d.model = :newModel where d.id in(select d.id from d where d.model = :oldModel)")
+    int batchUpdateDevices(String oldModel,String newModel);
 
     List<DeviceLibrary> findAllByModel(String model);
 }

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

@@ -228,10 +228,10 @@ public interface DeviceLibraryService {
 
     /**
      * 批量更新装备
-     * @param model 装备的型号
-     * @param ids 装备的id
+     * @param
+     * @param
      */
-    void batchUpdateDevices(String model,List<Integer> ids);
+    void batchUpdateDevices(String oldModel,String newModel);
     /**
      * 通过型号查询装备
      */

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

@@ -664,8 +664,8 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
     }
 
     @Override
-    public void batchUpdateDevices(String model, List<Integer> ids) {
-        deviceLibraryDao.batchUpdateDevices(model,ids);
+    public void batchUpdateDevices(String oldModel,String newModel) {
+        deviceLibraryDao.batchUpdateDevices(oldModel,newModel);
     }
 
     @Override

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

@@ -32,28 +32,11 @@ public class DeviceModelSort {
      * @return 排】序过后的型号列表
      */
     public static List<String> modelToSort(List<String> modelList) {
-        //int -> map {id , value String} -> sort -> mappping get value -> to list
-        //        List<String> resultModel = new ArrayList<>();
-//        List<SortedModel> sortedModels = new ArrayList<>();
-//
-//        for (String m : modelList) {
-//            sortedModels.add(new SortedModel(toModelSort(m), m));
-//        }
-//
-//        sortedModels.sort(Comparator.comparing(SortedModel::getId));
-//
-//        for (SortedModel model : sortedModels) {
-//            resultModel.add(model.getValue());
-//        }
-
-
         return modelList.stream()
                 .map(s -> new SortedModel(toModelSort(s), s))
-                .sorted(Comparator.comparing(SortedModel::getId))
+                .sorted(Comparator.comparing(SortedModel::getId).thenComparing(SortedModel::getValue))
                 .map(SortedModel::getValue)
                 .collect(Collectors.toList());
-//        modelList= modelList.stream().sorted(Comparator.comparing(DeviceModelSort::toModelSort)).collect(Collectors.toList());
-//        return modelList;
     }
 
     @Data

dev-packing/src/main/java/com/tykj/dev/device/packing/repository/PackingLibraryDao.java

@@ -3,6 +3,10 @@ package com.tykj.dev.device.packing.repository;
 import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -52,5 +56,23 @@ public interface PackingLibraryDao extends JpaRepository<PackingLibrary, Integer
      */
     List<PackingLibrary> findAllByModel(String model);
 
+    /**
+     *
+     */
+    @Query("select max(o.showOrder) from PackingLibrary o")
+    int maxShowOrder();
+
+    @Query(value = "select p.showOrder from PackingLibrary p where p.showOrder between :beginShowOrder and :endShowOrder ")
+    List<Integer> selectShowOrders(@Param("beginShowOrder") Integer beginShowOrder,@Param("endShowOrder") Integer endShowOrder);
+
+    List<PackingLibrary> findByShowOrderIn(List<Integer> showOrders);
+
+    @Transactional
+    @Modifying
+    @Query("update PackingLibrary p set p.showOrder = p.showOrder+1 where p in (:packingLibraries)")
+    void updateShowOrders(@Param("packingLibraries") List<PackingLibrary> packingLibraries);
+
+    @Query("select p.showOrder from PackingLibrary p")
+    List<Integer> selectAllShowOrders();
 }
 

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

@@ -162,7 +162,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<PackingLibrary> list = packingLibraryDao.findAllByIsRootAndPackingStatus(1,2).stream().sorted(Comparator.comparing(PackingLibrary::getShowOrder,Comparator.nullsLast(Integer::compareTo)).thenComparing(PackingLibrary::getModel)).collect(Collectors.toList());
 
         List<String> s = new ArrayList<>();
         for (PackingLibrary d : list) {
@@ -759,7 +759,16 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
 
     @Override
     public void getSortMap() {
-        DeviceModelSort.mapModelSort = packingLibraryDao.findAllByIsRootAndPackingStatus(1,2).stream().collect(toMap(PackingLibrary::getModel,PackingLibrary::getShowOrder));
+            Map<String, Integer> map=new HashMap<>();
+//        DeviceModelSort.mapModelSort = packingLibraryDao.findAllByIsRootAndPackingStatus(1,2).stream().collect(toMap(PackingLibrary::getModel,PackingLibrary::getShowOrder));
+        packingLibraryDao.findAllByIsRootAndPackingStatus(1,2).forEach(packingLibrary -> {
+            if (packingLibrary.getShowOrder()!=null) {
+                map.put(packingLibrary.getModel(), packingLibrary.getShowOrder());
+            }else {
+                map.put(packingLibrary.getModel(), 9999);
+            }
+        });
+        DeviceModelSort.mapModelSort=map;
     }
 
     private Specification<PackingLibrary> getSelectSpecification(PackingLibrarySelectVo packingLibrarySelectVo) {

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

@@ -31,7 +31,7 @@ public class PackingModelEdit {
     @ApiModelProperty(value = "列装状态")
     private Integer status;
 
-    @NotNull(message = "showOrder不能为空")
+//    @NotNull(message = "showOrder不能为空")
     @ApiModelProperty(value = "排序号")
     private Integer showOrder;
 

dev-statistical/src/main/java/com/tykj/dev/statistical/service/impl/BigScreenServiceImpl.java

@@ -22,6 +22,7 @@ import com.tykj.dev.device.user.subject.entity.Area;
 import com.tykj.dev.device.user.subject.entity.Units;
 import com.tykj.dev.device.user.subject.entity.User;
 import com.tykj.dev.misc.base.BusinessEnum;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.StringSplitUtil;
 import com.tykj.dev.statistical.cache.StatisticalCache;
 import com.tykj.dev.statistical.service.BigScreenService;
@@ -148,7 +149,10 @@ public class BigScreenServiceImpl implements BigScreenService {
         centerNum.setDeviceAddCount((int) deviceLibraryDao.findAll().stream().filter(deviceLibrary -> deviceLibrary.getCreateTime()!=null&&isPresentYear(deviceLibrary.getCreateTime())).count());
         //故障率
         Set<Integer> repairDeviceIds = new HashSet<>();
-        List<Task> tasks = taskDao.findAllByBusinessType(BusinessEnum.REPAIR.id).stream().filter(task -> task.getParentTaskId()==null).collect(Collectors.toList());
+        List<Task> businessList = taskDao.findAllByBusinessType(BusinessEnum.REPAIR.id);
+        List<Task> tasks = businessList.stream()
+                .filter(task -> task.getParentTaskId()==null && !task.getBillStatus().equals(StatusEnum.END.id) && !task.getBillStatus().equals(StatusEnum.REVOKEALLOTTASK.id))
+                .collect(Collectors.toList());
         List<RepairSendBill> repairSendBills = tasks.stream()
                 .map(task -> repairBillService.getOne(task.getBillId()))
                 .map(repairBill -> repairSendBillDao.findByDeviceRepairBillId(repairBill.getId()))
@@ -170,7 +174,8 @@ public class BigScreenServiceImpl implements BigScreenService {
     @Override
     public RepairNum getRepairNum() {
         RepairNum repairNum = new RepairNum();
-        List<Task> tasks = taskDao.findAllByBusinessType(BusinessEnum.REPAIR.id).stream().filter(task -> task.getParentTaskId()==null).collect(Collectors.toList());
+        List<Task> tasks = taskDao.findAllByBusinessType(BusinessEnum.REPAIR.id).stream()
+                .filter(task -> task.getParentTaskId()==null && !task.getBillStatus().equals(StatusEnum.END.id) && !task.getBillStatus().equals(StatusEnum.REVOKEALLOTTASK.id)).collect(Collectors.toList());
         List<List<RepairDetail>> repairDetails = tasks.stream()
                 .map(task -> repairBillService.getOne(task.getBillId()))
                 .map(repairBill -> repairDetailDao.findByDeviceRepairBillId(repairBill.getId()))
@@ -224,7 +229,8 @@ public class BigScreenServiceImpl implements BigScreenService {
     @Override
     public List<RepairDevice> getRepairDevices() {
         List<RepairDevice> repairDevices = new ArrayList<>();
-        List<Task> tasks = taskDao.findAllByBusinessType(BusinessEnum.REPAIR.id).stream().filter(task -> task.getParentTaskId()==null).collect(Collectors.toList());
+        List<Task> tasks = taskDao.findAllByBusinessType(BusinessEnum.REPAIR.id).stream()
+                .filter(task -> task.getParentTaskId()==null && !task.getBillStatus().equals(StatusEnum.END.id) && !task.getBillStatus().equals(StatusEnum.REVOKEALLOTTASK.id)).collect(Collectors.toList());
         List<List<RepairDetail>> repairDetails = tasks.stream()
                 .map(task -> repairBillService.getOne(task.getBillId()))
                 .map(repairBill -> repairDetailDao.findByDeviceRepairBillId(repairBill.getId()))

dev-user/src/main/java/com/tykj/dev/device/user/read/service/impl/MessageServiceImpl.java

@@ -150,6 +150,9 @@ public class MessageServiceImpl implements MessageService {
                     .sorted(Comparator.comparing(MessageUserVo::getCreateTime, Comparator.nullsLast(Date::compareTo)).reversed())
                     .collect(Collectors.toList());
             return messageUserVos;
+//            userRecords.forEach(userRecord -> {
+//
+//            });
         }
     }