|
|
@@ -2,6 +2,7 @@ package com.huimv.admin.jinghongtimer;
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.huimv.admin.entity.EnergyData;
|
|
|
import com.huimv.admin.entity.ProtData;
|
|
|
import com.huimv.admin.jinghongtimer.Vo.JinghongWater;
|
|
|
@@ -34,9 +35,10 @@ public class ProtTimer {
|
|
|
@Autowired
|
|
|
private EnergyDataMapper energyDataMapper;
|
|
|
|
|
|
- @Scheduled(cron = "0 0/10 * * * ? ")
|
|
|
+
|
|
|
// @Scheduled(cron = "0 * * * * ? ")
|
|
|
// @GetMapping("/test3")
|
|
|
+ @Scheduled(cron = "0 0/10 * * * ? ")
|
|
|
public void action(){
|
|
|
String url = "http://139.9.172.209:8085/getFlow"; // 更好的做法是从配置中读取这个URL
|
|
|
try {
|
|
|
@@ -59,6 +61,7 @@ public class ProtTimer {
|
|
|
}else {
|
|
|
protData.setLoctionType(1);
|
|
|
}
|
|
|
+
|
|
|
if("865661077850256".equals(jinghongWater.getDeviceId())){
|
|
|
protData.setFlow(String.format("%.2f",Double.parseDouble(jinghongWater.getValueA()) * 0.01));
|
|
|
QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
|
|
|
@@ -66,13 +69,16 @@ public class ProtTimer {
|
|
|
EnergyData energyData = energyDataMapper.selectOne(queryWrapper);
|
|
|
EnergyData energyData1 = new EnergyData();
|
|
|
String waterValue = energyData.getOriginalWaterValue();
|
|
|
+ if(StringUtils.isBlank(waterValue)){
|
|
|
+ waterValue = jinghongWater.getValueA();
|
|
|
+ }
|
|
|
energyData1.setUnitName("潞水基地一层2单元");
|
|
|
energyData1.setUnitId(162);
|
|
|
energyData1.setFarmId(30);
|
|
|
energyData1.setDisplayType(0);
|
|
|
energyData1.setCreateDate(new Date());
|
|
|
energyData1.setElectricityValue("0");
|
|
|
- energyData1.setOriginalFeedValue(jinghongWater.getValueA());
|
|
|
+ energyData1.setOriginalWaterValue(jinghongWater.getValueA());
|
|
|
energyData1.setFeedValue("0");
|
|
|
energyData1.setGasValue("0");
|
|
|
if (ObjectUtil.isNotEmpty(energyData)) {
|
