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

src/main/java/com/gyee/frame/controller/contrast/ContrastController.java

@@ -320,7 +320,7 @@ public class ContrastController {
         List<BenchMarkVo> vos=null;
        // List<BenchMarkVo> vos =contrastWtService.benchmarkWtList(wpId,wtId,beginDate, endDate);
 
-            contrastZjService.addBenchmarkZj(request, wpId, year, month, zjs);
+        contrastZjService.addBenchmarkZj(request, wpId, year, month, zjs);
 
 
         if (null != request.getSession().getAttribute("bmvos")) {
@@ -330,6 +330,15 @@ public class ContrastController {
 
         }
 
+        Map<String, ConditionVo> ctmap = null;
+        if (null != request.getSession().getAttribute("bmwtvos")) {
+            ctmap = (Map<String, ConditionVo>) request.getSession().getAttribute("bmwtvos");
+        }else
+        {
+            ctmap=new HashMap<>();
+        }
+
+        Map<String,Object> map=new HashMap<>();
         if (vos != null && !vos.isEmpty()) {
             BenchmarkUtil bu = new BenchmarkUtil();
             vos = bu.getBenchMarkOrder(vos);
@@ -338,6 +347,8 @@ public class ContrastController {
             {
                 vos = bu.getBenchMarkOrder(vos,tablepar);
             }
+            map.put("list",vos);//每次添加，前台需要把新返回的记录，追加到前台seesion对象中
+            map.put("key",ctmap);//每次添加，前台需要把新返回的记录，追加到前台seesion对象中
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
             return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
@@ -384,13 +395,16 @@ public class ContrastController {
     @ResponseBody
     public AjaxResult benchmarkZjWtList(HttpServletRequest request,Tablepar tablepar, ConditionVo ct) {
         List<BenchMarkVo> vos=new ArrayList<>();
-
+//        Map<String, List<ConditionVo>> ctmap = null;
+//        if (null != request.getSession().getAttribute("bmwtvos")) {
+//            ctmap = (Map<String, List<ConditionVo>>) request.getSession().getAttribute("bmwtvos");
+//        } else {
+//            ctmap = new HashMap<String, List<ConditionVo>>();
+//        }
 
         if (StringUtils.notEmp(ct) ) {
 
             Map<String, BenchMarkVo> bmmap = new HashMap<String, BenchMarkVo>();
-
-
             String wpId = ct.getWpId();
             String beginDate = DateUtils.format(ct.getBeginDate());
             String endDate =DateUtils.format(ct.getEndDate());