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 maxH.doubleValue()) { Q = new BigDecimal(1343).multiply(BigDecimal.valueOf(Math.pow(maxH.doubleValue(), 2.47))); @@ -167,7 +166,6 @@ public class DeviceSLDataServiceImpl extends ServiceImpl 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