初始化influxdb优化

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/DemoController.java

@@ -91,16 +91,19 @@ public class DemoController extends BaseController {
     }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "初始化风机")
+    @ApiOperation(value = "初始化influxdb-风电、光伏、升压站")
     @GetMapping("/test4")
     public void demoTest3() {
+        //数据说明 夏造风电、泰和光伏、夏造升压站、泰和升压站
+        String [] strings = {"1668801435891929089","1669524885619085313"};
 //        Object o=this.monitorFanIndicatorImpl.getIndicatoralueAvage("1668801435891929089","60秒平均风速");
 //        System.out.println(o.toString());
+        for (int i = 0; i < strings.length; i++) {
             QueryWrapper<MonitorFanIndicator> QueryWrapper = new QueryWrapper<>();
 //        夏造风电
 //        QueryWrapper.eq("gateway", "1668801435891929089");
 //        泰和光伏
-        QueryWrapper.eq("gateway", "1669524885619085313");
+            QueryWrapper.eq("gateway", strings[i]);
             long DATE = new Date().getTime();
             System.out.println(DATE);
             List<MonitorFanIndicator> list = monitorFanIndicatorregionMapper.selectList(QueryWrapper);
@@ -109,13 +112,12 @@ public class DemoController extends BaseController {
                 Map<String, String> tag = new HashMap<>();
                 Map<String, Object> maps2 = new HashMap<>();
 
-            tag.put("address", monitorFanIndicator.getIndexAddress());
-            tag.put("dataType", monitorFanIndicator.getDataType());
-            tag.put("equipmentSpecificName", monitorFanIndicator.getFanCode());
+                maps2.put("address", monitorFanIndicator.getIndexAddress());
+                maps2.put("dataType", monitorFanIndicator.getDataType());
+                maps2.put("equipmentSpecificName", monitorFanIndicator.getFanCode());
                 tag.put("equipmentsIdx", monitorFanIndicator.getAddressGateway());
-            tag.put("gatewayId", monitorFanIndicator.getGateway());
-            tag.put("isAlarm", monitorFanIndicator.getIsAlarm());
-
+                maps2.put("gatewayId", monitorFanIndicator.getGateway());
+                maps2.put("isAlarm", monitorFanIndicator.getIsAlarm());
                 maps2.put("createdTime", "2023-07-05 18:30:26");
                 maps2.put("unit", monitorFanIndicator.getUnit());
                 maps2.put("value", "");
@@ -125,10 +127,12 @@ public class DemoController extends BaseController {
                 maps2.put("equipmentNumber", monitorFanIndicator.getEquipmentNumber());
                 maps2.put("frontModule", monitorFanIndicator.getFrontModule());
                 maps2.put("systemType", monitorFanIndicator.getSystemType());
-
+                maps2.put("pictureName", monitorFanIndicator.getPictureName());
+                //升压站的字段显示名称
+                maps2.put("displayName", "");
                 influxDbConnection.insert("indicators_" + monitorFanIndicator.getGateway(), tag, maps2, 1688558007051L, TimeUnit.MILLISECONDS);
             }
-
+        }
 
     }
 
@@ -152,13 +156,16 @@ public class DemoController extends BaseController {
     @ApiOperation(value = "初始化升压站")
     @GetMapping("/test6")
     public void demoTest5() {
-//！！！！！！！！！！！！！！注意 初始化升压站的时候需要先更新monitor_fan_indicator_copy2表数据 且修改entity的表映射为monitor_fan_indicator_copy2
+        //数据说明 夏造风电、泰和光伏、夏造升压站、泰和升压站
+        String [] strings = {"1668801570352926721","1669525017559306241"};
+//        Object o=this.monitorFanIndicatorImpl.getIndicatoralueAvage("1668801435891929089","60秒平均风速");
+//        System.out.println(o.toString());
+        for (int i = 0; i < strings.length; i++) {
             QueryWrapper<MonitorFanIndicator> QueryWrapper = new QueryWrapper<>();
-//        夏造风电升压站
-//        QueryWrapper.eq("gateway", "1668801570352926721");
-//        泰和前进光伏站
-        QueryWrapper.eq("gateway", "1669525017559306241");
-//        QueryWrapper.eq("gateway", "1668801570352926721").eq("front_module","电量表计");
+//        夏造风电
+//        QueryWrapper.eq("gateway", "1668801435891929089");
+//        泰和光伏
+            QueryWrapper.eq("gateway", strings[i]);
             long DATE = new Date().getTime();
             System.out.println(DATE);
             List<MonitorFanIndicator> list = monitorFanIndicatorregionMapper.selectList(QueryWrapper);
@@ -166,38 +173,29 @@ public class DemoController extends BaseController {
             for (MonitorFanIndicator monitorFanIndicator : list) {
                 Map<String, String> tag = new HashMap<>();
                 Map<String, Object> maps2 = new HashMap<>();
-//-------------------tag----------
-            tag.put("address", monitorFanIndicator.getIndexAddress());
-            tag.put("dataType", monitorFanIndicator.getDataType());
-            tag.put("equipmentSpecificName", monitorFanIndicator.getFanCode());
+
+                maps2.put("address", monitorFanIndicator.getIndexAddress());
+                maps2.put("dataType", monitorFanIndicator.getDataType());
+                maps2.put("equipmentSpecificName", monitorFanIndicator.getFanCode());
                 tag.put("equipmentsIdx", monitorFanIndicator.getAddressGateway());
-            tag.put("gatewayId", monitorFanIndicator.getGateway());
-            tag.put("isAlarm", monitorFanIndicator.getIsAlarm());
-//--------------------field------------------------
+                maps2.put("gatewayId", monitorFanIndicator.getGateway());
+                maps2.put("isAlarm", monitorFanIndicator.getIsAlarm());
                 maps2.put("createdTime", "2023-07-05 18:30:26");
-            maps2.put("unit", "");
+                maps2.put("unit", monitorFanIndicator.getUnit());
                 maps2.put("value", "");
-            maps2.put("valueLabel", "");
+                maps2.put("valueLabel","" );
                 maps2.put("traceId", "");
                 maps2.put("equipmentIndexName", monitorFanIndicator.getIndicator());
-            maps2.put("equipmentNumber", "");
-            maps2.put("frontModule", "");
-            maps2.put("systemType", "");
-            maps2.put("pictureName", monitorFanIndicator.getPictureName());
-//            升压站的字段显示名称
-            maps2.put("displayName", monitorFanIndicator.getEquipmentNumber());
-            if (!ObjectUtils.isEmpty(monitorFanIndicator.getFrontModule())) {
+                maps2.put("equipmentNumber", monitorFanIndicator.getEquipmentNumber());
                 maps2.put("frontModule", monitorFanIndicator.getFrontModule());
-            }
-            if (!ObjectUtils.isEmpty(monitorFanIndicator.getSystemType())) {
                 maps2.put("systemType", monitorFanIndicator.getSystemType());
-            }
-            if (!ObjectUtils.isEmpty(monitorFanIndicator.getUnit())) {
-                maps2.put("unit", monitorFanIndicator.getUnit());
-            }
+                maps2.put("pictureName", monitorFanIndicator.getPictureName());
+                //升压站的字段显示名称
+                maps2.put("displayName", monitorFanIndicator.getEquipmentNumber());
                 influxDbConnection.insert("indicators_" + monitorFanIndicator.getGateway(), tag, maps2, 1688558007051L, TimeUnit.MILLISECONDS);
             }
         }
+    }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "测试动态图片")