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

1.用能系统空调关机策略

Browse Source 
2.终端模块对外接口
This commit is contained in:
雨木c
2022-08-04 16:32:05 +08:00
parent 9a26722f14
commit 591519d857
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pqs-energy/energy-boot/src/main/java/com/njcn/energy/handler/MqttMessageHandler.java
View File

@@ -53,17 +53,6 @@ public class MqttMessageHandler {
private final IEleLogsService eleLogsService; private final IEleLogsService eleLogsService;
@Value("${mqtt.client-id}")
private String clientId;
/**
* 用于记录错误指令发送次数,默认发送三次停止
* @author cdf
* @date 2022/6/28
*/
private Integer mqttSendCount = 0;
private String mqttJsonMsg;
private String mqttSendTopic;
// /** // /**
// * 设备注册 // * 设备注册

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

@@ -91,8 +91,8 @@ public class EleAirStrategyServiceImpl extends ServiceImpl<AirStrategyMapper, Ai
@Value("${mqtt.client-id}") @Value("${mqtt.client-id}")
private String clientId; private String clientId;
//徐扬执行器 5 陈道飞执行器6 3 18数据库测试执行器 //徐扬执行器 5 陈道飞执行器 6 18数据库测试执行器 3
private final Integer xxlGroup = 6; private final Integer xxlGroup = 5;
@Override @Override
@@ -482,11 +482,10 @@ public class EleAirStrategyServiceImpl extends ServiceImpl<AirStrategyMapper, Ai
//如果是关闭操作 //如果是关闭操作
if ("close".equals(operation)) { if ("close".equals(operation)) {
StringBuilder temSql = assToInfluxParam(lineIds); StringBuilder temSql = assToInfluxParam(lineIds);
String sql = "select LineId from air_data_Real where " + temSql + " and ACInStat = 'On'"; String sql = "select LineId,ACInStat from air_data_Real where " + temSql + " and ACInStat = 'On'";
QueryResult result = influxDbUtils.query(sql); QueryResult result = influxDbUtils.query(sql);
List<QueryResult.Series> listSeries = result.getResults().get(0).getSeries(); List<QueryResult.Series> listSeries = result.getResults().get(0).getSeries();
if (!CollectionUtils.isEmpty(listSeries)) { if (!CollectionUtils.isEmpty(listSeries)) {
System.out.println(listSeries);
List<String> lineIdTem = new ArrayList<>(); List<String> lineIdTem = new ArrayList<>();
listSeries.get(0).getValues().forEach(item -> { listSeries.get(0).getValues().forEach(item -> {
lineIdTem.add(item.get(1).toString()); lineIdTem.add(item.get(1).toString());