From ec4eec7d1eb0f3faa503cdcd4bc8a150bb15ee52 Mon Sep 17 00:00:00 2001
From: lijw <lijw@123.com>
Date: Wed, 5 Mar 2025 17:22:44 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/job/PatrolDeviceStateMapper.xml    | 16 +++++++--------
 .../eqpbook/mapper/BasedataEqpBookMapper.java |  4 ++--
 .../BasedataMontPatDevRunDataMapper.xml       | 20 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/inspect-job/src/main/resources/mapper/job/PatrolDeviceStateMapper.xml b/inspect-job/src/main/resources/mapper/job/PatrolDeviceStateMapper.xml
index a185d9c..873dbba 100644
--- a/inspect-job/src/main/resources/mapper/job/PatrolDeviceStateMapper.xml
+++ b/inspect-job/src/main/resources/mapper/job/PatrolDeviceStateMapper.xml
@@ -5,17 +5,17 @@
 <mapper namespace="com.inspect.job.mapper.PatrolDeviceStateMapper">
     <update id="initData">
         INSERT INTO patrol_device_state_record (patrol_device_code, patrol_device_name, time, type, create_time)
-        select patroldevice_code as patrol_device_code,
-               patroldevice_name as patrol_device_name,
+        select patrol_device_code as patrol_device_code,
+               patrol_device_name as patrol_device_name,
                now() as time,type as type,create_time as create_time
         from basedata_eqpbook
-        where type != 12 and type != 20 and del_flag = 0 and patroldevice_code is not null
+        where type != 12 and type != 20 and del_flag = 0 and patrol_device_code is not null
 
     </update>
 
     <select id="queryData" resultType="HashMap">
-        select patrol_device_code                                patroldevice_code,
-               any_value(patrol_device_name)                     patroldevice_name,
+        select patrol_device_code                                patrol_device_code,
+               any_value(patrol_device_name)                     patrol_device_name,
                any_value(create_time)                            commission_time,
                sum(online_time_sum)                              onlineSum,
                sum(offline_count)                                offlineCount,
@@ -39,7 +39,7 @@
             patrol_device_state_record record
         SET record.record_time = nvr.duration
         WHERE
-            nvr.patroldevice_code = record.patrol_device_code
+            nvr.patrol_device_code = record.patrol_device_code
           AND DATE_FORMAT(record.time
             , '%Y-%m-%d' ) = DATE_FORMAT(CURRENT_DATE ()- 1
             , '%Y-%m-%d')
@@ -51,7 +51,7 @@
             patrol_device_state_record record
         SET record.online_time_sum = nvr.total_online_time, record.offline_count = nvr.offline_count
         WHERE
-            nvr.patroldevice_code = record.patrol_device_code
+            nvr.patrol_device_code = record.patrol_device_code
           AND DATE_FORMAT( record.time
             , '%Y-%m-%d' ) = DATE_FORMAT(
             CURRENT_DATE ()- 1
@@ -64,7 +64,7 @@
             patrol_device_state_record record
         SET record.state = nvr.`value`
         WHERE
-            nvr.patroldevice_code = record.patrol_device_code
+            nvr.patrol_device_code = record.patrol_device_code
           AND DATE_FORMAT( record.time
             , '%Y-%m-%d' ) = DATE_FORMAT(
             CURRENT_DATE ()- 1
diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/mapper/BasedataEqpBookMapper.java b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/mapper/BasedataEqpBookMapper.java
index 80ebe1e..f2c8aee 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/mapper/BasedataEqpBookMapper.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/mapper/BasedataEqpBookMapper.java
@@ -32,9 +32,9 @@ public interface BasedataEqpBookMapper {
 
     List<BasedataEqpBook> getUavList();
 
-    BasedataEqpBook checkEqpBookCodeUnique(@Param("patroldeviceCode") String deviceCode, @Param("eqpbookId") Long bookId);
+    BasedataEqpBook checkEqpBookCodeUnique(@Param("patrolDeviceCode") String deviceCode, @Param("eqpBookId") Long bookId);
 
-    BasedataEqpBook checkEqpBookNameUnique(@Param("patroldeviceName") String deviceName, @Param("eqpbookId") Long bookId);
+    BasedataEqpBook checkEqpBookNameUnique(@Param("patrolDeviceName") String deviceName, @Param("eqpBookId") Long bookId);
 
     List<BasedataEqpBook> getRobotUavList();
 
diff --git a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevRunDataMapper.xml b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevRunDataMapper.xml
index 1a6083f..f0c918f 100644
--- a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevRunDataMapper.xml
+++ b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevRunDataMapper.xml
@@ -7,8 +7,8 @@
     <resultMap type="BasedataMontPatDevRunData" id="BasedataMontPatDevRunDataResult">
         <result property="dataId" column="mont_patdevrundata_id"/>
         <result property="eqpBookId" column="eqpbook_id"/>
-        <result property="patrolDeviceCode" column="patroldevice_code"/>
-        <result property="patrolDeviceName" column="patroldevice_name"/>
+        <result property="patrolDeviceCode" column="patrol_device_code"/>
+        <result property="patrolDeviceName" column="patrol_device_name"/>
         <result property="time" column="time"/>
         <result property="type" column="type"/>
         <result property="typeName" column="type_name"/>
@@ -25,8 +25,8 @@
     <sql id="selectBasedataMontPatDevRunDataVo">
         select mont_patdevrundata_id,
                eqpbook_id,
-               patroldevice_code,
-               patroldevice_name, time, type, type_name, value, value_unit, unit, create_by, create_time, update_by, update_time, delete_flag
+               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
     </sql>
 
@@ -35,10 +35,10 @@
         <include refid="selectBasedataMontPatDevRunDataVo"/>
         <where>
             <if test="eqpBookId != null ">and eqpbook_id = #{eqpBookId}</if>
-            <if test="patrolDeviceCode != null  and patrolDeviceCode != ''">and patroldevice_code =
+            <if test="patrolDeviceCode != null  and patrolDeviceCode != ''">and patrol_device_code =
                 #{patrolDeviceCode}
             </if>
-            <if test="patrolDeviceName != null  and patrolDeviceName != ''">and patroldevice_name like concat('%',
+            <if test="patrolDeviceName != null  and patrolDeviceName != ''">and patrol_device_name like concat('%',
                 #{patrolDeviceName}, '%')
             </if>
             <if test="time != null  and time != ''">and time = #{time}</if>
@@ -62,8 +62,8 @@
         insert into basedata_mont_patdevrundata
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="eqpBookId != null">eqpbook_id,</if>
-            <if test="patrolDeviceCode != null">patroldevice_code,</if>
-            <if test="patrolDeviceName != null">patroldevice_name,</if>
+            <if test="patrolDeviceCode != null">patrol_device_code,</if>
+            <if test="patrolDeviceName != null">patrol_device_name,</if>
             <if test="time != null">time,</if>
             <if test="type != null">type,</if>
             <if test="typeName != null">type_name,</if>
@@ -98,8 +98,8 @@
         update basedata_mont_patdevrundata
         <trim prefix="SET" suffixOverrides=",">
             <if test="eqpBookId != null">eqpbook_id = #{eqpBookId},</if>
-            <if test="patrolDeviceCode != null">patroldevice_code = #{patrolDeviceCode},</if>
-            <if test="patrolDeviceName != null">patroldevice_name = #{patrolDeviceName},</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>
             <if test="type != null">type = #{type},</if>
             <if test="typeName != null">type_name = #{typeName},</if>