IndicatorsDto新增displayName字段及是否兼容风机测试

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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.entity.MonitorFanIndicator;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.MonitorFanIndicatorMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IndicatorsDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.Test;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.MonitorFanIndicatorImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.SjglZsjZsbtzServiceImpl;
@@ -85,9 +86,12 @@ public class DemoController extends BaseController {
     @ApiOperation(value = "demo测试influxdb")
     @GetMapping("/test3")
     public void demoTest2() {
-        String sql = "SELECT createdTime ,gatewayId,address,valueLabel FROM \"iot_data\" WHERE equipmentSpecificName=~/.*27风机.*/  and  gatewayId='1668801435891929089'    GROUP BY equipmentIndex    ORDER BY time  desc  LIMIT 600";
-        List<IndexDto> list = influxDButils.getListData(sql, IndexDto.class);
+        String sql = "SELECT * FROM indicators_1668801435891929089";
+        String sql1 = "SELECT * FROM indicators_1668801570352926721";
+        List<IndicatorsDto> list = influxDButils.getListData(sql, IndicatorsDto.class);
+        List<IndicatorsDto> list2 = influxDButils.getListData(sql1, IndicatorsDto.class);
         System.out.println(list.size());
+        System.out.println(list2.size());
     }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/CompletionOfPowerIndicatorsDto.java

@@ -11,7 +11,7 @@ public class CompletionOfPowerIndicatorsDto {
     private String installCapactity;
     //风速或者辐照度
     private String windSpeedOrIrradiance;
-    //    有功功率
+    //有功功率
     private String activePower;
     //日发电量
     private String dailyPower;

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IndicatorsDto.java

@@ -25,6 +25,7 @@ public class IndicatorsDto {
     private String valueLabel;
     private String distinct;
     private String time;
+    private String displayName;
 
 
     public String getTime() {