单机信息总览线路明细功率曲线接口

src/main/java/com/gyee/frame/controller/powersaturation/PowerSaturationController.java

@@ -14,7 +14,6 @@ import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -32,7 +31,7 @@ public class PowerSaturationController {
     private WindturbinecurvefittingService windturbinecurvefittingService;
 
     /**日功率饱和列表**/
-    @GetMapping("/powersaturationlist")
+    @PostMapping("/powersaturationlist")
     @ResponseBody
     public AjaxResult powersaturationlist(Tablepar tablepar, String wtId, String recorddate) {
 

src/main/java/com/gyee/frame/service/WarningInfoDayService.java

@@ -181,20 +181,41 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 		{
 			for(WarningInfoDay ap:wils)
 			{
-				Warning2 warning=InitialRunner.warningmap.get(ap.getWarningid());
-				WarningClassify warningClassify=InitialRunner.warningClassifymap.get(warning.getWarningclassifyid());
+				Warning2 warning=null;
+				if(InitialRunner.warningmap.containsKey(ap.getWarningid()))
+				{
+					warning=InitialRunner.warningmap.get(ap.getWarningid());
+				}
+
 				List<WarningInfoDay> items=null;
+				if(StringUtils.notEmp(warning) && StringUtils.notEmp(warning.getWarningclassifyid()) && !warning.getWarningclassifyid().equals(""))
+				{
+						WarningClassify warningClassify=null;
+						if(InitialRunner.warningClassifymap.containsKey(warning.getWarningclassifyid()))
+						{
+							warningClassify=InitialRunner.warningClassifymap.get(warning.getWarningclassifyid());
+						}
+						if(StringUtils.notEmp(warningClassify))
+						{
+							if (lsMap.containsKey(warningClassify.getName())) {
+								items = lsMap.get(warningClassify.getName());
+								items.add(ap);
+								lsMap.put(warningClassify.getName(), items);
+							} else {
+								items = new ArrayList<>();
+								items.add(ap);
+								lsMap.put(warningClassify.getName(), items);
+							}
+						}
+
 
-				if (lsMap.containsKey(warningClassify.getName())) {
-					items = lsMap.get(warningClassify.getName());
-					items.add(ap);
-					lsMap.put(warningClassify.getName(), items);
-				} else {
-					items = new ArrayList<>();
-					items.add(ap);
-					lsMap.put(warningClassify.getName(), items);
 				}
 
+
+
+
+
+
 			}
 
 
@@ -347,20 +368,30 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 		{
 			for(WarningInfoDay ap:wils)
 			{
-				Manufacturer manufacturer=InitialRunner.manufacturermap.get(ap.getManufacturerid());
+				Manufacturer manufacturer=null;
+
+				if(InitialRunner.manufacturermap.containsKey(ap.getManufacturerid()))
+				{
+					 manufacturer=InitialRunner.manufacturermap.get(ap.getManufacturerid());
+
+				}
 
 				List<WarningInfoDay> items=null;
 
-				if (lsMap.containsKey(manufacturer.getName())) {
-					items = lsMap.get(manufacturer.getName());
-					items.add(ap);
-					lsMap.put(manufacturer.getName(), items);
-				} else {
-					items = new ArrayList<>();
-					items.add(ap);
-					lsMap.put(manufacturer.getName(), items);
+				if(null!=manufacturer)
+				{
+					if (lsMap.containsKey(manufacturer.getName())) {
+						items = lsMap.get(manufacturer.getName());
+						items.add(ap);
+						lsMap.put(manufacturer.getName(), items);
+					} else {
+						items = new ArrayList<>();
+						items.add(ap);
+						lsMap.put(manufacturer.getName(), items);
+					}
 				}
 
+
 			}
 
 
@@ -518,20 +549,35 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 			int total=wils.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//总合计
 			for(WarningInfoDay ap:wils)
 			{
-				Warning2 warning=InitialRunner.warningmap.get(ap.getWarningid());
-				WarningClassify warningClassify=InitialRunner.warningClassifymap.get(warning.getWarningclassifyid());
-				List<WarningInfoDay> items=null;
+				Warning2 warning=null;
+				if(InitialRunner.warningmap.containsKey(ap.getWarningid()))
+				{
+					warning=InitialRunner.warningmap.get(ap.getWarningid());
+				}
 
-				if (lsMap.containsKey(warningClassify.getName())) {
-					items = lsMap.get(warningClassify.getName());
-					items.add(ap);
-					lsMap.put(warningClassify.getName(), items);
-				} else {
-					items = new ArrayList<>();
-					items.add(ap);
-					lsMap.put(warningClassify.getName(), items);
+				List<WarningInfoDay> items=null;
+				if(StringUtils.notEmp(warning) && StringUtils.notEmp(warning.getWarningclassifyid()) && !warning.getWarningclassifyid().equals(""))
+				{
+					WarningClassify warningClassify=null;
+					if(InitialRunner.warningClassifymap.containsKey(warning.getWarningclassifyid()))
+					{
+						warningClassify=InitialRunner.warningClassifymap.get(warning.getWarningclassifyid());
+					}
+					if(StringUtils.notEmp(warningClassify))
+					{
+						if (lsMap.containsKey(warningClassify.getName())) {
+							items = lsMap.get(warningClassify.getName());
+							items.add(ap);
+							lsMap.put(warningClassify.getName(), items);
+						} else {
+							items = new ArrayList<>();
+							items.add(ap);
+							lsMap.put(warningClassify.getName(), items);
+						}
+					}
 				}
 
+
 			}
 
 
@@ -618,20 +664,28 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 			int total=wils.stream().mapToInt(WarningInfoDay::getFrequencyday).sum();//总合计
 			for(WarningInfoDay ap:wils)
 			{
-				Manufacturer manufacturer=InitialRunner.manufacturermap.get(ap.getManufacturerid());
-
-				List<WarningInfoDay> items=null;
+				Manufacturer manufacturer=null;
+				if(InitialRunner.manufacturermap.containsKey(ap.getManufacturerid()))
+				{
+					manufacturer=InitialRunner.manufacturermap.get(ap.getManufacturerid());
+				}
 
-				if (lsMap.containsKey(manufacturer.getName())) {
-					items = lsMap.get(manufacturer.getName());
-					items.add(ap);
-					lsMap.put(manufacturer.getName(), items);
-				} else {
-					items = new ArrayList<>();
-					items.add(ap);
-					lsMap.put(manufacturer.getName(), items);
+				if(null!=manufacturer)
+				{
+					List<WarningInfoDay> items=null;
+
+					if (lsMap.containsKey(manufacturer.getName())) {
+						items = lsMap.get(manufacturer.getName());
+						items.add(ap);
+						lsMap.put(manufacturer.getName(), items);
+					} else {
+						items = new ArrayList<>();
+						items.add(ap);
+						lsMap.put(manufacturer.getName(), items);
+					}
 				}
 
+
 			}
 
 

src/main/java/com/gyee/frame/service/contrast/ContrastZjService.java

@@ -41,7 +41,6 @@ public class ContrastZjService {
         if (StringUtils.notEmp(wpId) && StringUtils.notEmp(zjs)) {
             Map<String, Windpowerstation> wpmap = InitialRunner.wpmap;
 
-            List<ConditionVo> ctvos = new ArrayList<ConditionVo>();
             if (zjs.indexOf(",") > 0) {
                 String[] strs = zjs.split(",");
 
@@ -110,10 +109,10 @@ public class ContrastZjService {
                     vo.setBeginDate(beginDate);
                     vo.setEndDate(endDate);
                     vo.setWpId(wpId);
-                    ctvos.add(vo);
+
 
                     setBenchMarkInfo(bm,wpId, beginDate, endDate);// 统计值际数据
-                    setBenchMark(bm, ctvos, str,request);
+                    setBenchMark(bm, vo, str,request);
                 }
             } else {
                 BenchMarkVo bm = new BenchMarkVo();
@@ -178,10 +177,10 @@ public class ContrastZjService {
                 vo.setBeginDate(beginDate);
                 vo.setEndDate(endDate);
                 vo.setWpId(wpId);
-                ctvos.add(vo);
+
 
                 setBenchMarkInfo(bm,wpId, beginDate, endDate);// 统计值际数据
-                setBenchMark(bm, ctvos, zjs,request);
+                setBenchMark(bm, vo, zjs,request);
             }
 
         }
@@ -189,7 +188,7 @@ public class ContrastZjService {
     }
 
 
-    private void setBenchMark(BenchMarkVo bm, List<ConditionVo> ctvos, String str,HttpServletRequest request) {
+    private void setBenchMark(BenchMarkVo bm, ConditionVo ctvos, String str,HttpServletRequest request) {
         totalBenchmarkInfo(bm);// 统计值际计算指标
 
         bm.setCid(StringUtils.getUUID());
@@ -219,18 +218,18 @@ public class ContrastZjService {
 
         request.getSession().setAttribute("bmvos", vos);
 
-//        Map<String, List<ConditionVo>> ctmap = null;
-//        if (null != request.getSession().getAttribute("bmwtvos")) {
-//            ctmap = (Map<String, List<ConditionVo>>) request.getSession().getAttribute("bmwtvos");
-//
-//            ctmap.put(bm.getCid(), ctvos);
-//        } else {
-//            ctmap = new HashMap<String, List<ConditionVo>>();
-//
-//            ctmap.put(bm.getCid(), ctvos);
-//        }
-//
-//        request.getSession().setAttribute("bmwtvos", ctmap);
+        Map<String, ConditionVo> ctmap = null;
+        if (null != request.getSession().getAttribute("bmwtvos")) {
+            ctmap = (Map<String, ConditionVo>) request.getSession().getAttribute("bmwtvos");
+
+            ctmap.put(bm.getCid(), ctvos);
+        } else {
+            ctmap = new HashMap<String, ConditionVo>();
+
+            ctmap.put(bm.getCid(), ctvos);
+        }
+
+        request.getSession().setAttribute("bmwtvos", ctmap);
     }
 
     private void totalBenchmarkInfo(BenchMarkVo bm) {