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

bug修复

Browse Source
This commit is contained in:
guo 2024-01-30 14:43:36 +08:00
parent c2d5c23a62
commit f229c20acd
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zhgd.xmgl.modules.electrical.entity.ElectricalData; import com.zhgd.xmgl.modules.electrical.entity.ElectricalData;
import com.zhgd.xmgl.modules.electrical.entity.ElectricalDev; import com.zhgd.xmgl.modules.electrical.entity.ElectricalDev;
import com.zhgd.xmgl.modules.electrical.mapper.ElectricalDataMapper; import com.zhgd.xmgl.modules.electrical.mapper.ElectricalDataMapper;
import com.zhgd.xmgl.modules.electrical.mapper.ElectricalDevMapper;
import com.zhgd.xmgl.modules.electrical.service.IElectricAlarmService;
import com.zhgd.xmgl.modules.electrical.service.IElectricalDataService; import com.zhgd.xmgl.modules.electrical.service.IElectricalDataService;
import com.zhgd.xmgl.modules.electrical.service.IElectricalDevService; import com.zhgd.xmgl.modules.electrical.service.IElectricalDevService;
import com.zhgd.xmgl.modules.project.entity.Project; import com.zhgd.xmgl.modules.project.entity.Project;
@ -14,6 +16,7 @@ import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
import com.zhgd.xmgl.util.XiwonUtil; import com.zhgd.xmgl.util.XiwonUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.javacrumbs.shedlock.core.SchedulerLock; import net.javacrumbs.shedlock.core.SchedulerLock;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -21,6 +24,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -43,7 +47,10 @@ public class ElectricalTask {
private ElectricalDataMapper electricalDataMapper; private ElectricalDataMapper electricalDataMapper;
@Resource @Resource
private ProjectMapper projectMapper; private ProjectMapper projectMapper;
@Autowired
private IElectricAlarmService electricAlarmService;
@Autowired
private ElectricalDevMapper electricalDevMapper;
@Resource @Resource
private IElectricalDevService electricalDevService; private IElectricalDevService electricalDevService;
@ -98,6 +105,10 @@ public class ElectricalTask {
Integer code = realTimeData.getInteger("code"); Integer code = realTimeData.getInteger("code");
// code校验是否成功请求 // code校验是否成功请求
if (code == HttpStatus.OK.value()) { if (code == HttpStatus.OK.value()) {
ElectricalDev tempElectricalDev = new ElectricalDev();
tempElectricalDev.setId(dev.getId());
tempElectricalDev.setRealTime(new Date());
electricalDevMapper.updateById(tempElectricalDev);
JSONArray dataArray = realTimeData.getJSONArray("data"); JSONArray dataArray = realTimeData.getJSONArray("data");
if (CollUtil.isNotEmpty(dataArray)) { if (CollUtil.isNotEmpty(dataArray)) {
// 解析请求到的参数，保存到我们的数据库 // 解析请求到的参数，保存到我们的数据库
@ -107,6 +118,8 @@ public class ElectricalTask {
data.getString("leakage"), data.getString("temperatureA"), data.getString("temperatureB"), data.getString("temperatureC"), data.getString("temperatureD")); data.getString("leakage"), data.getString("temperatureA"), data.getString("temperatureB"), data.getString("temperatureC"), data.getString("temperatureD"));
electricalData.setXiewenId(data.getLong("id")); electricalData.setXiewenId(data.getLong("id"));
electricalDataService.saveElectricalData(electricalData); electricalDataService.saveElectricalData(electricalData);
electricAlarmService.addAlarm(electricalData, dev);
} else { } else {
log.error("设备sn：{}，当前无数据！", devSn); log.error("设备sn：{}，当前无数据！", devSn);
} }