修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -3905,9 +3905,12 @@
       <if test="noticeNo != null and noticeNo != ''">
         and NOTICE_NO LIKE '%${noticeNo}%'
       </if>
-      <if test="carNo != null and carNo != ''">
+      <if test="carNo != null and carNo != '' and isCongruent == null">
         and CAR_NO LIKE '%${carNo}%'
       </if>
+      <if test="carNo != null and carNo != '' and isCongruent != null">
+        and CAR_NO =  '${carNo}'
+      </if>
       <if test="trailerNo != null and trailerNo != ''">
         and TRAILER_NO LIKE '%${trailerNo}%'
       </if>

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -473,9 +473,12 @@
       <if test="noticeNo != null and noticeNo != ''">
         and NOTICE_NO LIKE '%${noticeNo}%'
       </if>
-      <if test="carNo != null and carNo != ''">
+      <if test="carNo != null and carNo != '' and isCongruent == null">
         and CAR_NO LIKE '%${carNo}%'
       </if>
+      <if test="carNo != null and carNo != '' and isCongruent != null">
+        and CAR_NO =  '${carNo}'
+      </if>
       <if test="trailerNo != null and trailerNo != ''">
         and TRAILER_NO LIKE '%${trailerNo}%'
       </if>

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.xml

@@ -442,109 +442,65 @@
 
     <select id="truckHisTareComparison" parameterType="java.util.HashMap"
             resultType="com.steerinfo.meterwork.meterworkdatacount.model.TruckHisTareComparison">
-        WITH
-        -- 1. 历史皮重表最新记录（每个车号最近一条）
-        latest_tare AS (
-        SELECT car_no, avg_weight, up_weight, tare_type,
-        ROW_NUMBER() OVER (PARTITION BY car_no ORDER BY create_time DESC) AS rn
-        FROM meter_base_his_tare_data
-        ),
-        -- 2. 洁净表最新非混装记录（排除混装/混卸）
-        latest_clean AS (
-        SELECT car_no, tare_weight AS clean_up_weight,
-        ROW_NUMBER() OVER (PARTITION BY car_no ORDER BY net_time DESC) AS rn
-        FROM meter_work_car_actual
-        WHERE PREDICTION_TYPE = 1   -- 请根据实际业务调整条件
-        ),
-        -- 3. 主关联 + 计算有效皮重及偏差
-        base_with_effective AS (
         SELECT
-        A.base_spot_name,
-        A.car_no,
-        A.meter_weight,
-        A.MATTER_NAME,
-        A.FORWARDING_UNIT_NAME,
-        A.RECEIVING_UINT_NAME,
-        A.value_flag,
-        A.create_man_no,
-        A.create_man_name,
-        A.create_time,
-        A.update_man_no,
-        A.update_man_name,
-        A.update_time,
-        A.meter_mode,
-        A.meter_type_Name,
-        A.note,
-        B.avg_weight,
-        B.up_weight,
-        B.tare_type,
-        C.clean_up_weight,
-        -- 有效皮重上限：当 tare_type 为 '3' 或 '4' 时取洁净皮重，否则取历史皮重
-        CASE
-        WHEN B.tare_type IN ('3', '4') THEN C.clean_up_weight
-        ELSE B.up_weight
-        END AS effectiveUpWeight,
-        -- 偏差绝对值（用于报警判断和过滤）
-        ABS(ROUND((A.meter_weight -
-        CASE
-        WHEN B.tare_type IN ('3', '4') THEN C.clean_up_weight
-        ELSE B.up_weight
-        END) / 1000, 2)) AS deviation
-        FROM meter_work_car_actual_first A
-        LEFT JOIN latest_tare B ON A.car_no = B.car_no AND B.rn = 1
-        LEFT JOIN latest_clean C ON A.car_no = C.car_no AND C.rn = 1
-        WHERE A.weight_type = '1'
-        )
-        -- 4. 最终查询：投影 + 过滤 + 排序
-        SELECT
-        base_spot_name AS baseSpotName,
-        car_no AS carNo,
-        -- 报警类型：根据 deviation 和阈值动态生成
+        A.base_spot_name AS baseSpotName,
+        A.car_no AS carNo,
+        -- 报警类型
         CASE
-        WHEN effectiveUpWeight IS NOT NULL
-        AND deviation > (SELECT TO_NUMBER(BASE_NAME) / 1000 FROM com_base_info WHERE BASE_CODE = '001067001')
+        WHEN C.clean_up_weight IS NOT NULL
+        AND ABS(ROUND((A.meter_weight - C.clean_up_weight) / 1000, 2)) >
+        (SELECT TO_NUMBER(BASE_NAME) / 1000 FROM com_base_info WHERE BASE_CODE = '001067001')
         THEN '皮重超过偏差'
-        WHEN effectiveUpWeight IS NOT NULL THEN '正常皮重'
+        WHEN C.clean_up_weight IS NOT NULL THEN '正常皮重'
         ELSE NULL
         END AS alarmType,
-        ROUND(meter_weight / 1000, 2) AS meterWeight,
-        ROUND(avg_weight / 1000, 2) AS avgWeight,
-        ROUND(up_weight / 1000, 2) AS upWeight,
-        tare_type AS tareType,
-        ROUND((meter_weight - effectiveUpWeight) / 1000, 2) AS absoluteError,
-        ROUND((meter_weight / (meter_weight + effectiveUpWeight)) * 100, 2) AS relativeError,
+        ROUND(A.meter_weight / 1000, 2) AS meterWeight,
+        null AS avgWeight,
+        ROUND(C.clean_up_weight / 1000, 2) AS upWeight,
+        ROUND((A.meter_weight - C.clean_up_weight) / 1000, 2) AS absoluteError,
+        ROUND((A.meter_weight / (A.meter_weight + C.clean_up_weight)) * 100, 2) AS relativeError,
         CASE
-        WHEN value_flag = '0' THEN '作废'
-        WHEN value_flag = '1' THEN '有效'
-        WHEN value_flag = '2' THEN '结净'
+        WHEN A.value_flag = '0' THEN '作废'
+        WHEN A.value_flag = '1' THEN '有效'
+        WHEN A.value_flag = '2' THEN '结净'
         ELSE NULL
         END AS valueFlag,
-        create_man_no AS createManNo,
-        create_man_name AS createManName,
-        create_time AS createTime,
-        update_man_no AS updateManNo,
-        update_man_name AS updateManName,
-        update_time AS updateTime,
-        RECEIVING_UINT_NAME AS receivingUintName,
-        FORWARDING_UNIT_NAME AS forwardingUnitName,
-        MATTER_NAME AS matterName,
+        A.create_man_no AS createManNo,
+        A.create_man_name AS createManName,
+        A.create_time AS createTime,
+        A.update_man_no AS updateManNo,
+        A.update_man_name AS updateManName,
+        A.update_time AS updateTime,
+        A.RECEIVING_UINT_NAME AS receivingUintName,
+        A.FORWARDING_UNIT_NAME AS forwardingUnitName,
+        A.MATTER_NAME AS matterName,
         CASE
-        WHEN meter_mode = '1' THEN '远程计量'
-        WHEN meter_mode = '2' THEN '智能计量'
-        WHEN meter_mode = '3' THEN '手工计量'
+        WHEN A.meter_mode = '1' THEN '远程计量'
+        WHEN A.meter_mode = '2' THEN '智能计量'
+        WHEN A.meter_mode = '3' THEN '手工计量'
         ELSE NULL
         END AS meterMode,
         CASE
-        WHEN meter_type_Name = 'SendToOutTms' THEN '外发'
-        WHEN meter_type_Name = 'GM2GM' THEN '厂内转储'
-        WHEN meter_type_Name = 'PO2GM' THEN '外进'
+        WHEN A.meter_type_Name = 'SendToOutTms' THEN '外发'
+        WHEN A.meter_type_Name = 'GM2GM' THEN '厂内转储'
+        WHEN A.meter_type_Name = 'PO2GM' THEN '外进'
         ELSE NULL
         END AS meterTypeName,
-        note,
-        effectiveUpWeight,
-        clean_up_weight AS cleanUpWeight
-        FROM base_with_effective
-        WHERE 1=1
+        A.note,
+        C.clean_up_weight AS effectiveUpWeight,
+        C.clean_up_weight AS cleanUpWeight
+        FROM meter_work_car_actual_first A
+        OUTER APPLY (
+        SELECT tare_weight AS clean_up_weight
+        FROM meter_work_car_actual C
+        WHERE C.car_no = A.car_no
+        AND C.create_time &lt; A.create_time
+        AND C.VALUE_FLAG != 0
+        AND C.prediction_Combination is null        -- 非混装/混卸
+        ORDER BY C.create_time DESC
+        FETCH FIRST 1 ROW ONLY
+        ) C
+        WHERE A.weight_type = '1'
         <!-- 时间范围 -->
         <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
             AND create_time >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
@@ -556,6 +512,7 @@
                 AND deviation > (SELECT TO_NUMBER(BASE_NAME) / 1000 FROM com_base_info WHERE BASE_CODE = '001067001')
             </if>
             <if test="alarmType == 1">
+                AND effectiveUpWeight IS NOT NULL
                 AND deviation &lt;= (SELECT TO_NUMBER(BASE_NAME) / 1000 FROM com_base_info WHERE BASE_CODE = '001067001')
             </if>
         </if>
@@ -563,14 +520,6 @@
         <if test="carNo != null and carNo != ''">
             AND car_no LIKE '%${carNo}%'
         </if>
-        <!-- 创建人 -->
-        <if test="createManNo != null and createManNo != ''">
-            AND create_man_no = #{createManNo}
-        </if>
-        <!-- 更新人 -->
-        <if test="updateManNo != null and updateManNo != ''">
-            AND update_man_no = #{updateManNo}
-        </if>
         <!-- 计量模式 -->
         <if test="meterMode != null and meterMode != ''">
             AND meter_mode = #{meterMode}

src/main/java/com/steerinfo/meterwork/meterworkmonitor/controller/MeterWorkMonitorController.java

@@ -5,6 +5,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkmonitor.dto.MeterMonitorFullDto;
 import com.steerinfo.meterwork.meterworkmonitor.dto.MeterWorkMonitorDto;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 import com.steerinfo.meterwork.meterworkmonitor.service.IMeterWorkMonitorService;
@@ -76,6 +77,19 @@ public class MeterWorkMonitorController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "电子地图获取除去陇西所有的秤点信息-获取列表", notes = "分页查询")
+    //@RequiresPermissions("meterworkmonitor:view")
+    @GetMapping(value = "/listByLonxiRe")
+    public RESTfulResult listByLonxiRe(@RequestParam HashMap parmas) {
+        try {
+            List<MeterMonitorFullDto> list = meterWorkMonitorService.listByLonxiRe(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

src/main/java/com/steerinfo/meterwork/meterworkmonitor/dto/MeterMonitorFullDto.java

@@ -0,0 +1,146 @@
+package com.steerinfo.meterwork.meterworkmonitor.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 称重监控完整数据 DTO（重量 + 布局配置）
+ * 用于 listByLonxi 接口返回
+ */
+public class MeterMonitorFullDto {
+
+    // ========== 重量数据（来自 MeterWorkMonitor） ==========
+    private String pointNo;
+    private String pointName;
+    private BigDecimal wgt;           // 重量（吨）
+    private String spotTypeNo;        // 点位类型编号（原业务字段）
+    private Date dataTime;            // 数据时间
+    private Date lastTime;            // 数据时间
+    private String isOnline;            // 数据时间
+
+    // ========== 布局配置（来自 METRIC_POINT_LAYOUT 表） ==========
+    private BigDecimal posTop;        // 顶部位置百分比
+    private BigDecimal posLeft;       // 左侧位置百分比
+    private String iconType;          // car / train
+    private String iconOffsetTop;     // 图标顶部偏移，如 "-10px"
+    private String iconOffsetRight;   // 图标右侧偏移，如 "1px"
+    private Integer sortOrder;        // 排序号
+    private String isEnabled;         // 1-启用 0-禁用
+
+    // ========== 构造方法 ==========
+    public MeterMonitorFullDto() {
+    }
+
+    // ========== Getter / Setter ==========
+    public String getPointNo() {
+        return pointNo;
+    }
+
+    public void setPointNo(String pointNo) {
+        this.pointNo = pointNo;
+    }
+
+    public String getPointName() {
+        return pointName;
+    }
+
+    public void setPointName(String pointName) {
+        this.pointName = pointName;
+    }
+
+    public BigDecimal getWgt() {
+        return wgt;
+    }
+
+    public void setWgt(BigDecimal wgt) {
+        this.wgt = wgt;
+    }
+
+    public String getSpotTypeNo() {
+        return spotTypeNo;
+    }
+
+    public void setSpotTypeNo(String spotTypeNo) {
+        this.spotTypeNo = spotTypeNo;
+    }
+
+    public Date getDataTime() {
+        return dataTime;
+    }
+
+    public void setDataTime(Date dataTime) {
+        this.dataTime = dataTime;
+    }
+
+    public BigDecimal getPosTop() {
+        return posTop;
+    }
+
+    public void setPosTop(BigDecimal posTop) {
+        this.posTop = posTop;
+    }
+
+    public BigDecimal getPosLeft() {
+        return posLeft;
+    }
+
+    public void setPosLeft(BigDecimal posLeft) {
+        this.posLeft = posLeft;
+    }
+
+    public String getIconType() {
+        return iconType;
+    }
+
+    public void setIconType(String iconType) {
+        this.iconType = iconType;
+    }
+
+    public String getIconOffsetTop() {
+        return iconOffsetTop;
+    }
+
+    public void setIconOffsetTop(String iconOffsetTop) {
+        this.iconOffsetTop = iconOffsetTop;
+    }
+
+    public String getIconOffsetRight() {
+        return iconOffsetRight;
+    }
+
+    public void setIconOffsetRight(String iconOffsetRight) {
+        this.iconOffsetRight = iconOffsetRight;
+    }
+
+    public Integer getSortOrder() {
+        return sortOrder;
+    }
+
+    public void setSortOrder(Integer sortOrder) {
+        this.sortOrder = sortOrder;
+    }
+
+    public String getIsEnabled() {
+        return isEnabled;
+    }
+
+    public void setIsEnabled(String isEnabled) {
+        this.isEnabled = isEnabled;
+    }
+
+    public Date getLastTime() {
+        return lastTime;
+    }
+
+    public void setLastTime(Date lastTime) {
+        this.lastTime = lastTime;
+    }
+
+    public String getIsOnline() {
+        return isOnline;
+    }
+
+    public void setIsOnline(String isOnline) {
+        this.isOnline = isOnline;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkmonitor/mapper/MeterWorkMonitorMapper.java

@@ -1,6 +1,8 @@
 package com.steerinfo.meterwork.meterworkmonitor.mapper;
 
+import com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint;
 import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkmonitor.dto.MeterMonitorFullDto;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 import io.micrometer.core.instrument.Meter;
 import org.apache.ibatis.annotations.Mapper;
@@ -27,4 +29,7 @@ public interface MeterWorkMonitorMapper extends IBaseMapper<MeterWorkMonitor, St
 
     List<MeterWorkMonitor> selectForList();
 
+    List<MeterMonitorFullDto> selectMeterMonitorFullDto(HashMap parmas);
+
+
 }

src/main/java/com/steerinfo/meterwork/meterworkmonitor/mapper/MeterWorkMonitorMapper.xml

@@ -2185,4 +2185,52 @@
   <select id="selectForList" resultMap="BaseResultMap">
     select t.* from METER_WORK_MONITOR t  where t.point_no = 'JT0127'
   </select>
+  <select id="selectMeterMonitorFullDto"
+          resultType="com.steerinfo.meterwork.meterworkmonitor.dto.MeterMonitorFullDto">
+    SELECT * FROM (SELECT
+                     -- 重量数据（来自原表）
+                     m.point_no          AS pointNo,
+                     m.point_name        AS pointName,
+                     ROUND(m.wgt / 1000, 2) AS wgt,   -- 吨，保留2位小数
+                     m.spot_type_no      AS spotTypeNo,
+                     m.last_time          AS lastTime,
+                     -- 布局配置（来自配置表，左连接）
+                     l.pos_top           AS posTop,
+                     l.pos_left          AS posLeft,
+                     l.icon_type         AS iconType,
+                     l.icon_offset_top   AS iconOffsetTop,
+                     l.icon_offset_right AS iconOffsetRight,
+                     l.sort_order        AS sortOrder,
+                     NVL(l.is_enabled, '1') AS isEnabled  -- 若无配置默认启用
+                   FROM
+                     meter_work_monitor m
+                     INNER JOIN  metric_point_layout l ON m.point_no = l.point_no
+                   WHERE
+                     l.pos_top is not null
+                   AND l.is_enabled = '1'
+                   UNION ALL
+                   SELECT
+                     s.BASE_SPOT_NO          AS pointNo,
+                     s.BASE_SPOT_NAME        AS pointName,
+                     ROUND(s.WEIGHT / 1000, 2) AS wgt,   -- 吨，保留2位小数
+                     s.spot_type_no      AS spotTypeNo,
+                     s.last_time          AS lastTime,
+                     -- 布局配置（来自配置表，左连接）
+                     l.pos_top           AS posTop,
+                     l.pos_left          AS posLeft,
+                     l.icon_type         AS iconType,
+                     l.icon_offset_top   AS iconOffsetTop,
+                     l.icon_offset_right AS iconOffsetRight,
+                     l.sort_order        AS sortOrder,
+                     NVL(l.is_enabled, '1') AS isEnabled  -- 若无配置默认启用
+                   FROM
+                     METER_BASE_SCALE_POINT s
+                     INNER JOIN  metric_point_layout l ON s.BASE_SPOT_NO = l.point_no
+                   WHERE
+                     l.pos_top is not null
+                     AND l.is_enabled = '1'
+                   )
+    ORDER BY
+      NVL(sortOrder, 999) ASC  -- 有排序号的按排序号，无则放最后
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/IMeterWorkMonitorService.java

@@ -3,6 +3,7 @@ package com.steerinfo.meterwork.meterworkmonitor.service;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.meterwork.meterworkmonitor.dto.MeterMonitorFullDto;
 import com.steerinfo.meterwork.meterworkmonitor.dto.MeterWorkMonitorDto;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 
@@ -37,6 +38,7 @@ public interface IMeterWorkMonitorService extends IBaseService<MeterWorkMonitor,
 
     PageList<MeterWorkMonitorDto> queryForPage2(HashMap parmas, Integer pageNum, Integer pageSize);
     PageList<MeterWorkMonitorDto> listByLonxi(HashMap parmas, Integer pageNum, Integer pageSize);
+    List<MeterMonitorFullDto> listByLonxiRe(HashMap parmas);
 
     List<MeterWorkMonitor> queryForList();
 

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/impl/MeterWorkMonitorServiceImpl.java

@@ -1,10 +1,12 @@
 package com.steerinfo.meterwork.meterworkmonitor.service.impl;
 
+import com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.meterwork.meterworkmonitor.dto.MeterMonitorFullDto;
 import com.steerinfo.meterwork.meterworkmonitor.dto.MeterWorkMonitorDto;
 import com.steerinfo.meterwork.meterworkmonitor.mapper.MeterWorkMonitorMapper;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
@@ -311,7 +313,7 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
     public PageList<MeterWorkMonitorDto> listByLonxi(HashMap parmas, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         List<MeterWorkMonitor> rows = this.getMapper().selectByParameters(parmas);
-
+//        List<MeterMonitorFullDto> rows = meterWorkMonitorMapper.selectMeterMonitorFullDto(parmas);
         List<MeterWorkMonitor> rowsTemp = new ArrayList<>();
         if(rows.size() >= 1) {
             for (MeterWorkMonitor model: rows) {
@@ -320,7 +322,6 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
                 }
             }
         }
-
         List<MeterWorkMonitorDto> list = new ArrayList<>();
         for (MeterWorkMonitor meterWorkMonitor : rowsTemp){
             long time = 45*1000;//45秒
@@ -346,6 +347,26 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         return pageInfo;
     }
 
+    @Override
+    public List<MeterMonitorFullDto> listByLonxiRe(HashMap parmas) {
+        List<MeterMonitorFullDto> rows = meterWorkMonitorMapper.selectMeterMonitorFullDto(parmas);
+        for (MeterMonitorFullDto meterMonitorFullDto : rows){
+            long time = 45*1000;//45秒
+            Date now = new Date();
+            Date beforeDate = new Date(now.getTime() - time);//30秒前的时间
+            if (meterMonitorFullDto.getLastTime() != null){
+                boolean before = meterMonitorFullDto.getLastTime().before(beforeDate);
+                if (before){
+                    meterMonitorFullDto.setIsOnline("N");
+                }else{
+                    meterMonitorFullDto.setIsOnline("Y");
+                }
+            }else {
+                meterMonitorFullDto.setIsOnline("N");
+            }
+        }
+        return rows;
+    }
     @Override
     public List<MeterWorkMonitor> queryForList() {
         return meterWorkMonitorMapper.selectForList();

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -3501,8 +3501,11 @@
   <select id="noPageDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     where 1 = 1
-    <if test="carNo != null and carNo != ''">
-      and CAR_NO like '%${carNo}%'
+    <if test="carNo != null and carNo != '' and isCongruent == null">
+      and CAR_NO LIKE '%${carNo}%'
+    </if>
+    <if test="carNo != null and carNo != '' and isCongruent != null">
+      and CAR_NO =  '${carNo}'
     </if>
     <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
       and FORWARDING_UNIT_NO = #{forwardingUnitNo}

src/main/resources/bootstrap.yml

@@ -7,12 +7,12 @@ spring:
     sampler:
       #默认值为0.1f，现在为了测试设置100%采集
       percentage: 1.0      
-#  cloud:
-#    config:
-##      fail-fast: true
-#      discovery:
-#        enabled: true
-#        service-id: config-server
+  cloud:
+    config:
+#      fail-fast: true
+      discovery:
+        enabled: true
+        service-id: config-server
     bus:
       trace:
         enabled: false # 2021年9月10日取消springcloud中bus总线服务