Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -42,11 +42,6 @@ public class DemoController extends BaseController {
     StationBasicServiceImpl stationBasicServiceimpl;
     @Autowired
     TestServiceImpl testServiceimpl;
-    @Autowired
-    RedisUtils redisUtils;
-
-    @Autowired
-    StationBasicMapper stationBasicMapper;
 
     @Autowired
     InfluxDbConnection influxDbConnection;
@@ -91,8 +86,8 @@ public class DemoController extends BaseController {
     @GetMapping("/test4")
     public void demoTest3() {
         //数据说明 夏造风电、泰和光伏、夏造升压站、泰和升压站
-//        String [] strings = {"1668801435891929089","1669524885619085313"};
-        String [] strings = {"1669524885619085313"};
+        String [] strings = {"1668801435891929089","1669524885619085313"};
+//        String [] strings = {"1669524885619085313"};
 //        Object o=this.monitorFanIndicatorImpl.getIndicatoralueAvage("1668801435891929089","60秒平均风速");
 //        System.out.println(o.toString());
         for (int i = 0; i < strings.length; i++) {
@@ -101,7 +96,6 @@ public class DemoController extends BaseController {
 //        QueryWrapper.eq("gateway", "1668801435891929089");
 //        泰和光伏
             QueryWrapper.eq("gateway", strings[i]);
-            QueryWrapper.eq("front_module", "箱变");
             long DATE = new Date().getTime();
             System.out.println(DATE);
             List<MonitorFanIndicator> list = monitorFanIndicatorregionMapper.selectList(QueryWrapper);
@@ -117,8 +111,8 @@ public class DemoController extends BaseController {
                 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", "");
+                maps2.put("unit", monitorFanIndicator.getUnit());
+                maps2.put("value", "");
                 maps2.put("valueLabel","" );
                 maps2.put("traceId", "");
                 maps2.put("equipmentIndexName", monitorFanIndicator.getIndicator());
@@ -155,8 +149,8 @@ public class DemoController extends BaseController {
     @GetMapping("/test6")
     public void demoTest5() {
         //数据说明 夏造风电、泰和光伏、夏造升压站、泰和升压站
-//        String [] strings = {"1668801570352926721","1669525017559306241"};
-        String [] strings = {"1669525017559306241"};
+        String [] strings = {"1668801570352926721","1669525017559306241"};
+//        String [] strings = {"1669525017559306241"};
 //        Object o=this.monitorFanIndicatorImpl.getIndicatoralueAvage("1668801435891929089","60秒平均风速");
 //        System.out.println(o.toString());
         for (int i = 0; i < strings.length; i++) {
@@ -165,7 +159,6 @@ public class DemoController extends BaseController {
 //        QueryWrapper.eq("gateway", "1668801435891929089");
 //        泰和光伏
             QueryWrapper.eq("gateway", strings[i]);
-            QueryWrapper.like("system_type","模拟量");
             long DATE = new Date().getTime();
             System.out.println(DATE);
             List<MonitorFanIndicator> list = monitorFanIndicatorregionMapper.selectList(QueryWrapper);
@@ -182,9 +175,9 @@ public class DemoController extends BaseController {
                 maps2.put("isAlarm", monitorFanIndicator.getIsAlarm());
                 maps2.put("createdTime", "2023-07-05 18:30:26");
                 maps2.put("unit", monitorFanIndicator.getUnit());
-//                maps2.put("value", "");
-//                maps2.put("valueLabel","" );
-//                maps2.put("traceId", "");
+                maps2.put("value", "");
+                maps2.put("valueLabel","" );
+                maps2.put("traceId", "");
                 maps2.put("equipmentIndexName", monitorFanIndicator.getIndicator());
                 maps2.put("equipmentNumber", monitorFanIndicator.getEquipmentNumber());
                 maps2.put("frontModule", monitorFanIndicator.getFrontModule());

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java

@@ -324,6 +324,7 @@ public class MonitoringServiceImpl {
             TabDto tab11 = new TabDto("故障信息", "11");
             TabDto tab12 = new TabDto("集中式-离散率", "12");
             TabDto tab13 = new TabDto("组串式-离散率", "13");
+            TabDto tab14 = new TabDto("离散率", "14");
             tabDtoList.add(tab6);
             tabDtoList.add(tab7);
             tabDtoList.add(tab8);
@@ -332,6 +333,7 @@ public class MonitoringServiceImpl {
             tabDtoList.add(tab11);
             tabDtoList.add(tab12);
             tabDtoList.add(tab13);
+            tabDtoList.add(tab14);
         }
         return tabDtoList;
     }