From 54b66901e4f7a6cf1ce0f7daeb23e04955189f83 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Fri, 15 Dec 2023 10:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E8=BE=B9=E5=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/HighSlopeCurrentDataMapper.xml    | 16 ++++++++--------
 .../mapper/xml/HighSlopeEngineeringMapper.xml    |  6 +++---
 .../mapper/xml/HighSlopeMeasurePointMapper.xml   |  8 ++++----
 .../xml/HighSlopeMeasurePointThresholdMapper.xml |  2 +-
 .../mapper/xml/HighSlopeMonitorTypeMapper.xml    |  2 +-
 .../xml/HighSlopeMonitorTypeRelaMapper.xml       |  4 ++--
 .../xml/HighSlopePlaneFigureCoordinateMapper.xml |  2 +-
 .../mapper/xml/HighSlopePlaneFigureMapper.xml    |  2 +-
 .../mapper/xml/HighSlopeSensorMapper.xml         | 10 +++++-----
 .../mapper/xml/HighSlopeSensorTypeMapper.xml     |  2 +-
 10 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeCurrentDataMapper.xml
index f722d8a9d..57b41a403 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeCurrentDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeCurrentDataMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhgd.xmgl.modules.foundation.mapper.HighSlopeCurrentDataMapper">
+<mapper namespace="com.zhgd.xmgl.modules.highslope.mapper.HighSlopeCurrentDataMapper">
     <select id="selectPageByProjectSn"
-            resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeCurrentData">
+            resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeCurrentData">
         SELECT dee.engineering_name engineeringName,
         demp.measure_point_name measurePointName,
         dest.sensor_type_name sensorTypeName,
@@ -65,7 +65,7 @@
     </select>
 
     <select id="selectHighSlopeCurrentDataPage"
-            resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeCurrentData">
+            resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeCurrentData">
         SELECT a.*
         from deep_excavation_current_data a
         LEFT JOIN deep_excavation_measure_point b ON
@@ -89,7 +89,7 @@
         order by a.receive_time desc
     </select>
     <select id="selectNewestHighSlopeCurrentData"
-            resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeCurrentData">
+            resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeCurrentData">
         SELECT decd.*
         from deep_excavation_current_data decd
         inner join deep_excavation_sensor des on des.sensor_sn = decd.sensor_sn
@@ -102,7 +102,7 @@
     </select>
 
     <select id="selectHighSlopeCurrentDataList"
-            resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeCurrentData">
+            resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeCurrentData">
         select dee.engineering_name engineeringName,
         demp.measure_point_name measurePointName,
         demp.measure_point_number measurePointNumber,
@@ -152,7 +152,7 @@
         order by decd.receive_time desc
     </select>
     <select id="selectArticleOneDataList"
-            resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeCurrentData">
+            resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeCurrentData">
         SELECT decd.*
         from deep_excavation_current_data decd
         inner join
@@ -164,7 +164,7 @@
         </foreach>
         group by sensor_sn) temp on decd.id = temp.id
     </select>
-    <select id="getAllEndData" resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeCurrentData">
+    <select id="getAllEndData" resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeCurrentData">
         select sensor_sn, MAX(receive_time) receive_time
         from deep_excavation_current_data
         group by sensor_sn
@@ -214,7 +214,7 @@
         order by num desc
     </select>
     <!-- <select id="selectHighSlopeCurrentDataList"
-             resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeCurrentData">
+             resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeCurrentData">
          SELECT a.*
          from deep_excavation_current_data a LEFT JOIN deep_excavation_measure_point b ON
          a.measuring_point_sn=b.measure_point_number
diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeEngineeringMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeEngineeringMapper.xml
index 91a272750..c7122aef1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeEngineeringMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeEngineeringMapper.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhgd.xmgl.modules.foundation.mapper.HighSlopeEngineeringMapper">
+<mapper namespace="com.zhgd.xmgl.modules.highslope.mapper.HighSlopeEngineeringMapper">
     <select id="selectHighSlopeEngineeringPage"
-            resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeEngineering">
+            resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeEngineering">
         SELECT *
         from deep_excavation_engineering
         WHERE project_sn=#{param.projectSn}
         order by start_time
     </select>
     <select id="selectHighSlopeList"
-            resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeEngineering">
+            resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeEngineering">
         SELECT *
         from deep_excavation_engineering
         WHERE project_sn=#{projectSn}
diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMeasurePointMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMeasurePointMapper.xml
index 8a14e0edd..f40bcf3f9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMeasurePointMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMeasurePointMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhgd.xmgl.modules.foundation.mapper.HighSlopeMeasurePointMapper">
+<mapper namespace="com.zhgd.xmgl.modules.highslope.mapper.HighSlopeMeasurePointMapper">
     <select id="selectHighSlopeAllMeasurePointList"
-            resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeMeasurePoint">
+            resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeMeasurePoint">
         select a.*
         from deep_excavation_measure_point a
         INNER JOIN deep_excavation_monitor_type_rela b ON a.rela_id = b.id
@@ -13,10 +13,10 @@
     </select>
 
     <resultMap autoMapping="true" id="measurePointAndSensor"
-               type="com.zhgd.xmgl.modules.foundation.entity.HighSlopeMeasurePoint">
+               type="com.zhgd.xmgl.modules.highslope.entity.HighSlopeMeasurePoint">
         <id property="id" column="id"/>
         <collection autoMapping="true" property="sensorList"
-                    ofType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeSensor">
+                    ofType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeSensor">
             <id property="id" column="sId"/>
         </collection>
     </resultMap>
diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMeasurePointThresholdMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMeasurePointThresholdMapper.xml
index 5ea929935..c58ebdcb1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMeasurePointThresholdMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMeasurePointThresholdMapper.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhgd.xmgl.modules.foundation.mapper.HighSlopeMeasurePointThresholdMapper">
+<mapper namespace="com.zhgd.xmgl.modules.highslope.mapper.HighSlopeMeasurePointThresholdMapper">
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml
index 822eb3df9..c0db92d79 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhgd.xmgl.modules.foundation.mapper.HighSlopeMonitorTypeMapper">
+<mapper namespace="com.zhgd.xmgl.modules.highslope.mapper.HighSlopeMonitorTypeMapper">
     <select id="selectHighSlopeMonitorList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
         SELECT a.*, IFNULL(b.num, 0) measure_point_num
         from deep_excavation_monitor_type a
diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeRelaMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeRelaMapper.xml
index ad19350ed..01752dfb0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeRelaMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeRelaMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhgd.xmgl.modules.foundation.mapper.HighSlopeMonitorTypeRelaMapper">
-    <resultMap id="BaseResultMap" type="com.zhgd.xmgl.modules.foundation.entity.HighSlopeMonitorTypeRela">
+<mapper namespace="com.zhgd.xmgl.modules.highslope.mapper.HighSlopeMonitorTypeRelaMapper">
+    <resultMap id="BaseResultMap" type="com.zhgd.xmgl.modules.highslope.entity.HighSlopeMonitorTypeRela">
         <!--@mbg.generated-->
         <!--@Table deep_excavation_monitor_type_rela-->
         <id column="id" jdbcType="BIGINT" property="id"/>
diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopePlaneFigureCoordinateMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopePlaneFigureCoordinateMapper.xml
index bfbc9cd6b..c6fc74858 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopePlaneFigureCoordinateMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopePlaneFigureCoordinateMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhgd.xmgl.modules.foundation.mapper.HighSlopePlaneFigureCoordinateMapper">
+<mapper namespace="com.zhgd.xmgl.modules.highslope.mapper.HighSlopePlaneFigureCoordinateMapper">
     <select id="selectPlaneFigureCoordinateList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
         SELECT a.*,
         b.measure_point_name,
diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopePlaneFigureMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopePlaneFigureMapper.xml
index 62bb9ffe6..d93b7a1f1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopePlaneFigureMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopePlaneFigureMapper.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhgd.xmgl.modules.foundation.mapper.HighSlopePlaneFigureMapper">
+<mapper namespace="com.zhgd.xmgl.modules.highslope.mapper.HighSlopePlaneFigureMapper">
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeSensorMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeSensorMapper.xml
index b5c24add3..308b4b1e6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeSensorMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeSensorMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhgd.xmgl.modules.foundation.mapper.HighSlopeSensorMapper">
-    <select id="getListBySensorSnSet" resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeSensor">
+<mapper namespace="com.zhgd.xmgl.modules.highslope.mapper.HighSlopeSensorMapper">
+    <select id="getListBySensorSnSet" resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeSensor">
         select des.*, dee.project_sn,dest.sensor_type_code
         from deep_excavation_sensor des
         left join deep_excavation_measure_point demp on des.measure_point_number = demp.measure_point_number
@@ -17,7 +17,7 @@
     </select>
 
     <select id="getListByMeasurePointNumberList"
-            resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeSensor">
+            resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeSensor">
         SELECT des.id,
         des.sensor_sn,
         des.measure_point_number,
@@ -40,7 +40,7 @@
         </foreach>
     </select>
     <select id="getListBySensorSnList"
-            resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeSensor">
+            resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeSensor">
         select des.*, dee.project_sn
         from deep_excavation_sensor des
         left join deep_excavation_measure_point demp
@@ -56,7 +56,7 @@
     </select>
 
     <select id="getUnitAndAlarmValueBySnAndPointNumber"
-            resultType="com.zhgd.xmgl.modules.foundation.entity.HighSlopeSensor">
+            resultType="com.zhgd.xmgl.modules.highslope.entity.HighSlopeSensor">
         select dest.unit, des.alarm_value, des.fiducial_value
         from deep_excavation_sensor_type dest
         inner join deep_excavation_sensor des on dest.id = des.sensor_type_id
diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeSensorTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeSensorTypeMapper.xml
index b153886ae..eedf3cba0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeSensorTypeMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeSensorTypeMapper.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhgd.xmgl.modules.foundation.mapper.HighSlopeSensorTypeMapper">
+<mapper namespace="com.zhgd.xmgl.modules.highslope.mapper.HighSlopeSensorTypeMapper">
 </mapper>