矩阵设备增加部分信息

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/monitor/MatrixController.java

@@ -4,6 +4,7 @@ package com.gyee.runeconomy.controller.monitor;/*
 */
 
 import com.gyee.common.model.StringUtils;
+import com.gyee.runeconomy.dto.AjaxResult;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
 import com.gyee.runeconomy.service.monitor.MatrixService;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.Map;
 
 @Controller
@@ -84,5 +86,27 @@ public class MatrixController {
         }
     }
 
+    /**
+     * 基础矩阵
+     *
+     * @return
+     */
+    @GetMapping("/sbxx")
+    @ResponseBody
+    @ApiOperation(value = "矩阵设备信息", notes = "矩阵设备信息")
+    public AjaxResult basic(@RequestParam(value = "wtid", required = true) String wtid) throws Exception {
+
+        Map<String,String> resultList = new HashMap<>();
+        if (com.gyee.runeconomy.util.StringUtils.notEmp(wtid)) {
+            resultList = matrixService.equipment(wtid);
+        }
+
+        if (null != resultList) {
+            return AjaxResult.successData(200, resultList);
+        } else {
+            return AjaxResult.error(500, "操作失败");
+        }
+
+    }
 
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Windresourceanalysis/WindresourceanalysisService.java

@@ -83,9 +83,18 @@ public class WindresourceanalysisService {
                 List<PointData> mins = edosUtil.getHistStat(pjfs, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 1);
                 List<PointData> ave = edosUtil.getHistStat(pjfs, startTime.getTime() / 1000, endTime.getTime() / 1000, (long) 1, null, 2);
 
-                double avenum = ave.get(0).getPointValueInDouble();
-                double maxsnum = maxs.get(0).getPointValueInDouble();
-                double minsnum = mins.get(0).getPointValueInDouble();
+                double avenum = 0.0;
+                double maxsnum = 0.0;
+                double minsnum = 0.0;
+                if (wp.getId().contains("NJLF01")) {
+                    avenum = ave.get(0).getPointValueInDouble() / 10;
+                    maxsnum = maxs.get(0).getPointValueInDouble() / 10;
+                    minsnum = mins.get(0).getPointValueInDouble() /10;
+                } else {
+                    avenum = ave.get(0).getPointValueInDouble();
+                    maxsnum = maxs.get(0).getPointValueInDouble();
+                    minsnum = mins.get(0).getPointValueInDouble();
+                }
 
                 vo.setWpid(wp.getWindpowerstationId());
                 vo.setName(collect.get(0).getName());

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MatrixService.java

@@ -811,4 +811,24 @@ public class MatrixService {
 
         return resultMap;
     }
+
+
+    public Map<String,String> equipment(String wtid) throws Exception {
+
+        Map<String,String> map = new HashMap<>();
+        List<ProBasicEquipment> collect = CacheContext.wtls.stream().filter(w -> wtid.equals(w.getId())).collect(Collectors.toList());
+        List<ProEconEquipmentmodel> cs = CacheContext.equipmentmodels.stream().filter(m -> collect.get(0).getModelId().equals(m.getId())).collect(Collectors.toList());
+
+        List<ProBasicSquare> squares = CacheContext.sqls.stream().filter(s -> collect.get(0).getSquareId().equals(s.getId())).collect(Collectors.toList());
+        if (wtid!=null && !wtid.isEmpty() && wtid.contains("F_WT")){
+                map.put("model",cs.get(0).getId());
+                map.put("manufacturer",cs.get(0).getWindturbineManufacturerId());
+        }
+        if (wtid!=null && !wtid.isEmpty() && wtid.contains("G_IN")){
+            map.put("model",cs.get(0).getId());
+            map.put("manufacturer",cs.get(0).getWindturbineManufacturerId());
+            map.put("squareid",squares.get(0).getTypes());
+        }
+        return map;
+    }
 }