admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
guoshengxiong 2024-05-18 11:09:58 +08:00
commit 4abcf1d793
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zhgd/xmgl/task/ElectricalTask.java
View File

@ -91,9 +91,9 @@ public class ElectricalTask {
} }
/** /**
* 获取电箱情况 每5分钟触发任务 0 30 * * * ? * 获取电箱情况 每5分钟触发任务
*/ */
@Scheduled(cron = "0 0/1 * * * ?") @Scheduled(cron = "0 30 * * * ?")
@RequestMapping("/xmgl/task/getElectricData") @RequestMapping("/xmgl/task/getElectricData")
public void getElectricData() { public void getElectricData() {
log.info("获取设备数据 每1分钟触发任务"); log.info("获取设备数据 每1分钟触发任务");
@ -140,12 +140,13 @@ public class ElectricalTask {
log.info("电箱实时数据" + execute.body()); log.info("电箱实时数据" + execute.body());
JSONObject result = JSONObject.parseObject(execute.body()).getJSONObject("result"); JSONObject result = JSONObject.parseObject(execute.body()).getJSONObject("result");
JSONObject metric = result.getJSONObject("metric"); JSONObject metric = result.getJSONObject("metric");
String temperatures = result.getJSONArray("temperatures").getJSONObject(0).getString("temperature");
ElectricalData electricalData = new ElectricalData(devId, metric.getString("modified"), metric.getString("voltage_a"), ElectricalData electricalData = new ElectricalData(devId, metric.getString("modified"), metric.getString("voltage_a"),
metric.getString("voltage_b"), metric.getString("voltage_b"),
metric.getString("voltage_c"), metric.getString("current_a"), metric.getString("current_b"), metric.getString("current_c"), metric.getString("voltage_c"), metric.getString("current_a"), metric.getString("current_b"), metric.getString("current_c"),
result.getJSONArray("leakages").getJSONObject(0).getString("leakage"), result.getJSONArray("leakages").getJSONObject(0).getString("leakage"),
"0", "0", "0", temperatures, temperatures, temperatures,
result.getJSONArray("temperatures").getJSONObject(0).getString("temperature")); temperatures);
electricalDataService.saveElectricalData(electricalData); electricalDataService.saveElectricalData(electricalData);
return true; return true;
} }