xzzn/emsback
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正部分参数

Browse Source
This commit is contained in:
dashixiong
2025-06-30 21:38:17 +08:00
parent 62e4608a7a
commit 790e4ca716
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java
View File

@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.TypeReference; import com.alibaba.fastjson2.TypeReference;
import com.xzzn.common.enums.*;
import com.xzzn.common.utils.DateUtils; import com.xzzn.common.utils.DateUtils;
import com.xzzn.common.utils.StringUtils; import com.xzzn.common.utils.StringUtils;
import com.xzzn.ems.domain.*; import com.xzzn.ems.domain.*;
@ -188,9 +189,9 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
data.setTotalDischargeEnergy(BigDecimal.ZERO); data.setTotalDischargeEnergy(BigDecimal.ZERO);
// 其他非 BigDecimal 字段 // 其他非 BigDecimal 字段
data.setWorkStatus("1"); // 或其他默认值 data.setWorkStatus(WorkStatus.NORMAL.getCode()); // 或其他默认值
data.setPcsCommunicationStatus("1"); data.setPcsCommunicationStatus(CommunicationStatus.OK.getCode());
data.setEmsCommunicationStatus("1"); data.setEmsCommunicationStatus(CommunicationStatus.OK.getCode());
data.setCreateBy("system"); data.setCreateBy("system");
data.setCreateTime(DateUtils.getNowDate()); data.setCreateTime(DateUtils.getNowDate());
data.setUpdateBy("system"); data.setUpdateBy("system");
@ -247,9 +248,9 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
dataStack.setTotalDischargeEnergy(BigDecimal.ZERO); dataStack.setTotalDischargeEnergy(BigDecimal.ZERO);
// 其他非 BigDecimal 字段 // 其他非 BigDecimal 字段
dataStack.setWorkStatus("1"); // 或其他默认值 dataStack.setWorkStatus(WorkStatus.NORMAL.getCode()); // 或其他默认值
dataStack.setPcsCommunicationStatus("1"); dataStack.setPcsCommunicationStatus(CommunicationStatus.OK.getCode());
dataStack.setEmsCommunicationStatus("1"); dataStack.setEmsCommunicationStatus(CommunicationStatus.OK.getCode());
dataStack.setCreateBy("system"); dataStack.setCreateBy("system");
dataStack.setCreateTime(DateUtils.getNowDate()); dataStack.setCreateTime(DateUtils.getNowDate());
dataStack.setUpdateBy("system"); dataStack.setUpdateBy("system");
@ -307,10 +308,10 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
EmsPcsData pcsData = new EmsPcsData(); EmsPcsData pcsData = new EmsPcsData();
// 时间与状态类字段 // 时间与状态类字段
pcsData.setDataUpdateTime(new Date()); pcsData.setDataUpdateTime(new Date());
pcsData.setWorkStatus("A"); pcsData.setWorkStatus(WorkStatus.NORMAL.getCode());
pcsData.setGridStatus("B"); pcsData.setGridStatus(GridStatus.GRID.getCode());
pcsData.setDeviceStatus("C"); pcsData.setDeviceStatus(DeviceStatus.ONLINE.getCode());
pcsData.setControlMode("D"); pcsData.setControlMode(ControlModeStatus.REMOTE.getCode());
// 功率与能量类字段 // 功率与能量类字段
pcsData.setTotalActivePower(BigDecimal.ZERO); pcsData.setTotalActivePower(BigDecimal.ZERO);
@ -338,11 +339,11 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
pcsData.setAcFrequency(BigDecimal.ZERO); pcsData.setAcFrequency(BigDecimal.ZERO);
// 状态指示类 // 状态指示类
pcsData.setBranchStatus("A"); pcsData.setBranchStatus(BranchStatus.NORMAL.getCode());
pcsData.setDischargeStatus("A"); pcsData.setDischargeStatus(ChargeStatus.CHARGING.getCode());
pcsData.setAcSwitchStatus("A"); pcsData.setAcSwitchStatus(SwitchStatus.CLOSED.getCode());
pcsData.setDcSwitchStatus("A"); pcsData.setDcSwitchStatus(SwitchStatus.CLOSED.getCode());
pcsData.setRemoteControlStatus("A"); pcsData.setRemoteControlStatus(ControlModeStatus.REMOTE.getCode());
// 直流参数 // 直流参数
pcsData.setDcVoltage(BigDecimal.ZERO); pcsData.setDcVoltage(BigDecimal.ZERO);
@ -359,8 +360,6 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
pcsData.setDateMonth(DateUtils.getNowMonthLong()); pcsData.setDateMonth(DateUtils.getNowMonthLong());
pcsData.setDateDay(DateUtils.getNowDayLong()); pcsData.setDateDay(DateUtils.getNowDayLong());
pcsData.setDeviceId(deviceId);
emsPcsDataService.insertEmsPcsData(pcsData); emsPcsDataService.insertEmsPcsData(pcsData);
Map<String, Map<String, Object>> records = processDataPrefix(JSON.parseObject(jsonData, new TypeReference<Map<String, Object>>() {})); Map<String, Map<String, Object>> records = processDataPrefix(JSON.parseObject(jsonData, new TypeReference<Map<String, Object>>() {}));