Merge remote-tracking branch 'origin/v29.6_ultimate_interaction_20241017' into dev_jdk17

clx-performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectTransportIntentionController.java

@@ -42,7 +42,7 @@ public class CarrierDriverCollectTransportIntentionController {
 
     @Operation(summary = "删除", description = "<br>By:马路路")
     @PostMapping("/delete")
-    public Result<Object> deleteCarrierDriverCollectTransportIntention(@RequestBody List<CarrierDriverCollectTransportIntentionDetailParam> param) {
+    public Result<Object> deleteCarrierDriverCollectTransportIntention(@RequestBody CarrierDriverCollectTransportIntentionDetailParam param) {
         collectDriverTransportIntentionService.deleteCarrierDriverCollectTransportIntention(param);
         return Result.ok();
     }

clx-performance-web/src/main/java/com/clx/performance/service/collect/CollectDriverTransportIntentionService.java

@@ -19,7 +19,7 @@ public interface CollectDriverTransportIntentionService {
 
     Integer enableCarrierDriverCollectTransportIntention(CarrierDriverCollectTransportIntentionEnableParam param);
 
-    Integer deleteCarrierDriverCollectTransportIntention(List<CarrierDriverCollectTransportIntentionDetailParam> param);
+    Integer deleteCarrierDriverCollectTransportIntention(CarrierDriverCollectTransportIntentionDetailParam param);
 
     IPage<CarrierDriverCollectTransportIntentionVO> listCarrierDriverCollectTransportIntention(CarrierDriverCollectTransportIntentionListParam param);
 

clx-performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectDriverTransportIntentionServiceImpl.java

@@ -50,6 +50,11 @@ public class CollectDriverTransportIntentionServiceImpl implements CollectDriver
         if (Objects.isNull(param) || param.getCollectIntentionRecordList().isEmpty()) {
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
         }
+        // 查询当前名字的数据是否存在
+        List<CollectDriverTransportIntention> returnList = collectDriverTransportIntentionDao.listByField(CollectDriverTransportIntention::getCollectName, param.getCollectName());
+        if (!CollectionUtils.isEmpty(returnList)) {
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_REPEAT);
+        }
 
         CollectDriverTransportIntention collectDriverTransportIntention = new CollectDriverTransportIntention();
         // 默认排序
@@ -103,6 +108,7 @@ public class CollectDriverTransportIntentionServiceImpl implements CollectDriver
         }
         // 1.修改主表信息
         CollectDriverTransportIntention updateCollectDriverTransportIntention = new CollectDriverTransportIntention();
+        updateCollectDriverTransportIntention.setId(param.getId());
         updateCollectDriverTransportIntention.setCollectName(param.getCollectName());
         updateCollectDriverTransportIntention.setCollectDescribe(param.getCollectDescribe());
         updateCollectDriverTransportIntention.setCollectCheckType(param.getCollectCheckType());
@@ -144,20 +150,17 @@ public class CollectDriverTransportIntentionServiceImpl implements CollectDriver
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Integer deleteCarrierDriverCollectTransportIntention(List<CarrierDriverCollectTransportIntentionDetailParam> param) {
-        if (CollectionUtils.isEmpty(param)) {
+    public Integer deleteCarrierDriverCollectTransportIntention(CarrierDriverCollectTransportIntentionDetailParam param) {
+        if (Objects.isNull(param)) {
             log.info("deleteCarrierDriverCollectTransportIntention param is null");
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
         }
-        Set<Integer> paramsIds = param.stream()
-                .map(CarrierDriverCollectTransportIntentionDetailParam::getId)
-                .collect(Collectors.toSet());
 
         // 1.删除主表信息
-        collectDriverTransportIntentionDao.deleteInField(CollectDriverTransportIntention::getId, paramsIds);
+        collectDriverTransportIntentionDao.deleteByField(CollectDriverTransportIntention::getId, param.getId());
         // 2.删除子表信息
         boolean result = collectDriverTransportIntentionRecordDao
-                .deleteInField(CollectDriverTransportIntentionRecord::getCollectDriverTransportIntentionId, paramsIds);
+                .deleteByField(CollectDriverTransportIntentionRecord::getCollectDriverTransportIntentionId, param.getId());
         return result ? 1 : 0;
     }
 
@@ -217,23 +220,23 @@ public class CollectDriverTransportIntentionServiceImpl implements CollectDriver
         Optional<CollectDriverTransportIntention> one = collectDriverTransportIntentionDao.getEntityByKey(adjustOrderId);
         //如果上调，这条记录传的是移动数据后面的记录id，如果下调，这条记录传的是移动数据前面的记录id
         Optional<CollectDriverTransportIntention> two = collectDriverTransportIntentionDao.getEntityByKey(adjustOrderBeforeId);
-        if(!one.isPresent() || !two.isPresent()){
+        if (!one.isPresent() || !two.isPresent()) {
             throw new ServiceSystemException(ResultEnum.DATA_NOT_FIND);
         }
         boolean isUp = false;
         //通过seq判断是上调还是下调
-        if(one.get().getSortNo()  <  two.get().getSortNo()){
+        if (one.get().getSortNo() < two.get().getSortNo()) {
             isUp = true;
         }
         //上调：大于two 这条记录的seq + 1 ； 下调：大于等于two这条记录的seq + 1 ;
-        collectDriverTransportIntentionDao.updateRecordOrder(two.get().getSortNo(),isUp);
-        if(isUp){   //上调
+        collectDriverTransportIntentionDao.updateRecordOrder(two.get().getSortNo(), isUp);
+        if (isUp) {   //上调
             //调整的记录使用 two 的seq + 1;
             CollectDriverTransportIntention updateOne = new CollectDriverTransportIntention();
             updateOne.setId(one.get().getId());
             updateOne.setSortNo(two.get().getSortNo() + 1);
             collectDriverTransportIntentionDao.updateEntityByKey(updateOne);
-        }else{    //下调
+        } else {    //下调
             //调整的记录使用 two 的seq;
             CollectDriverTransportIntention updateOne = new CollectDriverTransportIntention();
             updateOne.setId(one.get().getId());