状态规则修改

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/StatusService.java

@@ -847,7 +847,7 @@ public class StatusService {
             Optional<ProBasicStatusPoint> first = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformCode().equals(Contant.AI422)).findFirst();
             if (first.isPresent()){
                 ProBasicStatusPoint windturbinestatusdi = first.get();
-                int pointValueInDouble = (int) edosUtil.getRealData(windturbinestatusdi.getId()).getPointValueInDouble();
+                int pointValueInDouble = (int) edosUtil.getRealData(windturbinestatusdi.getNemCode()).getPointValueInDouble();
                 mxstatus = (double)stateMap.get(pointValueInDouble);
             }
         }else {
@@ -855,7 +855,7 @@ public class StatusService {
             Map<String,String> stateMap = new HashMap<>();
             List<ProBasicStatusPoint> windturbinestatusdis = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformCode().equals(Contant.MX000) || w.getUniformCode().equals(Contant.MX002) || w.getUniformCode().equals(Contant.MX003) || w.getUniformCode().equals(Contant.MX006) || w.getUniformCode().equals(Contant.MX008)).collect(Collectors.toList());
             for(ProBasicStatusPoint w : windturbinestatusdis){
-                PointData realData = edosUtil.getRealData(w.getId());
+                PointData realData = edosUtil.getRealData(w.getNemCode());
                 if (realData.getPointValueInDouble()==1){
                     stateMap.put(w.getUniformCode(),w.getTypeId());
                     mxstatus = Double.parseDouble(w.getTypeId());

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

@@ -4,7 +4,6 @@ package com.gyee.runeconomy.controller.monitor;/*
 */
 
 import com.gyee.common.model.StringUtils;
-import com.gyee.common.vo.monitor.AgcVo;
 import com.gyee.common.vo.monitor.StatusVo;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
@@ -40,7 +39,7 @@ public class StatusController {
 
         List<StatusVo> resultList = statusService.monitor(company,type);
         if (StringUtils.isNotNull(resultList)) {
-            return R.data(ResultMsg.ok(resultList));
+            return R.data(ResultMsg.ok(resultList,resultList.size()));
         }else{
             return R.error(ResultMsg.error());
         }