光伏集电线左侧接口 概览接口调整

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

@@ -197,11 +197,11 @@ public class MonitorFanIdxController extends BaseController {
 
         for (String column : columnList) {
             Double result = commonService.getTotalByIndicatior(gatewayId, column);
-            columnMap.put(column, result);
+            columnMap.put(column, String.format("%2f",result));
         }
         for (String column : columnLists) {
             Double result = commonService.getAvgvalueByIndicatior(gatewayId, column);
-            columnMap.put(column, result);
+            columnMap.put(column, String.format("%2f",result));
         }
 
         String num = monitorFanIndicator.getFJCount(gatewayId);
@@ -213,28 +213,28 @@ public class MonitorFanIdxController extends BaseController {
 
         List<Map<String,Object>> objects = new ArrayList<>();
         Map<String, Object> data = new HashMap<>();
-        data.put("title",Float.valueOf(columnMap.get("装机容量").toString()));
+        data.put("title",columnMap.get("装机容量").toString());
         objects.add(data);
         Map<String, Object> data1 = new HashMap<>();
-        data1.put("title",Float.valueOf(columnMap.get("日发电量").toString()));
+        data1.put("title",columnMap.get("日发电量").toString());
         objects.add(data1);
         Map<String, Object> data2 = new HashMap<>();
         data2.put("title",columnMap.get("风机台数").toString().replace(".0",""));
         objects.add(data2);
         Map<String, Object> data3 = new HashMap<>();
-        data3.put("title",Float.valueOf(columnMap.get("月发电量").toString()));
+        data3.put("title",columnMap.get("月发电量").toString());
         objects.add(data3);
         Map<String, Object> data4 = new HashMap<>();
-        data4.put("title",Float.valueOf(columnMap.get("瞬时风速").toString()));
+        data4.put("title",columnMap.get("瞬时风速").toString());
         objects.add(data4);
         Map<String, Object> data5 = new HashMap<>();
-        data5.put("title",Float.valueOf(columnMap.get("年发电量").toString()));
+        data5.put("title",columnMap.get("年发电量").toString());
         objects.add(data5);
         Map<String, Object> data6 = new HashMap<>();
-        data6.put("title",Float.valueOf(columnMap.get("有功功率").toString()));
+        data6.put("title",columnMap.get("有功功率").toString());
         objects.add(data6);
         Map<String, Object> data7 = new HashMap<>();
-        data7.put("title",7.47);
+        data7.put("title",(double)columnMap.get("日发电量")/(double)columnMap.get("装机容量")*1000);
         objects.add(data7);
 
         IPage<Map<String,Object>> result = new Page<>();
@@ -377,7 +377,11 @@ public class MonitorFanIdxController extends BaseController {
         for (StationBasic stationBasic : stationBasics) {
             String gatewayId = stationBasic.getBoosterGatewayId();
             String werks = stationBasic.getStationNumber();
-            monitorFanIndicator.getStatusJDX(gatewayId, "集电线", werks, stationBasic.getSequenceNbr().toString());
+            if (stationBasic.getStationType().equals("FDZ")){
+                monitorFanIndicator.getStatusJDX(gatewayId,  stationBasic.getSequenceNbr().toString(),"集电");
+            }else if (stationBasic.getStationType().equals("JZSGFDZ") ){
+                monitorFanIndicator.getStatusJDX(gatewayId, stationBasic.getSequenceNbr().toString(),"前光");
+            }
         }
         return  CommonResponseUtil.success();
     }
@@ -575,15 +579,15 @@ public class MonitorFanIdxController extends BaseController {
 
         for (String column : columnList) {
             Double result = commonService.getTotalByIndicatior(gatewayId, column);
-            columnMap.put(column, result);
+            columnMap.put(column, String.format("%2f",result));
         }
         for (String column : syLists) {
             Double result = commonService.getTotalByIndicatior(boosterGatewayId, column);
-            columnMap.put(column, result);
+            columnMap.put(column, String.format("%2f",result));
         }
         for (String column : columnLists) {
             Double result = commonService.getAvgvalueByIndicatior(gatewayId, column);
-            columnMap.put(column, result);
+            columnMap.put(column, String.format("%2f",result));
         }
 
         String num = monitorFanIndicator.getFJCount(gatewayId);
@@ -594,15 +598,15 @@ public class MonitorFanIdxController extends BaseController {
 
 
         Map<String, Object> data = new HashMap<>();
-        data.put("title1",Float.valueOf(columnMap.get("装机容量").toString()));
-        data.put("title2",Float.valueOf(columnMap.get("日发电量").toString()));
+        data.put("title1",columnMap.get("装机容量").toString());
+        data.put("title2",columnMap.get("日发电量").toString());
         data.put("title3",columnMap.get("风机台数").toString().replace(".0",""));
-        data.put("title4",Float.valueOf(columnMap.get("月发电量").toString()));
+        data.put("title4",columnMap.get("月发电量").toString());
         data.put("title5",7.47);//辐照强度
-        data.put("title6",Float.valueOf(columnMap.get("年发电量").toString()));
-        data.put("title7",Float.valueOf(columnMap.get("有功功率").toString()));
-        data.put("title8",(Float.valueOf(columnMap.get("日发电量").toString())/Float.valueOf(columnMap.get("装机容量").toString())*1000));//日利用小时
-        data.put("title9",Float.valueOf(columnMap.get("总辐射累计").toString()));//总辐射日累计
+        data.put("title6",columnMap.get("年发电量").toString());
+        data.put("title7",columnMap.get("有功功率").toString());
+        data.put("title8",(double)columnMap.get("日发电量")/(double)columnMap.get("装机容量")*1000);//日利用小时
+        data.put("title9",columnMap.get("总辐射累计").toString());//总辐射日累计
         data.put("title0",7.47);//综合效率
         return ResponseHelper.buildResponse(data);
     }
@@ -636,4 +640,20 @@ public class MonitorFanIdxController extends BaseController {
         result.setTotal(equipmentNum.size());
         return ResponseHelper.buildResponse(result);
     }
+
+
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "详情基础信息")
+    @GetMapping("/getStatisticsInfo")
+    public ResponseModel<Map<String,String>> getStatisticsInfo(@RequestParam(value = "equipmentIndexName", required = false) String equipmentIndexName,
+                                                                    @RequestParam(value = "stationId", required = false) String stationId,
+                                                               @RequestParam(value = "stationType", required = false) String stationType) {
+        StationBasic stationBasic = stationBasicMapper.selectById(stationId);
+        String gatewayId = stationBasic.getFanGatewayId();
+        if (null != stationType){
+            gatewayId = stationBasic.getBoosterGatewayId();
+        }
+        return ResponseHelper.buildResponse(monitorFanIndicator.getStatisticsInfo(gatewayId,equipmentIndexName ));
+    }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/TemporaryDataMapper.java

@@ -14,4 +14,8 @@ public interface TemporaryDataMapper extends BaseMapper<TemporaryData> {
     List<Map<String, String>> timingTemporarysSorageData (@RequestParam(value ="gatewayId" ) String gatewayId);
 
 
+    Map<String, String> getStatisticsInfo (@RequestParam(value ="gatewayId" ) String gatewayId,
+                                           @RequestParam(value ="equipmentIndexName" ) String equipmentIndexName);
+
+
 }

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

@@ -811,24 +811,32 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
 
 
-    public void getStatusJDX(String gatewayId, String dataName, String werks,String stationId){
-        String sql =   " SELECT * FROM indicators_"+gatewayId+"  WHERE frontModule =~/集电/ and displayName =~/合位$/";
+    public void getStatusJDX(String gatewayId, String stationId,String frontModule){
+        String sql =   " SELECT * FROM indicators_"+gatewayId+"  WHERE frontModule =~/"+frontModule+"/ and displayName =~/合位$/";
         List<IndicatorsDto> listData = influxDButils.getListData(sql, IndicatorsDto.class);
         List<Map<String,Object>> statusMaps = new ArrayList<>();
 
         Map<String, List<IndicatorsDto>> collect = listData.stream().collect(Collectors.groupingBy(IndicatorsDto::getFrontModule,LinkedHashMap::new,Collectors.toList()));
         for (String s : collect.keySet()) {
             Map<String, Object> statusMap = new HashMap<>();
-
+            if (frontModule.equals("前光")){
+                String sql1 =   " SELECT * FROM indicators_"+gatewayId+"  WHERE frontModule =~/"+s+"/ and systemType =~/模拟量/";
+                List<IndicatorsDto> value = influxDButils.getListData(sql1, IndicatorsDto.class);
+                for (IndicatorsDto indicatorsDto : value) {
+                    Double aDouble = Double.valueOf(indicatorsDto.getValue());
+                    statusMap.put(indicatorsDto.getDisplayName()+"Value",String.format("%.2f",aDouble));
+                }
+            }
             List<IndicatorsDto> indicatorsDtos = collect.get(s);
             for (IndicatorsDto indicatorsDto : indicatorsDtos) {
                 if (indicatorsDto.getDisplayName().contains("合位")){
                     statusMap.put("type",indicatorsDto.getValue());
+                    statusMap.put("status",indicatorsDto.getValue().equals("true")?"1":"0");
                     statusMap.put("position",indicatorsDto.getDisplayName().split("_")[0]+"开关位置");
                 }
 
             }
-            statusMap.put("title",s);
+            statusMap.put("title",s.substring(3));
             statusMap.put("power","有功 (kW)");
             statusMap.put("windSpeed","风速 (m/s)");
             statusMaps.add(statusMap);
@@ -868,8 +876,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                     if (Integer.parseInt(num) == Integer.parseInt(listDatum.getEquipmentNumber())){
                         Map<String,Object>  map = new HashMap<>();
                         map.put("title",listDatum.getEquipmentNumber());
-                        map.put("power",listDatum.getValue());
-                        map.put("windSpeed",listDatum.getValueLabel());
+                        map.put("windSpeed",listDatum.getValue());
+                        map.put("power",listDatum.getValueLabel());
                         statusMaps.add(map);
                     }
                 }
@@ -1385,6 +1393,11 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         return resultMap;
     }
 
+    public Map<String, String> getStatisticsInfo(String gatewayId ,String equipmentIndexName){
+        return     temporaryDataMapper.getStatisticsInfo(gatewayId,equipmentIndexName);
+    }
+
+
 
     public List<Map<String,Object>>  getEquipmentNum (String gatewayId,String frontModule,String equipmentNumber){
         String sql =   "    SELECT  equipmentNumber, equipmentSpecificName   FROM indicators_"+gatewayId+" WHERE   frontModule = '"+frontModule+"' and equipmentNumber !=''";

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/TemporaryDataMapper.xml

@@ -17,4 +17,18 @@
         </where>
         GROUP BY batch_no ,equipmentIndexName;
     </select>
+
+
+    <select id="getStatisticsInfo" resultType="map">
+        SELECT
+            avg( VALUE ) AS mean,
+            ( SELECT created_time FROM temporary_data WHERE gatewayId = #{gatewayId} and equipmentIndexName =#{equipmentIndexName} ORDER BY `value` LIMIT 1 ) AS minTime,
+	        max( `value` ) AS max,
+	       ( SELECT created_time FROM temporary_data WHERE gatewayId = #{gatewayId} and equipmentIndexName =#{equipmentIndexName} ORDER BY `value` DESC LIMIT 1 ) AS maxTime,
+	      min( `value` ) AS min
+        FROM
+            `temporary_data`
+        WHERE
+            gatewayId = #{gatewayId} and equipmentIndexName =#{equipmentIndexName}
+    </select>
 </mapper>