Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

用能代码提交

Browse Source
This commit is contained in:
chendaofei
2024-07-24 20:12:42 +08:00
parent d64b15a8e6
commit 0fe103d01e
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleAirStrategyServiceImpl.java
View File

@@ -20,7 +20,6 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.db.constant.DbConstant;
import com.njcn.energy.handler.MqttMessageHandler;
import com.njcn.energy.mapper.AirStrategyMapper;
import com.njcn.energy.mapper.LogicDeviceLineMapper;
import com.njcn.energy.pojo.dto.AirStrategyDTO;
@@ -75,7 +74,6 @@ public class EleAirStrategyServiceImpl extends ServiceImpl<AirStrategyMapper, Ai
private final AirStrategyMapper airStrategyMapper;
private final MqttMessageHandler mqttMessageHandler;
private final InfluxDbUtils influxDbUtils;
@@ -527,7 +525,6 @@ public class EleAirStrategyServiceImpl extends ServiceImpl<AirStrategyMapper, Ai
publisher.send(topic, json, 1, false);
//mqttMessageHandler.setMqttParam(0,topic,json);
this.mqttSendCount = 0;
this.mqttJsonMsg = json;
this.mqttSendTopic = topic;

2
pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java
View File

@@ -414,7 +414,7 @@ public class LogicDeviceLineServiceImpl extends ServiceImpl<LogicDeviceLineMappe
stringBuilderMax.append(listData.get(j).getName()).append(", ");
}
}
stringBuilderMax.append("from ").append(tableName + "_Real").append(" where").append(" LineId='" + lineId + "'").append(" order by time").append(InfluxDBPublicParam.TIME_ZONE);
stringBuilderMax.append("from ").append(tableName + "_Real").append(" where").append(" LineId='" + lineId + "'").append(" order by time");
List<Map<String, Object>> list = influxDbUtils.getResult(stringBuilderMax.toString(), "");
if (CollectionUtil.isNotEmpty(list)) {
for(int i=0;i<list.size();i++){