From a06b269f362353f6fd08e29e020a4684270b2a89 Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Tue, 18 Nov 2025 17:57:22 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3BUG=202=EF=BC=9A=E5=B0=86=E6=96=B9=E7=A8=8B=E5=BC=8F?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=85=88=E5=88=A0=E9=99=A4=E5=90=8E=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/hsz/common/mapper/JcskSyRMapper.java |  4 ++--
 .../waterLevel/SyncRiverWaterLevelService.java   |  1 +
 .../waterLevel/SyncRsvrWaterLevelService.java    |  1 +
 .../hsz/service/AttDamProfileService.java        |  2 --
 .../project/hsz/service/JcskSyRService.java      | 16 ++++++++++++++++
 5 files changed, 20 insertions(+), 4 deletions(-)

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 fc8fa30..235f47a 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
@@ -106,9 +106,9 @@ public interface JcskSyRMapper extends BaseMapper<JcskSyR> {
 
     @Select("""
             <script>
-                select to_char((t.tm - INTERVAL '5 minutes'),'YYYY-MM-DD HH24:MI:SS') as tm,t.rz
+                select to_char(t.tm,'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'
+                where t.stcd = #{stcd} and to_char(t.tm, 'MI:SS') = '00:00'
                 <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
                     and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
                 </if>  
diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRiverWaterLevelService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRiverWaterLevelService.java
index dc3ead9..6008b02 100644
--- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRiverWaterLevelService.java
+++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRiverWaterLevelService.java
@@ -109,6 +109,7 @@ public class SyncRiverWaterLevelService implements SyncTableRService<JcskStRsvrR
             if (existingTarget == null) {
                 StRiverR targetEntity = new StRiverR();
                 BeanUtils.copyProperties(sourceEntity, targetEntity);
+                targetEntity.setTm(LocalDateTimeConverter.toDate(sourceEntity.getTm()));
                 targetEntity.setZ(sourceEntity.getRz());
                 targetEntity.setWptn(sourceEntity.getRwptn());
                 targetMapper.insert(targetEntity);
diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRsvrWaterLevelService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRsvrWaterLevelService.java
index 3cc8708..f5feaf6 100644
--- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRsvrWaterLevelService.java
+++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRsvrWaterLevelService.java
@@ -104,6 +104,7 @@ public class SyncRsvrWaterLevelService implements SyncTableRService<JcskStRsvrR,
             if (existingTarget == null) {
                 StRsvrR targetEntity = new StRsvrR();
                 BeanUtils.copyProperties(sourceEntity, targetEntity);
+                targetEntity.setTm(LocalDateTimeConverter.toDate(sourceEntity.getTm()));
                 targetMapper.insert(targetEntity);
             }
             count++;
diff --git a/src/main/java/com/gunshi/project/hsz/service/AttDamProfileService.java b/src/main/java/com/gunshi/project/hsz/service/AttDamProfileService.java
index 234fa12..4169fb0 100644
--- a/src/main/java/com/gunshi/project/hsz/service/AttDamProfileService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/AttDamProfileService.java
@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gunshi.project.hsz.entity.vo.ProfilePressTreeVo;
 import com.gunshi.project.hsz.mapper.AttDamProfileMapper;
 import com.gunshi.project.hsz.model.AttDamProfile;
-import com.gunshi.project.hsz.model.OsmoticPressDevice;
-import com.gunshi.project.hsz.model.OsmoticPressDeviceAutoDao;
 import com.gunshi.project.hsz.util.MyBeanUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
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 9d7e0f9..7fa39d3 100644
--- a/src/main/java/com/gunshi/project/hsz/service/JcskSyRService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/JcskSyRService.java
@@ -862,6 +862,10 @@ public class JcskSyRService extends ServiceImpl<JcskSyRMapper, JcskSyR> {
         RegressionEquation first = RegressionAnalysis.calculateLinear(data);
         LocalDateTime createTime = LocalDateTime.now();
         if(first != null){
+            LambdaQueryWrapper<SyRegressionData> query = new LambdaQueryWrapper<>();
+            query.eq(SyRegressionData::getDvcd, dto.getDvcd());
+            query.eq(SyRegressionData::getOrder,1);
+            syRegressionDataService.remove(query);
             res.setOne(first.toString());
             SyRegressionData syRegressionData = new SyRegressionData();
             syRegressionData.setOrder(1);
@@ -874,6 +878,10 @@ public class JcskSyRService extends ServiceImpl<JcskSyRMapper, JcskSyR> {
         }
         RegressionEquation second = RegressionAnalysis.calculateQuadratic(data);
         if(second != null){
+            LambdaQueryWrapper<SyRegressionData> query = new LambdaQueryWrapper<>();
+            query.eq(SyRegressionData::getDvcd, dto.getDvcd());
+            query.eq(SyRegressionData::getOrder,2);
+            syRegressionDataService.remove(query);
             res.setTwo(second.toString());
             SyRegressionData syRegressionData = new SyRegressionData();
             syRegressionData.setOrder(2);
@@ -886,6 +894,10 @@ public class JcskSyRService extends ServiceImpl<JcskSyRMapper, JcskSyR> {
         }
         RegressionEquation three = RegressionAnalysis.calculateCubic(data);
         if(three != null){
+            LambdaQueryWrapper<SyRegressionData> query = new LambdaQueryWrapper<>();
+            query.eq(SyRegressionData::getDvcd, dto.getDvcd());
+            query.eq(SyRegressionData::getOrder,3);
+            syRegressionDataService.remove(query);
             res.setThree(three.toString());
             SyRegressionData syRegressionData = new SyRegressionData();
             syRegressionData.setOrder(3);
@@ -898,6 +910,10 @@ public class JcskSyRService extends ServiceImpl<JcskSyRMapper, JcskSyR> {
         }
         RegressionEquation four = RegressionAnalysis.calculateQuartic(data);
         if(four != null){
+            LambdaQueryWrapper<SyRegressionData> query = new LambdaQueryWrapper<>();
+            query.eq(SyRegressionData::getDvcd, dto.getDvcd());
+            query.eq(SyRegressionData::getOrder,4);
+            syRegressionDataService.remove(query);
             res.setFour(four.toString());
             SyRegressionData syRegressionData = new SyRegressionData();
             syRegressionData.setOrder(4);