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

src/main/java/com/gyee/frame/controller/singleanalysis/SingleAnalysisController.java

@@ -109,9 +109,26 @@ public class SingleAnalysisController {
 
             SingleAnalysisVo  tbzb =singleAnalysisService.SingleAnalysisListByWtId(byzb,tqzb);
 
+
+            cal.set(Calendar.YEAR, Integer.valueOf(year));
+            cal.set(Calendar.MONTH, Integer.valueOf(month) - 1);
+            cal.add(Calendar.MONTH, -1);
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+            beginDate = cal.getTime();
+            cal.add(Calendar.MONTH, 1);
+            endDate = cal.getTime();
+
+
+            SingleAnalysisVo  hqzb =singleAnalysisService.SingleAnalysisListByWtId(wtId,beginDate,endDate);
+            SingleAnalysisVo  hbzb =singleAnalysisService.SingleAnalysisListByWtId(byzb,hqzb);
+
+
+
             map.put("byzb",byzb);//本月指标
             map.put("tqzb",tqzb);//全年同期
             map.put("tbzb",tbzb);//同比指标
+            map.put("hqzb",hqzb);//上月同期
+            map.put("hbzb",hbzb);//环比指标
         }
 
         if (null!=map) {