From 61001d680a08e7b112a5f3aa6b01d18048c9cf09 Mon Sep 17 00:00:00 2001
From: 15195 <yangyang1@honeycombis.com>
Date: Tue, 3 Feb 2026 14:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LyricVProjectStationExcepTionToDM.java    | 41 ++++++++++---------
 ...yricVProjectStationExcepTionToDMMapper.xml | 24 +++++------
 .../impl/LyricInternalServiceImpl.java        |  4 +-
 .../resources/mapper/SimulationNodeMapper.xml |  2 +-
 4 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVProjectStationExcepTionToDM.java b/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVProjectStationExcepTionToDM.java
index 044a2440..253f08be 100644
--- a/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVProjectStationExcepTionToDM.java
+++ b/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVProjectStationExcepTionToDM.java
@@ -1,4 +1,5 @@
 package com.sdm.outbridge.entity;
+
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -12,7 +13,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName(value = "v_project_station_exception_to_DM", autoResultMap = true)
+@TableName(value = "v_ecn_info_DM", autoResultMap = true)
 @Schema(description = "项目——工位——异常信息视图")
 public class LyricVProjectStationExcepTionToDM {
 
@@ -21,35 +22,35 @@ public class LyricVProjectStationExcepTionToDM {
     private String projectNum;
 
     @Schema(description = "异常编号")
-    @TableField(value = "exception_num")
-    private String exceptionNum;
+    @TableField(value = "ecn_code")
+    private String ecnCode;
 
     @Schema(description = "异常描述")
-    @TableField(value = "exception_desc")
-    private String exceptionDesc;
+    @TableField(value = "question_description")
+    private String questionDescription;
 
-    @Schema(description = "工位编号")
-    @TableField(value = "station_num")
-    private String stationNum;
+    @Schema(description = "工位代号")
+    @TableField(value = "station_code")
+    private String stationCode;
 
     @Schema(description = "工位名称")
     @TableField(value = "station_name")
     private String stationName;
 
-    @Schema(description = "异常类别")
-    @TableField(value = "exception_type")
-    private String exceptionType;
-
-    @Schema(description = "当前责任人")
-    @TableField(value = "current_responsible_person")
-    private String currentResponsiblePerson;
-
     @Schema(description = "异常提出者")
-    @TableField(value = "exception_proposer")
-    private String exceptionProposer;
+    @TableField(value = "question_proposer")
+    private String questionProposer;
+
+    @Schema(description = "异常类别")
+    @TableField(value = "exception_category")
+    private String exceptionCategory;
 
     @Schema(description = "异常等级")
-    @TableField(value = "exception_level")
-    private String exceptionLevel;
+    @TableField(value = "abnormal_level")
+    private String abnormalLevel;
+
+    @Schema(description = "工号")
+    @TableField(value = "jobnum")
+    private String jobNum;
 
 }
\ No newline at end of file
diff --git a/outbridge/src/main/resources/thirdDaoMapper/LyricVProjectStationExcepTionToDMMapper.xml b/outbridge/src/main/resources/thirdDaoMapper/LyricVProjectStationExcepTionToDMMapper.xml
index c36ee14e..7c83a100 100644
--- a/outbridge/src/main/resources/thirdDaoMapper/LyricVProjectStationExcepTionToDMMapper.xml
+++ b/outbridge/src/main/resources/thirdDaoMapper/LyricVProjectStationExcepTionToDMMapper.xml
@@ -5,21 +5,21 @@
     <select id="queryExceptionsByProjectAndStation"
             resultType="com.sdm.outbridge.entity.LyricVProjectStationExcepTionToDM">
         SELECT
-        project_num,
-        exception_num,
-        exception_desc,
-        station_num,
-        station_name,
-        exception_type,
-        current_responsible_person,
-        exception_proposer,
-        exception_level
-        FROM LyricVProjectStationExcepTionToDM
+        project_num projectNum,
+        ecn_code ecnCode,
+        question_description questionDescription,
+        station_code stationCode,
+        station_name stationName,
+        question_proposer questionProposer,
+        exception_category exceptionCategory,
+        abnormal_level abnormalLevel,
+        jobnum jobNum
+        FROM v_ecn_info_DM
         WHERE 1=1
             AND (
             <foreach collection="list" item="task" separator="OR">
-                <!-- 核心条件：projectNum = tag1Code 且 stationNum = tag5Code -->
-                (project_num = #{task.tag1Code} AND station_num = #{task.tag5Code})
+                <!-- 核心条件：project_num = tag1Code 且 station_code = tag5Code -->
+                (project_num = #{task.tag1Code} AND station_code = #{task.tag5Code})
             </foreach>
             )
     </select>
diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
index 4ba22313..483d080a 100644
--- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
@@ -2106,10 +2106,10 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
                 // 过滤掉异常列表中的无效数据（null 或关键字段为空）
                 .filter(exception -> exception != null
                         && exception.getProjectNum() != null && !exception.getProjectNum().trim().isEmpty()
-                        && exception.getStationNum() != null && !exception.getStationNum().trim().isEmpty())
+                        && exception.getStationCode() != null && !exception.getStationCode().trim().isEmpty())
                 .map(exception -> {
                     // 生成匹配键：projectNum + "_" + stationNum
-                    String matchKey = exception.getProjectNum().trim() + "_" + exception.getStationNum().trim();
+                    String matchKey = exception.getProjectNum().trim() + "_" + exception.getStationCode().trim();
                     // 从 taskMap 中查找匹配的任务对象
                     SimulationTaskSyncExBo matchTask = taskMap.get(matchKey);
                     if (matchTask != null) {
diff --git a/project/src/main/resources/mapper/SimulationNodeMapper.xml b/project/src/main/resources/mapper/SimulationNodeMapper.xml
index 8555a6dc..796b775f 100644
--- a/project/src/main/resources/mapper/SimulationNodeMapper.xml
+++ b/project/src/main/resources/mapper/SimulationNodeMapper.xml
@@ -764,7 +764,7 @@
 
     <select id="queryNodeCodeByTags" resultType="com.sdm.project.model.entity.SimulationNode">
         SELECT nodeCode,uuid
-        FROM spdm_baseline.simulation_node
+        FROM simulation_node
         WHERE nodeType = #{tagValue}
         <!-- 处理 List<String> 的 IN 条件，防止空列表导致 SQL 报错 -->
         <if test="list != null and list.size() > 0">