From f871f315d5a5b016ec6eb8f33e368ef5ba117dd7 Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Fri, 4 Nov 2022 17:09:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=BF=85=E5=A1=AB=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=90=8E=EF=BC=8C=E9=9C=80=E8=A6=81=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=20device=5Finfo=20=E8=A1=A8=E7=9A=84=20latest=5Freporting=5Fti?=
 =?UTF-8?q?me=20=E5=B1=9E=E6=80=A7=E3=80=82=E5=88=A0=E9=99=A4=20device=5Fd?=
 =?UTF-8?q?ata=20=E4=B8=AD=E5=AF=B9=E5=BA=94=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhdbaqapi/mapper/DeviceDataMapper.java    |  2 +
 .../zhdbaqapi/service/IDeviceInfoService.java |  2 +-
 .../service/impl/DeviceDataServiceImpl.java   |  2 +-
 .../service/impl/DeviceInfoServiceimpl.java   | 56 +++++++++++++++++--
 .../resources/mapper/DeviceDataMapper.xml     |  3 +
 .../resources/mapper/DeviceInfoMapper.xml     |  2 +-
 6 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/whdc/zhdbaqapi/mapper/DeviceDataMapper.java b/src/main/java/com/whdc/zhdbaqapi/mapper/DeviceDataMapper.java
index 69d1130..3cb5185 100644
--- a/src/main/java/com/whdc/zhdbaqapi/mapper/DeviceDataMapper.java
+++ b/src/main/java/com/whdc/zhdbaqapi/mapper/DeviceDataMapper.java
@@ -21,4 +21,6 @@ public interface DeviceDataMapper extends BaseMapper<DeviceData> {
      * @return
      */
     IPage<DeviceData> page(@Param("page") IPage<SysUser> page, @Param("obj") FindDeviceDto findDto);
+
+    void clearByDeviceId(@Param("deviceId") String deviceId, @Param("channelNum") Integer channelNum);
 }
diff --git a/src/main/java/com/whdc/zhdbaqapi/service/IDeviceInfoService.java b/src/main/java/com/whdc/zhdbaqapi/service/IDeviceInfoService.java
index 3c67d13..29d6296 100644
--- a/src/main/java/com/whdc/zhdbaqapi/service/IDeviceInfoService.java
+++ b/src/main/java/com/whdc/zhdbaqapi/service/IDeviceInfoService.java
@@ -33,7 +33,7 @@ public interface IDeviceInfoService extends IService<DeviceInfo> {
     List<DeviceInfo> list(String stationCode);
 
     List<DeviceInfo> listAll();
-
+    boolean updateByIdInternal(DeviceInfo entity);
     /**
      * 分页查询
      *
diff --git a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java
index 57d4ea7..50cef1d 100644
--- a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java
@@ -167,7 +167,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
                         cnt += 1;
 
                         di.setLatestReportingTime(dd.getTimestamp());
-                        iDeviceInfoService.updateById(di);
+                        iDeviceInfoService.updateByIdInternal(di);
                         changeDi = true;
                     }
                 } catch (Exception e) {
diff --git a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceInfoServiceimpl.java b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceInfoServiceimpl.java
index 4364ba4..ad405ad 100644
--- a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceInfoServiceimpl.java
+++ b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceInfoServiceimpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.whdc.zhdbaqapi.constant.Constants;
 import com.whdc.zhdbaqapi.exception.MyException;
+import com.whdc.zhdbaqapi.mapper.DeviceDataMapper;
 import com.whdc.zhdbaqapi.mapper.DeviceInfoMapper;
 import com.whdc.zhdbaqapi.model.dto.FindDeviceDto;
 import com.whdc.zhdbaqapi.model.entity.DeviceInfo;
@@ -22,6 +23,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.InputStream;
 import java.io.Serializable;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -32,6 +35,18 @@ import java.util.*;
 public class DeviceInfoServiceimpl extends ServiceImpl<DeviceInfoMapper, DeviceInfo> implements IDeviceInfoService {
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
+    @Autowired
+    private DeviceDataMapper deviceDataMapper;
+
+    private static long defaultTimeStamp;
+
+    static {
+        try {
+            defaultTimeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2022-07-01 00:00:00").getTime();
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     @Override
     public DeviceInfo get(Integer id) {
@@ -55,10 +70,43 @@ public class DeviceInfoServiceimpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @CacheEvict(Constants.CACHE_NAME)
     public boolean updateById(DeviceInfo entity) {
         DeviceInfo old = baseMapper.checkValidStationCode(entity.getStationCode());
+        if (old == null) {
+            throw new MyException("stationCode=" + entity.getStationCode() + " 没有找到");
+        }
         if (old != null && !old.getId().equals(entity.getId())) {
             throw new MyException("stationCode=" + entity.getStationCode() + " 已被其他有效数据使用，不能恢复");
         }
         entity.setModificationTime(new Date());
+        System.out.println("==============================");
+        System.out.println(old.getChannelNum());
+        System.out.println(entity.getChannelNum());
+        System.out.println("==============================");
+        if (
+                !old.getChannelNum().equals(entity.getChannelNum())
+                        || !old.getStationCode().equals(entity.getStationCode())
+                        || !old.getInitialReading().equals(entity.getInitialReading())
+                        || !old.getStartTemperature().equals(entity.getStartTemperature())
+                        || !old.getCalibrationCoefficient().equals(entity.getCalibrationCoefficient())
+                        || !old.getTemperatureK().equals(entity.getTemperatureK())
+                        || !old.getDeviceId().equals(entity.getDeviceId())
+                        || !old.getDistFromOsmosisMeterToBottom().equals(entity.getDistFromOsmosisMeterToBottom())
+                        || !old.getEmbeddingElevation().equals(entity.getEmbeddingElevation())
+        ) {
+            entity.setLatestReportingTime(new Date(defaultTimeStamp));
+            deviceDataMapper.clearByDeviceId(entity.getDeviceId(), entity.getChannelNum());
+        }
+        return super.updateById(entity);
+    }
+
+    @Override
+    @CacheEvict(Constants.CACHE_NAME)
+    public boolean updateByIdInternal(DeviceInfo entity) {
+        DeviceInfo old = baseMapper.checkValidStationCode(entity.getStationCode());
+        if (old != null && !old.getId().equals(entity.getId())) {
+            throw new MyException("stationCode=" + entity.getStationCode() + " 已被其他有效数据使用，不能恢复");
+        }
+        entity.setModificationTime(new Date());
+
         return super.updateById(entity);
     }
 
@@ -116,10 +164,10 @@ public class DeviceInfoServiceimpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 return new DeviceInfoImpVo().setLoad(0).setSuccess(0).setFail(0).setMsg("没有读取有有效数据");
             }
 
-            List<DeviceInfo>        err     = new ArrayList<>();
-            List<DeviceInfo>        impList = new ArrayList<>();
-            Set<String>             scs     = new HashSet<>();
-            Map<String, DeviceInfo> chkMap  = new HashMap<>();
+            List<DeviceInfo> err = new ArrayList<>();
+            List<DeviceInfo> impList = new ArrayList<>();
+            Set<String> scs = new HashSet<>();
+            Map<String, DeviceInfo> chkMap = new HashMap<>();
 
             for (DeviceInfo di : list) {
                 if (StringUtils.isBlank(di.getStationCode())) {
diff --git a/src/main/resources/mapper/DeviceDataMapper.xml b/src/main/resources/mapper/DeviceDataMapper.xml
index cc18fe4..547fbb5 100644
--- a/src/main/resources/mapper/DeviceDataMapper.xml
+++ b/src/main/resources/mapper/DeviceDataMapper.xml
@@ -22,4 +22,7 @@
         ORDER BY D.TIMESTAMP DESC
     </select>
 
+    <delete id="clearByDeviceId">
+        delete from dam_safe.device_data where device_id=#{deviceId} and channel_num=#{channelNum}
+    </delete>
 </mapper>
diff --git a/src/main/resources/mapper/DeviceInfoMapper.xml b/src/main/resources/mapper/DeviceInfoMapper.xml
index e96a96a..c35477c 100644
--- a/src/main/resources/mapper/DeviceInfoMapper.xml
+++ b/src/main/resources/mapper/DeviceInfoMapper.xml
@@ -57,7 +57,7 @@
     </select>
 
     <select id="checkValidStationCode" resultType="com.whdc.zhdbaqapi.model.entity.DeviceInfo">
-        SELECT ID, STATION_CODE FROM DEVICE_INFO
+        SELECT * FROM DEVICE_INFO
         WHERE DEL = 0
         AND STATION_CODE = #{stationCode}
         LIMIT 1