Commit 8be28b39 authored by caotao's avatar caotao

初始化风机与升压站调整

parent a52291ba
...@@ -55,12 +55,8 @@ public class DemoController extends BaseController { ...@@ -55,12 +55,8 @@ public class DemoController extends BaseController {
@Autowired @Autowired
InfluxDbConnection influxDbConnection; InfluxDbConnection influxDbConnection;
@Autowired
SjglZsjZsbtzServiceImpl sjglZsjZsbtzServiceImpl;
@Autowired @Autowired
MonitorFanIndicatorImpl monitorFanIndicatorImpl;
@Autowired
InfluxDButils influxDButils; InfluxDButils influxDButils;
@Autowired @Autowired
EmqKeeper emqKeeper; EmqKeeper emqKeeper;
...@@ -117,13 +113,13 @@ public class DemoController extends BaseController { ...@@ -117,13 +113,13 @@ public class DemoController extends BaseController {
tag.put("gatewayId", monitorFanIndicator.getGateway()); tag.put("gatewayId", monitorFanIndicator.getGateway());
tag.put("isAlarm", monitorFanIndicator.getIsAlarm()); tag.put("isAlarm", monitorFanIndicator.getIsAlarm());
// maps2.put("createdTime", "2023-07-05 18:30:26"); maps2.put("createdTime", "2023-07-05 18:30:26");
// maps2.put("unit", monitorFanIndicator.getUnit()); maps2.put("unit", monitorFanIndicator.getUnit());
// maps2.put("value", ""); maps2.put("value", "");
// maps2.put("valueLabel","" ); maps2.put("valueLabel","" );
// maps2.put("traceId", ""); maps2.put("traceId", "");
// maps2.put("equipmentIndexName", monitorFanIndicator.getIndicator()); maps2.put("equipmentIndexName", monitorFanIndicator.getIndicator());
// maps2.put("equipmentNumber", monitorFanIndicator.getEquipmentNumber()); maps2.put("equipmentNumber", monitorFanIndicator.getEquipmentNumber());
maps2.put("frontModule", monitorFanIndicator.getFrontModule()); maps2.put("frontModule", monitorFanIndicator.getFrontModule());
maps2.put("systemType", monitorFanIndicator.getSystemType()); maps2.put("systemType", monitorFanIndicator.getSystemType());
...@@ -156,6 +152,7 @@ public class DemoController extends BaseController { ...@@ -156,6 +152,7 @@ public class DemoController extends BaseController {
//!!!!!!!!!!!!!!注意 初始化升压站的时候需要先更新monitor_fan_indicator_copy2表数据 且修改entity的表映射为monitor_fan_indicator_copy2 //!!!!!!!!!!!!!!注意 初始化升压站的时候需要先更新monitor_fan_indicator_copy2表数据 且修改entity的表映射为monitor_fan_indicator_copy2
QueryWrapper<MonitorFanIndicator> QueryWrapper = new QueryWrapper<>(); QueryWrapper<MonitorFanIndicator> QueryWrapper = new QueryWrapper<>();
QueryWrapper.eq("gateway", "1668801570352926721"); QueryWrapper.eq("gateway", "1668801570352926721");
// QueryWrapper.eq("gateway", "1668801570352926721").eq("front_module","电量表计");
long DATE = new Date().getTime(); long DATE = new Date().getTime();
System.out.println(DATE); System.out.println(DATE);
List<MonitorFanIndicator> list = monitorFanIndicatorregionMapper.selectList(QueryWrapper); List<MonitorFanIndicator> list = monitorFanIndicatorregionMapper.selectList(QueryWrapper);
...@@ -180,7 +177,7 @@ public class DemoController extends BaseController { ...@@ -180,7 +177,7 @@ public class DemoController extends BaseController {
maps2.put("equipmentNumber", ""); maps2.put("equipmentNumber", "");
maps2.put("frontModule", ""); maps2.put("frontModule", "");
maps2.put("systemType", ""); maps2.put("systemType", "");
//升压站的字段显示名称 // 升压站的字段显示名称
maps2.put("displayName", monitorFanIndicator.getEquipmentNumber()); maps2.put("displayName", monitorFanIndicator.getEquipmentNumber());
if (!ObjectUtils.isEmpty(monitorFanIndicator.getFrontModule())) { if (!ObjectUtils.isEmpty(monitorFanIndicator.getFrontModule())) {
maps2.put("frontModule", monitorFanIndicator.getFrontModule()); maps2.put("frontModule", monitorFanIndicator.getFrontModule());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment