Merge remote-tracking branch 'origin/dev' into dev

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/dos/mysql/KwsDeviceReference.java

@@ -96,6 +96,12 @@ public class KwsDeviceReference implements Serializable {
     @TableField(exist = false)
     private String  unit;
 
+    /**
+     * 单位-ne
+     */
+    @TableField(exist = false)
+    private String  unitNe;
+
     private static final long serialVersionUID = 1L;
 
 }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/param/DeviceAdd.java

@@ -1,6 +1,8 @@
 package com.sckw.slope.detection.model.param;
 
 import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -75,6 +77,7 @@ public class DeviceAdd {
     /**
      * 备注
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String remark;
 
     /**

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/vo/DevicePartModelVo.java

@@ -39,6 +39,11 @@ public class DevicePartModelVo implements Serializable {
      */
     private String unit;
 
+    /**
+     * 要素-单位-N-E
+     */
+    private String unitNe;
+
     /**
      * 要素基准
      */

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/BackTrackService.java

@@ -104,6 +104,7 @@ public class BackTrackService {
             for (SystemDict value : dictList.values()) {
                 if (re.getItem().equals(value.getValue())) {
                     re.setUnit(value.getUrl());
+                    re.setUnitNe(value.getRemark());
                 }
             }
         }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/DeviceService.java

@@ -299,6 +299,7 @@ public class DeviceService {
                     if (part.getPartName().equals(value.getValue())) {
                         part.setPartNameDesc(value.getLabel());
                         part.setUnit(value.getUrl());
+                        part.setUnitNe(value.getRemark());
                     }
                 }
                 references.forEach(re -> {

slope-modules/slope-detection/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ spring:
     name: slope-detection
 #    name: slope-detection
   profiles:
-    active: dev
+    active: lfdc
     #active: ${DEPLOY_MODE:dev}
   main:
     allow-bean-definition-overriding: true