From 9b4cd3bfbad273a9cd813d6bcafa9816cb709dcc Mon Sep 17 00:00:00 2001
From: WangGuangYuan <wgy_2020@163.com>
Date: Thu, 20 Mar 2025 17:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E6=97=A0=E4=BA=BA=E6=9C=BA?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=90=8C=E6=AD=A5=E7=82=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasedataMontPatrolPointConsumerHandle.java     |  2 ++
 .../montdata/BasedataMontPatDevRunDataMapper.xml   | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java
index ac20668..537deda 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java
@@ -62,6 +62,7 @@ public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataH
     private SftpClient sftpClient;
 
     public void handMontData(JSONObject jsonObject) {
+        log.info(Color.BLUE + "[METADATA] 模型同步basedataMont-modelup-1024-----------jsonObject-----: {}" + Color.END, jsonObject);
         String Type = jsonObject.getString("Type");
         String convertFlag = "0";
         String SendCode = jsonObject.getString("SendCode");
@@ -75,6 +76,7 @@ public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataH
 
         JSONArray jsonObjectItems = jsonObject.getJSONArray("Items");
         List<ModelFileItem> list = jsonObjectItems.toJavaList(ModelFileItem.class);
+        log.info(Color.BLUE + "[METADATA] 模型同步-----list--{}-------------jsonObject-----: {}" + Color.END, list, jsonObject);
         if (null != list && !list.isEmpty()) {
             String modelString;
             for (Iterator<ModelFileItem> iterator = list.iterator(); iterator.hasNext(); basedataMontPatrolPointHandleComponent.handPointModelData(SendCode, modelString)) {
diff --git a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevRunDataMapper.xml b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevRunDataMapper.xml
index f0c918f..7592f03 100644
--- a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevRunDataMapper.xml
+++ b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevRunDataMapper.xml
@@ -5,8 +5,8 @@
 <mapper namespace="com.inspect.metadata.montdata.mapper.BasedataMontPatDevRunDataMapper">
 
     <resultMap type="BasedataMontPatDevRunData" id="BasedataMontPatDevRunDataResult">
-        <result property="dataId" column="mont_patdevrundata_id"/>
-        <result property="eqpBookId" column="eqpbook_id"/>
+        <result property="dataId" column="data_id"/>
+        <result property="eqpBookId" column="eqp_book_id"/>
         <result property="patrolDeviceCode" column="patrol_device_code"/>
         <result property="patrolDeviceName" column="patrol_device_name"/>
         <result property="time" column="time"/>
@@ -23,8 +23,8 @@
     </resultMap>
 
     <sql id="selectBasedataMontPatDevRunDataVo">
-        select mont_patdevrundata_id,
-               eqpbook_id,
+        select data_id,
+               eqp_book_id,
                patrol_device_code,
                patrol_device_name, time, type, type_name, value, value_unit, unit, create_by, create_time, update_by, update_time, delete_flag
         from basedata_mont_patdevrundata
@@ -34,7 +34,7 @@
             resultMap="BasedataMontPatDevRunDataResult">
         <include refid="selectBasedataMontPatDevRunDataVo"/>
         <where>
-            <if test="eqpBookId != null ">and eqpbook_id = #{eqpBookId}</if>
+            <if test="eqpBookId != null ">and eqp_book_id = #{eqpBookId}</if>
             <if test="patrolDeviceCode != null  and patrolDeviceCode != ''">and patrol_device_code =
                 #{patrolDeviceCode}
             </if>
@@ -61,7 +61,7 @@
             keyProperty="dataId">
         insert into basedata_mont_patdevrundata
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="eqpBookId != null">eqpbook_id,</if>
+            <if test="eqpBookId != null">eqp_book_id,</if>
             <if test="patrolDeviceCode != null">patrol_device_code,</if>
             <if test="patrolDeviceName != null">patrol_device_name,</if>
             <if test="time != null">time,</if>
@@ -97,7 +97,7 @@
     <update id="updateBasedataMontPatDevRunData" parameterType="BasedataMontPatDevRunData">
         update basedata_mont_patdevrundata
         <trim prefix="SET" suffixOverrides=",">
-            <if test="eqpBookId != null">eqpbook_id = #{eqpBookId},</if>
+            <if test="eqpBookId != null">eqp_book_id = #{eqpBookId},</if>
             <if test="patrolDeviceCode != null">patrol_device_code = #{patrolDeviceCode},</if>
             <if test="patrolDeviceName != null">patrol_device_name = #{patrolDeviceName},</if>
             <if test="time != null">time = #{time},</if>