From 0ef16c7afa0517de80222e5ef1bf9710862fb266 Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Tue, 29 Nov 2022 17:16:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B8=97=E6=B5=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=85=AC=E5=BC=8F=E8=AE=A1=E7=AE=97=E7=9A=84=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhdbaqapi/component/ScheduledTask.java     |  6 +++---
 .../zhdbaqapi/model/entity/DeviceSLData.java   |  2 +-
 .../service/impl/DeviceSLDataServiceImpl.java  |  8 +++-----
 .../service/impl/DeviceSLInfoServiceimpl.java  | 18 ++++++++----------
 src/main/resources/application.yml             |  5 +++--
 ...viceSLMapper.xml => DeviceSLInfoMapper.xml} |  0
 6 files changed, 18 insertions(+), 21 deletions(-)
 rename src/main/resources/mapper/{DeviceSLMapper.xml => DeviceSLInfoMapper.xml} (100%)

diff --git a/src/main/java/com/whdc/zhdbaqapi/component/ScheduledTask.java b/src/main/java/com/whdc/zhdbaqapi/component/ScheduledTask.java
index b956dbd..86ec50c 100644
--- a/src/main/java/com/whdc/zhdbaqapi/component/ScheduledTask.java
+++ b/src/main/java/com/whdc/zhdbaqapi/component/ScheduledTask.java
@@ -22,9 +22,9 @@ public class ScheduledTask {
         String OS = System.getProperty("os.name").toLowerCase();
 
         // 简单粗暴的判断，在 linux 环境下运行时，为生成环境
-        if (OS.contains("linux")) {
-            iDeviceDataService.syncData();
+//        if (OS.contains("linux")) {
+//            iDeviceDataService.syncData();
             iDeviceSLDataService.syncData();
-        }
+//        }
     }
 }
diff --git a/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceSLData.java b/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceSLData.java
index 39ae75d..d6f9fe4 100644
--- a/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceSLData.java
+++ b/src/main/java/com/whdc/zhdbaqapi/model/entity/DeviceSLData.java
@@ -39,7 +39,7 @@ public class DeviceSLData {
      */
     @ApiParam(value = "堰上水头")
     @ApiModelProperty(value = "堰上水头", dataType = "java.math.BigDecimal")
-    @TableField("DATA")
+    @TableField("L")
     private BigDecimal l;
 
     /**
diff --git a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceSLDataServiceImpl.java b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceSLDataServiceImpl.java
index 18518e9..7d5971b 100644
--- a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceSLDataServiceImpl.java
+++ b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceSLDataServiceImpl.java
@@ -127,7 +127,6 @@ public class DeviceSLDataServiceImpl extends ServiceImpl<DeviceSLDataMapper, Dev
                             .setDataA(record.getDataA())
                             .setDataB(record.getDataB())
                             .setDataC(record.getDataC());
-
                     String formula = di.getFormula();
                     BigDecimal R0 = di.getReading0();// initialReading 初始读数
                     BigDecimal R1 = record.getDataC();// initialReading 初始读数
@@ -150,15 +149,15 @@ public class DeviceSLDataServiceImpl extends ServiceImpl<DeviceSLDataMapper, Dev
                         } else {
                             L = null;
                         }
-
                         dd.setL(L);
 
                         BigDecimal Q; //单位L/s
                         //Q=1343∗H^2.47
                         //H=h+P
                         BigDecimal P = di.getZeroPointHeight();//单位mm
-                        BigDecimal h = L; //单位m?
-                        BigDecimal H = h.add(P); //单位m
+                        BigDecimal h = L; //单位mm
+                        BigDecimal H = h.add(P); //单位mm
+                        H = H.divide(BigDecimal.valueOf(1000)); //单位m
                         BigDecimal maxH = di.getMaxH(); //单位m
                         if (H.doubleValue() > maxH.doubleValue()) {
                             Q = new BigDecimal(1343).multiply(BigDecimal.valueOf(Math.pow(maxH.doubleValue(), 2.47)));
@@ -167,7 +166,6 @@ public class DeviceSLDataServiceImpl extends ServiceImpl<DeviceSLDataMapper, Dev
                         }
                         dd.setQ(Q);
                     }
-
                     if (super.save(dd)) {
                         cnt += 1;
 
diff --git a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceSLInfoServiceimpl.java b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceSLInfoServiceimpl.java
index 5aab564..6ab0f58 100644
--- a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceSLInfoServiceimpl.java
+++ b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceSLInfoServiceimpl.java
@@ -9,16 +9,14 @@ import com.whdc.zhdbaqapi.exception.MyException;
 import com.whdc.zhdbaqapi.mapper.DeviceDataMapper;
 import com.whdc.zhdbaqapi.mapper.DeviceSLInfoMapper;
 import com.whdc.zhdbaqapi.model.dto.FindDeviceDto;
-import com.whdc.zhdbaqapi.model.entity.DeviceInfo;
 import com.whdc.zhdbaqapi.model.entity.DeviceSLInfo;
-import com.whdc.zhdbaqapi.model.vo.DeviceInfoImpVo;
 import com.whdc.zhdbaqapi.model.vo.DeviceSLInfoImpVo;
 import com.whdc.zhdbaqapi.service.IDeviceSLInfoService;
 import com.whdc.zhdbaqapi.utils.DataUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
+//import org.springframework.cache.annotation.CacheEvict;
+//import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -58,7 +56,7 @@ public class DeviceSLInfoServiceimpl extends ServiceImpl<DeviceSLInfoMapper, Dev
     }
 
     @Override
-    @CacheEvict(Constants.CACHE_NAME)
+//    @CacheEvict(Constants.CACHE_NAME)
     public boolean save(DeviceSLInfo entity) {
         if (baseMapper.checkValidStationCode(entity.getStationCode()) != null) {
             throw new MyException("stationCode=" + entity.getStationCode() + " 已被其他有效数据使用，不能恢复");
@@ -69,7 +67,7 @@ public class DeviceSLInfoServiceimpl extends ServiceImpl<DeviceSLInfoMapper, Dev
     }
 
     @Override
-    @CacheEvict(Constants.CACHE_NAME)
+//    @CacheEvict(Constants.CACHE_NAME)
     public boolean updateById(DeviceSLInfo entity) {
         DeviceSLInfo old = baseMapper.checkValidStationCode(entity.getStationCode());
         if (old == null) {
@@ -96,7 +94,7 @@ public class DeviceSLInfoServiceimpl extends ServiceImpl<DeviceSLInfoMapper, Dev
     }
 
     @Override
-    @CacheEvict(Constants.CACHE_NAME)
+//    @CacheEvict(Constants.CACHE_NAME)
     public boolean updateByIdInternal(DeviceSLInfo entity) {
         DeviceSLInfo old = baseMapper.checkValidStationCode(entity.getStationCode());
         if (old != null && !old.getId().equals(entity.getId())) {
@@ -108,7 +106,7 @@ public class DeviceSLInfoServiceimpl extends ServiceImpl<DeviceSLInfoMapper, Dev
     }
 
     @Override
-    @CacheEvict(Constants.CACHE_NAME)
+//    @CacheEvict(Constants.CACHE_NAME)
     public boolean removeById(Serializable id) {
         DeviceSLInfo entity = baseMapper.selectById(id);
         entity.setDel(1);
@@ -116,7 +114,7 @@ public class DeviceSLInfoServiceimpl extends ServiceImpl<DeviceSLInfoMapper, Dev
     }
 
     @Override
-    @CacheEvict(Constants.CACHE_NAME)
+//    @CacheEvict(Constants.CACHE_NAME)
     public boolean restore(Integer id) {
         DeviceSLInfo entity = baseMapper.selectById(id);
 
@@ -138,7 +136,7 @@ public class DeviceSLInfoServiceimpl extends ServiceImpl<DeviceSLInfoMapper, Dev
     }
 
     @Override
-    @Cacheable(Constants.CACHE_NAME)
+//    @Cacheable(Constants.CACHE_NAME)
     public List<DeviceSLInfo> listAll() {
         return baseMapper.listAll();
     }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6a8ab18..97e0709 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -6,7 +6,8 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: dm.jdbc.driver.DmDriver
-    url: jdbc:dm://120.76.31.37:5236/DAM_SAFE?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+    # url: jdbc:dm://120.76.31.37:5236/DAM_SAFE?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+    url: jdbc:dm://172.20.1.100:5236/DAM_SAFE?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
     username: DAM_SAFE
     password: Dam_safe_890
     druid:
@@ -79,7 +80,7 @@ sa-token:
   is-log: false
 
 # 大坝安全监测数据获取接口
-cklat_data_api: http://localhost:8008/api/v1/devices/records
+cklat_data_api: http://172.20.1.202:8008/api/v1/devices/records
 
 # 渗压换算管内水位系数
 o_z_modulus: 0.10197
diff --git a/src/main/resources/mapper/DeviceSLMapper.xml b/src/main/resources/mapper/DeviceSLInfoMapper.xml
similarity index 100%
rename from src/main/resources/mapper/DeviceSLMapper.xml
rename to src/main/resources/mapper/DeviceSLInfoMapper.xml