修改代码

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

@@ -24,10 +24,7 @@ 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.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
@@ -150,7 +147,7 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "风机布置图-总概览")
     @GetMapping("/overview")
-    public ResponseModel<Map<String, Object>> getData(@RequestParam(value = "stationId", required = true)String stationId) {
+    public ResponseModel<IPage<Map<String, Object>>> getData(@RequestParam(value = "stationId", required = true)String stationId) {
 
 
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
@@ -161,6 +158,7 @@ public class MonitorFanIdxController extends BaseController {
         List<String> columnLists = Arrays.asList(avgColumns);
         Map<String, Object> columnMap = new HashMap<>();
 
+
         for (String column : columnList) {
             Double result = commonService.getTotalByIndicatior(gatewayId, column);
             columnMap.put(column, result);
@@ -171,13 +169,44 @@ public class MonitorFanIdxController extends BaseController {
         }
 
         String num = monitorFanIndicator.getFJCount(gatewayId);
-        columnMap.put("风机台数",Integer.valueOf(num));
+        columnMap.put("风机台数",num);
 
         Double capacityl = commonService.getStationCapactityByStationWerks(stationBasic.getStationNumber());
         columnMap.put("装机容量",capacityl);
 
 
-        return ResponseHelper.buildResponse(columnMap);
+        List<Map<String,Object>> objects = new ArrayList<>();
+        Map<String, Object> data = new HashMap<>();
+        data.put("title",Float.valueOf(columnMap.get("装机容量").toString()));
+        objects.add(data);
+        Map<String, Object> data1 = new HashMap<>();
+        data1.put("title",Float.valueOf(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()));
+        objects.add(data3);
+        Map<String, Object> data4 = new HashMap<>();
+        data4.put("title",Float.valueOf(columnMap.get("瞬时风速").toString()));
+        objects.add(data4);
+        Map<String, Object> data5 = new HashMap<>();
+        data5.put("title",Float.valueOf(columnMap.get("年发电量").toString()));
+        objects.add(data5);
+        Map<String, Object> data6 = new HashMap<>();
+        data6.put("title",Float.valueOf(columnMap.get("有功功率").toString()));
+        objects.add(data6);
+        Map<String, Object> data7 = new HashMap<>();
+        data7.put("title",7.47);
+        objects.add(data7);
+
+        IPage<Map<String,Object>> result = new Page<>();
+        result.setRecords(objects);
+        result.setCurrent(1);
+        result.setTotal(objects.size());
+
+        return ResponseHelper.buildResponse(result);
     }
 
 

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -361,8 +362,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 values.add(stringStringMap.get("value"));
             }else {
                 valueList.add(stringStringMap.get("value"));
+                time.add(stringStringMap.get("createdTime"));
             }
-            time.add(stringStringMap.get("createdTime"));
         }
 
         List<  Map<String,Object>> seriesData = new ArrayList<>();
@@ -425,6 +426,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         }
     }
 
+    @Scheduled(cron = "0 57 23 * * ?")
+    private void deleteTemporaryData(){
+        QueryWrapper<TemporaryData> wrapper = new QueryWrapper<>();
+        temporaryDataMapper.delete(wrapper);
+    }
+