feat: 增加装置可调整排序功能

db/upgrade20250305.sql

@@ -15,3 +15,8 @@ CREATE TABLE `ied_dl_record` (
   KEY `idxDev` (`dev_id`,`d_time`),
   KEY `idxConfig` (`config_id`,`d_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `n_sensor`
+ADD COLUMN `order_num` INT NULL AFTER `icd_id`,
+ADD INDEX `idxOrd` (`order_num` ASC),
+ADD INDEX `idxZsb` (`zsb_id` ASC, `order_num` ASC);

src/main/java/com/xydl/cac/entity/NSensor.java

@@ -64,6 +64,10 @@ public class NSensor {
     @ApiModelProperty("关联icd表中的id")
     private Integer icdId;
 
+    @Column(name = "order_num")
+    @ApiModelProperty("排序编号")
+    private Integer orderNum;
+
     @ApiModelProperty("主设备名称")
     @Transient
     private String zsbName;

src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java

@@ -60,6 +60,7 @@ public class NSensorServiceImpl implements NSensorService {
             if (typeId != null) {
                 predicate.getExpressions().add(builder.equal(root.get("typeId"), typeId));
             }
+            query.orderBy(builder.asc(root.get("orderNum")));
             return predicate;
         };
         List<NSensor> list = repository.findAll(specification);

src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java

@@ -12,11 +12,13 @@ import com.xydl.cac.service.ModevTypeService;
 import com.xydl.cac.service.ParamBindService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import javax.persistence.criteria.Predicate;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -82,7 +84,12 @@ public class ParamBindServiceImpl implements ParamBindService {
         for (Zsb zsb : zsbList) {
             zsbMap.put(zsb.getId(), zsb);
         }
-        List<NSensor> sensorList = sensorRepository.findAll();
+        Specification<NSensor> specification = (root, query, builder) -> {
+            Predicate predicate = builder.conjunction();
+            query.orderBy(builder.asc(root.get("orderNum")));
+            return predicate;
+        };
+        List<NSensor> sensorList = sensorRepository.findAll(specification);
 
         // 每一个放入上一层
         for (NSensor sensor : sensorList) {