配置中心—配置管理—问卷配置WEB端接口--进行中数据调整顺序

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

@@ -11,13 +11,11 @@ import com.msl.common.base.PageData;
 import com.msl.common.result.Result;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -37,7 +35,7 @@ public class CarrierDriverCollectTransportIntentionController {
         return Result.ok();
     }
 
-    @Operation(summary = "编辑更新/拖动更新", description = "<br>By:马路路")
+    @Operation(summary = "编辑更新", description = "<br>By:马路路")
     @PostMapping("/update")
     public Result<Object> updateCarrierDriverCollectTransportIntention(@RequestBody @Validated CarrierDriverCollectTransportIntentionParam param) {
         collectDriverTransportIntentionService.updateCarrierDriverCollectTransportIntention(param);
@@ -71,4 +69,12 @@ public class CarrierDriverCollectTransportIntentionController {
         return Result.ok(collectDriverTransportIntentionService.detailCarrierDriverCollectTransportIntention(param));
     }
 
+    @Operation(summary = "进行中数据调整顺序", description = "<br>By:马路路")
+    @GetMapping("/updateAdjustOrder")
+    public Result<Object> updateAdjustOrder (@RequestParam("adjustOrderOneId") @NotNull(message = "调整订单1的id不能为空") Integer adjustOrderId,
+                                             @RequestParam("adjustOrderTwoId") @NotNull(message = "调整订单2的id不能为空") Integer adjustOrderBeforeId) {
+        collectDriverTransportIntentionService.updateAdjustOrder(adjustOrderId,adjustOrderBeforeId);
+        return Result.ok();
+    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/collect/CollectDriverTransportIntentionDao.java

@@ -18,4 +18,6 @@ public interface CollectDriverTransportIntentionDao extends BaseDao<CollectDrive
     IPage<CollectDriverTransportIntention> listByCondition(CarrierDriverCollectTransportIntentionListParam param);
 
     IPage<CollectDriverTransportIntention> listEnableInfo(AppCarrierDriverCollectTransportIntentionParam param);
+
+    void updateRecordOrder(Long sortNo, boolean isUp);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectDriverTransportIntentionDaoImpl.java

 package com.clx.performance.dao.impl.collect;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.collect.CollectDriverTransportIntentionDao;
@@ -44,4 +45,16 @@ public class CollectDriverTransportIntentionDaoImpl extends BaseDaoImpl<CollectD
 
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()), query);
     }
+
+    @Override
+    public void updateRecordOrder(Long seq, boolean isUp) {
+        LambdaUpdateWrapper<CollectDriverTransportIntention> update = new LambdaUpdateWrapper<>();
+        if (isUp) {
+            update.gt(CollectDriverTransportIntention::getSortNo, seq);
+        } else {
+            update.ge(CollectDriverTransportIntention::getSortNo, seq);
+        }
+        update.setSql("sort_no = sort_no + 1");
+        baseMapper.update(null, update);
+    }
 }

performance-web/src/main/java/com/clx/performance/model/collect/CollectDriverTransportIntention.java

@@ -28,7 +28,7 @@ public class CollectDriverTransportIntention implements HasKey<Integer> {
 
     @TableField("sort_no")
     @Schema(description="排序编号")
-    private Integer sortNo;
+    private Long sortNo;
 
     @TableField("collect_name")
     @Schema(description="问题名称")

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

@@ -29,4 +29,6 @@ public interface CollectDriverTransportIntentionService {
     List<CarrierDriverCollectTransportIntentionRecordVO> detailCarrierDriverCollectTransportIntention(CarrierDriverCollectTransportIntentionDetailParam param);
 
     IPage<CarrierDriverCollectTransportIntentionVO> listCarrierDriverCollectTransportIntentionAll(AppCarrierDriverCollectTransportIntentionParam param);
+
+    void updateAdjustOrder(Integer adjustOrderId, Integer adjustOrderBeforeId);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.collect.CollectDriverTransportIntentionDao;
 import com.clx.performance.dao.collect.CollectDriverTransportIntentionRecordDao;
+import com.clx.performance.enums.ResultEnum;
 import com.clx.performance.enums.collect.CollectDriverTransportIntentionEnum;
 import com.clx.performance.model.collect.CollectDriverTransportIntention;
 import com.clx.performance.model.collect.CollectDriverTransportIntentionRecord;
@@ -13,6 +14,8 @@ import com.clx.performance.struct.collect.CollectDriverTransportIntentionDaoStru
 import com.clx.performance.struct.collect.CollectDriverTransportIntentionRecordDaoStruct;
 import com.clx.performance.vo.pc.collect.CarrierDriverCollectTransportIntentionRecordVO;
 import com.clx.performance.vo.pc.collect.CarrierDriverCollectTransportIntentionVO;
+import com.msl.common.base.Optional;
+import com.msl.common.exception.ServiceSystemException;
 import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -50,7 +53,7 @@ public class CollectDriverTransportIntentionServiceImpl implements CollectDriver
 
         CollectDriverTransportIntention collectDriverTransportIntention = new CollectDriverTransportIntention();
         // 默认排序
-        collectDriverTransportIntention.setSortNo(1);
+        collectDriverTransportIntention.setSortNo(0L);
         collectDriverTransportIntention.setCollectName(param.getCollectName());
         collectDriverTransportIntention.setCollectDescribe(param.getCollectDescribe());
         collectDriverTransportIntention.setCollectCheckType(param.getCollectCheckType());
@@ -207,4 +210,35 @@ public class CollectDriverTransportIntentionServiceImpl implements CollectDriver
         }
         return new Page<CarrierDriverCollectTransportIntentionVO>().setPages(page.getPages()).setTotal(page.getTotal()).setRecords(listVO);
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateAdjustOrder(Integer adjustOrderId, Integer adjustOrderBeforeId) {
+        Optional<CollectDriverTransportIntention> one = collectDriverTransportIntentionDao.getEntityByKey(adjustOrderId);
+        //如果上调，这条记录传的是移动数据后面的记录id，如果下调，这条记录传的是移动数据前面的记录id
+        Optional<CollectDriverTransportIntention> two = collectDriverTransportIntentionDao.getEntityByKey(adjustOrderBeforeId);
+        if(!one.isPresent() || !two.isPresent()){
+            throw new ServiceSystemException(ResultEnum.DATA_NOT_FIND);
+        }
+        boolean isUp = false;
+        //通过seq判断是上调还是下调
+        if(one.get().getSortNo()  <  two.get().getSortNo()){
+            isUp = true;
+        }
+        //上调：大于two 这条记录的seq + 1 ； 下调：大于等于two这条记录的seq + 1 ;
+        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{    //下调
+            //调整的记录使用 two 的seq;
+            CollectDriverTransportIntention updateOne = new CollectDriverTransportIntention();
+            updateOne.setId(one.get().getId());
+            updateOne.setSortNo(two.get().getSortNo());
+            collectDriverTransportIntentionDao.updateEntityByKey(updateOne);
+        }
+    }
 }