修改代码

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

@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.MonitorFanIndicatorImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.IOUtils;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.Aggregations;
@@ -28,6 +29,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.aggregations.metrics.ParsedSum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -40,10 +42,14 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.alibaba.fastjson.JSON.parseArray;
+
 @RestController
 @Api(tags = "大屏相关API")
 @RequestMapping(value = "/monitorFanIdx")
@@ -59,6 +65,11 @@ public class MonitorFanIdxController extends BaseController {
     @Autowired
     StationBasicMapper stationBasicMapper;
 
+    @Value("classpath:/json/overview.json")
+    private Resource overview;
+    @Value("classpath:/json/overviewGF.json")
+    private Resource overviewGF;
+
     @Autowired
     CommonServiceImpl commonService;
 
@@ -192,9 +203,9 @@ public class MonitorFanIdxController extends BaseController {
     }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "风机布置图-总概览")
+    @ApiOperation(value = "全国风机-总概览")
     @GetMapping("/overview")
-    public ResponseModel<IPage<Map<String, Object>>> getData(@RequestParam(value = "stationId")String stationId) {
+    public ResponseModel<IPage<Map>> getData(@RequestParam(value = "stationId")String stationId) {
 
 
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
@@ -218,78 +229,33 @@ public class MonitorFanIdxController extends BaseController {
         Double capacityl = commonService.getStationCapactityByStationWerks(stationBasic.getStationNumber());
         columnMap.put("装机容量",String.format("%.2f",capacityl));
 
+        String json = null;
+        try {
+            json = IOUtils.toString(overview.getInputStream(), java.lang.String.valueOf(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        List<Map>  list = parseArray(json, Map.class);
+        for (Map map : list) {
+            String key = map.get("title").toString();
+            if (map.containsKey("action")){
+                if (key.equals("日利用小时")){
+                    map.put("title", map.get("action").toString().replace("*","日发电量").replace("-","装机容量"));
+                    map.put("title2",map.get("title"));
+                }else {
+                    map.put("title", map.get("action").toString().replace("*",columnMap.get(key).toString()));
+                    map.put("title2",map.get("title"));
+                }
+            }
+            map.put("title", columnMap.get(key)==null?0.00:columnMap.get(key));
+            map.put("title2",map.get("title"));
 
-        List<Map<String,Object>> objects = new ArrayList<>();
-        Map<String, Object> data = new HashMap<>();
-        data.put("title",columnMap.get("装机容量").toString());
-        data.put("title2",columnMap.get("装机容量").toString());
-        data.put("title1","装机容量(MW)");
-        data.put("url","upload/jxiop/amos_studio/2F378EF430F788CA71E876359B46C4E.png");
-        objects.add(data);
-
-        Map<String, Object> data1 = new HashMap<>();
-        data1.put("title",columnMap.get("日发电量").toString());
-        data1.put("title2",columnMap.get("日发电量").toString());
-        data1.put("title1","日发电量(万kWh)");
-        data1.put("url","upload/jxiop/amos_studio/E07C6C41715033585F69934AF08A3431.png");
-        objects.add(data1);
-
-        Map<String, Object> data2 = new HashMap<>();
-        data2.put("title",columnMap.get("风机台数").toString().replace(".0",""));
-        data2.put("title2",columnMap.get("风机台数").toString().replace(".0",""));
-        data2.put("title1","风机台数(台)");
-        data2.put("url","upload/jxiop/amos_studio/EA3572E1BD31DC1E7D8DA162F09ECB.png");
-        objects.add(data2);
-
-
-        Map<String, Object> data3 = new HashMap<>();
-        data3.put("title",columnMap.get("月发电量").toString());
-        data3.put("title2",columnMap.get("月发电量").toString());
-        data3.put("title1","月发电量(万kWh)");
-        data3.put("url","upload/jxiop/amos_studio/6CE2792ABEEAE816CB798649A6796.png");
-        objects.add(data3);
-
-
-        Map<String, Object> data4 = new HashMap<>();
-        data4.put("title",columnMap.get("瞬时风速").toString());
-        data4.put("title2",columnMap.get("瞬时风速").toString());
-        data4.put("title1","平均风速(m/s)");
-        data4.put("url","upload/jxiop/amos_studio/3B66742AAB2FEB0F5CEC10DA50156F.png");
-        objects.add(data4);
-
-
-        Map<String, Object> data5 = new HashMap<>();
-        data5.put("title",columnMap.get("年发电量").toString());
-        data5.put("title2",columnMap.get("年发电量").toString());
-        data5.put("title1","年发电量(万kWh)");
-        data5.put("url","upload/jxiop/amos_studio/12D321E29727689B334E3E625383EB7C.png");
-        objects.add(data5);
-
-        Map<String, Object> data6 = new HashMap<>();
-        data6.put("title", String.format("%.2f",Double.parseDouble(columnMap.get("有功功率").toString())/1000)) ;
-        data6.put("title2", String.format("%.2f",Double.parseDouble(columnMap.get("有功功率").toString())/1000)) ;
-        data6.put("title1","有功功率(MW)");
-        data6.put("url","upload/jxiop/amos_studio/C46B483E51ACAC137CBEB5156F6F377.png");
-        objects.add(data6);
-
-        Map<String, Object> data7 = new HashMap<>();
-        data7.put("title",String.format("%.2f",Double.parseDouble(columnMap.get("日发电量").toString())/ (Double.parseDouble(columnMap.get("装机容量").toString())*1000)));
-        data7.put("title2",String.format("%.2f",Double.parseDouble(columnMap.get("日发电量").toString())/ (Double.parseDouble(columnMap.get("装机容量").toString())*1000)));
-        data7.put("title1","日利用小时");
-        data7.put("url","upload/jxiop/amos_studio/C46B483E51ACAC137CBEB5156F6F377.png");
-        objects.add(data7);
-
-        Map<String, Object> data8 = new HashMap<>();
-        data8.put("title",0.23);
-        data8.put("title2",0.23);
-        data8.put("title1","上网电量(万kWh)");
-        data8.put("url","upload/jxiop/amos_studio/1660C5DDA22ACFADC89A60DEDB82FA39.png");
-        objects.add(data8);
+        }
 
-        IPage<Map<String,Object>> result = new Page<>();
-        result.setRecords(objects);
+        IPage<Map> result = new Page<>();
+        result.setRecords(list);
         result.setCurrent(1);
-        result.setTotal(objects.size());
+        result.setTotal(list.size());
 
         return ResponseHelper.buildResponse(result);
     }
@@ -618,7 +584,7 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "光伏-总概览")
     @GetMapping("/solarPowerOverview")
-    public ResponseModel<IPage<Map<String, Object>>> solarPowerData(@RequestParam(value = "stationId")String stationId) {
+    public ResponseModel<IPage<Map>> solarPowerData(@RequestParam(value = "stationId")String stationId) {
 
 
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
@@ -646,46 +612,72 @@ public class MonitorFanIdxController extends BaseController {
         }
 
         String num = monitorFanIndicator.getFJCount(gatewayId);
-        columnMap.put("风机台数",num);
+        columnMap.put("逆变器台数",num);
         Double capacityl = commonService.getStationCapactityByStationWerks(stationBasic.getStationNumber());
         columnMap.put("装机容量",capacityl);
-        List<Map<String,Object>> objects = new ArrayList<>();
-        Map<String, Object> data = new HashMap<>();
-        data.put("title",columnMap.get("装机容量").toString());
-        objects.add(data);
-        Map<String, Object> data1 = new HashMap<>();
-        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",columnMap.get("月发电量").toString());
-        objects.add(data3);
-        Map<String, Object> data4 = new HashMap<>();
-        data4.put("title",columnMap.get("总辐射").toString());
-        objects.add(data4);
-        Map<String, Object> data5 = new HashMap<>();
-        data5.put("title",columnMap.get("年发电量").toString());
-        objects.add(data5);
-        Map<String, Object> data6 = new HashMap<>();
-        data6.put("title", String.format("%.2f",Double.parseDouble(columnMap.get("有功功率").toString())/1000)) ;
-        objects.add(data6);
-        Map<String, Object> data7 = new HashMap<>();
-        data7.put("title",columnMap.get("日照时数").toString());
-        objects.add(data7);
-        Map<String, Object> data8 = new HashMap<>();
-        data8.put("title",columnMap.get("总辐射累计").toString());
-        objects.add(data8);
-        Map<String, Object> data9 = new HashMap<>();
-        data9.put("title","84.00%");//综合效率
-        objects.add(data9);
 
+        String json = null;
+        try {
+            json = IOUtils.toString(overviewGF.getInputStream(), java.lang.String.valueOf(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        List<Map>  list = parseArray(json, Map.class);
+        for (Map map : list) {
+            String key = map.get("title").toString();
+            if (map.containsKey("action")){
+                if (key.equals("年利用小时")){
+                    map.put("title", map.get("action").toString().replace("*","年发电量").replace("-","装机容量"));
+                    map.put("title2",map.get("title"));
+                }else {
+                    map.put("title", map.get("action").toString().replace("*",columnMap.get(key).toString()));
+                    map.put("title2",map.get("title"));
+                }
+            }
+            map.put("title", columnMap.get(key)==null?0.00:columnMap.get(key));
+            map.put("title2",map.get("title"));
 
-        IPage<Map<String,Object>> result = new Page<>();
-        result.setRecords(objects);
+        }
+
+
+
+//        List<Map<String,Object>> objects = new ArrayList<>();
+//        Map<String, Object> data = new HashMap<>();
+//        data.put("title",columnMap.get("装机容量").toString());
+//        objects.add(data);
+//        Map<String, Object> data1 = new HashMap<>();
+//        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",columnMap.get("月发电量").toString());
+//        objects.add(data3);
+//        Map<String, Object> data4 = new HashMap<>();
+//        data4.put("title",columnMap.get("总辐射").toString());
+//        objects.add(data4);
+//        Map<String, Object> data5 = new HashMap<>();
+//        data5.put("title",columnMap.get("年发电量").toString());
+//        objects.add(data5);
+//        Map<String, Object> data6 = new HashMap<>();
+//        data6.put("title", String.format("%.2f",Double.parseDouble(columnMap.get("有功功率").toString())/1000)) ;
+//        objects.add(data6);
+//        Map<String, Object> data7 = new HashMap<>();
+//        data7.put("title",columnMap.get("日照时数").toString());
+//        objects.add(data7);
+//        Map<String, Object> data8 = new HashMap<>();
+//        data8.put("title",columnMap.get("总辐射累计").toString());
+//        objects.add(data8);
+//        Map<String, Object> data9 = new HashMap<>();
+//        data9.put("title","84.00%");//综合效率
+//        objects.add(data9);
+
+
+        IPage<Map> result = new Page<>();
+        result.setRecords(list);
         result.setCurrent(1);
-        result.setTotal(objects.size());
+        result.setTotal(list.size());
         return ResponseHelper.buildResponse(result);
 
     }
@@ -916,8 +908,8 @@ public class MonitorFanIdxController extends BaseController {
         for (StationType value : StationType.values()) {
             Map<String, Object> map = new LinkedHashMap<>();
             List<StationCacheInfoDto> dtos = listMap.get(value.getCode());
-            map.put("title",dtos.size());
-            map.put("data",dtos.stream().filter(obj -> !ObjectUtils.isEmpty(obj.getInstalledCapacity())).mapToDouble(l->Double.parseDouble(l.getInstalledCapacity())).sum());
+            map.put("data",dtos.size());
+            map.put("title",dtos.stream().filter(obj -> !ObjectUtils.isEmpty(obj.getInstalledCapacity())).mapToDouble(l->Double.parseDouble(l.getInstalledCapacity())).sum());
             mapList.add(map);
         }
 
@@ -942,7 +934,6 @@ public class MonitorFanIdxController extends BaseController {
         map.put("equipmentIndexName.keyword",value);
         List<? extends Terms.Bucket> lidate=  commonService.getgroupsum(map,"valueDouble" ,"equipmentIndexName.keyword", ESEquipments.class);
 
-        Map<String,Object>  mapdta=new HashMap<>();
         DecimalFormat format2 = new DecimalFormat("#.0000");
         Double num = 0.00;
         for (Terms.Bucket bucket : lidate) {

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/json/overview.json

+[
+  {
+    "titie": "装机容量",
+    "title1": "装机容量(MW)",
+    "url": "upload/jxiop/amos_studio/2F378EF430F788CA71E876359B46C4E.png"
+  },
+  {
+    "titie": "日发电量",
+    "title1": "日发电量(万kWh)",
+    "url": "upload/jxiop/amos_studio/E07C6C41715033585F69934AF08A3431.png"
+  },
+  {
+    "titie": "风机台数",
+    "title1": "风机台数(台)",
+    "action": "*.replace(\".0\",\"\")",
+    "url": "upload/jxiop/amos_studio/EA3572E1BD31DC1E7D8DA162F09ECB.png"
+  },
+  {
+    "titie": "月发电量",
+    "title1": "月发电量(万kWh)",
+    "url": "upload/jxiop/amos_studio/6CE2792ABEEAE816CB798649A6796.png"
+  },
+  {
+    "titie": "瞬时风速",
+    "title1": "平均风速(m/s)",
+    "url": "upload/jxiop/amos_studio/3B66742AAB2FEB0F5CEC10DA50156F.png"
+  },
+  {
+    "titie": "年发电量",
+    "title1": "年发电量(万kWh)",
+    "url": "upload/jxiop/amos_studio/12D321E29727689B334E3E625383EB7C.png"
+  },
+  {
+    "titie": "有功功率",
+    "title1": "有功功率(MW)",
+    "action": "String.format(\"%.2f\",Double.parseDouble(*)/1000)",
+    "url": "upload/jxiop/amos_studio/C46B483E51ACAC137CBEB5156F6F377.png"
+  },
+  {
+    "titie": "日利用小时",
+    "title1": "日利用小时",
+    "action":"String.format(\"%.2f\",Double.parseDouble(columnMap.get(\"*\").toString())/ (Double.parseDouble(columnMap.get(\"-\").toString())*1000))",
+    "url": "upload/jxiop/amos_studio/C46B483E51ACAC137CBEB5156F6F377.png"
+  },
+  {
+    "titie": "上网电量",
+    "title1": "上网电量(万kWh)",
+    "url": "upload/jxiop/amos_studio/1660C5DDA22ACFADC89A60DEDB82FA39.png"
+  }
+]
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/json/overviewGF.json

+[
+  {
+  "titie": "逆变器台数",
+  "title1": "逆变器台数(台)",
+  "action": "*.replace(\".0\",\"\")",
+  "url": "upload/jxiop/amos_studio/EA3572E1BD31DC1E7D8DA162F09ECB.png"
+  },
+  {
+    "titie": "装机容量",
+    "title1": "装机容量(MW)",
+    "url": "upload/jxiop/amos_studio/2F378EF430F788CA71E876359B46C4E.png"
+  },
+  {
+    "titie": "有功功率",
+    "title1": "有功功率(MW)",
+    "action": "String.format(\"%.2f\",Double.parseDouble(*)/1000)",
+    "url": "upload/jxiop/amos_studio/C46B483E51ACAC137CBEB5156F6F377.png"
+  },
+  {
+    "url": "upload/jxiop/amos_studio/F9A5F9E6EB7C825CA869063E817E281.png",
+    "title1": "综合效率（%）",
+    "title2": "综合效率"
+  },
+  {
+    "url": "upload/jxiop/amos_studio/DD1CE8BAF5A7C3AC5E6E2C0D46C3EEC.png",
+    "title1": "辐照强度（W/㎡）",
+    "title": "总辐射"
+  },
+  {
+    "url": "upload/jxiop/amos_studio/22639FDFF29B20B681DF55F1252876B3.png",
+    "title1": "总辐射日累计（Mb/㎡）",
+    "title2": "总辐射累计"
+  },
+  {
+    "titie": "日发电量",
+    "title1": "日发电量(万kWh)",
+    "url": "upload/jxiop/amos_studio/E07C6C41715033585F69934AF08A3431.png"
+  },
+  {
+    "titie": "月发电量",
+    "title1": "月发电量(万kWh)",
+    "url": "upload/jxiop/amos_studio/6CE2792ABEEAE816CB798649A6796.png"
+  },
+  {
+    "titie": "年发电量",
+    "title1": "年发电量(万kWh)",
+    "url": "upload/jxiop/amos_studio/12D321E29727689B334E3E625383EB7C.png"
+  },
+  {
+    "titie": "上网电量",
+    "title1": "上网电量(万kWh)",
+    "url": "upload/jxiop/amos_studio/1660C5DDA22ACFADC89A60DEDB82FA39.png"
+  },
+  {
+    "titie": "年利用小时",
+    "title1": "年利用小时",
+    "action":"String.format(\"%.2f\",Double.parseDouble(columnMap.get(\"*\").toString())/ (Double.parseDouble(columnMap.get(\"-\").toString())*1000))",
+    "url": "upload/jxiop/amos_studio/C46B483E51ACAC137CBEB5156F6F377.png"
+  }
+]
\ No newline at end of file