diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskByBMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskByBMapper.java
index 1505275..b231149 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskByBMapper.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskByBMapper.java
@@ -8,4 +8,4 @@ import org.apache.ibatis.annotations.Mapper;
 @DS("tsg")
 @Mapper
 public interface JcskByBMapper extends BaseMapper<JcskByB> {
-}
\ No newline at end of file
+}
diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskGnssBMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskGnssBMapper.java
index d9535ae..f3544e0 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskGnssBMapper.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskGnssBMapper.java
@@ -2,10 +2,60 @@ package com.gunshi.project.hsz.common.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gunshi.project.hsz.common.model.vo.HomeJcskGnssBVo;
 import com.gunshi.project.hsz.common.model.JcskGnssB;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @DS("tsg")
 @Mapper
 public interface JcskGnssBMapper extends BaseMapper<JcskGnssB> {
-}
\ No newline at end of file
+
+    @Select("""
+            <script>
+            SELECT st.*,r.de as x,r.dn as y,r.du as h,r.tm FROM jcsk_gnss_b st
+            LEFT JOIN (SELECT cd ,MAX(tm) tm FROM jcsk_gnss_r GROUP BY cd) maxr ON st.cd = maxr.cd
+            LEFT JOIN jcsk_gnss_r r ON maxr.cd = r.cd AND maxr.tm = r.tm
+            </script>
+            """)
+    List<HomeJcskGnssBVo> getDetailsAndMonitoringDataList();
+
+
+
+    @Select("""
+            <script>
+            SELECT st.*,r.de as x,r.dn as y,r.du as h,r.tm FROM jcsk_gnss_b st
+            LEFT JOIN (SELECT cd ,MAX(tm) tm FROM jcsk_gnss_r GROUP BY cd) maxr ON st.cd = maxr.cd
+            LEFT JOIN jcsk_gnss_r r ON maxr.cd = r.cd AND maxr.tm = r.tm
+            WHERE st.cd = #{id}
+            </script>
+            """)
+    HomeJcskGnssBVo getDetailsById(String id);
+
+
+    @Select("""
+    select ch from jcsk_gnss_b where ch is not null
+    group by ch
+""")
+    List<String> listDms();
+
+    @Select("""
+    select ch from jcsk_gnss_b group by ch
+""")
+    List<String> selectCH();
+
+
+    @Select("""
+    select cd from jcsk_gnss_b where ch = #{ch}
+""")
+    List<String> selectCDbyCh(@Param("ch") String ch);
+
+    @Select("""
+    select * from jcsk_gnss_b where ch is null order by cd asc
+""")
+    List<JcskGnssB> selectArtificial();
+
+}
diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskGnssRMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskGnssRMapper.java
index e88904e..9075037 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskGnssRMapper.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskGnssRMapper.java
@@ -2,10 +2,232 @@ package com.gunshi.project.hsz.common.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gunshi.project.hsz.common.model.so.JcskGnssRPageSo;
+import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
+import com.gunshi.project.hsz.common.model.vo.JcskGnessListVo;
+import com.gunshi.project.hsz.common.model.vo.JcskGnssRHisVo;
+import com.gunshi.project.hsz.common.model.vo.OsmoticShiftListVo2;
+import com.gunshi.project.hsz.common.model.vo.OsmoticShiftValueVo2;
 import com.gunshi.project.hsz.common.model.JcskGnssR;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @DS("tsg")
 @Mapper
 public interface JcskGnssRMapper extends BaseMapper<JcskGnssR> {
-}
\ No newline at end of file
+
+//    @Select("""
+//            <script>
+//            SELECT st.cd,r.de,r.dn,r.du,to_char(r.tm,'YYYY-MM-DD HH24:MI:SS') as tm FROM jcsk_gnss_r st
+//            LEFT JOIN (SELECT cd,MAX(tm) tm FROM jcsk_gnss_r GROUP BY cd) maxr ON st.cd = maxr.cd
+//            LEFT JOIN jcsk_gnss_r r ON maxr.cd = r.cd AND maxr.tm = r.tm
+//            ORDER BY st.cd asc,r.tm desc
+//            </script>
+//            """)
+//    List<JcskGnessListVo> listValue();
+
+
+    @Select("""
+            <script>
+            select
+    t1.cd,
+    t1.ch,
+    t1.cd_nm as cdnm,
+    t2.de,
+    t2.dn,
+    t2.du,
+    to_char(t2.tm,'YYYY-MM-DD HH24:MI:SS') as tm
+            from jcsk_gnss_b t1
+            left join (
+    select t2.*
+    from jcsk_gnss_r t2
+    join (
+        select cd, MAX(tm) as tm
+        from jcsk_gnss_r
+        GROUP BY cd
+    ) maxr on t2.cd = maxr.cd and t2.tm = maxr.tm
+            ) t2 on t1.cd = t2.cd
+            ORDER BY t1.cd asc, t2.tm desc;
+            </script>
+            """)
+    List<JcskGnessListVo> listValue();
+
+    @Select("""
+            <script>
+                select t.station_code as cd,to_char(t.tm,'YYYY-MM-DD HH24:MI:SS') as tm,s.direction
+                from public.osmotic_warn_r t
+                left join public.osmotic_warn_rule s on t.rule_id = s.id
+                where t.station_code in
+                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
+                    #{code}
+                </foreach>	
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>  
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t.tm desc
+            </script>
+            """)
+    List<OsmoticShiftListVo2> queryWarn(@Param("obj") OsmoticQuerySo so);
+
+
+    @Select("""
+            <script>
+                select t.cd,t.tm as tm,t.de ,t.dn ,t.du,t.res_cd,t.alt
+                from public.jcsk_gnss_r t
+                where t.cd in
+                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
+                    #{code}
+                </foreach>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t.tm desc
+            </script>
+            """)
+    List<OsmoticShiftValueVo2> queryValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
+
+    @Select("""
+            <script>
+                select t.cd,t.tm as tm,t.de ,t.dn ,t.du,t.res_cd,t.alt
+                from public.jcsk_gnss_r_8am t
+                where t.cd in
+                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
+                    #{code}
+                </foreach>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t.tm desc
+            </script>
+            """)
+    List<OsmoticShiftValueVo2> queryReorganizeValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
+
+
+    @Select("""
+            <script>
+                select to_char(t.tm,'YYYY-MM-DD HH24:MI:SS') as tm,t.de,t.dn ,t.du,t.is_artificial as isArtificial from public.jcsk_gnss_r t
+                where t.cd = #{obj.stationCode}
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>  
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t.tm desc
+            </script>
+            """)
+    List<OsmoticShiftValueVo2> detailValue(@Param("obj") OsmoticDetailQuerySo so);
+
+    @Select("""
+    <script>
+            WITH daily_data AS (
+        SELECT
+            t2.cd,
+            t1.ch,
+            t1.cd_nm,
+            t2.de,
+            t2.dn,
+            t2.du,
+            t2.alt,
+            t2.tm,
+            t2.update_tm,
+            ROW_NUMBER() OVER (PARTITION BY t2.cd, t1.ch, DATE(t2.tm) ORDER BY t2.tm DESC) as rn
+        FROM jcsk_gnss_b t1
+        JOIN jcsk_gnss_r t2 ON t1.cd = t2.cd
+        WHERE 1=1
+        <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+            AND t2.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+        </if> 
+        <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+            AND t2.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+        </if>
+        <if test="obj.cd != null and obj.cd != ''">
+            AND t2.cd = #{obj.cd}
+        </if>
+        <if test="obj.ch != null and obj.ch != ''">
+            AND t1.ch = #{obj.ch}
+        </if>
+        <if test= "obj.isArtificial != null">
+            AND t2.is_artificial = #{obj.isArtificial}
+        </if>
+    )
+    SELECT
+        cd,
+        ch,
+        cd_nm as cdnm,
+        de,
+        dn,
+        du,
+        alt,
+        tm as tm,
+        update_tm
+    FROM daily_data
+    WHERE rn = 1
+    ORDER BY DATE(tm) DESC, tm DESC, cd DESC
+    </script>
+""")
+    Page<JcskGnssR> pageQuery(Page<Object> page, @Param("obj") JcskGnssRPageSo page1);
+
+
+    @Select("""
+    <script>
+    select t1.ch,t2.* from 
+    jcsk_gnss_b t1
+    left join jcsk_gnss_r t2
+    on t1.cd = t2.cd
+    where 1=1
+    <if test="dto.cd != null and dto.cd != ''">
+        AND t1.cd = #{dto.cd}
+    </if>
+    <if test="dto.ch != null and dto.ch != ''">
+        AND t1.ch = #{dto.ch}
+    </if>
+        <if test="dto.dateTimeRangeSo != null">
+        <![CDATA[
+        AND t2.tm >= #{dto.dateTimeRangeSo.start}
+        AND t2.tm <= #{dto.dateTimeRangeSo.end}
+        ]]>
+    </if>
+    </script>
+""")
+    Page<JcskGnssRHisVo> historyPage(Page<Object> page, @Param("dto") JcskGnssRPageSo page1);
+
+
+    @Select("""
+    <script>
+    select t1.ch,t2.* from 
+    jcsk_gnss_b t1
+    left join jcsk_gnss_r t2
+    on t1.cd = t2.cd
+    where t2.is_artificial = 1
+    <if test="dto.cd != null and dto.cd != ''">
+        AND t1.cd = #{dto.cd}
+    </if>
+    <if test="dto.ch != null and dto.ch != ''">
+        AND t1.ch = #{dto.ch}
+    </if>
+        <if test="dto.dateTimeRangeSo != null">
+        <![CDATA[
+        AND t2.tm >= #{dto.dateTimeRangeSo.start}
+        AND t2.tm <= #{dto.dateTimeRangeSo.end}
+        ]]>
+    </if>
+    order by t2.tm desc
+    </script>
+""")
+    Page<JcskGnssR> artificialPage(Page<Object> page,@Param("dto") JcskGnssRPageSo page1);
+}
diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSlBMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSlBMapper.java
index 67bafc3..9caeb96 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSlBMapper.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSlBMapper.java
@@ -1,11 +1,162 @@
 package com.gunshi.project.hsz.common.mapper;
 
+
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
+import com.gunshi.project.hsz.common.model.vo.HomeJcskSlBVo;
+import com.gunshi.project.hsz.common.model.vo.JcskSyRVo;
+import com.gunshi.project.hsz.common.model.vo.OsmoticPressDetailVo;
+import com.gunshi.project.hsz.common.model.vo.OsmoticValueVo2;
 import com.gunshi.project.hsz.common.model.JcskSlB;
+import com.gunshi.project.hsz.common.model.JcskSlR;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @DS("tsg")
 @Mapper
 public interface JcskSlBMapper extends BaseMapper<JcskSlB> {
-}
\ No newline at end of file
+
+    @Select("""
+            <script>
+            SELECT st.*,r.spqn as q,r.mstm as tm FROM jcsk_sl_b st
+            LEFT JOIN (SELECT mpcd,MAX(mstm) tm FROM jcsk_sl_r GROUP BY mpcd) maxr ON st.mpcd = maxr.mpcd
+            LEFT JOIN jcsk_sl_r r ON maxr.mpcd = r.mpcd AND maxr.tm = r.mstm
+            </script>
+            """)
+    List<HomeJcskSlBVo> getDetailsAndMonitoringDataList();
+
+
+    @Select("""
+            <script>
+                    SELECT st.*,r.spqn as q,r.mstm as tm FROM jcsk_sl_b st
+                    LEFT JOIN (SELECT mpcd,MAX(mstm) tm FROM jcsk_sl_r GROUP BY mpcd) maxr ON st.mpcd = maxr.mpcd
+                    LEFT JOIN jcsk_sl_r r ON maxr.mpcd = r.mpcd AND maxr.tm = r.mstm
+                    where st.mpcd = #{id}
+            </script>
+            """)
+    HomeJcskSlBVo getDetailsById(String id);
+
+
+    @Select("""
+    select dvcd from jcsk_sl_b where dm = #{dm}
+""")
+    List<String> getDvcdByProfileCode(@Param("dm") String profileCode);
+
+
+    @Select(
+            """
+        <script>
+        SELECT station_code, value, tm
+        FROM (
+            SELECT
+                st.dvcd as station_code,
+                r.spqn as value,
+                to_char(r.mstm,'YYYY-MM-DD HH24:MI:SS') as tm,
+                ROW_NUMBER() OVER (PARTITION BY st.mpcd ORDER BY r.mstm DESC) as rn
+            FROM jcsk_sl_b st
+            LEFT JOIN jcsk_sl_r r ON st.mpcd = r.mpcd
+        ) t
+        WHERE rn = 1
+        ORDER BY station_code asc;
+        </script>
+"""
+    )
+    List<JcskSyRVo> listValue();
+
+
+    @Select("""
+            <script>
+                select t1.dvcd as stationCode,t2.mstm as tm,t2.spqn as value 
+                from public.jcsk_sl_b t1 
+                left join public.jcsk_sl_r t2
+                on t1.mpcd = t2.mpcd
+                where t1.dvcd in 
+                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
+                    #{code}
+                </foreach>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t2.mstm desc
+            </script>
+            """)
+    List<OsmoticValueVo2> queryValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
+
+    @Select("""
+            <script>
+                select t2.*
+                from public.jcsk_sl_b t1 
+                left join public.jcsk_sl_r t2
+                on t1.mpcd = t2.mpcd
+                where t1.dvcd in 
+                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
+                    #{code}
+                </foreach>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t2.mstm desc
+            </script>
+            """)
+    List<JcskSlR> syncqueryValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
+
+    @Select("""
+            <script>
+                select t1.dvcd as stationCode,t2.mstm as tm,t2.spqn as value 
+                from public.jcsk_sl_b t1 
+                left join public.jcsk_sl_r_8am t2
+                on  t1.mpcd = t2.mpcd
+                where t1.dvcd in 
+                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
+                    #{code}
+                </foreach>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t2.mstm desc
+            </script>
+            """)
+    List<OsmoticValueVo2> query8AmValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
+
+
+    @Select("""
+            <script>
+                select to_char(t.mstm,'YYYY-MM-DD HH24:MI:SS') as tm,
+                t.spqn as value from public.jcsk_sl_b t2
+                left join 
+                public.jcsk_sl_r t on t2.mpcd = t.mpcd
+                where t2.dvcd = #{obj.stationCode}
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>  
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t.mstm desc
+            </script>
+            """)
+    List<OsmoticPressDetailVo> detailValue(@Param("obj") OsmoticDetailQuerySo so);
+
+
+    @Select("""
+    <script>
+    select dvcd from jcsk_sl_b where  mpcd = #{mpcd} limit 1
+    </script>
+""")
+    String selectDvcdByStcdAndMpcd(@Param("mpcd") String mpcd);
+}
diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSlRMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSlRMapper.java
index 93ccf0a..e13c34d 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSlRMapper.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSlRMapper.java
@@ -2,10 +2,83 @@ package com.gunshi.project.hsz.common.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gunshi.project.hsz.common.model.so.JcskSlRPageSo;
+import com.gunshi.project.hsz.common.model.vo.JcskSlRHisVo;
 import com.gunshi.project.hsz.common.model.JcskSlR;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 @DS("tsg")
 @Mapper
 public interface JcskSlRMapper extends BaseMapper<JcskSlR> {
-}
\ No newline at end of file
+
+
+    @Select("""
+    <script>
+    <![CDATA[
+    WITH ranked_data AS (
+        SELECT 
+            t1.*,
+            t2.dm,
+            t3.profile_name as dmName,
+            t2.dvcd,
+            ROW_NUMBER() OVER (PARTITION BY  t1.mpcd, DATE_TRUNC('day', t1.mstm) ORDER BY t1.mstm DESC) as rn
+        FROM jcsk_sl_r t1
+        JOIN jcsk_sl_b t2 ON t1.mpcd = t2.mpcd
+        LEFT JOIN att_dam_profile t3 ON t2.dm = t3.profile_code
+        WHERE 1=1
+    ]]>
+    <if test="dto.dvcd != null and dto.dvcd != ''">
+        AND t2.dvcd = #{dto.dvcd}
+    </if>
+    <if test="dto.dm != null and dto.dm != ''">
+        AND t2.dm = #{dto.dm} 
+    </if>
+    <if test="dto.dateTimeRangeSo != null">
+        <![CDATA[
+        AND t1.mstm >= #{dto.dateTimeRangeSo.start}
+        AND t1.mstm <= #{dto.dateTimeRangeSo.end}
+        ]]>
+    </if>
+    )
+    SELECT *
+    FROM ranked_data
+    WHERE rn = 1
+    ORDER BY mstm DESC
+    </script>
+""")
+    Page<JcskSlR> pageQuery(Page<Object> page, @Param("dto") JcskSlRPageSo page1);
+
+
+    @Select("""
+        <script>
+    <![CDATA[
+    select  t2.*,
+            t1.dm,
+            t3.profile_name as dmName,
+            t1.dvcd 
+    from jcsk_sl_b t1
+    left join jcsk_sl_r t2 on t1.mpcd = t2.mpcd
+    left join att_dam_profile t3 on t1.dm = t3.profile_code
+    where 1=1
+    ]]>
+    <if test="dto.dvcd != null and dto.dvcd != ''">
+        AND t1.dvcd = #{dto.dvcd}
+    </if>
+    <if test="dto.dm != null and dto.dm != ''">
+        AND t1.dm = #{dto.dm} 
+    </if>
+    <if test="dto.dateTimeRangeSo != null">
+        <![CDATA[
+        AND t2.mstm >= #{dto.dateTimeRangeSo.start}
+        AND t2.mstm <= #{dto.dateTimeRangeSo.end}
+        ]]>
+    </if>
+    order by t2.mstm desc
+    </script>
+""")
+    Page<JcskSlRHisVo> historyPage(Page<Object> page, JcskSlRPageSo page1);
+
+}
diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSyBMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSyBMapper.java
index 3426169..73019a4 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSyBMapper.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSyBMapper.java
@@ -3,9 +3,58 @@ package com.gunshi.project.hsz.common.mapper;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gunshi.project.hsz.common.model.JcskSyB;
+import com.gunshi.project.hsz.common.model.vo.HomeJcskSYBVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @DS("tsg")
 @Mapper
 public interface JcskSyBMapper extends BaseMapper<JcskSyB> {
-}
\ No newline at end of file
+
+
+    @Select("""
+            <script>
+            SELECT st.*, r.spprwl as value, r.mstm
+            FROM jcsk_sy_b st
+            LEFT JOIN (
+            SELECT mpcd, MAX(mstm) as max_mstm
+            FROM jcsk_sy_r
+            GROUP BY mpcd) maxr ON st.mpcd = maxr.mpcd
+            LEFT JOIN jcsk_sy_r r ON maxr.mpcd = r.mpcd AND maxr.max_mstm = r.mstm
+            </script>
+            """)
+    List<HomeJcskSYBVo> getDetailsAndMonitoringDataList();
+
+
+    @Select("""
+            <script>
+            SELECT st.*, r.spprwl as value, r.mstm
+            FROM jcsk_sy_b st
+            LEFT JOIN (
+            SELECT mpcd, MAX(mstm) as tm\s
+            FROM jcsk_sy_r\s
+            GROUP BY mpcd
+            )maxr ON st.mpcd = maxr.mpcd
+            LEFT JOIN jcsk_sy_r r ON maxr.mpcd = r.mpcd AND maxr.tm = r.mstm
+            WHERE st.mpcd = #{id}
+            </script>
+            """)
+    HomeJcskSYBVo getDetailsById(@Param("id") String id);
+
+
+    @Select("""
+    SELECT dvcd from jcsk_sy_b where dm = #{dm} 
+                               ORDER BY LENGTH(dvcd) ASC,dvcd ASC;
+""")
+    List<String> getDvcdByProfileCode(@Param("dm") String profileCode);
+
+    @Select("""
+    <script>
+    select dvcd from jcsk_sy_b where mpcd = #{mpcd} and stcd =#{stcd}
+    </script>
+""")
+    String selectDvcdByStcdAndMpcd(@Param("stcd")String stcd,@Param("mpcd") String mpcd);
+}
diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSyRMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSyRMapper.java
index ec57fa8..eb58423 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSyRMapper.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/JcskSyRMapper.java
@@ -2,10 +2,364 @@ package com.gunshi.project.hsz.common.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gunshi.project.hsz.common.model.JcskSyB;
 import com.gunshi.project.hsz.common.model.JcskSyR;
+import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
+import com.gunshi.project.hsz.common.model.vo.*;
+import com.gunshi.project.hsz.common.model.so.JcskSyRPageSo;
+import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @DS("tsg")
 @Mapper
 public interface JcskSyRMapper extends BaseMapper<JcskSyR> {
-}
\ No newline at end of file
+    @Select(
+            """
+        <script>
+    SELECT
+    st.dvcd as station_code,
+    r.spprwl as value,
+    to_char(r.mstm,'YYYY-MM-DD HH24:MI:SS') as tm,
+    m.profile_name
+    FROM jcsk_sy_b st
+    LEFT JOIN (
+    SELECT mpcd,stcd, MAX(mstm) as max_tm
+    FROM jcsk_sy_r
+    GROUP BY mpcd,stcd
+) maxr ON st.mpcd = maxr.mpcd and st.stcd = maxr.stcd
+    LEFT JOIN jcsk_sy_r r ON maxr.mpcd = r.mpcd AND maxr.max_tm = r.mstm and maxr.stcd = r.stcd
+    LEFT JOIN att_dam_profile m ON st.dm = m.profile_code
+    ORDER BY m._order ASC;
+        </script>
+"""
+    )
+    List<JcskSyRVo> listValue();
+
+
+
+    @Select(
+            """
+        <script>
+        SELECT
+            st.mpcd as station_code,
+            r.spqn as value,
+            to_char(r.mstm,'YYYY-MM-DD HH24:MI:SS') as tm
+        FROM jcsk_sl_b st
+        LEFT JOIN (
+            SELECT mpcd, MAX(mstm) as tm
+            FROM jcsk_sl_r
+            GROUP BY mpcd
+        ) maxr ON st.mpcd = maxr.mpcd
+        LEFT JOIN jcsk_sl_r r ON maxr.mpcd = r.mpcd AND maxr.tm = r.mstm
+        ORDER BY st.mpcd asc, r.mstm desc;
+        </script>
+"""
+    )
+    List<JcskSyRVo> flowListValue();
+
+
+    @Select("""
+            <script>
+                select t.station_code as stationCode,to_char(t.tm,'YYYY-MM-DD HH24:MI:SS') as tm
+                from public.osmotic_warn_r t
+                where t.station_code in
+                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
+                    #{code}
+                </foreach>	
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>  
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t.tm desc
+            </script>
+            """)
+    List<OsmoticValueVo2> queryWarn(@Param("obj") OsmoticQuerySo so);
+
+
+    @Select("""
+            <script>
+                select to_char(t.mstm,'YYYY-MM-DD HH24:MI:SS') as tm,
+                t.spprwl as value from public.jcsk_sy_b t2
+                left join public.jcsk_sy_r t on t2.stcd = t.stcd and t2.mpcd = t.mpcd
+                where t2.dvcd = #{obj.stationCode}
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>  
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t.mstm desc
+            </script>
+            """)
+    List<OsmoticPressDetailVo> detailValue(@Param("obj") OsmoticDetailQuerySo so);
+
+
+    @Select("""
+            <script>
+                select to_char((t.tm - INTERVAL '5 minutes'),'YYYY-MM-DD HH24:MI:SS') as tm,t.rz
+                from public.st_rsvr_r t
+                where t.stcd = #{stcd} and to_char(t.tm, 'MI:SS') = '05:00'
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                    and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>  
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t.tm desc
+            </script>
+            """)
+    List<StRzVo> queryLineRz(@Param("obj") OsmoticQuerySo osmoticQuerySo, @Param("stcd") String stcd);
+
+
+    @Select("""
+            <script>
+                select to_char(t.tm,'YYYY-MM-DD') as tm,t.drp as rz
+                from public.st_pptn_r_d t
+                where t.year = #{year} and t.stcd = #{stcd}
+                order by t.tm desc
+            </script>
+            """)
+    List<StRzVo> queryDrp(@Param("year") Integer year,@Param("stcd") String stcd);
+
+
+
+    @Select("""
+            <script>
+                select to_char(t.tm,'YYYY-MM-DD') as tm,t.rz
+                from public.st_rsvr_r t
+                where to_char(t.tm, 'HH24:MI:SS') = '08:00:00' and t.stcd = #{stcd}
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t.tm desc
+            </script>
+            """)
+    List<StRzVo> queryRz(@Param("obj") OsmoticQuerySo osmoticQuerySo,@Param("stcd") String stcd);
+
+    @Select("""
+            <script>
+                select  t.tm,t.rz
+                from public.st_rsvr_r t
+                where to_char(t.tm, 'MI:SS') = '00:00' and to_char(t.tm, 'HH24:MI') like '%:00' and t.stcd = #{stcd}
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t.tm desc
+            </script>
+            """)
+    List<StRzVo> queryRz2(@Param("obj") OsmoticQuerySo osmoticQuerySo,@Param("stcd") String stcd);
+
+
+    @Select("""
+            <script>
+                select t1.dvcd as stationCode,t2.mstm as tm,t2.spprwl as value 
+                from public.jcsk_sy_b t1 left join public.jcsk_sy_r t2
+                on t1.stcd =t2.stcd and t1.mpcd = t2.mpcd
+                where t1.dvcd in 
+                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
+                    #{code}
+                </foreach>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t2.mstm desc
+            </script>
+            """)
+    List<OsmoticValueVo2> queryValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
+
+    @Select("""
+            <script>
+                select t1.dvcd as stationCode,t2.mstm as tm,t2.spprwl as value 
+                from public.jcsk_sy_b t1 left join public.jcsk_sy_r_8am t2
+                on t1.stcd =t2.stcd and t1.mpcd = t2.mpcd
+                where t1.dvcd in 
+                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
+                    #{code}
+                </foreach>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t2.mstm desc
+            </script>
+            """)
+    List<OsmoticValueVo2> query8AmValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
+
+
+    @Select("""
+            <script>
+                select t2.*
+                from public.jcsk_sy_b t1 
+                    left join public.jcsk_sy_r t2
+                on t1.stcd =t2.stcd and t1.mpcd = t2.mpcd
+                where t1.dvcd in 
+                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
+                    #{code}
+                </foreach>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t2.mstm desc
+            </script>
+            """)
+    List<JcskSyR> syncqueryValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
+
+
+
+    @Select("""
+            <script>
+                select t1.dvcd as stationCode,to_char(t2.mstm,'YYYY-MM-DD HH24:MI:SS') as tm,t2.spprwl as value
+                from public.jcsk_sy_b t1
+                left join public.jcsk_sy_r t2 on t1.stcd =t2.stcd and t1.mpcd = t2.mpcd
+                where t1.dvcd in
+                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
+                    #{code}
+                </foreach>	
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
+                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
+                </if>  
+                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
+                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
+                </if>
+                order by t2.mstm desc
+            </script>
+            """)
+    List<OsmoticValueVo2> queryLineValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
+
+
+    @Select("""
+    <script>
+    <![CDATA[
+    WITH ranked_data AS (
+        SELECT 
+            t1.*,
+            t2.dm,
+            t3.profile_name as dmName,
+            t2.dvcd,
+            ROW_NUMBER() OVER (PARTITION BY t1.stcd, t1.mpcd, DATE_TRUNC('day', t1.mstm) ORDER BY t1.mstm DESC) as rn
+        FROM jcsk_sy_r t1
+        JOIN jcsk_sy_b t2 ON t1.stcd = t2.stcd AND t1.mpcd = t2.mpcd
+        LEFT JOIN att_dam_profile t3 ON t2.dm = t3.profile_code
+        WHERE 1=1
+    ]]>
+    <if test="dto.dvcd != null and dto.dvcd != ''">
+        AND t2.dvcd = #{dto.dvcd}
+    </if>
+    <if test="dto.dm != null and dto.dm != ''">
+        AND t2.dm = #{dto.dm} 
+    </if>
+    <if test="dto.dateTimeRangeSo != null">
+        <![CDATA[
+        AND t1.mstm >= #{dto.dateTimeRangeSo.start}
+        AND t1.mstm <= #{dto.dateTimeRangeSo.end}
+        ]]>
+    </if>
+    )
+    SELECT *
+    FROM ranked_data
+    WHERE rn = 1
+    ORDER BY mstm DESC
+    </script>
+""")
+    Page<JcskSyR> queryPage(Page<Object> page, @Param("dto") JcskSyRPageSo pageSo);
+
+    @Select("""
+select dm from jcsk_sy_b
+GROUP BY dm
+""")
+    List<String> listDm();
+
+
+    @Select("""
+    select stcd,mpcd from jcsk_sy_b
+""")
+    List<JcskSyB> listStcdMpcd();
+
+
+    @Select("""
+    select dvcd from jcsk_sy_b where dm = #{dm}
+""")
+    List<String> listDvcdByDm(@Param("dm") String dm);
+
+    @Select("""
+    <script>
+    <![CDATA[
+    select  t2.*,
+            t1.dm,
+            t3.profile_name as dmName,
+            t1.dvcd 
+    from jcsk_sy_b t1
+    left join jcsk_sy_r t2 on t1.stcd = t2.stcd and t1.mpcd = t2.mpcd
+    left join att_dam_profile t3 on t1.dm = t3.profile_code
+    where 1=1
+    ]]>
+    <if test="dto.dvcd != null and dto.dvcd != ''">
+        AND t1.dvcd = #{dto.dvcd}
+    </if>
+    <if test="dto.dm != null and dto.dm != ''">
+        AND t1.dm = #{dto.dm} 
+    </if>
+    <if test="dto.dateTimeRangeSo != null">
+        <![CDATA[
+        AND t2.mstm >= #{dto.dateTimeRangeSo.start}
+        AND t2.mstm <= #{dto.dateTimeRangeSo.end}
+        ]]>
+    </if>
+    order by t2.mstm desc
+    </script>
+""")
+    Page<JcskSyRHisVo> historyPage(Page<Object> page, @Param("dto") JcskSyRPageSo page1);
+
+
+    @Select("""
+     <script>
+         <![CDATA[
+    select  t2.*,
+            t1.dm,
+            t3.profile_name as dmName,
+            t1.dvcd 
+    from jcsk_sy_b t1
+    left join jcsk_sy_r t2 on t1.stcd = t2.stcd and t1.mpcd = t2.mpcd
+    left join att_dam_profile t3 on t1.dm = t3.profile_code
+    where t2.is_artificial = 1
+    ]]>
+        <if test="dto.dvcd != null and dto.dvcd != ''">
+        AND t1.dvcd = #{dto.dvcd}
+    </if>
+    <if test="dto.dm != null and dto.dm != ''">
+        AND t1.dm = #{dto.dm} 
+    </if>
+        <if test="dto.dateTimeRangeSo != null">
+        <![CDATA[
+        AND t2.mstm >= #{dto.dateTimeRangeSo.start}
+        AND t2.mstm <= #{dto.dateTimeRangeSo.end}
+        ]]>
+    </if>
+    order by t2.mstm desc
+    </script>
+""")
+    Page<JcskSyR> artificialPage(Page<Object> page,@Param("dto") JcskSyRPageSo page1);
+}
diff --git a/src/main/java/com/gunshi/project/hsz/model/InspectTask.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTask.java
similarity index 99%
rename from src/main/java/com/gunshi/project/hsz/model/InspectTask.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTask.java
index 7e5d2ba..04f6592 100644
--- a/src/main/java/com/gunshi/project/hsz/model/InspectTask.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTask.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.model;
+package com.gunshi.project.hsz.common.model;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/src/main/java/com/gunshi/project/hsz/model/InspectTaskDetail.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTaskDetail.java
similarity index 98%
rename from src/main/java/com/gunshi/project/hsz/model/InspectTaskDetail.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTaskDetail.java
index 25cb7c0..4b7d272 100644
--- a/src/main/java/com/gunshi/project/hsz/model/InspectTaskDetail.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTaskDetail.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.model;
+package com.gunshi.project.hsz.common.model;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/src/main/java/com/gunshi/project/hsz/model/JcskByBD.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskByBD.java
similarity index 96%
rename from src/main/java/com/gunshi/project/hsz/model/JcskByBD.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskByBD.java
index badbd13..7bd4ad5 100644
--- a/src/main/java/com/gunshi/project/hsz/model/JcskByBD.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskByBD.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.model;
+package com.gunshi.project.hsz.common.model;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskByR.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskByR.java
index 7747f4f..b3a9c59 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskByR.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskByR.java
@@ -3,6 +3,8 @@ package com.gunshi.project.hsz.common.model;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.gunshi.db.annotation.IgnoreAutoMapperAndDao;
+import com.gunshi.project.hsz.common.model.vo.JcskByRProcessVo;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -106,4 +108,18 @@ public class JcskByR {
      */
     @TableField("receive_type")
     private Short receiveType;
+
+
+    @Schema(description = "是否处理")
+    @TableField(exist = false)
+    private Boolean isProcess = false;
+
+    @Schema(description = "是否有巡检任务")
+    @TableField(exist = false)
+    private Boolean hasInspectTask = false;
+
+
+    @Schema(description = "工单详情")
+    @TableField(exist = false)
+    private JcskByRProcessVo jcskByRProcessVo;
 }
\ No newline at end of file
diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskGnssB.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskGnssB.java
index 23eb635..07c2c6b 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskGnssB.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskGnssB.java
@@ -50,4 +50,7 @@ public class JcskGnssB {
      */
     @TableField("device_status")
     private String deviceStatus;
+
+    @TableField(exist = false)
+    private String stationCode;
 }
\ No newline at end of file
diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskGnssR.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskGnssR.java
index 13da77e..88fa8b8 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskGnssR.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskGnssR.java
@@ -2,11 +2,13 @@ package com.gunshi.project.hsz.common.model;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.db.annotation.IgnoreAutoMapperAndDao;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 位移数据表
@@ -23,6 +25,11 @@ public class JcskGnssR {
     @TableField("res_cd")
     private String resCd;
 
+
+    @TableField("is_artificial")
+    private Integer isArtificial;
+
+
     /**
      * 测点编码
      */
@@ -64,4 +71,24 @@ public class JcskGnssR {
      */
     @TableField("update_tm")
     private LocalDateTime updateTm;
+
+    /**
+     * 人工录入时间，用于执行更新时用
+     */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime newUpdateTm;
+
+
+    @TableField(exist = false)
+    private String ch;
+
+    @TableField(exist = false)
+    private String cdnm;
+
+    /**
+     * 人工录入cd，用于执行更新时用
+     */
+    @TableField(exist = false)
+    private String newUpdateCd;
 }
\ No newline at end of file
diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSlB.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSlB.java
index ffb5e1e..f439172 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSlB.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSlB.java
@@ -19,6 +19,8 @@ import java.time.LocalDateTime;
 @TableName("jcsk_sl_b")
 @IgnoreAutoMapperAndDao
 public class JcskSlB {
+
+
     /**
      * 水库代码
      */
@@ -108,4 +110,7 @@ public class JcskSlB {
      */
     @TableField("is_tb")
     private String isTb;
+
+    @TableField(exist = false)
+    private String stationCode;
 }
\ No newline at end of file
diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSlR.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSlR.java
index 86b5715..e195c76 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSlR.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSlR.java
@@ -36,6 +36,10 @@ public class JcskSlR {
     @TableField("mpcd")
     private String mpcd;
 
+    @TableField("stcd")
+    private String stcd;
+
+
     /**
      * 测量时间
      */
@@ -60,4 +64,7 @@ public class JcskSlR {
     @TableField("stspqn")
     private BigDecimal stspqn;
 
+    @TableField(exist = false)
+    private String dvcd;
+
 }
\ No newline at end of file
diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSyB.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSyB.java
index 3d2a743..dd0980c 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSyB.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSyB.java
@@ -132,4 +132,8 @@ public class JcskSyB {
      */
     @TableField("is_tb")
     private String isTb;
+
+
+    @TableField(exist = false)
+    private String stationCode;
 }
\ No newline at end of file
diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSyR.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSyR.java
index 3963884..c10cab5 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSyR.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskSyR.java
@@ -2,11 +2,14 @@ package com.gunshi.project.hsz.common.model;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.db.annotation.IgnoreAutoMapperAndDao;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 渗压数据表实体类
@@ -53,6 +56,19 @@ public class JcskSyR {
     @TableField("tm")
     private BigDecimal tm;
 
+    /**
+     * 用于记录人工录入数据时的新时间
+     */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateMstm;
+
+
+    @TableField("is_artificial")
+    @Schema(description = "是否为人工录入 0不是  1是")
+    private Integer isArtificial;
+
+
     /**
      * 渗流压力水位，单位m
      */
@@ -64,4 +80,19 @@ public class JcskSyR {
      */
     @TableField("update_tm")
     private LocalDateTime updateTm;
+
+
+    @TableField(exist = false)
+    @Schema(description = "断面编码")
+    private String dm;
+
+
+    @TableField(exist = false)
+    @Schema(description = "断面名称")
+    private String dmName;
+
+
+    @TableField(exist = false)
+    @Schema(description = "测点编号")
+    private String dvcd;
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/hsz/entity/page/GenericPageParams.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/page/GenericPageParams.java
similarity index 93%
rename from src/main/java/com/gunshi/project/hsz/entity/page/GenericPageParams.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/page/GenericPageParams.java
index f59e713..c3b8ade 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/page/GenericPageParams.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/page/GenericPageParams.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.page;
+package com.gunshi.project.hsz.common.model.page;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.gunshi.db.dto.PageSo;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/JcskByBDPageSo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskByBDPageSo.java
similarity index 91%
rename from src/main/java/com/gunshi/project/hsz/entity/so/JcskByBDPageSo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskByBDPageSo.java
index 71152ab..cc3959d 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/JcskByBDPageSo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskByBDPageSo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.so;
+package com.gunshi.project.hsz.common.model.so;
 
 import com.gunshi.db.dto.PageSo;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/JcskByRPageSo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskByRPageSo.java
similarity index 95%
rename from src/main/java/com/gunshi/project/hsz/entity/so/JcskByRPageSo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskByRPageSo.java
index b7a493a..aef40ad 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/JcskByRPageSo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskByRPageSo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.so;
+package com.gunshi.project.hsz.common.model.so;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/JcskGnssBPageSo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskGnssBPageSo.java
similarity index 90%
rename from src/main/java/com/gunshi/project/hsz/entity/so/JcskGnssBPageSo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskGnssBPageSo.java
index 1d9d82b..2e59c20 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/JcskGnssBPageSo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskGnssBPageSo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.so;
+package com.gunshi.project.hsz.common.model.so;
 
 
 import com.gunshi.db.dto.PageSo;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/JcskGnssRPageSo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskGnssRPageSo.java
similarity index 93%
rename from src/main/java/com/gunshi/project/hsz/entity/so/JcskGnssRPageSo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskGnssRPageSo.java
index 7b4799c..4d175b0 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/JcskGnssRPageSo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskGnssRPageSo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.so;
+package com.gunshi.project.hsz.common.model.so;
 
 
 import com.gunshi.db.dto.DateTimeRangeSo;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/JcskSlBPageSo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskSlBPageSo.java
similarity index 92%
rename from src/main/java/com/gunshi/project/hsz/entity/so/JcskSlBPageSo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskSlBPageSo.java
index a40e481..3d95391 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/JcskSlBPageSo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskSlBPageSo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.so;
+package com.gunshi.project.hsz.common.model.so;
 
 import com.gunshi.db.dto.PageSo;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/JcskSlRPageSo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskSlRPageSo.java
similarity index 92%
rename from src/main/java/com/gunshi/project/hsz/entity/so/JcskSlRPageSo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskSlRPageSo.java
index 8851682..4974e4d 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/JcskSlRPageSo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskSlRPageSo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.so;
+package com.gunshi.project.hsz.common.model.so;
 
 
 import com.gunshi.db.dto.DateTimeRangeSo;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/JcskSyBPageSo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskSyBPageSo.java
similarity index 90%
rename from src/main/java/com/gunshi/project/hsz/entity/so/JcskSyBPageSo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskSyBPageSo.java
index 9ef1f20..96c474b 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/JcskSyBPageSo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskSyBPageSo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.so;
+package com.gunshi.project.hsz.common.model.so;
 
 import com.gunshi.db.dto.PageSo;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/JcskSyRPageSo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskSyRPageSo.java
similarity index 92%
rename from src/main/java/com/gunshi/project/hsz/entity/so/JcskSyRPageSo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskSyRPageSo.java
index d91f798..8836e37 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/JcskSyRPageSo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/JcskSyRPageSo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.so;
+package com.gunshi.project.hsz.common.model.so;
 
 import com.gunshi.db.dto.DateTimeRangeSo;
 import com.gunshi.db.dto.PageSo;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/OsmoticDetailQuerySo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/OsmoticDetailQuerySo.java
similarity index 93%
rename from src/main/java/com/gunshi/project/hsz/entity/so/OsmoticDetailQuerySo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/so/OsmoticDetailQuerySo.java
index 6799aa4..a60a48c 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/OsmoticDetailQuerySo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/OsmoticDetailQuerySo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.so;
+package com.gunshi.project.hsz.common.model.so;
 
 import com.gunshi.db.dto.DateTimeRangeSo;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/OsmoticDevicePage.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/OsmoticDevicePage.java
similarity index 81%
rename from src/main/java/com/gunshi/project/hsz/entity/so/OsmoticDevicePage.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/so/OsmoticDevicePage.java
index b91270e..f4eb397 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/OsmoticDevicePage.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/OsmoticDevicePage.java
@@ -1,6 +1,6 @@
-package com.gunshi.project.hsz.entity.so;
+package com.gunshi.project.hsz.common.model.so;
 
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/OsmoticQueryPageSo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/OsmoticQueryPageSo.java
similarity index 94%
rename from src/main/java/com/gunshi/project/hsz/entity/so/OsmoticQueryPageSo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/so/OsmoticQueryPageSo.java
index d790f91..c4a343f 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/OsmoticQueryPageSo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/OsmoticQueryPageSo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.so;
+package com.gunshi.project.hsz.common.model.so;
 
 import com.gunshi.db.dto.DateTimeRangeSo;
 import com.gunshi.db.dto.PageSo;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/OsmoticQuerySo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/OsmoticQuerySo.java
similarity index 94%
rename from src/main/java/com/gunshi/project/hsz/entity/so/OsmoticQuerySo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/so/OsmoticQuerySo.java
index 9f39ecd..a9643a0 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/OsmoticQuerySo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/so/OsmoticQuerySo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.so;
+package com.gunshi.project.hsz.common.model.so;
 
 import com.gunshi.db.dto.DateTimeRangeSo;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/HomeJcskGnssBVo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/HomeJcskGnssBVo.java
similarity index 87%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/HomeJcskGnssBVo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/HomeJcskGnssBVo.java
index 5a5c16c..43d28b4 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/HomeJcskGnssBVo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/HomeJcskGnssBVo.java
@@ -1,8 +1,8 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.model.JcskGnssB;
+import com.gunshi.project.hsz.common.model.JcskGnssB;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/HomeJcskSYBVo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/HomeJcskSYBVo.java
similarity index 84%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/HomeJcskSYBVo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/HomeJcskSYBVo.java
index bf60697..f421062 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/HomeJcskSYBVo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/HomeJcskSYBVo.java
@@ -1,8 +1,8 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.model.JcskSyB;
+import com.gunshi.project.hsz.common.model.JcskSyB;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/HomeJcskSlBVo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/HomeJcskSlBVo.java
similarity index 83%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/HomeJcskSlBVo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/HomeJcskSlBVo.java
index 9587475..92fd980 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/HomeJcskSlBVo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/HomeJcskSlBVo.java
@@ -1,8 +1,9 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.model.JcskSlB;
+
+import com.gunshi.project.hsz.common.model.JcskSlB;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskByInspectDetailVo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskByInspectDetailVo.java
similarity index 58%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/JcskByInspectDetailVo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskByInspectDetailVo.java
index 236dea6..c133b33 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskByInspectDetailVo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskByInspectDetailVo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskByRProcessVo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskByRProcessVo.java
similarity index 87%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/JcskByRProcessVo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskByRProcessVo.java
index 657395e..c290de3 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskByRProcessVo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskByRProcessVo.java
@@ -1,9 +1,9 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.model.InspectTask;
+import com.gunshi.project.hsz.common.model.InspectTask;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskGnessListVo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskGnessListVo.java
similarity index 96%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/JcskGnessListVo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskGnessListVo.java
index 653179d..b60f060 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskGnessListVo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskGnessListVo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskGnssRHisVo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskGnssRHisVo.java
similarity index 96%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/JcskGnssRHisVo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskGnssRHisVo.java
index 7248e93..74e3033 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskGnssRHisVo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskGnssRHisVo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskSlRHisVo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskSlRHisVo.java
similarity index 96%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/JcskSlRHisVo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskSlRHisVo.java
index 9de7d91..77036d4 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskSlRHisVo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskSlRHisVo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskSyRHisVo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskSyRHisVo.java
similarity index 96%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/JcskSyRHisVo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskSyRHisVo.java
index 77b0bd6..5b278f3 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskSyRHisVo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskSyRHisVo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskSyRVo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskSyRVo.java
similarity index 92%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/JcskSyRVo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskSyRVo.java
index 9cf0a32..48daf2e 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/JcskSyRVo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/JcskSyRVo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticChartDetailVo2.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticChartDetailVo2.java
similarity index 90%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticChartDetailVo2.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticChartDetailVo2.java
index 4c9fc32..075173d 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticChartDetailVo2.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticChartDetailVo2.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticPressDetailVo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticPressDetailVo.java
similarity index 90%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticPressDetailVo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticPressDetailVo.java
index 89455b5..f148578 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticPressDetailVo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticPressDetailVo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticShiftListVo2.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticShiftListVo2.java
similarity index 96%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticShiftListVo2.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticShiftListVo2.java
index ff1b873..43aca26 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticShiftListVo2.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticShiftListVo2.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticShiftValueVo2.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticShiftValueVo2.java
similarity index 94%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticShiftValueVo2.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticShiftValueVo2.java
index 56ac3b3..cb0f066 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticShiftValueVo2.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticShiftValueVo2.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticValueVo2.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticValueVo2.java
similarity index 92%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticValueVo2.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticValueVo2.java
index 1f55f09..98389cf 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticValueVo2.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/OsmoticValueVo2.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/StRzVo.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/StRzVo.java
similarity index 89%
rename from src/main/java/com/gunshi/project/hsz/entity/vo/StRzVo.java
rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/StRzVo.java
index e2a3fc5..f614715 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/StRzVo.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/vo/StRzVo.java
@@ -1,4 +1,4 @@
-package com.gunshi.project.hsz.entity.vo;
+package com.gunshi.project.hsz.common.model.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/DebugController.java b/src/main/java/com/gunshi/project/hsz/controller/DebugController.java
index 361701c..9464b61 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/DebugController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/DebugController.java
@@ -1,6 +1,9 @@
 package com.gunshi.project.hsz.controller;
 
+import com.gunshi.core.result.R;
+import com.gunshi.project.hsz.timetask.JcskDataTask;
 import com.gunshi.project.hsz.timetask.PaDataTask;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,6 +21,9 @@ public class DebugController {
     @Autowired
     private PaDataTask paDataTask;
 
+    @Autowired
+    private JcskDataTask jcskDataTask;
+
 
     @GetMapping("/patask")
     public String patask(){
@@ -28,4 +34,15 @@ public class DebugController {
             return "失败";
         }
     }
+
+    @Operation(description = "同步一次渗压、渗流、位移的数据")
+    @GetMapping("/syncJcskData")
+    public R syncJcskData(){
+        jcskDataTask.syncGnssREightAmData();
+
+        jcskDataTask.syncSlREightAmData();
+
+        jcskDataTask.syncSyREightAmData();
+        return R.ok("ok");
+    }
 }
diff --git a/src/main/java/com/gunshi/project/hsz/controller/InspectTaskController.java b/src/main/java/com/gunshi/project/hsz/controller/InspectTaskController.java
index 6671f98..439e7ba 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/InspectTaskController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/InspectTaskController.java
@@ -5,7 +5,7 @@ import com.gunshi.core.result.R;
 import com.gunshi.project.hsz.entity.so.InspectTaskPageSo;
 import com.gunshi.project.hsz.entity.so.InspectTaskSo;
 import com.gunshi.project.hsz.entity.vo.InspectTaskVo;
-import com.gunshi.project.hsz.model.InspectTask;
+import com.gunshi.project.hsz.common.model.InspectTask;
 import com.gunshi.project.hsz.service.InspectTaskService;
 import com.gunshi.project.hsz.common.validate.markers.Insert;
 import com.gunshi.project.hsz.common.validate.markers.Update;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/InspectTaskDetailController.java b/src/main/java/com/gunshi/project/hsz/controller/InspectTaskDetailController.java
index c33d8d8..c4c7856 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/InspectTaskDetailController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/InspectTaskDetailController.java
@@ -5,7 +5,7 @@ import com.gunshi.core.result.R;
 import com.gunshi.project.hsz.entity.so.InspectProblemPageSo;
 import com.gunshi.project.hsz.entity.vo.InspectProblemVo;
 import com.gunshi.project.hsz.entity.vo.InspectTaskDetailVo;
-import com.gunshi.project.hsz.model.InspectTaskDetail;
+import com.gunshi.project.hsz.common.model.InspectTaskDetail;
 import com.gunshi.project.hsz.service.InspectTaskDetailService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/JcskByBController.java b/src/main/java/com/gunshi/project/hsz/controller/JcskByBController.java
index c9f1480..c5a8edf 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/JcskByBController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/JcskByBController.java
@@ -4,7 +4,7 @@ package com.gunshi.project.hsz.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
 import com.gunshi.project.hsz.entity.so.WaterDevicePageSo;
-import com.gunshi.project.hsz.model.JcskByB;
+import com.gunshi.project.hsz.common.model.JcskByB;
 import com.gunshi.project.hsz.service.WaterDeviceService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/JcskByRController.java b/src/main/java/com/gunshi/project/hsz/controller/JcskByRController.java
index bfe4c1c..3dbfd9a 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/JcskByRController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/JcskByRController.java
@@ -2,10 +2,10 @@ package com.gunshi.project.hsz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
-import com.gunshi.project.hsz.entity.so.JcskByRPageSo;
-import com.gunshi.project.hsz.model.JcskByB;
-import com.gunshi.project.hsz.model.JcskByBD;
-import com.gunshi.project.hsz.model.JcskByR;
+import com.gunshi.project.hsz.common.model.so.JcskByRPageSo;
+import com.gunshi.project.hsz.common.model.JcskByB;
+import com.gunshi.project.hsz.common.model.JcskByBD;
+import com.gunshi.project.hsz.common.model.JcskByR;
 import com.gunshi.project.hsz.model.JcskByRProcess;
 import com.gunshi.project.hsz.service.JcskByBDService;
 import com.gunshi.project.hsz.service.JcskByBService;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/JcskGnssBController.java b/src/main/java/com/gunshi/project/hsz/controller/JcskGnssBController.java
index ac87a5a..d231769 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/JcskGnssBController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/JcskGnssBController.java
@@ -3,9 +3,9 @@ package com.gunshi.project.hsz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
-import com.gunshi.project.hsz.entity.so.JcskGnssBPageSo;
-import com.gunshi.project.hsz.entity.vo.HomeJcskGnssBVo;
-import com.gunshi.project.hsz.model.JcskGnssB;
+import com.gunshi.project.hsz.common.model.so.JcskGnssBPageSo;
+import com.gunshi.project.hsz.common.model.vo.HomeJcskGnssBVo;
+import com.gunshi.project.hsz.common.model.JcskGnssB;
 import com.gunshi.project.hsz.service.JcskGnssBService;
 import com.gunshi.project.hsz.common.validate.markers.Insert;
 import com.gunshi.project.hsz.common.validate.markers.Update;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/JcskGnssRController.java b/src/main/java/com/gunshi/project/hsz/controller/JcskGnssRController.java
index 26b1262..0e956f7 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/JcskGnssRController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/JcskGnssRController.java
@@ -3,13 +3,16 @@ package com.gunshi.project.hsz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
+import com.gunshi.project.hsz.common.model.vo.JcskGnessListVo;
+import com.gunshi.project.hsz.common.model.vo.JcskGnssRHisVo;
+import com.gunshi.project.hsz.common.model.vo.OsmoticShiftValueVo2;
 import com.gunshi.project.hsz.entity.dto.ArtificialJcskGnssDeleteDto;
-import com.gunshi.project.hsz.entity.so.JcskGnssRPageSo;
-import com.gunshi.project.hsz.entity.so.OsmoticDetailQuerySo;
-import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
+import com.gunshi.project.hsz.common.model.so.JcskGnssRPageSo;
+import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
 import com.gunshi.project.hsz.entity.vo.*;
-import com.gunshi.project.hsz.model.JcskGnssB;
-import com.gunshi.project.hsz.model.JcskGnssR;
+import com.gunshi.project.hsz.common.model.JcskGnssB;
+import com.gunshi.project.hsz.common.model.JcskGnssR;
 import com.gunshi.project.hsz.service.JcskGnssBService;
 import com.gunshi.project.hsz.service.JcskGnssRService;
 import com.gunshi.project.hsz.common.validate.markers.Insert;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/JcskSlBController.java b/src/main/java/com/gunshi/project/hsz/controller/JcskSlBController.java
index bdebad4..e15f8b0 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/JcskSlBController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/JcskSlBController.java
@@ -3,9 +3,9 @@ package com.gunshi.project.hsz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
-import com.gunshi.project.hsz.entity.so.JcskSlBPageSo;
-import com.gunshi.project.hsz.entity.vo.HomeJcskSlBVo;
-import com.gunshi.project.hsz.model.JcskSlB;
+import com.gunshi.project.hsz.common.model.so.JcskSlBPageSo;
+import com.gunshi.project.hsz.common.model.vo.HomeJcskSlBVo;
+import com.gunshi.project.hsz.common.model.JcskSlB;
 import com.gunshi.project.hsz.service.JcskSlBService;
 import com.gunshi.project.hsz.common.validate.markers.Insert;
 import com.gunshi.project.hsz.common.validate.markers.Update;
@@ -17,6 +17,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -41,7 +42,7 @@ public class JcskSlBController {
             throw new IllegalArgumentException("当前编号已存在");
         }
 
-        dto.setDtuptm(new Date());
+        dto.setDtuptm(LocalDateTime.now());
         boolean result = service.save(dto);
 //        if (result){
 //            fileService.saveFile(dto.getFiles(), getGroupId(), dto.getStationCode());
diff --git a/src/main/java/com/gunshi/project/hsz/controller/JcskSlRController.java b/src/main/java/com/gunshi/project/hsz/controller/JcskSlRController.java
index ecfc4d7..8059d77 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/JcskSlRController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/JcskSlRController.java
@@ -3,9 +3,9 @@ package com.gunshi.project.hsz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
-import com.gunshi.project.hsz.entity.so.JcskSlRPageSo;
-import com.gunshi.project.hsz.entity.vo.JcskSlRHisVo;
-import com.gunshi.project.hsz.model.JcskSlR;
+import com.gunshi.project.hsz.common.model.so.JcskSlRPageSo;
+import com.gunshi.project.hsz.common.model.vo.JcskSlRHisVo;
+import com.gunshi.project.hsz.common.model.JcskSlR;
 import com.gunshi.project.hsz.service.JcskSlRService;
 import com.gunshi.project.hsz.common.validate.markers.Insert;
 import com.gunshi.project.hsz.common.validate.markers.Update;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/JcskSyBController.java b/src/main/java/com/gunshi/project/hsz/controller/JcskSyBController.java
index 05c346b..7f50bd3 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/JcskSyBController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/JcskSyBController.java
@@ -3,9 +3,9 @@ package com.gunshi.project.hsz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
-import com.gunshi.project.hsz.entity.so.JcskSyBPageSo;
-import com.gunshi.project.hsz.entity.vo.HomeJcskSYBVo;
-import com.gunshi.project.hsz.model.JcskSyB;
+import com.gunshi.project.hsz.common.model.so.JcskSyBPageSo;
+import com.gunshi.project.hsz.common.model.vo.HomeJcskSYBVo;
+import com.gunshi.project.hsz.common.model.JcskSyB;
 import com.gunshi.project.hsz.service.JcskSyBService;
 import com.gunshi.project.hsz.common.validate.markers.Insert;
 import com.gunshi.project.hsz.common.validate.markers.Update;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/JcskSyRController.java b/src/main/java/com/gunshi/project/hsz/controller/JcskSyRController.java
index e65a1cd..8fb78e6 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/JcskSyRController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/JcskSyRController.java
@@ -3,12 +3,16 @@ package com.gunshi.project.hsz.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
 
+import com.gunshi.project.hsz.common.model.JcskSyR;
+import com.gunshi.project.hsz.common.model.vo.JcskSyRHisVo;
+import com.gunshi.project.hsz.common.model.vo.JcskSyRVo;
+import com.gunshi.project.hsz.common.model.vo.OsmoticPressDetailVo;
 import com.gunshi.project.hsz.entity.dto.ArtificialJcskSyDeleteDto;
-import com.gunshi.project.hsz.entity.so.JcskSyRPageSo;
-import com.gunshi.project.hsz.entity.so.OsmoticDetailQuerySo;
-import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
+import com.gunshi.project.hsz.common.model.so.JcskSyRPageSo;
+import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
 import com.gunshi.project.hsz.entity.vo.*;
-import com.gunshi.project.hsz.model.JcskSyR;
+import com.gunshi.project.hsz.common.model.JcskSyB;
 import com.gunshi.project.hsz.service.JcskSyRService;
 import com.gunshi.project.hsz.common.validate.markers.Insert;
 import com.gunshi.project.hsz.common.validate.markers.Update;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/OsmoticFlowDeviceController.java b/src/main/java/com/gunshi/project/hsz/controller/OsmoticFlowDeviceController.java
index 40f2bf8..d9836d7 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/OsmoticFlowDeviceController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/OsmoticFlowDeviceController.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
-import com.gunshi.project.hsz.entity.so.OsmoticDevicePage;
+import com.gunshi.project.hsz.common.model.so.OsmoticDevicePage;
 import com.gunshi.project.hsz.entity.vo.HomeOsmoticFlowDeviceVo;
 import com.gunshi.project.hsz.model.OsmoticFlowDevice;
 import com.gunshi.project.hsz.service.FileAssociationsService;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/OsmoticFlowRController.java b/src/main/java/com/gunshi/project/hsz/controller/OsmoticFlowRController.java
index 26fdccc..818284b 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/OsmoticFlowRController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/OsmoticFlowRController.java
@@ -2,7 +2,7 @@ package com.gunshi.project.hsz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
-import com.gunshi.project.hsz.entity.so.OsmoticQueryPageSo;
+import com.gunshi.project.hsz.common.model.so.OsmoticQueryPageSo;
 import com.gunshi.project.hsz.model.OsmoticFlowR;
 import com.gunshi.project.hsz.service.OsmoticFlowRService;
 import com.gunshi.project.hsz.common.validate.markers.Insert;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/OsmoticPressDeviceController.java b/src/main/java/com/gunshi/project/hsz/controller/OsmoticPressDeviceController.java
index 26df7a6..431626f 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/OsmoticPressDeviceController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/OsmoticPressDeviceController.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
-import com.gunshi.project.hsz.entity.so.OsmoticDevicePage;
+import com.gunshi.project.hsz.common.model.so.OsmoticDevicePage;
 import com.gunshi.project.hsz.entity.vo.HomeOsmoticPressDeviceVo;
 import com.gunshi.project.hsz.model.OsmoticPressDevice;
 import com.gunshi.project.hsz.service.FileAssociationsService;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/OsmoticPressRController.java b/src/main/java/com/gunshi/project/hsz/controller/OsmoticPressRController.java
index 9a1f605..f64c30d 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/OsmoticPressRController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/OsmoticPressRController.java
@@ -5,11 +5,11 @@
 //import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 //import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 //import com.gunshi.core.result.R;
-//import com.gunshi.project.hsz.entity.so.OsmoticDetailQuerySo;
-//import com.gunshi.project.hsz.entity.so.OsmoticQueryPageSo;
-//import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
+//import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+//import com.gunshi.project.hsz.common.model.so.OsmoticQueryPageSo;
+//import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
 //import com.gunshi.project.hsz.entity.vo.OsmoticChartVo;
-//import com.gunshi.project.hsz.entity.vo.OsmoticPressDetailVo;
+//import com.gunshi.project.hsz.common.model.vo.OsmoticPressDetailVo;
 //import com.gunshi.project.hsz.entity.vo.OsmoticPressVo;
 //import com.gunshi.project.hsz.entity.vo.OsmoticStationVo;
 //import com.gunshi.project.hsz.model.OsmoticPressDevice;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/OsmoticShiftRController.java b/src/main/java/com/gunshi/project/hsz/controller/OsmoticShiftRController.java
index 1d3b003..65d4636 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/OsmoticShiftRController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/OsmoticShiftRController.java
@@ -4,9 +4,9 @@
 //import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 //import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 //import com.gunshi.core.result.R;
-//import com.gunshi.project.hsz.entity.so.OsmoticDetailQuerySo;
-//import com.gunshi.project.hsz.entity.so.OsmoticQueryPageSo;
-//import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
+//import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+//import com.gunshi.project.hsz.common.model.so.OsmoticQueryPageSo;
+//import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
 //import com.gunshi.project.hsz.entity.vo.*;
 //import com.gunshi.project.hsz.model.OsmoticShiftR;
 //import com.gunshi.project.hsz.service.OsmoticShiftRService;
diff --git a/src/main/java/com/gunshi/project/hsz/controller/SysDictBController.java b/src/main/java/com/gunshi/project/hsz/controller/SysDictBController.java
index a285f03..3285c23 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/SysDictBController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/SysDictBController.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import com.gunshi.project.hsz.model.SysDictB;
 import com.gunshi.project.hsz.service.SysDictBService;
 import com.gunshi.project.hsz.common.validate.markers.Insert;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/dto/BusinessRuleDto.java b/src/main/java/com/gunshi/project/hsz/entity/dto/BusinessRuleDto.java
index b997983..54e98b9 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/dto/BusinessRuleDto.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/dto/BusinessRuleDto.java
@@ -2,7 +2,7 @@ package com.gunshi.project.hsz.entity.dto;
 
 
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/dto/DispatchSchemeDto.java b/src/main/java/com/gunshi/project/hsz/entity/dto/DispatchSchemeDto.java
index 6973418..07d82b0 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/dto/DispatchSchemeDto.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/dto/DispatchSchemeDto.java
@@ -2,7 +2,7 @@ package com.gunshi.project.hsz.entity.dto;
 
 import com.gunshi.core.dateformat.DateFormatString;
 import com.gunshi.db.dto.PageSo;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/dto/ProjectSafetyDto.java b/src/main/java/com/gunshi/project/hsz/entity/dto/ProjectSafetyDto.java
index f06ffae..b42cd03 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/dto/ProjectSafetyDto.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/dto/ProjectSafetyDto.java
@@ -2,7 +2,7 @@ package com.gunshi.project.hsz.entity.dto;
 
 
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/GateValveCctvRelPage.java b/src/main/java/com/gunshi/project/hsz/entity/so/GateValveCctvRelPage.java
index 768a1ea..90c9a2f 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/GateValveCctvRelPage.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/so/GateValveCctvRelPage.java
@@ -1,6 +1,6 @@
 package com.gunshi.project.hsz.entity.so;
 
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/GeneralDataPage.java b/src/main/java/com/gunshi/project/hsz/entity/so/GeneralDataPage.java
index c25d130..39f4945 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/GeneralDataPage.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/so/GeneralDataPage.java
@@ -1,6 +1,6 @@
 package com.gunshi.project.hsz.entity.so;
 
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/PersonnelPlanLogPage.java b/src/main/java/com/gunshi/project/hsz/entity/so/PersonnelPlanLogPage.java
index 18d7654..a33cf23 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/PersonnelPlanLogPage.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/so/PersonnelPlanLogPage.java
@@ -2,7 +2,7 @@ package com.gunshi.project.hsz.entity.so;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/PersonnelPlanPage.java b/src/main/java/com/gunshi/project/hsz/entity/so/PersonnelPlanPage.java
index 88d4df0..9a43a93 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/PersonnelPlanPage.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/so/PersonnelPlanPage.java
@@ -2,7 +2,7 @@ package com.gunshi.project.hsz.entity.so;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/ResPersonPage.java b/src/main/java/com/gunshi/project/hsz/entity/so/ResPersonPage.java
index 2209a63..0fcfc2b 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/ResPersonPage.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/so/ResPersonPage.java
@@ -1,6 +1,6 @@
 package com.gunshi.project.hsz.entity.so;
 
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/SzCasePage.java b/src/main/java/com/gunshi/project/hsz/entity/so/SzCasePage.java
index acb842c..ad9f9c8 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/SzCasePage.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/so/SzCasePage.java
@@ -2,7 +2,7 @@ package com.gunshi.project.hsz.entity.so;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/SzRegulatoryFrameworkPage.java b/src/main/java/com/gunshi/project/hsz/entity/so/SzRegulatoryFrameworkPage.java
index faf0333..c65db88 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/SzRegulatoryFrameworkPage.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/so/SzRegulatoryFrameworkPage.java
@@ -2,7 +2,7 @@ package com.gunshi.project.hsz.entity.so;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/SzRuleByLawPage.java b/src/main/java/com/gunshi/project/hsz/entity/so/SzRuleByLawPage.java
index b4d0c74..42156fa 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/so/SzRuleByLawPage.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/so/SzRuleByLawPage.java
@@ -2,7 +2,7 @@ package com.gunshi.project.hsz.entity.so;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/InspectProblemVo.java b/src/main/java/com/gunshi/project/hsz/entity/vo/InspectProblemVo.java
index d37fe28..cf74ed6 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/InspectProblemVo.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/vo/InspectProblemVo.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.gunshi.core.dateformat.DateFormatString;
 import com.gunshi.project.hsz.model.FileAssociations;
-import com.gunshi.project.hsz.model.InspectTaskDetail;
+import com.gunshi.project.hsz.common.model.InspectTaskDetail;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/InspectTaskDetailVo.java b/src/main/java/com/gunshi/project/hsz/entity/vo/InspectTaskDetailVo.java
index 321d02b..dd40a30 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/InspectTaskDetailVo.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/vo/InspectTaskDetailVo.java
@@ -1,7 +1,7 @@
 package com.gunshi.project.hsz.entity.vo;
 
 import com.gunshi.project.hsz.model.FileAssociations;
-import com.gunshi.project.hsz.model.InspectTaskDetail;
+import com.gunshi.project.hsz.common.model.InspectTaskDetail;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticShiftVo2.java b/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticShiftVo2.java
index 5e3eb02..4729cd4 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticShiftVo2.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticShiftVo2.java
@@ -1,5 +1,6 @@
 package com.gunshi.project.hsz.entity.vo;
 
+import com.gunshi.project.hsz.common.model.vo.OsmoticShiftValueVo2;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticStationVo.java b/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticStationVo.java
index 1cbebef..373dcc5 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticStationVo.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticStationVo.java
@@ -1,5 +1,6 @@
 package com.gunshi.project.hsz.entity.vo;
 
+import com.gunshi.project.hsz.common.model.vo.StRzVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticStationVo2.java b/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticStationVo2.java
index 64cd5fb..f92a353 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticStationVo2.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/vo/OsmoticStationVo2.java
@@ -1,5 +1,7 @@
 package com.gunshi.project.hsz.entity.vo;
 
+import com.gunshi.project.hsz.common.model.vo.OsmoticValueVo2;
+import com.gunshi.project.hsz.common.model.vo.StRzVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -7,7 +9,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 @Data
-public class OsmoticStationVo2 extends StRzVo{
+public class OsmoticStationVo2 extends StRzVo {
 
     @Schema(description = "结果分析（0异常 1正常）")
     private Integer status = 1;
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/StFlowRVo.java b/src/main/java/com/gunshi/project/hsz/entity/vo/StFlowRVo.java
index 5fc95fb..da727be 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/StFlowRVo.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/vo/StFlowRVo.java
@@ -2,7 +2,6 @@ package com.gunshi.project.hsz.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.project.hsz.model.ResMonthEcoFlow;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -16,7 +15,6 @@ import java.time.LocalDateTime;
  */
 
 @Data
-@TableName("public.st_flow_r")
 public class StFlowRVo {
 
     @TableId(value = "id")
diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/StWaterRRVo.java b/src/main/java/com/gunshi/project/hsz/entity/vo/StWaterRRVo.java
index 76b876e..f73e117 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/StWaterRRVo.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/vo/StWaterRRVo.java
@@ -1,13 +1,11 @@
 package com.gunshi.project.hsz.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
-import com.gunshi.project.hsz.model.StWaterRReorganize;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 @Data
 public class StWaterRRVo extends GenericPageParams {
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/InspectTaskDetailMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/InspectTaskDetailMapper.java
index 14d2aa4..79c1595 100644
--- a/src/main/java/com/gunshi/project/hsz/mapper/InspectTaskDetailMapper.java
+++ b/src/main/java/com/gunshi/project/hsz/mapper/InspectTaskDetailMapper.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.project.hsz.entity.so.InspectProblemPageSo;
 import com.gunshi.project.hsz.entity.vo.InspectProblemVo;
 import com.gunshi.project.hsz.entity.vo.InspectTaskDetailVo;
-import com.gunshi.project.hsz.model.InspectTaskDetail;
+import com.gunshi.project.hsz.common.model.InspectTaskDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/InspectTaskMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/InspectTaskMapper.java
index 49b6c60..5f9c2aa 100644
--- a/src/main/java/com/gunshi/project/hsz/mapper/InspectTaskMapper.java
+++ b/src/main/java/com/gunshi/project/hsz/mapper/InspectTaskMapper.java
@@ -3,7 +3,7 @@ package com.gunshi.project.hsz.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.project.hsz.entity.so.InspectTaskPageSo;
-import com.gunshi.project.hsz.model.InspectTask;
+import com.gunshi.project.hsz.common.model.InspectTask;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/JcskByBDMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/JcskByBDMapper.java
index a07eea8..dcc1ea9 100644
--- a/src/main/java/com/gunshi/project/hsz/mapper/JcskByBDMapper.java
+++ b/src/main/java/com/gunshi/project/hsz/mapper/JcskByBDMapper.java
@@ -1,7 +1,7 @@
 package com.gunshi.project.hsz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gunshi.project.hsz.model.JcskByBD;
+import com.gunshi.project.hsz.common.model.JcskByBD;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/JcskByBMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/JcskByBMapper.java
deleted file mode 100644
index 905e43a..0000000
--- a/src/main/java/com/gunshi/project/hsz/mapper/JcskByBMapper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.gunshi.project.hsz.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gunshi.project.hsz.model.JcskByB;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface JcskByBMapper extends BaseMapper<JcskByB> {
-}
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/JcskGnssBMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/JcskGnssBMapper.java
deleted file mode 100644
index 78fb6aa..0000000
--- a/src/main/java/com/gunshi/project/hsz/mapper/JcskGnssBMapper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.gunshi.project.hsz.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gunshi.project.hsz.entity.vo.HomeJcskGnssBVo;
-import com.gunshi.project.hsz.model.JcskGnssB;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-@Mapper
-public interface JcskGnssBMapper extends BaseMapper<JcskGnssB> {
-
-    @Select("""
-            <script>
-            SELECT st.*,r.de as x,r.dn as y,r.du as h,r.tm FROM jcsk_gnss_b st
-            LEFT JOIN (SELECT cd ,MAX(tm) tm FROM jcsk_gnss_r GROUP BY cd) maxr ON st.cd = maxr.cd
-            LEFT JOIN jcsk_gnss_r r ON maxr.cd = r.cd AND maxr.tm = r.tm
-            </script>
-            """)
-    List<HomeJcskGnssBVo> getDetailsAndMonitoringDataList();
-
-
-
-    @Select("""
-            <script>
-            SELECT st.*,r.de as x,r.dn as y,r.du as h,r.tm FROM jcsk_gnss_b st
-            LEFT JOIN (SELECT cd ,MAX(tm) tm FROM jcsk_gnss_r GROUP BY cd) maxr ON st.cd = maxr.cd
-            LEFT JOIN jcsk_gnss_r r ON maxr.cd = r.cd AND maxr.tm = r.tm
-            WHERE st.cd = #{id}
-            </script>
-            """)
-    HomeJcskGnssBVo getDetailsById(String id);
-
-
-    @Select("""
-    select ch from jcsk_gnss_b where ch is not null
-    group by ch
-""")
-    List<String> listDms();
-
-    @Select("""
-    select ch from jcsk_gnss_b group by ch
-""")
-    List<String> selectCH();
-
-
-    @Select("""
-    select cd from jcsk_gnss_b where ch = #{ch}
-""")
-    List<String> selectCDbyCh(@Param("ch") String ch);
-
-    @Select("""
-    select * from jcsk_gnss_b where ch is null order by cd asc
-""")
-    List<JcskGnssB> selectArtificial();
-
-}
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/JcskGnssRMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/JcskGnssRMapper.java
deleted file mode 100644
index 2311d9a..0000000
--- a/src/main/java/com/gunshi/project/hsz/mapper/JcskGnssRMapper.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package com.gunshi.project.hsz.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gunshi.project.hsz.entity.so.JcskGnssRPageSo;
-import com.gunshi.project.hsz.entity.so.OsmoticDetailQuerySo;
-import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
-import com.gunshi.project.hsz.entity.vo.JcskGnessListVo;
-import com.gunshi.project.hsz.entity.vo.JcskGnssRHisVo;
-import com.gunshi.project.hsz.entity.vo.OsmoticShiftListVo2;
-import com.gunshi.project.hsz.entity.vo.OsmoticShiftValueVo2;
-import com.gunshi.project.hsz.model.JcskGnssR;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-@Mapper
-public interface JcskGnssRMapper extends BaseMapper<JcskGnssR> {
-
-//    @Select("""
-//            <script>
-//            SELECT st.cd,r.de,r.dn,r.du,to_char(r.tm,'YYYY-MM-DD HH24:MI:SS') as tm FROM jcsk_gnss_r st
-//            LEFT JOIN (SELECT cd,MAX(tm) tm FROM jcsk_gnss_r GROUP BY cd) maxr ON st.cd = maxr.cd
-//            LEFT JOIN jcsk_gnss_r r ON maxr.cd = r.cd AND maxr.tm = r.tm
-//            ORDER BY st.cd asc,r.tm desc
-//            </script>
-//            """)
-//    List<JcskGnessListVo> listValue();
-
-
-    @Select("""
-            <script>
-            select
-    t1.cd,
-    t1.ch,
-    t1.cd_nm as cdnm,
-    t2.de,
-    t2.dn,
-    t2.du,
-    to_char(t2.tm,'YYYY-MM-DD HH24:MI:SS') as tm
-            from jcsk_gnss_b t1
-            left join (
-    select t2.*
-    from jcsk_gnss_r t2
-    join (
-        select cd, MAX(tm) as tm
-        from jcsk_gnss_r
-        GROUP BY cd
-    ) maxr on t2.cd = maxr.cd and t2.tm = maxr.tm
-            ) t2 on t1.cd = t2.cd
-            ORDER BY t1.cd asc, t2.tm desc;
-            </script>
-            """)
-    List<JcskGnessListVo> listValue();
-
-    @Select("""
-            <script>
-                select t.station_code as cd,to_char(t.tm,'YYYY-MM-DD HH24:MI:SS') as tm,s.direction
-                from public.osmotic_warn_r t
-                left join public.osmotic_warn_rule s on t.rule_id = s.id
-                where t.station_code in
-                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
-                    #{code}
-                </foreach>	
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>  
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t.tm desc
-            </script>
-            """)
-    List<OsmoticShiftListVo2> queryWarn(@Param("obj") OsmoticQuerySo so);
-
-
-    @Select("""
-            <script>
-                select t.cd,t.tm as tm,t.de ,t.dn ,t.du,t.res_cd,t.alt
-                from public.jcsk_gnss_r t
-                where t.cd in
-                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
-                    #{code}
-                </foreach>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t.tm desc
-            </script>
-            """)
-    List<OsmoticShiftValueVo2> queryValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
-
-    @Select("""
-            <script>
-                select t.cd,t.tm as tm,t.de ,t.dn ,t.du,t.res_cd,t.alt
-                from public.jcsk_gnss_r_8am t
-                where t.cd in
-                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
-                    #{code}
-                </foreach>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t.tm desc
-            </script>
-            """)
-    List<OsmoticShiftValueVo2> queryReorganizeValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
-
-
-    @Select("""
-            <script>
-                select to_char(t.tm,'YYYY-MM-DD HH24:MI:SS') as tm,t.de,t.dn ,t.du,t.is_artificial as isArtificial from public.jcsk_gnss_r t
-                where t.cd = #{obj.stationCode}
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>  
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t.tm desc
-            </script>
-            """)
-    List<OsmoticShiftValueVo2> detailValue(@Param("obj") OsmoticDetailQuerySo so);
-
-    @Select("""
-    <script>
-            WITH daily_data AS (
-        SELECT
-            t2.cd,
-            t1.ch,
-            t1.cd_nm,
-            t2.de,
-            t2.dn,
-            t2.du,
-            t2.alt,
-            t2.tm,
-            t2.update_tm,
-            ROW_NUMBER() OVER (PARTITION BY t2.cd, t1.ch, DATE(t2.tm) ORDER BY t2.tm DESC) as rn
-        FROM jcsk_gnss_b t1
-        JOIN jcsk_gnss_r t2 ON t1.cd = t2.cd
-        WHERE 1=1
-        <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-            AND t2.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-        </if> 
-        <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-            AND t2.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-        </if>
-        <if test="obj.cd != null and obj.cd != ''">
-            AND t2.cd = #{obj.cd}
-        </if>
-        <if test="obj.ch != null and obj.ch != ''">
-            AND t1.ch = #{obj.ch}
-        </if>
-        <if test= "obj.isArtificial != null">
-            AND t2.is_artificial = #{obj.isArtificial}
-        </if>
-    )
-    SELECT
-        cd,
-        ch,
-        cd_nm as cdnm,
-        de,
-        dn,
-        du,
-        alt,
-        tm as tm,
-        update_tm
-    FROM daily_data
-    WHERE rn = 1
-    ORDER BY DATE(tm) DESC, tm DESC, cd DESC
-    </script>
-""")
-    Page<JcskGnssR> pageQuery(Page<Object> page, @Param("obj") JcskGnssRPageSo page1);
-
-
-    @Select("""
-    <script>
-    select t1.ch,t2.* from 
-    jcsk_gnss_b t1
-    left join jcsk_gnss_r t2
-    on t1.cd = t2.cd
-    where 1=1
-    <if test="dto.cd != null and dto.cd != ''">
-        AND t1.cd = #{dto.cd}
-    </if>
-    <if test="dto.ch != null and dto.ch != ''">
-        AND t1.ch = #{dto.ch}
-    </if>
-        <if test="dto.dateTimeRangeSo != null">
-        <![CDATA[
-        AND t2.tm >= #{dto.dateTimeRangeSo.start}
-        AND t2.tm <= #{dto.dateTimeRangeSo.end}
-        ]]>
-    </if>
-    </script>
-""")
-    Page<JcskGnssRHisVo> historyPage(Page<Object> page, @Param("dto") JcskGnssRPageSo page1);
-
-
-    @Select("""
-    <script>
-    select t1.ch,t2.* from 
-    jcsk_gnss_b t1
-    left join jcsk_gnss_r t2
-    on t1.cd = t2.cd
-    where t2.is_artificial = 1
-    <if test="dto.cd != null and dto.cd != ''">
-        AND t1.cd = #{dto.cd}
-    </if>
-    <if test="dto.ch != null and dto.ch != ''">
-        AND t1.ch = #{dto.ch}
-    </if>
-        <if test="dto.dateTimeRangeSo != null">
-        <![CDATA[
-        AND t2.tm >= #{dto.dateTimeRangeSo.start}
-        AND t2.tm <= #{dto.dateTimeRangeSo.end}
-        ]]>
-    </if>
-    order by t2.tm desc
-    </script>
-""")
-    Page<JcskGnssR> artificialPage(Page<Object> page,@Param("dto") JcskGnssRPageSo page1);
-}
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/JcskSlBMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/JcskSlBMapper.java
deleted file mode 100644
index 2bfbcdc..0000000
--- a/src/main/java/com/gunshi/project/hsz/mapper/JcskSlBMapper.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.gunshi.project.hsz.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gunshi.project.hsz.entity.so.OsmoticDetailQuerySo;
-import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
-import com.gunshi.project.hsz.entity.vo.HomeJcskSlBVo;
-import com.gunshi.project.hsz.entity.vo.JcskSyRVo;
-import com.gunshi.project.hsz.entity.vo.OsmoticPressDetailVo;
-import com.gunshi.project.hsz.entity.vo.OsmoticValueVo2;
-import com.gunshi.project.hsz.model.JcskSlB;
-import com.gunshi.project.hsz.model.JcskSlR;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-
-@Mapper
-public interface JcskSlBMapper extends BaseMapper<JcskSlB> {
-
-    @Select("""
-            <script>
-            SELECT st.*,r.spqn as q,r.mstm as tm FROM jcsk_sl_b st
-            LEFT JOIN (SELECT mpcd,MAX(mstm) tm FROM jcsk_sl_r GROUP BY mpcd) maxr ON st.mpcd = maxr.mpcd
-            LEFT JOIN jcsk_sl_r r ON maxr.mpcd = r.mpcd AND maxr.tm = r.mstm
-            </script>
-            """)
-    List<HomeJcskSlBVo> getDetailsAndMonitoringDataList();
-
-
-    @Select("""
-            <script>
-                    SELECT st.*,r.spqn as q,r.mstm as tm FROM jcsk_sl_b st
-                    LEFT JOIN (SELECT mpcd,MAX(mstm) tm FROM jcsk_sl_r GROUP BY mpcd) maxr ON st.mpcd = maxr.mpcd
-                    LEFT JOIN jcsk_sl_r r ON maxr.mpcd = r.mpcd AND maxr.tm = r.mstm
-                    where st.mpcd = #{id}
-            </script>
-            """)
-    HomeJcskSlBVo getDetailsById(String id);
-
-
-    @Select("""
-    select dvcd from jcsk_sl_b where dm = #{dm}
-""")
-    List<String> getDvcdByProfileCode(@Param("dm") String profileCode);
-
-
-    @Select(
-            """
-        <script>
-        SELECT station_code, value, tm
-        FROM (
-            SELECT
-                st.dvcd as station_code,
-                r.spqn as value,
-                to_char(r.mstm,'YYYY-MM-DD HH24:MI:SS') as tm,
-                ROW_NUMBER() OVER (PARTITION BY st.mpcd ORDER BY r.mstm DESC) as rn
-            FROM jcsk_sl_b st
-            LEFT JOIN jcsk_sl_r r ON st.mpcd = r.mpcd
-        ) t
-        WHERE rn = 1
-        ORDER BY station_code asc;
-        </script>
-"""
-    )
-    List<JcskSyRVo> listValue();
-
-
-    @Select("""
-            <script>
-                select t1.dvcd as stationCode,t2.mstm as tm,t2.spqn as value 
-                from public.jcsk_sl_b t1 
-                left join public.jcsk_sl_r t2
-                on t1.mpcd = t2.mpcd
-                where t1.dvcd in 
-                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
-                    #{code}
-                </foreach>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t2.mstm desc
-            </script>
-            """)
-    List<OsmoticValueVo2> queryValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
-
-    @Select("""
-            <script>
-                select t2.*
-                from public.jcsk_sl_b t1 
-                left join public.jcsk_sl_r t2
-                on t1.mpcd = t2.mpcd
-                where t1.dvcd in 
-                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
-                    #{code}
-                </foreach>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t2.mstm desc
-            </script>
-            """)
-    List<JcskSlR> syncqueryValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
-
-    @Select("""
-            <script>
-                select t1.dvcd as stationCode,t2.mstm as tm,t2.spqn as value 
-                from public.jcsk_sl_b t1 
-                left join public.jcsk_sl_r_8am t2
-                on  t1.mpcd = t2.mpcd
-                where t1.dvcd in 
-                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
-                    #{code}
-                </foreach>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t2.mstm desc
-            </script>
-            """)
-    List<OsmoticValueVo2> query8AmValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
-
-
-    @Select("""
-            <script>
-                select to_char(t.mstm,'YYYY-MM-DD HH24:MI:SS') as tm,
-                t.spqn as value from public.jcsk_sl_b t2
-                left join 
-                public.jcsk_sl_r t on t2.mpcd = t.mpcd
-                where t2.dvcd = #{obj.stationCode}
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>  
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t.mstm desc
-            </script>
-            """)
-    List<OsmoticPressDetailVo> detailValue(@Param("obj") OsmoticDetailQuerySo so);
-
-
-    @Select("""
-    <script>
-    select dvcd from jcsk_sl_b where  mpcd = #{mpcd} limit 1
-    </script>
-""")
-    String selectDvcdByStcdAndMpcd(@Param("mpcd") String mpcd);
-}
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/JcskSlRMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/JcskSlRMapper.java
deleted file mode 100644
index 0fe9541..0000000
--- a/src/main/java/com/gunshi/project/hsz/mapper/JcskSlRMapper.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.gunshi.project.hsz.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gunshi.project.hsz.entity.so.JcskSlRPageSo;
-import com.gunshi.project.hsz.entity.vo.JcskSlRHisVo;
-import com.gunshi.project.hsz.model.JcskSlR;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-@Mapper
-public interface JcskSlRMapper extends BaseMapper<JcskSlR> {
-
-
-    @Select("""
-    <script>
-    <![CDATA[
-    WITH ranked_data AS (
-        SELECT 
-            t1.*,
-            t2.dm,
-            t3.profile_name as dmName,
-            t2.dvcd,
-            ROW_NUMBER() OVER (PARTITION BY  t1.mpcd, DATE_TRUNC('day', t1.mstm) ORDER BY t1.mstm DESC) as rn
-        FROM jcsk_sl_r t1
-        JOIN jcsk_sl_b t2 ON t1.mpcd = t2.mpcd
-        LEFT JOIN att_dam_profile t3 ON t2.dm = t3.profile_code
-        WHERE 1=1
-    ]]>
-    <if test="dto.dvcd != null and dto.dvcd != ''">
-        AND t2.dvcd = #{dto.dvcd}
-    </if>
-    <if test="dto.dm != null and dto.dm != ''">
-        AND t2.dm = #{dto.dm} 
-    </if>
-    <if test="dto.dateTimeRangeSo != null">
-        <![CDATA[
-        AND t1.mstm >= #{dto.dateTimeRangeSo.start}
-        AND t1.mstm <= #{dto.dateTimeRangeSo.end}
-        ]]>
-    </if>
-    )
-    SELECT *
-    FROM ranked_data
-    WHERE rn = 1
-    ORDER BY mstm DESC
-    </script>
-""")
-    Page<JcskSlR> pageQuery(Page<Object> page, @Param("dto") JcskSlRPageSo page1);
-
-
-    @Select("""
-        <script>
-    <![CDATA[
-    select  t2.*,
-            t1.dm,
-            t3.profile_name as dmName,
-            t1.dvcd 
-    from jcsk_sl_b t1
-    left join jcsk_sl_r t2 on t1.mpcd = t2.mpcd
-    left join att_dam_profile t3 on t1.dm = t3.profile_code
-    where 1=1
-    ]]>
-    <if test="dto.dvcd != null and dto.dvcd != ''">
-        AND t1.dvcd = #{dto.dvcd}
-    </if>
-    <if test="dto.dm != null and dto.dm != ''">
-        AND t1.dm = #{dto.dm} 
-    </if>
-    <if test="dto.dateTimeRangeSo != null">
-        <![CDATA[
-        AND t2.mstm >= #{dto.dateTimeRangeSo.start}
-        AND t2.mstm <= #{dto.dateTimeRangeSo.end}
-        ]]>
-    </if>
-    order by t2.mstm desc
-    </script>
-""")
-    Page<JcskSlRHisVo> historyPage(Page<Object> page, JcskSlRPageSo page1);
-
-}
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/JcskSyBMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/JcskSyBMapper.java
deleted file mode 100644
index e5470e6..0000000
--- a/src/main/java/com/gunshi/project/hsz/mapper/JcskSyBMapper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.gunshi.project.hsz.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gunshi.project.hsz.entity.vo.HomeJcskSYBVo;
-import com.gunshi.project.hsz.model.JcskSyB;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-
-@Mapper
-public interface JcskSyBMapper extends BaseMapper<JcskSyB> {
-
-
-    @Select("""
-            <script>
-            SELECT st.*, r.spprwl as value, r.mstm
-            FROM jcsk_sy_b st
-            LEFT JOIN (
-            SELECT mpcd, MAX(mstm) as max_mstm
-            FROM jcsk_sy_r
-            GROUP BY mpcd) maxr ON st.mpcd = maxr.mpcd
-            LEFT JOIN jcsk_sy_r r ON maxr.mpcd = r.mpcd AND maxr.max_mstm = r.mstm
-            </script>
-            """)
-    List<HomeJcskSYBVo> getDetailsAndMonitoringDataList();
-
-
-    @Select("""
-            <script>
-            SELECT st.*, r.spprwl as value, r.mstm
-            FROM jcsk_sy_b st
-            LEFT JOIN (
-            SELECT mpcd, MAX(mstm) as tm\s
-            FROM jcsk_sy_r\s
-            GROUP BY mpcd
-            )maxr ON st.mpcd = maxr.mpcd
-            LEFT JOIN jcsk_sy_r r ON maxr.mpcd = r.mpcd AND maxr.tm = r.mstm
-            WHERE st.mpcd = #{id}
-            </script>
-            """)
-    HomeJcskSYBVo getDetailsById(@Param("id") String id);
-
-
-    @Select("""
-    SELECT dvcd from jcsk_sy_b where dm = #{dm} 
-                               ORDER BY LENGTH(dvcd) ASC,dvcd ASC;
-""")
-    List<String> getDvcdByProfileCode(@Param("dm") String profileCode);
-
-    @Select("""
-    <script>
-    select dvcd from jcsk_sy_b where mpcd = #{mpcd} and stcd =#{stcd}
-    </script>
-""")
-    String selectDvcdByStcdAndMpcd(@Param("stcd")String stcd,@Param("mpcd") String mpcd);
-}
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/JcskSyRMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/JcskSyRMapper.java
deleted file mode 100644
index 32e1bb9..0000000
--- a/src/main/java/com/gunshi/project/hsz/mapper/JcskSyRMapper.java
+++ /dev/null
@@ -1,361 +0,0 @@
-package com.gunshi.project.hsz.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gunshi.project.hsz.entity.so.JcskSyRPageSo;
-import com.gunshi.project.hsz.entity.so.OsmoticDetailQuerySo;
-import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
-import com.gunshi.project.hsz.entity.vo.*;
-import com.gunshi.project.hsz.model.JcskSyB;
-import com.gunshi.project.hsz.model.JcskSyR;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-@Mapper
-public interface JcskSyRMapper extends BaseMapper<JcskSyR> {
-    @Select(
-            """
-        <script>
-    SELECT
-    st.dvcd as station_code,
-    r.spprwl as value,
-    to_char(r.mstm,'YYYY-MM-DD HH24:MI:SS') as tm,
-    m.profile_name
-    FROM jcsk_sy_b st
-    LEFT JOIN (
-    SELECT mpcd,stcd, MAX(mstm) as max_tm
-    FROM jcsk_sy_r
-    GROUP BY mpcd,stcd
-) maxr ON st.mpcd = maxr.mpcd and st.stcd = maxr.stcd
-    LEFT JOIN jcsk_sy_r r ON maxr.mpcd = r.mpcd AND maxr.max_tm = r.mstm and maxr.stcd = r.stcd
-    LEFT JOIN att_dam_profile m ON st.dm = m.profile_code
-    ORDER BY m._order ASC;
-        </script>
-"""
-    )
-    List<JcskSyRVo> listValue();
-
-
-
-    @Select(
-            """
-        <script>
-        SELECT
-            st.mpcd as station_code,
-            r.spqn as value,
-            to_char(r.mstm,'YYYY-MM-DD HH24:MI:SS') as tm
-        FROM jcsk_sl_b st
-        LEFT JOIN (
-            SELECT mpcd, MAX(mstm) as tm
-            FROM jcsk_sl_r
-            GROUP BY mpcd
-        ) maxr ON st.mpcd = maxr.mpcd
-        LEFT JOIN jcsk_sl_r r ON maxr.mpcd = r.mpcd AND maxr.tm = r.mstm
-        ORDER BY st.mpcd asc, r.mstm desc;
-        </script>
-"""
-    )
-    List<JcskSyRVo> flowListValue();
-
-
-    @Select("""
-            <script>
-                select t.station_code as stationCode,to_char(t.tm,'YYYY-MM-DD HH24:MI:SS') as tm
-                from public.osmotic_warn_r t
-                where t.station_code in
-                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
-                    #{code}
-                </foreach>	
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>  
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t.tm desc
-            </script>
-            """)
-    List<OsmoticValueVo2> queryWarn(@Param("obj") OsmoticQuerySo so);
-
-
-    @Select("""
-            <script>
-                select to_char(t.mstm,'YYYY-MM-DD HH24:MI:SS') as tm,
-                t.spprwl as value from public.jcsk_sy_b t2
-                left join public.jcsk_sy_r t on t2.stcd = t.stcd and t2.mpcd = t.mpcd
-                where t2.dvcd = #{obj.stationCode}
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>  
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t.mstm desc
-            </script>
-            """)
-    List<OsmoticPressDetailVo> detailValue(@Param("obj") OsmoticDetailQuerySo so);
-
-
-    @Select("""
-            <script>
-                select to_char((t.tm - INTERVAL '5 minutes'),'YYYY-MM-DD HH24:MI:SS') as tm,t.rz
-                from public.st_rsvr_r t
-                where t.stcd = #{stcd} and to_char(t.tm, 'MI:SS') = '05:00'
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                    and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>  
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t.tm desc
-            </script>
-            """)
-    List<StRzVo> queryLineRz(@Param("obj") OsmoticQuerySo osmoticQuerySo, @Param("stcd") String stcd);
-
-
-    @Select("""
-            <script>
-                select to_char(t.tm,'YYYY-MM-DD') as tm,t.drp as rz
-                from public.st_pptn_r_d t
-                where t.year = #{year} and t.stcd = #{stcd}
-                order by t.tm desc
-            </script>
-            """)
-    List<StRzVo> queryDrp(@Param("year") Integer year,@Param("stcd") String stcd);
-
-
-
-    @Select("""
-            <script>
-                select to_char(t.tm,'YYYY-MM-DD') as tm,t.rz
-                from public.st_rsvr_r t
-                where to_char(t.tm, 'HH24:MI:SS') = '08:00:00' and t.stcd = #{stcd}
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t.tm desc
-            </script>
-            """)
-    List<StRzVo> queryRz(@Param("obj") OsmoticQuerySo osmoticQuerySo,@Param("stcd") String stcd);
-
-    @Select("""
-            <script>
-                select  t.tm,t.rz
-                from public.st_rsvr_r t
-                where to_char(t.tm, 'MI:SS') = '00:00' and to_char(t.tm, 'HH24:MI') like '%:00' and t.stcd = #{stcd}
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t.tm desc
-            </script>
-            """)
-    List<StRzVo> queryRz2(@Param("obj") OsmoticQuerySo osmoticQuerySo,@Param("stcd") String stcd);
-
-
-    @Select("""
-            <script>
-                select t1.dvcd as stationCode,t2.mstm as tm,t2.spprwl as value 
-                from public.jcsk_sy_b t1 left join public.jcsk_sy_r t2
-                on t1.stcd =t2.stcd and t1.mpcd = t2.mpcd
-                where t1.dvcd in 
-                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
-                    #{code}
-                </foreach>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t2.mstm desc
-            </script>
-            """)
-    List<OsmoticValueVo2> queryValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
-
-    @Select("""
-            <script>
-                select t1.dvcd as stationCode,t2.mstm as tm,t2.spprwl as value 
-                from public.jcsk_sy_b t1 left join public.jcsk_sy_r_8am t2
-                on t1.stcd =t2.stcd and t1.mpcd = t2.mpcd
-                where t1.dvcd in 
-                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
-                    #{code}
-                </foreach>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t2.mstm desc
-            </script>
-            """)
-    List<OsmoticValueVo2> query8AmValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
-
-
-    @Select("""
-            <script>
-                select t2.*
-                from public.jcsk_sy_b t1 
-                    left join public.jcsk_sy_r t2
-                on t1.stcd =t2.stcd and t1.mpcd = t2.mpcd
-                where t1.dvcd in 
-                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
-                    #{code}
-                </foreach>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t2.mstm desc
-            </script>
-            """)
-    List<JcskSyR> syncqueryValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
-
-
-
-    @Select("""
-            <script>
-                select t1.dvcd as stationCode,to_char(t2.mstm,'YYYY-MM-DD HH24:MI:SS') as tm,t2.spprwl as value
-                from public.jcsk_sy_b t1
-                left join public.jcsk_sy_r t2 on t1.stcd =t2.stcd and t1.mpcd = t2.mpcd
-                where t1.dvcd in
-                <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
-                    #{code}
-                </foreach>	
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
-                     and t2.mstm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>  
-                <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
-                    and t2.mstm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
-                </if>
-                order by t2.mstm desc
-            </script>
-            """)
-    List<OsmoticValueVo2> queryLineValue(@Param("obj") OsmoticQuerySo osmoticQuerySo);
-
-
-    @Select("""
-    <script>
-    <![CDATA[
-    WITH ranked_data AS (
-        SELECT 
-            t1.*,
-            t2.dm,
-            t3.profile_name as dmName,
-            t2.dvcd,
-            ROW_NUMBER() OVER (PARTITION BY t1.stcd, t1.mpcd, DATE_TRUNC('day', t1.mstm) ORDER BY t1.mstm DESC) as rn
-        FROM jcsk_sy_r t1
-        JOIN jcsk_sy_b t2 ON t1.stcd = t2.stcd AND t1.mpcd = t2.mpcd
-        LEFT JOIN att_dam_profile t3 ON t2.dm = t3.profile_code
-        WHERE 1=1
-    ]]>
-    <if test="dto.dvcd != null and dto.dvcd != ''">
-        AND t2.dvcd = #{dto.dvcd}
-    </if>
-    <if test="dto.dm != null and dto.dm != ''">
-        AND t2.dm = #{dto.dm} 
-    </if>
-    <if test="dto.dateTimeRangeSo != null">
-        <![CDATA[
-        AND t1.mstm >= #{dto.dateTimeRangeSo.start}
-        AND t1.mstm <= #{dto.dateTimeRangeSo.end}
-        ]]>
-    </if>
-    )
-    SELECT *
-    FROM ranked_data
-    WHERE rn = 1
-    ORDER BY mstm DESC
-    </script>
-""")
-    Page<JcskSyR> queryPage(Page<Object> page, @Param("dto") JcskSyRPageSo pageSo);
-
-    @Select("""
-select dm from jcsk_sy_b
-GROUP BY dm
-""")
-    List<String> listDm();
-
-
-    @Select("""
-    select stcd,mpcd from jcsk_sy_b
-""")
-    List<JcskSyB> listStcdMpcd();
-
-
-    @Select("""
-    select dvcd from jcsk_sy_b where dm = #{dm}
-""")
-    List<String> listDvcdByDm(@Param("dm") String dm);
-
-    @Select("""
-    <script>
-    <![CDATA[
-    select  t2.*,
-            t1.dm,
-            t3.profile_name as dmName,
-            t1.dvcd 
-    from jcsk_sy_b t1
-    left join jcsk_sy_r t2 on t1.stcd = t2.stcd and t1.mpcd = t2.mpcd
-    left join att_dam_profile t3 on t1.dm = t3.profile_code
-    where 1=1
-    ]]>
-    <if test="dto.dvcd != null and dto.dvcd != ''">
-        AND t1.dvcd = #{dto.dvcd}
-    </if>
-    <if test="dto.dm != null and dto.dm != ''">
-        AND t1.dm = #{dto.dm} 
-    </if>
-    <if test="dto.dateTimeRangeSo != null">
-        <![CDATA[
-        AND t2.mstm >= #{dto.dateTimeRangeSo.start}
-        AND t2.mstm <= #{dto.dateTimeRangeSo.end}
-        ]]>
-    </if>
-    order by t2.mstm desc
-    </script>
-""")
-    Page<JcskSyRHisVo> historyPage(Page<Object> page, @Param("dto") JcskSyRPageSo page1);
-
-
-    @Select("""
-     <script>
-         <![CDATA[
-    select  t2.*,
-            t1.dm,
-            t3.profile_name as dmName,
-            t1.dvcd 
-    from jcsk_sy_b t1
-    left join jcsk_sy_r t2 on t1.stcd = t2.stcd and t1.mpcd = t2.mpcd
-    left join att_dam_profile t3 on t1.dm = t3.profile_code
-    where t2.is_artificial = 1
-    ]]>
-        <if test="dto.dvcd != null and dto.dvcd != ''">
-        AND t1.dvcd = #{dto.dvcd}
-    </if>
-    <if test="dto.dm != null and dto.dm != ''">
-        AND t1.dm = #{dto.dm} 
-    </if>
-        <if test="dto.dateTimeRangeSo != null">
-        <![CDATA[
-        AND t2.mstm >= #{dto.dateTimeRangeSo.start}
-        AND t2.mstm <= #{dto.dateTimeRangeSo.end}
-        ]]>
-    </if>
-    order by t2.mstm desc
-    </script>
-""")
-    Page<JcskSyR> artificialPage(Page<Object> page,@Param("dto") JcskSyRPageSo page1);
-}
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/OsmoticPressRMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/OsmoticPressRMapper.java
index c7de23c..5aca79b 100644
--- a/src/main/java/com/gunshi/project/hsz/mapper/OsmoticPressRMapper.java
+++ b/src/main/java/com/gunshi/project/hsz/mapper/OsmoticPressRMapper.java
@@ -2,13 +2,13 @@ package com.gunshi.project.hsz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gunshi.project.hsz.entity.so.OsmoticDetailQuerySo;
-import com.gunshi.project.hsz.entity.so.OsmoticQueryPageSo;
-import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
-import com.gunshi.project.hsz.entity.vo.OsmoticPressDetailVo;
+import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+import com.gunshi.project.hsz.common.model.so.OsmoticQueryPageSo;
+import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
+import com.gunshi.project.hsz.common.model.vo.OsmoticPressDetailVo;
 import com.gunshi.project.hsz.entity.vo.OsmoticPressVo;
 import com.gunshi.project.hsz.entity.vo.OsmoticValueVo;
-import com.gunshi.project.hsz.entity.vo.StRzVo;
+import com.gunshi.project.hsz.common.model.vo.StRzVo;
 import com.gunshi.project.hsz.model.OsmoticPressR;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/OsmoticShiftRMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/OsmoticShiftRMapper.java
index 9129bb6..930dd1b 100644
--- a/src/main/java/com/gunshi/project/hsz/mapper/OsmoticShiftRMapper.java
+++ b/src/main/java/com/gunshi/project/hsz/mapper/OsmoticShiftRMapper.java
@@ -1,8 +1,8 @@
 package com.gunshi.project.hsz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gunshi.project.hsz.entity.so.OsmoticDetailQuerySo;
-import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
+import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
 import com.gunshi.project.hsz.entity.vo.OsmoticShiftListVo;
 import com.gunshi.project.hsz.entity.vo.OsmoticShiftValueVo;
 import com.gunshi.project.hsz.model.OsmoticShiftR;
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/StPptnRHMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/StPptnRHMapper.java
index 4f8e2b0..0b67907 100644
--- a/src/main/java/com/gunshi/project/hsz/mapper/StPptnRHMapper.java
+++ b/src/main/java/com/gunshi/project/hsz/mapper/StPptnRHMapper.java
@@ -1,7 +1,7 @@
 package com.gunshi.project.hsz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gunshi.project.hsz.entity.vo.StRzVo;
+import com.gunshi.project.hsz.common.model.vo.StRzVo;
 import com.gunshi.project.hsz.model.StPptnRD;
 import com.gunshi.project.hsz.model.StPptnRH;
 import org.apache.ibatis.annotations.Mapper;
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/WaterDataTermitesMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/WaterDataTermitesMapper.java
index a87f0f7..0b2a29a 100644
--- a/src/main/java/com/gunshi/project/hsz/mapper/WaterDataTermitesMapper.java
+++ b/src/main/java/com/gunshi/project/hsz/mapper/WaterDataTermitesMapper.java
@@ -4,8 +4,8 @@ package com.gunshi.project.hsz.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import com.gunshi.project.hsz.entity.so.JcskByRPageSo;
-import com.gunshi.project.hsz.model.JcskByR;
+import com.gunshi.project.hsz.common.model.so.JcskByRPageSo;
+import com.gunshi.project.hsz.common.model.JcskByR;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/WaterDeviceMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/WaterDeviceMapper.java
index bd9205a..bf01c61 100644
--- a/src/main/java/com/gunshi/project/hsz/mapper/WaterDeviceMapper.java
+++ b/src/main/java/com/gunshi/project/hsz/mapper/WaterDeviceMapper.java
@@ -1,7 +1,7 @@
 package com.gunshi.project.hsz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gunshi.project.hsz.model.JcskByB;
+import com.gunshi.project.hsz.common.model.JcskByB;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
diff --git a/src/main/java/com/gunshi/project/hsz/model/ForecastK.java b/src/main/java/com/gunshi/project/hsz/model/ForecastK.java
index 6101511..cb90f43 100644
--- a/src/main/java/com/gunshi/project/hsz/model/ForecastK.java
+++ b/src/main/java/com/gunshi/project/hsz/model/ForecastK.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/model/ForecastPPaR.java b/src/main/java/com/gunshi/project/hsz/model/ForecastPPaR.java
index e9b3bc6..36a00ec 100644
--- a/src/main/java/com/gunshi/project/hsz/model/ForecastPPaR.java
+++ b/src/main/java/com/gunshi/project/hsz/model/ForecastPPaR.java
@@ -3,7 +3,7 @@ package com.gunshi.project.hsz.model;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/model/ForecastProject.java b/src/main/java/com/gunshi/project/hsz/model/ForecastProject.java
index c17e6dc..6d6c366 100644
--- a/src/main/java/com/gunshi/project/hsz/model/ForecastProject.java
+++ b/src/main/java/com/gunshi/project/hsz/model/ForecastProject.java
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import com.gunshi.project.hsz.entity.vo.ForecastResultVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Size;
diff --git a/src/main/java/com/gunshi/project/hsz/model/ForecastResults.java b/src/main/java/com/gunshi/project/hsz/model/ForecastResults.java
index d465677..755b2c9 100644
--- a/src/main/java/com/gunshi/project/hsz/model/ForecastResults.java
+++ b/src/main/java/com/gunshi/project/hsz/model/ForecastResults.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/model/ForecastTask.java b/src/main/java/com/gunshi/project/hsz/model/ForecastTask.java
index 6005013..b99b1e3 100644
--- a/src/main/java/com/gunshi/project/hsz/model/ForecastTask.java
+++ b/src/main/java/com/gunshi/project/hsz/model/ForecastTask.java
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
diff --git a/src/main/java/com/gunshi/project/hsz/model/ForecastU.java b/src/main/java/com/gunshi/project/hsz/model/ForecastU.java
index 4f08d84..a6fba76 100644
--- a/src/main/java/com/gunshi/project/hsz/model/ForecastU.java
+++ b/src/main/java/com/gunshi/project/hsz/model/ForecastU.java
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/gunshi/project/hsz/model/ForecastUseparam.java b/src/main/java/com/gunshi/project/hsz/model/ForecastUseparam.java
index 67945d9..5525772 100644
--- a/src/main/java/com/gunshi/project/hsz/model/ForecastUseparam.java
+++ b/src/main/java/com/gunshi/project/hsz/model/ForecastUseparam.java
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
diff --git a/src/main/java/com/gunshi/project/hsz/model/JcskByB.java b/src/main/java/com/gunshi/project/hsz/model/JcskByB.java
deleted file mode 100644
index 9e05e1d..0000000
--- a/src/main/java/com/gunshi/project/hsz/model/JcskByB.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package com.gunshi.project.hsz.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * 白蚁设备表实体类
- * 数据源为WaterDevice
- * 与r表通过device_id关联
- */
-@Data
-@TableName("jcsk_by_b")
-public class JcskByB {
-    /**
-     * 主键
-     */
-    @TableField("id")
-    private Integer id;
-
-    /**
-     * 设备名称
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 设备编码
-     */
-    @TableField("code")
-    private String code;
-
-    /**
-     * 站点接入编码
-     */
-    @TableField("mn_no")
-    private String mnNo;
-
-    /**
-     * 厂家id
-     */
-    @TableField("factory_id")
-    private Integer factoryId;
-
-    /**
-     * 服务站点id
-     */
-    @TableField("station_id")
-    private Integer stationId;
-
-    /**
-     * 服务站点名称
-     */
-    @TableField("station_name")
-    private String stationName;
-
-    /**
-     * 创建时间
-     */
-    @TableField("created_at")
-    private Integer createdAt;
-
-    /**
-     * 创建人id
-     */
-    @TableField("created_user")
-    private Integer createdUser;
-
-    /**
-     * 修改时间
-     */
-    @TableField("updated_at")
-    private Integer updatedAt;
-
-    /**
-     * 修改人id
-     */
-    @TableField("updated_user")
-    private Integer updatedUser;
-
-    /**
-     * 状态
-     */
-    @TableField("status")
-    private Integer status;
-
-    /**
-     * 纬度
-     */
-    @TableField("lat")
-    private BigDecimal lat;
-
-    /**
-     * 经度
-     */
-    @TableField("lon")
-    private BigDecimal lon;
-
-    /**
-     * 省份id
-     */
-    @TableField("province_id")
-    private Long provinceId;
-
-    /**
-     * 省份名称
-     */
-    @TableField("province_name")
-    private String provinceName;
-
-    /**
-     * 城市id
-     */
-    @TableField("city_id")
-    private Long cityId;
-
-    /**
-     * 城市名称
-     */
-    @TableField("city_name")
-    private String cityName;
-
-    /**
-     * 区域名称
-     */
-    @TableField("area_name")
-    private String areaName;
-
-    /**
-     * 区域id
-     */
-    @TableField("area_id")
-    private Long areaId;
-
-    /**
-     * 设备类型
-     */
-    @TableField("type")
-    private Integer type;
-
-    /**
-     * 设备类型详情
-     */
-    @TableField("send_type")
-    private String sendType;
-
-    /**
-     * 联系人
-     */
-    @TableField("contact")
-    private String contact;
-
-    /**
-     * 联系电话
-     */
-    @TableField("telephone")
-    private String telephone;
-
-    /**
-     * 流域
-     */
-    @TableField("river")
-    private String river;
-
-    /**
-     * 安装地点
-     */
-    @TableField("address")
-    private String address;
-
-    /**
-     * 产品型号
-     */
-    @TableField("model")
-    private String model;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 通信方式
-     */
-    @TableField("communication_type")
-    private Integer communicationType;
-
-    /**
-     * 设备图片
-     */
-    @TableField("image_url")
-    private String imageUrl;
-
-    /**
-     * 设备视频流地址的ip
-     */
-    @TableField("video_ip")
-    private String videoIp;
-
-    /**
-     * 设备视频id
-     */
-    @TableField("video_id")
-    private String videoId;
-}
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/hsz/model/JcskByInspectTask.java b/src/main/java/com/gunshi/project/hsz/model/JcskByInspectTask.java
index a6e38fd..72fb07c 100644
--- a/src/main/java/com/gunshi/project/hsz/model/JcskByInspectTask.java
+++ b/src/main/java/com/gunshi/project/hsz/model/JcskByInspectTask.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
+import com.gunshi.db.annotation.IgnoreAutoMapperAndDao;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -17,6 +18,7 @@ import java.util.Date;
  */
 @Data
 @TableName(value = "jcsk_by_inspect_task")
+@IgnoreAutoMapperAndDao
 public class JcskByInspectTask {
 
     /**
diff --git a/src/main/java/com/gunshi/project/hsz/model/JcskByR.java b/src/main/java/com/gunshi/project/hsz/model/JcskByR.java
deleted file mode 100644
index a39bf86..0000000
--- a/src/main/java/com/gunshi/project/hsz/model/JcskByR.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.gunshi.project.hsz.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.gunshi.project.hsz.entity.vo.JcskByRProcessVo;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 白蚁数据表实体类
- * 数据源为WaterDataTermites
- */
-@Data
-@TableName("jcsk_by_r")
-public class JcskByR {
-    /**
-     * 设备编码
-     */
-    @TableField("mn_no")
-    private String mnNo;
-
-    /**
-     * 白蚁蚁情状态,有白蚁入侵为1
-     */
-    @TableField("status")
-    private Integer status;
-
-    /**
-     * 白蚁设备电量
-     */
-    @TableField("electricity")
-    private Integer electricity;
-
-    /**
-     * 白蚁设备安装的点位顺序(测点编号）
-     */
-    @TableField("\"order\"")
-    private String order;
-
-    /**
-     * 创建时间
-     */
-    @TableField("created_at")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createdAt;
-
-    /**
-     * 观测时间
-     */
-    @TableField("ob_time")
-    private String obTime;
-
-    /**
-     * 观测时间2
-     */
-    @TableField("ob_date")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date obDate;
-
-    /**
-     * 主键id
-     */
-    @TableField("id")
-    private Integer id;
-
-    /**
-     * 水库id
-     */
-    @TableField("station_id")
-    private Integer stationId;
-
-    /**
-     * 站点名称
-     */
-    @TableField("station_name")
-    private String stationName;
-
-    /**
-     * 设备id
-     */
-    @TableField("device_id")
-    private Integer deviceId;
-
-    /**
-     * 设备名称
-     */
-    @TableField("device_name")
-    private String deviceName;
-
-    /**
-     * 任务状态
-     */
-    @TableField("task_status")
-    private String taskStatus;
-
-    /**
-     * 任务id
-     */
-    @TableField("task_id")
-    private String taskId;
-
-    /**
-     * 接收类型
-     */
-    @TableField("receive_type")
-    private Short receiveType;
-
-    @Schema(description = "是否处理")
-    @TableField(exist = false)
-    private Boolean isProcess = false;
-
-    @Schema(description = "是否有巡检任务")
-    @TableField(exist = false)
-    private Boolean hasInspectTask = false;
-
-
-    @Schema(description = "工单详情")
-    @TableField(exist = false)
-    private JcskByRProcessVo jcskByRProcessVo;
-}
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/hsz/model/JcskByRProcess.java b/src/main/java/com/gunshi/project/hsz/model/JcskByRProcess.java
index ac436ad..825b5a0 100644
--- a/src/main/java/com/gunshi/project/hsz/model/JcskByRProcess.java
+++ b/src/main/java/com/gunshi/project/hsz/model/JcskByRProcess.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
+import com.gunshi.project.hsz.common.model.InspectTask;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
diff --git a/src/main/java/com/gunshi/project/hsz/model/JcskGnssB.java b/src/main/java/com/gunshi/project/hsz/model/JcskGnssB.java
deleted file mode 100644
index a96b37c..0000000
--- a/src/main/java/com/gunshi/project/hsz/model/JcskGnssB.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.gunshi.project.hsz.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * 位移设备表
- * 数据源为AttWyCdBase
- * 与r表通过rscd加cd关联
- */
-@Data
-@TableName("jcsk_gnss_b")
-public class JcskGnssB {
-    /**
-     * 测点编码
-     */
-    @TableField("cd")
-    private String cd;
-
-    @TableField(exist = false)
-    private String stationCode;
-
-    /**
-     * 测点名称
-     */
-    @TableField("cd_nm")
-    private String cdNm;
-
-    /**
-     * 桩号
-     */
-    @TableField("ch")
-    private String ch;
-
-    /**
-     * 测点类型(sl/wy/sy)
-     */
-    @TableField("cd_type")
-    private String cdType;
-
-    /**
-     * 水库编码
-     */
-    @TableField("res_cd")
-    private String resCd;
-
-    /**
-     * 设备状态
-     */
-    @TableField("device_status")
-    private String deviceStatus;
-}
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/hsz/model/JcskGnssR.java b/src/main/java/com/gunshi/project/hsz/model/JcskGnssR.java
deleted file mode 100644
index 48c4c46..0000000
--- a/src/main/java/com/gunshi/project/hsz/model/JcskGnssR.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.gunshi.project.hsz.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 位移数据表
- * 数据源为AttMqttCalcDataNormal
- */
-@Data
-@TableName("jcsk_gnss_r")
-public class JcskGnssR {
-    /**
-     * 水库编码设备编码
-     */
-    @TableField("res_cd")
-    private String resCd;
-
-    /**
-     * 测点编码
-     */
-    @TableField("cd")
-    private String cd;
-
-    /**
-     * 人工录入cd，用于执行更新时用
-     */
-    @TableField(exist = false)
-    private String newUpdateCd;
-
-    @TableField("is_artificial")
-    private Integer isArtificial;
-
-    @TableField(exist = false)
-    private String ch;
-
-    @TableField(exist = false)
-    private String cdnm;
-
-    /**
-     * e方向变形值，单位(mm)
-     */
-    @TableField("de")
-    private BigDecimal de;
-
-    /**
-     * n方向变形值，单位(mm)
-     */
-    @TableField("dn")
-    private BigDecimal dn;
-
-    /**
-     * u方向变形值，单位(mm)
-     */
-    @TableField("du")
-    private BigDecimal du;
-
-    /**
-     * 站点高程
-     */
-    @TableField("alt")
-    private BigDecimal alt;
-
-    /**
-     * 监测时间
-     */
-    @TableField("tm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date tm;
-
-    /**
-     * 人工录入时间，用于执行更新时用
-     */
-    @TableField(exist = false)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date newUpdateTm;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_tm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updateTm;
-}
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/hsz/model/JcskSlB.java b/src/main/java/com/gunshi/project/hsz/model/JcskSlB.java
deleted file mode 100644
index ec527dd..0000000
--- a/src/main/java/com/gunshi/project/hsz/model/JcskSlB.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.gunshi.project.hsz.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.Date;
-
-/**
- * 渗流测点表实体类
- * 数据源为DsmSpgSpqnmp
- * 与r表通过rscd加mpcd关联
- */
-@Data
-@TableName("jcsk_sl_b")
-public class JcskSlB {
-    /**
-     * 水库代码
-     */
-    @TableField("rscd")
-    private String rscd;
-
-    @TableField(exist = false)
-    private String stationCode;
-
-    /**
-     * 水工建筑物编号
-     */
-    @TableField("hycncd")
-    private String hycncd;
-
-    /**
-     * 测点编号
-     */
-    @TableField("mpcd")
-    private String mpcd;
-
-    /**
-     * rtu编号
-     */
-    @TableField("stcd")
-    private String stcd;
-
-    /**
-     * 桩号
-     */
-    @TableField("ch")
-    private String ch;
-
-    /**
-     * 轴距，单位m
-     */
-    @TableField("ofax")
-    private BigDecimal ofax;
-
-    /**
-     * 高程，单位m
-     */
-    @TableField("el")
-    private BigDecimal el;
-
-    /**
-     * 安装日期
-     */
-    @TableField("indt")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate indt;
-
-    /**
-     * 仪器编号
-     */
-    @TableField("dvcd")
-    private String dvcd;
-
-    /**
-     * 经度
-     */
-    @TableField("lgtd")
-    private BigDecimal lgtd;
-
-    /**
-     * 纬度
-     */
-    @TableField("lttd")
-    private BigDecimal lttd;
-
-    /**
-     * 备注
-     */
-    @TableField("rm")
-    private String rm;
-
-    /**
-     * 资料更新时间
-     */
-    @TableField("dtuptm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date dtuptm;
-
-    /**
-     * 断面
-     */
-    @TableField("dm")
-    private String dm;
-
-    /**
-     * 是否填报
-     */
-    @TableField("is_tb")
-    private String isTb;
-}
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/hsz/model/JcskSlR.java b/src/main/java/com/gunshi/project/hsz/model/JcskSlR.java
deleted file mode 100644
index fc94b99..0000000
--- a/src/main/java/com/gunshi/project/hsz/model/JcskSlR.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.gunshi.project.hsz.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 渗流数据表实体类
- * 数据源为DsmSpgSpqnNormal
- */
-@Data
-@TableName("jcsk_sl_r")
-public class JcskSlR {
-    /**
-     * 水库代码
-     */
-    @TableField("rscd")
-    private String rscd;
-
-    /**
-     * 水工建筑物编号
-     */
-    @TableField("hycncd")
-    private String hycncd;
-
-    /**
-     * 测点编号
-     */
-    @TableField("mpcd")
-    private String mpcd;
-
-
-    @TableField("stcd")
-    private String stcd;
-
-    /**
-     * 测量时间
-     */
-    @TableField("mstm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date mstm;
-
-    /**
-     * 温度，单位℃
-     */
-    @TableField("tm")
-    private BigDecimal tm;
-
-    /**
-     * 渗流量，单位l/s
-     */
-    @TableField("spqn")
-    private BigDecimal spqn;
-
-    /**
-     * 标准水温渗流量，单位l/s
-     */
-    @TableField("stspqn")
-    private BigDecimal stspqn;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_tm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updateTm;
-
-
-    @TableField(exist = false)
-    private String dvcd;
-}
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/hsz/model/JcskSlREightAm.java b/src/main/java/com/gunshi/project/hsz/model/JcskSlREightAm.java
index 0e38ef5..5037b15 100644
--- a/src/main/java/com/gunshi/project/hsz/model/JcskSlREightAm.java
+++ b/src/main/java/com/gunshi/project/hsz/model/JcskSlREightAm.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -38,7 +39,7 @@ public class JcskSlREightAm {
      */
     @TableField("mstm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date mstm;
+    private LocalDateTime mstm;
 
     /**
      * 温度，单位℃
@@ -63,12 +64,12 @@ public class JcskSlREightAm {
      */
     @TableField("create_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
     @TableField("update_tm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updateTm;
+    private LocalDateTime updateTm;
 }
diff --git a/src/main/java/com/gunshi/project/hsz/model/JcskSyB.java b/src/main/java/com/gunshi/project/hsz/model/JcskSyB.java
deleted file mode 100644
index c2c0473..0000000
--- a/src/main/java/com/gunshi/project/hsz/model/JcskSyB.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.gunshi.project.hsz.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-/**
- * 渗压测点表
- * 数据源为DsmSpgSpprmp
- * 与r表通过rscd,stcd,mpcd关联
- */
-@Data
-@TableName("jcsk_sy_b")
-public class JcskSyB {
-    /**
-     * 水库代码
-     */
-    @TableField("rscd")
-    private String rscd;
-
-    /**
-     * rtu编码
-     */
-    @TableField("stcd")
-    private String stcd;
-
-    /**
-     * 水工建筑物编号
-     */
-    @TableField("hycncd")
-    private String hycncd;
-
-    /**
-     * 测点编号
-     */
-    @TableField("mpcd")
-    private String mpcd;
-
-    /**
-     * 桩号
-     */
-    @TableField("ch")
-    private String ch;
-
-    /**
-     * 轴距，单位m
-     */
-    @TableField("ofax")
-    private BigDecimal ofax;
-
-    /**
-     * 高程，单位m
-     */
-    @TableField("el")
-    private BigDecimal el;
-
-    /**
-     * 监测类型
-     */
-    @TableField("msps")
-    private String msps;
-
-    /**
-     * 透水段底高程，单位m
-     */
-    @TableField("pmbtel")
-    private BigDecimal pmbtel;
-
-    /**
-     * 透水段顶高程，单位m
-     */
-    @TableField("pmtpel")
-    private BigDecimal pmtpel;
-
-    /**
-     * 坝面高程
-     */
-    @TableField("dsel")
-    private BigDecimal dsel;
-
-    /**
-     * 安装日期
-     */
-    @TableField("indt")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate indt;
-
-    /**
-     * 仪器编号
-     */
-    @TableField("dvcd")
-    private String dvcd;
-
-    /**
-     * 经度
-     */
-    @TableField("lgtd")
-    private BigDecimal lgtd;
-
-    /**
-     * 纬度
-     */
-    @TableField("lttd")
-    private BigDecimal lttd;
-
-    /**
-     * 备注
-     */
-    @TableField("rm")
-    private String rm;
-
-    /**
-     * 资料更新时间
-     */
-    @TableField("dtuptm")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDateTime dtuptm;
-
-    /**
-     * 断面
-     */
-    @TableField("dm")
-    private String dm;
-
-    /**
-     * 是否填报
-     */
-    @TableField("is_tb")
-    private String isTb;
-
-    @TableField(exist = false)
-    private String stationCode;
-}
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/hsz/model/JcskSyR.java b/src/main/java/com/gunshi/project/hsz/model/JcskSyR.java
deleted file mode 100644
index 5fd5242..0000000
--- a/src/main/java/com/gunshi/project/hsz/model/JcskSyR.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.gunshi.project.hsz.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 渗压数据表实体类
- * 数据源为DsmSpgSpprNormal
- */
-@Data
-@TableName("jcsk_sy_r")
-public class JcskSyR {
-    /**
-     * 水库代码
-     */
-    @TableField("rscd")
-    private String rscd;
-
-    /**
-     * stcd
-     */
-    @TableField("stcd")
-    private String stcd;
-
-    /**
-     * 水工建筑物编号
-     */
-    @TableField("hycncd")
-    private String hycncd;
-
-    /**
-     * mpcd
-     */
-    @TableField("mpcd")
-    private String mpcd;
-
-    /**
-     * 测量时间
-     */
-    @TableField("mstm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date mstm;
-
-    /**
-     * 用于记录人工录入数据时的新时间
-     */
-    @TableField(exist = false)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updateMstm;
-
-    /**
-     * 温度
-     */
-    @TableField("tm")
-    private BigDecimal tm;
-
-    /**
-     * 渗流压力水位，单位m
-     */
-    @TableField("spprwl")
-    private BigDecimal spprwl;
-
-    @TableField("is_artificial")
-    @Schema(description = "是否为人工录入 0不是  1是")
-    private Integer isArtificial;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_tm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime updateTm;
-
-    @TableField(exist = false)
-    @Schema(description = "断面编码")
-    private String dm;
-
-
-    @TableField(exist = false)
-    @Schema(description = "断面名称")
-    private String dmName;
-
-
-    @TableField(exist = false)
-    @Schema(description = "测点编号")
-    private String dvcd;
-}
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/hsz/model/OsmoticWaterR.java b/src/main/java/com/gunshi/project/hsz/model/OsmoticWaterR.java
index baaa6f5..36dee28 100644
--- a/src/main/java/com/gunshi/project/hsz/model/OsmoticWaterR.java
+++ b/src/main/java/com/gunshi/project/hsz/model/OsmoticWaterR.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
diff --git a/src/main/java/com/gunshi/project/hsz/model/StWaterR.java b/src/main/java/com/gunshi/project/hsz/model/StWaterR.java
index 38d80b9..6a87bed 100644
--- a/src/main/java/com/gunshi/project/hsz/model/StWaterR.java
+++ b/src/main/java/com/gunshi/project/hsz/model/StWaterR.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
diff --git a/src/main/java/com/gunshi/project/hsz/model/StWaterRReorganize.java b/src/main/java/com/gunshi/project/hsz/model/StWaterRReorganize.java
index 54a2f3d..8729345 100644
--- a/src/main/java/com/gunshi/project/hsz/model/StWaterRReorganize.java
+++ b/src/main/java/com/gunshi/project/hsz/model/StWaterRReorganize.java
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
-import com.gunshi.project.hsz.entity.page.GenericPageParams;
+import com.gunshi.project.hsz.common.model.page.GenericPageParams;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
diff --git a/src/main/java/com/gunshi/project/hsz/service/InspectItemService.java b/src/main/java/com/gunshi/project/hsz/service/InspectItemService.java
index 3621b19..1777e06 100644
--- a/src/main/java/com/gunshi/project/hsz/service/InspectItemService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/InspectItemService.java
@@ -11,7 +11,7 @@ import com.gunshi.project.hsz.entity.so.AttCctvBasePage;
 import com.gunshi.project.hsz.mapper.InspectItemMapper;
 import com.gunshi.project.hsz.mapper.InspectTaskDetailMapper;
 import com.gunshi.project.hsz.model.InspectItem;
-import com.gunshi.project.hsz.model.InspectTaskDetail;
+import com.gunshi.project.hsz.common.model.InspectTaskDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/gunshi/project/hsz/service/InspectTaskDetailService.java b/src/main/java/com/gunshi/project/hsz/service/InspectTaskDetailService.java
index 111097c..3a5f765 100644
--- a/src/main/java/com/gunshi/project/hsz/service/InspectTaskDetailService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/InspectTaskDetailService.java
@@ -9,7 +9,7 @@ import com.gunshi.project.hsz.entity.so.InspectProblemPageSo;
 import com.gunshi.project.hsz.entity.vo.InspectProblemVo;
 import com.gunshi.project.hsz.entity.vo.InspectTaskDetailVo;
 import com.gunshi.project.hsz.mapper.InspectTaskDetailMapper;
-import com.gunshi.project.hsz.model.InspectTaskDetail;
+import com.gunshi.project.hsz.common.model.InspectTaskDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/gunshi/project/hsz/service/InspectTaskService.java b/src/main/java/com/gunshi/project/hsz/service/InspectTaskService.java
index d6d5fc4..016228d 100644
--- a/src/main/java/com/gunshi/project/hsz/service/InspectTaskService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/InspectTaskService.java
@@ -10,7 +10,7 @@ import com.gunshi.project.hsz.entity.so.InspectTaskSo;
 import com.gunshi.project.hsz.entity.vo.InspectTaskDetailVo;
 import com.gunshi.project.hsz.entity.vo.InspectTaskVo;
 import com.gunshi.project.hsz.mapper.InspectTaskMapper;
-import com.gunshi.project.hsz.model.InspectTask;
+import com.gunshi.project.hsz.common.model.InspectTask;
 import com.gunshi.project.hsz.model.MessageCenter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/gunshi/project/hsz/service/JcskByBDService.java b/src/main/java/com/gunshi/project/hsz/service/JcskByBDService.java
index 4baff6d..bf3716d 100644
--- a/src/main/java/com/gunshi/project/hsz/service/JcskByBDService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/JcskByBDService.java
@@ -4,9 +4,9 @@ package com.gunshi.project.hsz.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gunshi.project.hsz.entity.so.JcskByBDPageSo;
+import com.gunshi.project.hsz.common.model.so.JcskByBDPageSo;
 import com.gunshi.project.hsz.mapper.JcskByBDMapper;
-import com.gunshi.project.hsz.model.JcskByBD;
+import com.gunshi.project.hsz.common.model.JcskByBD;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/gunshi/project/hsz/service/JcskByBService.java b/src/main/java/com/gunshi/project/hsz/service/JcskByBService.java
index 12cf10e..2dc5542 100644
--- a/src/main/java/com/gunshi/project/hsz/service/JcskByBService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/JcskByBService.java
@@ -2,8 +2,8 @@ package com.gunshi.project.hsz.service;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gunshi.project.hsz.mapper.JcskByBMapper;
-import com.gunshi.project.hsz.model.JcskByB;
+import com.gunshi.project.hsz.common.mapper.JcskByBMapper;
+import com.gunshi.project.hsz.common.model.JcskByB;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/gunshi/project/hsz/service/JcskByInspectTaskService.java b/src/main/java/com/gunshi/project/hsz/service/JcskByInspectTaskService.java
index 973f246..d91f2c8 100644
--- a/src/main/java/com/gunshi/project/hsz/service/JcskByInspectTaskService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/JcskByInspectTaskService.java
@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.gunshi.project.hsz.mapper.InspectTaskMapper;
 import com.gunshi.project.hsz.mapper.JcskByInspectTaskMapper;
-import com.gunshi.project.hsz.model.InspectTask;
+import com.gunshi.project.hsz.common.model.InspectTask;
 import com.gunshi.project.hsz.model.JcskByInspectTask;
-import com.gunshi.project.hsz.model.JcskByR;
+import com.gunshi.project.hsz.common.model.JcskByR;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/gunshi/project/hsz/service/JcskByRProcessService.java b/src/main/java/com/gunshi/project/hsz/service/JcskByRProcessService.java
index b5cebcb..5877aa9 100644
--- a/src/main/java/com/gunshi/project/hsz/service/JcskByRProcessService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/JcskByRProcessService.java
@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gunshi.project.hsz.mapper.JcskByInspectTaskMapper;
 import com.gunshi.project.hsz.mapper.JcskByRProcessMapper;
-import com.gunshi.project.hsz.model.InspectTask;
+import com.gunshi.project.hsz.common.model.InspectTask;
 import com.gunshi.project.hsz.model.JcskByInspectTask;
-import com.gunshi.project.hsz.model.JcskByR;
+import com.gunshi.project.hsz.common.model.JcskByR;
 import com.gunshi.project.hsz.model.JcskByRProcess;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/gunshi/project/hsz/service/JcskByRService.java b/src/main/java/com/gunshi/project/hsz/service/JcskByRService.java
index 95f22da..bc7e15e 100644
--- a/src/main/java/com/gunshi/project/hsz/service/JcskByRService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/JcskByRService.java
@@ -4,11 +4,11 @@ package com.gunshi.project.hsz.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gunshi.project.hsz.entity.so.JcskByRPageSo;
-import com.gunshi.project.hsz.entity.vo.JcskByRProcessVo;
+import com.gunshi.project.hsz.common.model.so.JcskByRPageSo;
+import com.gunshi.project.hsz.common.model.vo.JcskByRProcessVo;
 import com.gunshi.project.hsz.mapper.WaterDataTermitesMapper;
-import com.gunshi.project.hsz.model.InspectTask;
-import com.gunshi.project.hsz.model.JcskByR;
+import com.gunshi.project.hsz.common.model.InspectTask;
+import com.gunshi.project.hsz.common.model.JcskByR;
 import com.gunshi.project.hsz.model.JcskByRProcess;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
diff --git a/src/main/java/com/gunshi/project/hsz/service/JcskGnssBService.java b/src/main/java/com/gunshi/project/hsz/service/JcskGnssBService.java
index 4e4d9af..c845307 100644
--- a/src/main/java/com/gunshi/project/hsz/service/JcskGnssBService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/JcskGnssBService.java
@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gunshi.project.hsz.entity.so.JcskGnssBPageSo;
-import com.gunshi.project.hsz.entity.vo.HomeJcskGnssBVo;
-import com.gunshi.project.hsz.mapper.JcskGnssBMapper;
-import com.gunshi.project.hsz.model.JcskGnssB;
+import com.gunshi.project.hsz.common.model.so.JcskGnssBPageSo;
+import com.gunshi.project.hsz.common.model.vo.HomeJcskGnssBVo;
+import com.gunshi.project.hsz.common.mapper.JcskGnssBMapper;
+import com.gunshi.project.hsz.common.model.JcskGnssB;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/gunshi/project/hsz/service/JcskGnssRService.java b/src/main/java/com/gunshi/project/hsz/service/JcskGnssRService.java
index 1e38c61..ab20ed5 100644
--- a/src/main/java/com/gunshi/project/hsz/service/JcskGnssRService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/JcskGnssRService.java
@@ -6,16 +6,17 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gunshi.db.dto.DateTimeRangeSo;
+import com.gunshi.project.hsz.common.model.vo.*;
 import com.gunshi.project.hsz.entity.dto.ArtificialJcskGnssDeleteDto;
-import com.gunshi.project.hsz.entity.so.JcskGnssRPageSo;
-import com.gunshi.project.hsz.entity.so.OsmoticDetailQuerySo;
-import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
+import com.gunshi.project.hsz.common.model.so.JcskGnssRPageSo;
+import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
 import com.gunshi.project.hsz.entity.vo.*;
 import com.gunshi.project.hsz.mapper.AttResBaseMapper;
-import com.gunshi.project.hsz.mapper.JcskGnssBMapper;
-import com.gunshi.project.hsz.mapper.JcskGnssRMapper;
-import com.gunshi.project.hsz.mapper.JcskSyRMapper;
-import com.gunshi.project.hsz.model.JcskGnssR;
+import com.gunshi.project.hsz.common.mapper.JcskGnssBMapper;
+import com.gunshi.project.hsz.common.mapper.JcskGnssRMapper;
+import com.gunshi.project.hsz.common.mapper.JcskSyRMapper;
+import com.gunshi.project.hsz.common.model.JcskGnssR;
 import com.gunshi.project.hsz.util.DataHandleUtil;
 import com.gunshi.project.hsz.util.DateUtil;
 import com.gunshi.project.hsz.util.ExcelUtil;
@@ -474,11 +475,11 @@ public class JcskGnssRService extends ServiceImpl<JcskGnssRMapper, JcskGnssR> {
             Map<String, Object> row = new HashMap<>();
             row.put("cd",record.getCd());
             row.put("isArtificial", record.getIsArtificial() != null && record.getIsArtificial() == 1 ? "人工录入" : "自动采集");
-            row.put("updateTm", transforDateToString(record.getUpdateTm()));
+            row.put("updateTm", record.getUpdateTm().toString());
             row.put("x",record.getDe());
             row.put("y",record.getDn());
             row.put("h",record.getDu());
-            row.put("tm",transforDateToString(record.getTm()));
+            row.put("tm",record.getTm().toString());
             exportData.add(row);
         }
 
@@ -522,14 +523,14 @@ public class JcskGnssRService extends ServiceImpl<JcskGnssRMapper, JcskGnssR> {
     public boolean saveData(JcskGnssR dto) {
 
         dto.setIsArtificial(1);
-        dto.setUpdateTm(new Date());
+        dto.setUpdateTm(LocalDateTime.now());
         int insert = this.baseMapper.insert(dto);
         return insert > 0;
     }
 
     public boolean updateData(JcskGnssR dto) {
-        dto.setUpdateTm(new Date());
-        Date oldTm = dto.getTm();
+        dto.setUpdateTm(LocalDateTime.now());
+        LocalDateTime oldTm = dto.getTm();
         LambdaQueryWrapper<JcskGnssR> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JcskGnssR::getIsArtificial, 1);
         queryWrapper.eq(JcskGnssR::getTm, oldTm);
diff --git a/src/main/java/com/gunshi/project/hsz/service/JcskSlBService.java b/src/main/java/com/gunshi/project/hsz/service/JcskSlBService.java
index 9b04f78..4af42f1 100644
--- a/src/main/java/com/gunshi/project/hsz/service/JcskSlBService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/JcskSlBService.java
@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gunshi.project.hsz.entity.so.JcskSlBPageSo;
-import com.gunshi.project.hsz.entity.vo.HomeJcskSlBVo;
-import com.gunshi.project.hsz.mapper.JcskSlBMapper;
-import com.gunshi.project.hsz.model.JcskSlB;
+import com.gunshi.project.hsz.common.model.so.JcskSlBPageSo;
+import com.gunshi.project.hsz.common.model.vo.HomeJcskSlBVo;
+import com.gunshi.project.hsz.common.mapper.JcskSlBMapper;
+import com.gunshi.project.hsz.common.model.JcskSlB;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/gunshi/project/hsz/service/JcskSlRService.java b/src/main/java/com/gunshi/project/hsz/service/JcskSlRService.java
index 2c477bc..8a70ae2 100644
--- a/src/main/java/com/gunshi/project/hsz/service/JcskSlRService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/JcskSlRService.java
@@ -2,10 +2,10 @@ package com.gunshi.project.hsz.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gunshi.project.hsz.entity.so.JcskSlRPageSo;
-import com.gunshi.project.hsz.entity.vo.JcskSlRHisVo;
-import com.gunshi.project.hsz.mapper.JcskSlRMapper;
-import com.gunshi.project.hsz.model.JcskSlR;
+import com.gunshi.project.hsz.common.model.so.JcskSlRPageSo;
+import com.gunshi.project.hsz.common.model.vo.JcskSlRHisVo;
+import com.gunshi.project.hsz.common.mapper.JcskSlRMapper;
+import com.gunshi.project.hsz.common.model.JcskSlR;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/gunshi/project/hsz/service/JcskSyBService.java b/src/main/java/com/gunshi/project/hsz/service/JcskSyBService.java
index 06ae3f0..23e035b 100644
--- a/src/main/java/com/gunshi/project/hsz/service/JcskSyBService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/JcskSyBService.java
@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gunshi.project.hsz.entity.so.JcskSyBPageSo;
-import com.gunshi.project.hsz.entity.vo.HomeJcskSYBVo;
-import com.gunshi.project.hsz.mapper.JcskSyBMapper;
-import com.gunshi.project.hsz.model.JcskSyB;
+import com.gunshi.project.hsz.common.model.so.JcskSyBPageSo;
+import com.gunshi.project.hsz.common.model.vo.HomeJcskSYBVo;
+import com.gunshi.project.hsz.common.mapper.JcskSyBMapper;
+import com.gunshi.project.hsz.common.model.JcskSyB;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/gunshi/project/hsz/service/JcskSyRService.java b/src/main/java/com/gunshi/project/hsz/service/JcskSyRService.java
index 9a5591b..104b511 100644
--- a/src/main/java/com/gunshi/project/hsz/service/JcskSyRService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/JcskSyRService.java
@@ -7,16 +7,17 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gunshi.db.dto.DateTimeRangeSo;
+import com.gunshi.project.hsz.common.model.JcskSyR;
+import com.gunshi.project.hsz.common.model.vo.*;
 import com.gunshi.project.hsz.entity.dto.ArtificialJcskSyDeleteDto;
-import com.gunshi.project.hsz.entity.so.JcskSyRPageSo;
-import com.gunshi.project.hsz.entity.so.OsmoticDetailQuerySo;
-import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
+import com.gunshi.project.hsz.common.model.so.JcskSyRPageSo;
+import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
 import com.gunshi.project.hsz.entity.vo.*;
-import com.gunshi.project.hsz.mapper.JcskSlBMapper;
+import com.gunshi.project.hsz.common.mapper.JcskSlBMapper;
 import com.gunshi.project.hsz.mapper.JcskSyREightAmMapper;
-import com.gunshi.project.hsz.mapper.JcskSyRMapper;
-import com.gunshi.project.hsz.model.JcskSyB;
-import com.gunshi.project.hsz.model.JcskSyR;
+import com.gunshi.project.hsz.common.mapper.JcskSyRMapper;
+import com.gunshi.project.hsz.common.model.JcskSyB;
 import com.gunshi.project.hsz.util.*;
 import com.ruoyi.common.utils.StringUtils;
 import jakarta.servlet.http.HttpServletResponse;
@@ -707,7 +708,7 @@ public class JcskSyRService extends ServiceImpl<JcskSyRMapper, JcskSyR> {
         List<Map<String, Object>> exportData = new ArrayList<>();
         for (JcskSyR record : records) {
             Map<String, Object> row = new HashMap<>();
-            row.put("mstm", transforDateToString(record.getMstm()));
+            row.put("mstm", record.getMstm().toString());
             row.put("tm", record.getTm());
             row.put("spprwl", record.getSpprwl());
             row.put("isArtificial", record.getIsArtificial() != null && record.getIsArtificial() == 1 ? "人工录入" : "自动采集");
diff --git a/src/main/java/com/gunshi/project/hsz/service/OsmoticFlowRService.java b/src/main/java/com/gunshi/project/hsz/service/OsmoticFlowRService.java
index d157fc1..185057e 100644
--- a/src/main/java/com/gunshi/project/hsz/service/OsmoticFlowRService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/OsmoticFlowRService.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gunshi.project.hsz.entity.so.OsmoticQueryPageSo;
+import com.gunshi.project.hsz.common.model.so.OsmoticQueryPageSo;
 import com.gunshi.project.hsz.mapper.OsmoticFlowRMapper;
 import com.gunshi.project.hsz.model.OsmoticFlowR;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/gunshi/project/hsz/service/OsmoticPressRService.java b/src/main/java/com/gunshi/project/hsz/service/OsmoticPressRService.java
index 3711307..89adc4f 100644
--- a/src/main/java/com/gunshi/project/hsz/service/OsmoticPressRService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/OsmoticPressRService.java
@@ -4,9 +4,9 @@
 //import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 //import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 //import com.gunshi.db.dto.DateTimeRangeSo;
-//import com.gunshi.project.hsz.entity.so.OsmoticDetailQuerySo;
-//import com.gunshi.project.hsz.entity.so.OsmoticQueryPageSo;
-//import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
+//import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+//import com.gunshi.project.hsz.common.model.so.OsmoticQueryPageSo;
+//import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
 //import com.gunshi.project.hsz.entity.vo.*;
 //import com.gunshi.project.hsz.mapper.OsmoticPressRMapper;
 //import com.gunshi.project.hsz.model.OsmoticPressR;
diff --git a/src/main/java/com/gunshi/project/hsz/service/OsmoticShiftRService.java b/src/main/java/com/gunshi/project/hsz/service/OsmoticShiftRService.java
index f980e38..dd33633 100644
--- a/src/main/java/com/gunshi/project/hsz/service/OsmoticShiftRService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/OsmoticShiftRService.java
@@ -7,9 +7,9 @@
 //import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 //import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 //import com.gunshi.db.dto.DateTimeRangeSo;
-//import com.gunshi.project.hsz.entity.so.OsmoticDetailQuerySo;
-//import com.gunshi.project.hsz.entity.so.OsmoticQueryPageSo;
-//import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
+//import com.gunshi.project.hsz.common.model.so.OsmoticDetailQuerySo;
+//import com.gunshi.project.hsz.common.model.so.OsmoticQueryPageSo;
+//import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
 //import com.gunshi.project.hsz.entity.vo.*;
 //import com.gunshi.project.hsz.mapper.AttResBaseMapper;
 //import com.gunshi.project.hsz.mapper.OsmoticPressRMapper;
diff --git a/src/main/java/com/gunshi/project/hsz/service/OsmoticWarnRService.java b/src/main/java/com/gunshi/project/hsz/service/OsmoticWarnRService.java
index 0cf8ce9..901cca7 100644
--- a/src/main/java/com/gunshi/project/hsz/service/OsmoticWarnRService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/OsmoticWarnRService.java
@@ -12,15 +12,17 @@ import com.gunshi.project.hsz.entity.so.WarnSo;
 import com.gunshi.project.hsz.entity.vo.OsmoticWarnVo;
 import com.gunshi.project.hsz.mapper.OsmoticWarnRMapper;
 import com.gunshi.project.hsz.mapper.OsmoticWarnRuleMapper;
-import com.gunshi.project.hsz.model.JcskGnssR;
+import com.gunshi.project.hsz.common.model.JcskGnssR;
 import com.gunshi.project.hsz.model.OsmoticWarnR;
 import com.gunshi.project.hsz.model.OsmoticWarnRule;
+import com.gunshi.project.hsz.util.DateTransforUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -73,13 +75,14 @@ public class OsmoticWarnRService extends ServiceImpl<OsmoticWarnRMapper, Osmotic
      */
     public void saveShiftWarn(JcskGnssR jcskGnssR){
         String stationCode = jcskGnssR.getCd();
-        Date tm = jcskGnssR.getTm();
+        LocalDateTime tm = jcskGnssR.getTm();
+        Date date = DateTransforUtil.transforLocalDateTimeToDate(tm);
         BigDecimal x = jcskGnssR.getDe();
-        savePressWarn(stationCode,x,tm,"x");
+        savePressWarn(stationCode,x,date,"x");
         BigDecimal y = jcskGnssR.getDn();
-        savePressWarn(stationCode,y,tm,"y");
+        savePressWarn(stationCode,y,date,"y");
         BigDecimal h = jcskGnssR.getDu();
-        savePressWarn(stationCode,h,tm,"h");
+        savePressWarn(stationCode,h,date,"h");
     }
 
     /**
diff --git a/src/main/java/com/gunshi/project/hsz/service/OsmoticWarnRuleService.java b/src/main/java/com/gunshi/project/hsz/service/OsmoticWarnRuleService.java
index 2920710..ec29916 100644
--- a/src/main/java/com/gunshi/project/hsz/service/OsmoticWarnRuleService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/OsmoticWarnRuleService.java
@@ -6,9 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gunshi.project.hsz.common.model.JcskGnssR;
+import com.gunshi.project.hsz.common.model.JcskSlR;
+import com.gunshi.project.hsz.common.model.JcskSyR;
 import com.gunshi.project.hsz.entity.so.WarnRulePageSo;
 import com.gunshi.project.hsz.mapper.OsmoticWarnRuleMapper;
 import com.gunshi.project.hsz.model.*;
+import com.gunshi.project.hsz.util.DateTransforUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -99,7 +103,7 @@ public class OsmoticWarnRuleService extends ServiceImpl<OsmoticWarnRuleMapper, O
             }
 
             if (shoudWarn) {
-                insertWarn(stationCode, rule.getId(), flow.getSpprwl(), OsmoticWarnRule.Type.PRESS.getType(), rule.getLevel(),flow.getMstm(),rule.getResolveSuggest());
+                insertWarn(stationCode, rule.getId(), flow.getSpprwl(), OsmoticWarnRule.Type.PRESS.getType(), rule.getLevel(),DateTransforUtil.transforLocalDateTimeToDate(flow.getMstm()),rule.getResolveSuggest());
             }
         }
     }
@@ -252,11 +256,11 @@ public class OsmoticWarnRuleService extends ServiceImpl<OsmoticWarnRuleMapper, O
 
             if (shoudWarn) {
                 if(rule.getDirection().contains("x")){
-                    insertWarn(stationCode, rule.getId(), shift.getDe(), OsmoticWarnRule.Type.SHIFT.getType(), rule.getLevel(),shift.getTm(), rule.getResolveSuggest());
+                    insertWarn(stationCode, rule.getId(), shift.getDe(), OsmoticWarnRule.Type.SHIFT.getType(), rule.getLevel(), DateTransforUtil.transforLocalDateTimeToDate(shift.getTm()), rule.getResolveSuggest());
                 }else if(rule.getDirection().contains("y")){
-                    insertWarn(stationCode, rule.getId(), shift.getDn(), OsmoticWarnRule.Type.SHIFT.getType(), rule.getLevel(),shift.getTm(), rule.getResolveSuggest());
+                    insertWarn(stationCode, rule.getId(), shift.getDn(), OsmoticWarnRule.Type.SHIFT.getType(), rule.getLevel(),DateTransforUtil.transforLocalDateTimeToDate(shift.getTm()), rule.getResolveSuggest());
                 }else{
-                    insertWarn(stationCode, rule.getId(), shift.getDu(), OsmoticWarnRule.Type.SHIFT.getType(), rule.getLevel(),shift.getTm(), rule.getResolveSuggest());
+                    insertWarn(stationCode, rule.getId(), shift.getDu(), OsmoticWarnRule.Type.SHIFT.getType(), rule.getLevel(),DateTransforUtil.transforLocalDateTimeToDate(shift.getTm()), rule.getResolveSuggest());
                 }
 
             }
@@ -317,7 +321,7 @@ public class OsmoticWarnRuleService extends ServiceImpl<OsmoticWarnRuleMapper, O
             }
 
             if (shoudWarn) {
-                insertWarn(stationCode, rule.getId(), flow.getSpqn(), OsmoticWarnRule.Type.FLOW.getType(), rule.getLevel(),flow.getMstm(), rule.getResolveSuggest());
+                insertWarn(stationCode, rule.getId(), flow.getSpqn(), OsmoticWarnRule.Type.FLOW.getType(), rule.getLevel(),DateTransforUtil.transforLocalDateTimeToDate(flow.getMstm()), rule.getResolveSuggest());
             }
         }
     }
diff --git a/src/main/java/com/gunshi/project/hsz/service/StatisticsService.java b/src/main/java/com/gunshi/project/hsz/service/StatisticsService.java
index a42d96c..624083e 100644
--- a/src/main/java/com/gunshi/project/hsz/service/StatisticsService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/StatisticsService.java
@@ -2,6 +2,7 @@ package com.gunshi.project.hsz.service;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.gunshi.db.dto.DateRangeSo;
+import com.gunshi.project.hsz.common.model.vo.StRzVo;
 import com.gunshi.project.hsz.entity.so.StatisticsQuerySo;
 import com.gunshi.project.hsz.entity.vo.*;
 import com.gunshi.project.hsz.mapper.StPptnRHMapper;
diff --git a/src/main/java/com/gunshi/project/hsz/service/WaterDeviceService.java b/src/main/java/com/gunshi/project/hsz/service/WaterDeviceService.java
index 04f2208..0166b50 100644
--- a/src/main/java/com/gunshi/project/hsz/service/WaterDeviceService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/WaterDeviceService.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.gunshi.project.hsz.entity.so.WaterDevicePageSo;
 import com.gunshi.project.hsz.mapper.WaterDeviceMapper;
-import com.gunshi.project.hsz.model.JcskByB;
+import com.gunshi.project.hsz.common.model.JcskByB;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/gunshi/project/hsz/timetask/JcskDataTask.java b/src/main/java/com/gunshi/project/hsz/timetask/JcskDataTask.java
index 8f88d93..fdcb029 100644
--- a/src/main/java/com/gunshi/project/hsz/timetask/JcskDataTask.java
+++ b/src/main/java/com/gunshi/project/hsz/timetask/JcskDataTask.java
@@ -3,14 +3,16 @@ package com.gunshi.project.hsz.timetask;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gunshi.db.dto.DateTimeRangeSo;
-import com.gunshi.project.hsz.entity.so.OsmoticQuerySo;
-import com.gunshi.project.hsz.entity.vo.OsmoticShiftValueVo2;
+import com.gunshi.project.hsz.common.model.*;
+import com.gunshi.project.hsz.common.model.so.OsmoticQuerySo;
+import com.gunshi.project.hsz.common.model.vo.OsmoticShiftValueVo2;
 import com.gunshi.project.hsz.mapper.JcskGnssREightAmMapper;
-import com.gunshi.project.hsz.mapper.JcskSlBMapper;
+import com.gunshi.project.hsz.common.mapper.JcskSlBMapper;
 import com.gunshi.project.hsz.mapper.JcskSlREightAmMapper;
 import com.gunshi.project.hsz.mapper.JcskSyREightAmMapper;
 import com.gunshi.project.hsz.model.*;
 import com.gunshi.project.hsz.service.*;
+import com.gunshi.project.hsz.util.DateTransforUtil;
 import com.gunshi.project.hsz.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -24,6 +26,7 @@ import org.springframework.stereotype.Component;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -81,34 +84,34 @@ public class JcskDataTask {
 //     */
 //    @Scheduled(cron = "0 */30 * * * ?")
 //    @Async
-//    public void syncWarn(){
-//        // 获取昨天的时间
-//        Date yesterday = getYesterday();
-//        Date syMaxTm = osmoticWarnRuleService.queryMaxTmByType(PRESS);
-//        if(syMaxTm==null){
-//            syMaxTm = yesterday;
-//        }
-//        Date slMaxTm = osmoticWarnRuleService.queryMaxTmByType(FLOW);
-//        if(slMaxTm==null){
-//            slMaxTm = yesterday;
-//        }
-//        Date gnssMaxTm = osmoticWarnRuleService.queryMaxTmByType(GNSS);
-//        if(gnssMaxTm==null){
-//            gnssMaxTm = yesterday;
-//        }
-//        List<JcskSyR> syList = jcskSyRService.lambdaQuery().gt(JcskSyR::getMstm, syMaxTm).list();
-//        List<JcskSlR> slList = jcskSlRService.lambdaQuery().gt(JcskSlR::getMstm, slMaxTm).list();
-//        List<JcskGnssR> gnssList = jcskGnssRService.lambdaQuery().gt(JcskGnssR::getTm, gnssMaxTm).list();
-//        for (JcskSyR jcskSyR : syList) {
-//            osmoticWarnRuleService.checkWarn(jcskSyR);
-//        }
-//        for (JcskSlR jcskSlR : slList) {
-//            osmoticWarnRuleService.checkWarn(jcskSlR);
-//        }
-//        for (JcskGnssR jcskGnssR : gnssList) {
-//            osmoticWarnRuleService.checkWarn(jcskGnssR);
-//        }
-//    }
+    public void syncWarn(){
+        // 获取昨天的时间
+        Date yesterday = getYesterday();
+        Date syMaxTm = osmoticWarnRuleService.queryMaxTmByType(PRESS);
+        if(syMaxTm==null){
+            syMaxTm = yesterday;
+        }
+        Date slMaxTm = osmoticWarnRuleService.queryMaxTmByType(FLOW);
+        if(slMaxTm==null){
+            slMaxTm = yesterday;
+        }
+        Date gnssMaxTm = osmoticWarnRuleService.queryMaxTmByType(GNSS);
+        if(gnssMaxTm==null){
+            gnssMaxTm = yesterday;
+        }
+        List<JcskSyR> syList = jcskSyRService.lambdaQuery().gt(JcskSyR::getMstm, syMaxTm).list();
+        List<JcskSlR> slList = jcskSlRService.lambdaQuery().gt(JcskSlR::getMstm, slMaxTm).list();
+        List<JcskGnssR> gnssList = jcskGnssRService.lambdaQuery().gt(JcskGnssR::getTm, gnssMaxTm).list();
+        for (JcskSyR jcskSyR : syList) {
+            osmoticWarnRuleService.checkWarn(jcskSyR);
+        }
+        for (JcskSlR jcskSlR : slList) {
+            osmoticWarnRuleService.checkWarn(jcskSlR);
+        }
+        for (JcskGnssR jcskGnssR : gnssList) {
+            osmoticWarnRuleService.checkWarn(jcskGnssR);
+        }
+    }
 
     private Date getYesterday() {
         Calendar calendar = Calendar.getInstance();
@@ -120,8 +123,8 @@ public class JcskDataTask {
      * 同步渗流每日八点的数据
      */
 // @Scheduled(cron = "*/10 * * * * ?")
-    @Scheduled(cron = "0 17 8 * * ?")
-    @Async
+//    @Scheduled(cron = "0 17 8 * * ?")
+//    @Async
     public void syncSlREightAmData() {
         OsmoticQuerySo osmoticQuerySo = new OsmoticQuerySo();
         DateTimeRangeSo so = new DateTimeRangeSo();
@@ -149,8 +152,8 @@ public class JcskDataTask {
 
                 if (jcskGnssREightAm != null) {
                     // 如果存在最新数据，从最新时间的第二天开始同步
-                    Date latestDate = jcskGnssREightAm.getMstm();
-                    calendar.setTime(latestDate);
+                    LocalDateTime latestDate = jcskGnssREightAm.getMstm();
+                    calendar.setTime(DateTransforUtil.transforLocalDateTimeToDate(latestDate));
                     calendar.add(Calendar.DAY_OF_MONTH, 1); // 加1天
                 } else {
                     // 如果为空，设置同步时间为前一个星期
@@ -176,30 +179,30 @@ public class JcskDataTask {
             syncData.add(osmoticValueVo2s);
         }
 
-        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
-        SimpleDateFormat sdf3 = new SimpleDateFormat("HH:mm");
+        // 使用 DateTimeFormatter 替代 SimpleDateFormat
+        DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        DateTimeFormatter formatter3 = DateTimeFormatter.ofPattern("HH:mm");
 
         if(syncData.size() > 0){
             for (List<JcskSlR> osmoticValueVo2s : syncData) {
                 //筛选出每天每个测点8-9点的数据
                 List<JcskSlR> closestTo8AMList = osmoticValueVo2s.stream()
                         .filter(vo -> {
-                            // 假设OsmoticShiftValueVo2中有getTm方法返回时间字符串
-                            String timeStr = sdf3.format(vo.getMstm());
+                            // 使用 DateTimeFormatter 格式化 LocalDateTime
+                            String timeStr = vo.getMstm().format(formatter3);
                             return timeStr.compareTo("08:00") >= 0 && timeStr.compareTo("09:00") <=0;
                         })
                         .collect(Collectors.groupingBy(vo -> {
                             // 分组键：日期(yyyy-MM-dd) + 测站编码 + 测点编码
-                            // 假设OsmoticShiftValueVo2中有getCd方法返回测点编码
-                            String date = sdf2.format(vo.getMstm());
-                            return date + "_" + vo.getStcd() + "_" + vo.getMpcd();
+                            String date = vo.getMstm().format(formatter2);
+                            return date + "_" + vo.getMpcd();
                         }))
                         .values().stream()
                         .map(group -> group.stream()
                                 .min((vo1, vo2) -> {
-                                    String time1 = sdf3.format(vo1.getMstm());
-                                    String time2 = sdf3.format(vo2.getMstm());
+                                    String time1 = vo1.getMstm().format(formatter3);
+                                    String time2 = vo2.getMstm().format(formatter3);
 
                                     // 计算与08:00的时间差（分钟数）
                                     int diff1 = Math.abs(
@@ -242,9 +245,9 @@ public class JcskDataTask {
     /**
      * 同步渗压每日八点的数据
      */
-     //@Scheduled(cron = "*/10 * * * * ?")
-    @Scheduled(cron = "0 17 8 * * ?")
-    @Async
+//@Scheduled(cron = "*/10 * * * * ?")
+//    @Scheduled(cron = "0 17 8 * * ?")
+//    @Async
     public void syncSyREightAmData() {
         OsmoticQuerySo osmoticQuerySo = new OsmoticQuerySo();
         DateTimeRangeSo so = new DateTimeRangeSo();
@@ -254,6 +257,7 @@ public class JcskDataTask {
         Long count = jcskSyREightAmMapper.selectCount(null);
         List<JcskSyREightAm> saveDatas = new ArrayList<>();
         List<List<JcskSyR>> syncData = new ArrayList<>();
+
         if (count > 0) {
             //增量同步
             //取最新的一个数据的时间
@@ -268,25 +272,20 @@ public class JcskDataTask {
                         .orderByDesc(JcskSyREightAm::getMstm).last("limit 1");
                 JcskSyREightAm jcskGnssREightAm = jcskSyREightAmMapper.selectOne(wrapper);
 
-                Calendar calendar = Calendar.getInstance();
+                LocalDateTime startTime;
 
                 if (jcskGnssREightAm != null) {
                     // 如果存在最新数据，从最新时间的第二天开始同步
-                    Date latestDate = Date.from(jcskGnssREightAm.getMstm().atZone(ZoneId.systemDefault()).toInstant());
-                    calendar.setTime(latestDate);
-                    calendar.add(Calendar.DAY_OF_MONTH, 1); // 加1天
+                    startTime = jcskGnssREightAm.getMstm().plusDays(1); // 加1天
                 } else {
                     // 如果为空，设置同步时间为前一个星期
-                    calendar.add(Calendar.DAY_OF_MONTH, -7); // 减7天
+                    startTime = LocalDateTime.now().minusDays(7); // 减7天
                 }
-                // 设置时间范围为8:00:00开始
-                calendar.set(Calendar.HOUR_OF_DAY, 8);
-                calendar.set(Calendar.MINUTE, 0);
-                calendar.set(Calendar.SECOND, 0);
-                Date start = calendar.getTime();
+                // 设置时间范围为当天的8:00:00开始
+                startTime = startTime.withHour(8).withMinute(0).withSecond(0).withNano(0);
 
-                so.setStart(start);
-                so.setEnd(new Date());
+                so.setStart(DateTransforUtil.transforLocalDateTimeToDate(startTime));
+                so.setEnd(DateTransforUtil.transforLocalDateTimeToDate(LocalDateTime.now()));
                 osmoticQuerySo.setDateTimeRangeSo(so);
                 List<JcskSyR> osmoticValueVo2s = jcskSyRService.getBaseMapper().syncqueryValue(osmoticQuerySo);
                 syncData.add(osmoticValueVo2s);
@@ -297,40 +296,39 @@ public class JcskDataTask {
             List<JcskSyR> osmoticValueVo2s = jcskSyRService.getBaseMapper().syncqueryValue(osmoticQuerySo);
             syncData.add(osmoticValueVo2s);
         }
-        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
-        SimpleDateFormat sdf3 = new SimpleDateFormat("HH:mm");
-        if(syncData.size()>0){
+
+        // 使用DateTimeFormatter替代SimpleDateFormat
+        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm");
+
+        if(!syncData.isEmpty()){
             for (List<JcskSyR> osmoticValueVo2s : syncData) {
                 //筛选出每天每个测点8-9点的数据
                 List<JcskSyR> closestTo8AMList = osmoticValueVo2s.stream()
                         .filter(vo -> {
-                            // 假设OsmoticShiftValueVo2中有getTm方法返回时间字符串
-                            String timeStr = sdf3.format(vo.getMstm());
-                            return timeStr.compareTo("08:00") >= 0 && timeStr.compareTo("09:00") <=0;
+                            // 使用LocalDateTime直接获取小时和分钟
+                            int hour = vo.getMstm().getHour();
+                            int minute = vo.getMstm().getMinute();
+                            // 过滤8:00到9:00之间的数据
+                            return (hour == 8 && minute >= 0) || (hour == 9 && minute == 0);
                         })
                         .collect(Collectors.groupingBy(vo -> {
                             // 分组键：日期(yyyy-MM-dd) + 测站编码 + 测点编码
-                            // 假设OsmoticShiftValueVo2中有getCd方法返回测点编码
-                            String date = sdf2.format(vo.getMstm());
+                            String date = vo.getMstm().format(dateFormatter);
                             return date + "_" + vo.getStcd() + "_" + vo.getMpcd();
                         }))
                         .values().stream()
                         .map(group -> group.stream()
                                 .min((vo1, vo2) -> {
-                                    String time1 = sdf3.format(vo1.getMstm());
-                                    String time2 = sdf3.format(vo2.getMstm());
                                     // 计算与08:00的时间差（分钟数）
                                     int diff1 = Math.abs(
-                                            Integer.parseInt(time1.substring(0, 2)) * 60 +
-                                                    Integer.parseInt(time1.substring(3, 5)) -
-                                                    8 * 60
+                                            vo1.getMstm().getHour() * 60 +
+                                                    vo1.getMstm().getMinute() - 8 * 60
                                     );
 
                                     int diff2 = Math.abs(
-                                            Integer.parseInt(time2.substring(0, 2)) * 60 +
-                                                    Integer.parseInt(time2.substring(3, 5)) -
-                                                    8 * 60
+                                            vo2.getMstm().getHour() * 60 +
+                                                    vo2.getMstm().getMinute() - 8 * 60
                                     );
                                     //获取最接近于八点的数据
                                     return Integer.compare(diff1, diff2);
@@ -344,14 +342,17 @@ public class JcskDataTask {
                 for (JcskSyR data : closestTo8AMList) {
                     JcskSyREightAm entity = new JcskSyREightAm();
                     BeanUtils.copyProperties(data, entity);
-                    LocalDateTime localDateTime = data.getMstm().toInstant()
-                            .atZone(ZoneId.systemDefault())
-                            .toLocalDateTime();
-                    entity.setMstm(localDateTime);
+                    entity.setMstm(data.getMstm()); // 直接设置LocalDateTime
                     saveDatas.add(entity);
                 }
-                if(saveDatas.size()>0){
-                    jcskSyREightAmMapper.insert(saveDatas);
+
+                if(!saveDatas.isEmpty()){
+                    // 批量插入，注意检查MyBatis-Plus是否支持批量插入
+                    for (JcskSyREightAm entity : saveDatas) {
+                        jcskSyREightAmMapper.insert(entity);
+                    }
+                    // 或者使用批量插入方法（如果配置了）
+                    // jcskSyREightAmMapper.insertBatch(saveDatas);
                 }
                 saveDatas.clear();
             }
@@ -363,9 +364,10 @@ public class JcskDataTask {
     /**
      * 同步位移监测每天最接近八点的数据
      */
-    @Scheduled(cron = "0 17 8 * * ?")
+
     //@Scheduled(cron = "*/30 * * * * ?")
-    @Async
+//    @Async
+//    @Scheduled(cron = "0 17 8 * * ?")
     public void syncGnssREightAmData() {
         OsmoticQuerySo osmoticQuerySo = new OsmoticQuerySo();
         DateTimeRangeSo so = new DateTimeRangeSo();
diff --git a/src/main/resources/mapper/StPptnRHMapper.xml b/src/main/resources/mapper/StPptnRHMapper.xml
index ac6fee2..b949558 100644
--- a/src/main/resources/mapper/StPptnRHMapper.xml
+++ b/src/main/resources/mapper/StPptnRHMapper.xml
@@ -8,7 +8,7 @@
         order by tm asc
     </select>
 
-    <select id="queryRzList" resultType="com.gunshi.project.hsz.entity.vo.StRzVo">
+    <select id="queryRzList" resultType="com.gunshi.project.hsz.common.model.vo.StRzVo">
         select tm,rz from public.st_rsvr_r where tm <![CDATA[>=]]> #{start} and tm <![CDATA[<]]> #{end}
         and stcd = (select stcd from public.att_res_base where res_code = '42118130001')
         order by tm asc