对标分析页面接口增加分页功能，单机性能分析详情页bug修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/bmk/BenchmarkingController.java

@@ -21,6 +21,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @RestController
@@ -188,9 +189,11 @@ public class BenchmarkingController {
                   @RequestParam(value = "beginDate",required = true) String beginDate,
                   @RequestParam(value = "endDate",required = true) String endDate,
                   @RequestParam(value = "target",required = true) String target,
-                  @RequestParam(value = "sort",required = true) String sort
+                  @RequestParam(value = "sort",required = true) String sort,
+                  @RequestParam(value = "pageNum",required = true) int pageNum,
+                  @RequestParam(value = "pageSize",required = true) int pageSize
     ){
-        List<WxsslVo> resultList = benchmarkingService.cndb(companys,type,wpid,beginDate,endDate,target,sort);
+        Map<String, Object> resultList = benchmarkingService.cndb(companys,type,wpid,beginDate,endDate,target,sort,pageNum,pageSize);
 
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
@@ -205,36 +208,55 @@ public class BenchmarkingController {
     @ApiOperation(value = "场内对标同环比", notes = "场内对标同环比")
     public R cndbthb(@RequestParam(value = "companys",required = true) String companys,
                   @RequestParam(value = "type",required = true) String type,
-                  @RequestParam(value = "wpid",required = true) String wpid
+                  @RequestParam(value = "wpid",required = true) String wpid,
+                     @RequestParam(value = "pageNum",required = true) int pageNum,
+                     @RequestParam(value = "pageSize",required = true) int pageSize
     ) throws Exception {
         List<WxsslVo> resultList = new ArrayList<>();
         //获取当前时间
         String endDate = DateUtils.toDate1(new Date());
         Date date = DateUtils.parseDate(endDate);
         String  beginDate = DateUtils.toDate1(DateUtils.getFirstAndLastDayOfMonth(date));
-        List<WxsslVo> dateList = benchmarkingService.cndbthb(companys,type,wpid,beginDate,endDate);
-        if(dateList != null && dateList.size()>0){
-            dateList.get(0).setName("当月");
-            resultList.add((dateList != null && dateList.size()>0)?dateList.get(0): null);
-        }
-
-
-        String yestmonthLastday =  DateUtils.toDate1(DateUtils.getYestmonthLastday(date));
-        String  yestmonthbeginday = DateUtils.toDate1(DateUtils.getFirstAndLastDayOfMonth(DateUtils.parseDate(yestmonthLastday)));
-        List<WxsslVo> hbList = benchmarkingService.cndbthb(companys,type,wpid,yestmonthbeginday,yestmonthLastday);
-        if(hbList != null && hbList.size()>0){
-            hbList.get(0).setName("环比");
-            resultList.add((hbList != null && hbList.size()>0)?hbList.get(0): null);
-        }
-
-
-        Date  subOneYear = DateUtils.subOneYear(date);
-        String tbbeginDate = DateUtils.toDate1(DateUtils.getMonthFirstZero(DateUtils.toDate1(subOneYear)));
-        String tbendDate = DateUtils.toDate1(DateUtils.getMonthLast(subOneYear));
-        List<WxsslVo> tbList = benchmarkingService.cndbthb(companys,type,wpid,tbbeginDate,tbendDate);
-        if(tbList != null && tbList.size()>0){
-            tbList.get(0).setName("同比");
-            resultList.add((tbList != null && tbList.size()>0)?tbList.get(0):  null);
+//        Map<String, Object> dateList = benchmarkingService.cndbthb(companys,type,wpid,beginDate,endDate,page,pageSize);
+//        if(dateList != null && dateList.size()>0){
+//            dateList.get(0).setName("当月");
+//            resultList.add((dateList != null && dateList.size()>0)?dateList.get(0): null);
+//        }
+        Map<String, Object> dateList = benchmarkingService.cndbthb(companys, type, wpid, beginDate, endDate, pageNum, pageSize);
+        if (dateList != null && dateList.containsKey("resultList")) {
+            List<WxsslVo> currentMonthList = (List<WxsslVo>) dateList.get("resultList");
+            if (currentMonthList.size() > 0) {
+                WxsslVo firstItem = currentMonthList.get(0);
+                firstItem.setName("当月");
+                resultList.add(firstItem);
+            }
+        }
+
+        String previousMonthEndDate = DateUtils.toDate1(DateUtils.getYestmonthLastday(date));
+        String previousMonthBeginDate = DateUtils.toDate1(DateUtils.getFirstAndLastDayOfMonth(DateUtils.parseDate(previousMonthEndDate)));
+
+        Map<String, Object> previousMonthList = benchmarkingService.cndbthb(companys, type, wpid, previousMonthBeginDate, previousMonthEndDate, pageNum, pageSize);
+        if (previousMonthList != null && previousMonthList.containsKey("resultList")) {
+            List<WxsslVo> previousMonthData = (List<WxsslVo>) previousMonthList.get("resultList");
+            if (previousMonthData.size() > 0) {
+                WxsslVo firstItem = previousMonthData.get(0);
+                firstItem.setName("环比");
+                resultList.add(firstItem);
+            }
+        }
+
+        Date previousYearDate = DateUtils.subOneYear(date);
+        String previousYearBeginDate = DateUtils.toDate1(DateUtils.getMonthFirstZero(DateUtils.toDate1(previousYearDate)));
+        String previousYearEndDate = DateUtils.toDate1(DateUtils.getMonthLast(previousYearDate));
+
+        Map<String, Object> previousYearList = benchmarkingService.cndbthb(companys, type, wpid, previousYearBeginDate, previousYearEndDate, pageNum, pageSize);
+        if (previousYearList != null && previousYearList.containsKey("resultList")) {
+            List<WxsslVo> previousYearData = (List<WxsslVo>) previousYearList.get("resultList");
+            if (previousYearData.size() > 0) {
+                WxsslVo firstItem = previousYearData.get(0);
+                firstItem.setName("同比");
+                resultList.add(firstItem);
+            }
         }
 
 
@@ -308,9 +330,11 @@ public class BenchmarkingController {
                   @RequestParam(value = "beginDate",required = true) String beginDate,
                   @RequestParam(value = "endDate",required = true) String endDate,
                   @RequestParam(value = "target",required = true) String target,
-                  @RequestParam(value = "sort",required = true) String sort
+                  @RequestParam(value = "sort",required = true) String sort,
+                  @RequestParam(value = "pageNum",required = true) int pageNum,
+                  @RequestParam(value = "pageSize",required = true) int pageSize
     ){
-        List<WxsslVo> resultList = benchmarkingService.cjdb(companys,type,wpids,beginDate,endDate,target,sort);
+        Map<String, Object> resultList = benchmarkingService.cjdb(companys,type,wpids,beginDate,endDate,target,sort,pageNum,pageSize);
 
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
@@ -330,9 +354,11 @@ public class BenchmarkingController {
                   @RequestParam(value = "beginDate",required = true) String beginDate,
                   @RequestParam(value = "endDate",required = true) String endDate,
                   @RequestParam(value = "target",required = true) String target,
-                  @RequestParam(value = "sort",required = true) String sort
+                  @RequestParam(value = "sort",required = true) String sort,
+                  @RequestParam(value = "pageNum",required = true) int pageNum,
+                  @RequestParam(value = "pageSize",required = true) int pageSize
     ){
-        List<WxsslVo> resultList = benchmarkingService.xmdb(companys,type,wpids,projectids,beginDate,endDate,target,sort);
+        Map<String, Object> resultList = benchmarkingService.xmdb(companys,type,wpids,projectids,beginDate,endDate,target,sort,pageNum,pageSize);
 
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
@@ -353,9 +379,11 @@ public class BenchmarkingController {
                   @RequestParam(value = "beginDate",required = true) String beginDate,
                   @RequestParam(value = "endDate",required = true) String endDate,
                   @RequestParam(value = "target",required = true) String target,
-                  @RequestParam(value = "sort",required = true) String sort
+                  @RequestParam(value = "sort",required = true) String sort,
+                  @RequestParam(value = "pageNum",required = true) int pageNum,
+                  @RequestParam(value = "pageSize",required = true) int pageSize
     ){
-        List<WxsslVo> resultList = benchmarkingService.xldb(companys,type,wpids,projectids,lineids,beginDate,endDate,target,sort);
+        Map<String, Object> resultList = benchmarkingService.xldb(companys,type,wpids,projectids,lineids,beginDate,endDate,target,sort,pageNum,pageSize);
 
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
@@ -378,9 +406,11 @@ public class BenchmarkingController {
                      @RequestParam(value = "beginDate",required = true)String beginDate,
                      @RequestParam(value = "endDate",required = true)String endDate,
                      @RequestParam(value = "target",required = true) String target,
-                     @RequestParam(value = "sort",required = true) String sort
+                     @RequestParam(value = "sort",required = true) String sort,
+                     @RequestParam(value = "pageNum",required = true) int pageNum,
+                     @RequestParam(value = "pageSize",required = true) int pageSize
     ){
-        List<WxsslVo> resultList =  benchmarkingService.details(id,beginDate,endDate,target,sort);
+        Map<String, Object> resultList =  benchmarkingService.details(id,beginDate,endDate,target,sort,pageNum,pageSize);
 
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -11,6 +11,7 @@ import com.gyee.common.vo.benchmark.FjjxbVo;
 import com.gyee.common.vo.benchmark.FjjxbmxVo;
 import com.gyee.common.vo.benchmark.WxsslVo;
 import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.mapper.auto.ProEconEquipmentInfoDay1Mapper;
 import com.gyee.runeconomy.model.auto.*;
 import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDay1Service;
@@ -40,6 +41,9 @@ public class BenchmarkingService {
     @Resource
     private IProEconEquipmentInfoDay1Service proEconEquipmentInfoDay1Service;
 
+    @Resource
+    private ProEconEquipmentInfoDay1Mapper proEconEquipmentInfoDay1Mapper;
+
     public List<ProBasicCompany> companys() {
         List<ProBasicCompany> cpls = CacheContext.cpls;
         Map<String, ProBasicRegion> rgmap = CacheContext.rgmap;
@@ -562,8 +566,10 @@ public class BenchmarkingService {
 
 
 
-    public List<WxsslVo> cndb(String companys, String type, String wpid, String beginDate, String endDate, String target, String sort) {
+    public Map<String, Object> cndb(String companys, String type, String wpid, String beginDate, String endDate, String target, String sort,int pageNum, int pageSize) {
         QueryWrapper<ProEconEquipmentInfoDay1> qw = new QueryWrapper<>();
+         Integer total =0;
+
         List<WxsslVo> resultList = new ArrayList<>();
         qw.select("record_date,sum(rfdl) rfdl,sum(rllfdl) rllfdl,avg(rpjfs) rpjfs,sum(rjxssdl) rjxssdl,sum(rcnsljxssdl) rcnsljxssdl,sum(rgzssdl) rgzssdl,sum(rcnslgzssdl) rcnslgzssdl,sum(rxdtjssdl) rxdtjssdl,sum(rxdjclssdl) rxdjclssdl,sum(rdjssdl) rdjssdl,sum(rqxjclssdl) rqxjclssdl,sum(rsdtjssdl) rsdtjssdl,sum(rxnssdl) rxnssdl,sum(rcwsldwssdl) rcwsldwssdl,sum(rcwsltqssdl) rcwsltqssdl");
         qw.ge("record_date",DateUtils.parseDate(beginDate)).le("record_date",DateUtils.parseDate(endDate));
@@ -581,7 +587,25 @@ public class BenchmarkingService {
             qw.like("windturbine_id","_IN_");
         }
         qw.groupBy("record_date");
-        List<WxsslVo> wxsslVoList = getWxsslSortVos(qw,resultList,TYPE_DATE);
+
+//        total = proEconEquipmentInfoDay1Mapper.selectCount(qw);
+
+//        qw1.ge("record_date",DateUtils.parseDate(beginDate)).le("record_date",DateUtils.parseDate(endDate));
+//        if (StringUtils.isNotEmpty(wpid)){
+//            qw1.eq("windpowerstation_id",wpid);
+//        }
+//        if (companys.endsWith("RGN")){
+//            qw1.eq("region_id",companys);
+//        }else {
+//            qw1.eq("company_id",companys);
+//        }
+//        if (type.equals("-1")){
+//            qw1.like("windturbine_id","_WT_");
+//        }else {
+//            qw1.like("windturbine_id","_IN_");
+//        }
+
+        Map<String, Object> wxsslVoList = getWxsslSortVos(qw,total,resultList,TYPE_DATE,pageNum,pageSize);
         if (StringUtils.isNotEmpty(target) && StringUtils.isNotEmpty(sort)){
             if (sort.equals("1")){
                 SortUtils.sort(resultList,target,SortUtils.ASC);
@@ -597,8 +621,9 @@ public class BenchmarkingService {
 
 
 
-    public List<WxsslVo> cndbthb(String companys, String type, String wpid, String beginDate, String endDate) {
+    public Map<String, Object> cndbthb(String companys, String type, String wpid, String beginDate, String endDate,int pageNum, int pageSize) {
         QueryWrapper<ProEconEquipmentInfoDay1> qw = new QueryWrapper<>();
+        Integer total =0;
         List<WxsslVo> resultList = new ArrayList<>();
         qw.select("sum(rfdl) rfdl,sum(rllfdl) rllfdl,avg(rpjfs) rpjfs,sum(rjxssdl) rjxssdl,sum(rcnsljxssdl) rcnsljxssdl,sum(rgzssdl) rgzssdl,sum(rcnslgzssdl) rcnslgzssdl,sum(rxdtjssdl) rxdtjssdl,sum(rxdjclssdl) rxdjclssdl,sum(rdjssdl) rdjssdl,sum(rqxjclssdl) rqxjclssdl,sum(rsdtjssdl) rsdtjssdl,sum(rxnssdl) rxnssdl,sum(rcwsldwssdl) rcwsldwssdl,sum(rcwsltqssdl) rcwsltqssdl");
         qw.ge("record_date",DateUtils.parseDate(beginDate)).le("record_date",DateUtils.parseDate(endDate));
@@ -616,13 +641,17 @@ public class BenchmarkingService {
             qw.like("windturbine_id","_IN_");
         }
         qw.groupBy("windpowerstation_id");
-        List<WxsslVo> wxsslVoList = getWxsslSortVos(qw,resultList,TYPE_DATE);
+
+//        total = proEconEquipmentInfoDay1Mapper.selectCount(qw);
+
+        Map<String, Object> wxsslVoList = getWxsslSortVos(qw,total,resultList,TYPE_DATE,pageNum,pageSize);
         return wxsslVoList;
     }
 
-    public List<WxsslVo> cjdb(String companys, String type, String wpids, String beginDate, String endDate, String target, String sort) {
+    public Map<String, Object> cjdb(String companys, String type, String wpids, String beginDate, String endDate, String target, String sort,int pageNum, int pageSize) {
         List<WxsslVo> resultList = new ArrayList<>();
         QueryWrapper<ProEconEquipmentInfoDay1> qw = new QueryWrapper<>();
+        Integer total =0;
         qw.select("windpowerstation_id,sum(rfdl) rfdl,sum(rllfdl) rllfdl,avg(rpjfs) rpjfs,sum(rjxssdl) rjxssdl,sum(rcnsljxssdl) rcnsljxssdl,sum(rgzssdl) rgzssdl,sum(rcnslgzssdl) rcnslgzssdl,sum(rxdtjssdl) rxdtjssdl,sum(rxdjclssdl) rxdjclssdl,sum(rdjssdl) rdjssdl,sum(rqxjclssdl) rqxjclssdl,sum(rsdtjssdl) rsdtjssdl,sum(rxnssdl) rxnssdl,sum(rcwsldwssdl) rcwsldwssdl,sum(rcwsltqssdl) rcwsltqssdl");
 
         qw.ge("record_date",DateUtils.parseDate(beginDate)).le("record_date",DateUtils.parseDate(endDate));
@@ -641,7 +670,10 @@ public class BenchmarkingService {
             qw.like("windturbine_id","_IN_");
         }
         qw.groupBy("windpowerstation_id");
-        List<WxsslVo> wxsslVoList = getWxsslSortVos(qw,resultList,TYPE_WIND);
+
+//        total = proEconEquipmentInfoDay1Mapper.selectCount(qw);
+
+        Map<String, Object> wxsslVoList = getWxsslSortVos(qw,total,resultList,TYPE_WIND,pageNum,pageSize);
         if (StringUtils.isNotEmpty(target) && StringUtils.isNotEmpty(sort)){
             if (sort.equals("1")){
                 SortUtils.sort(resultList,target,SortUtils.ASC);
@@ -655,9 +687,10 @@ public class BenchmarkingService {
     }
 
 
-    public List<WxsslVo> xmdb(String companys, String type, String wpids, String projectids, String beginDate, String endDate, String target, String sort) {
+    public Map<String, Object> xmdb(String companys, String type, String wpids, String projectids, String beginDate, String endDate, String target, String sort,int pageNum, int pageSize) {
         List<WxsslVo> resultList = new ArrayList<>();
         QueryWrapper<ProEconEquipmentInfoDay1> qw = new QueryWrapper<>();
+        Integer total =0;
         qw.select("project_id,sum(rfdl) rfdl,sum(rllfdl) rllfdl,avg(rpjfs) rpjfs,sum(rjxssdl) rjxssdl,sum(rcnsljxssdl) rcnsljxssdl,sum(rgzssdl) rgzssdl,sum(rcnslgzssdl) rcnslgzssdl,sum(rxdtjssdl) rxdtjssdl,sum(rxdjclssdl) rxdjclssdl,sum(rdjssdl) rdjssdl,sum(rqxjclssdl) rqxjclssdl,sum(rsdtjssdl) rsdtjssdl,sum(rxnssdl) rxnssdl,sum(rcwsldwssdl) rcwsldwssdl,sum(rcwsltqssdl) rcwsltqssdl");
         qw.ge("record_date",DateUtils.parseDate(beginDate)).le("record_date",DateUtils.parseDate(endDate));
         if (StringUtils.isNotEmpty(wpids)){
@@ -679,7 +712,10 @@ public class BenchmarkingService {
             qw.like("windturbine_id","_IN_");
         }
         qw.groupBy("project_id");
-        List<WxsslVo> wxsslVoList = getWxsslSortVos(qw,resultList,TYPE_PROJECT);
+
+//        total = proEconEquipmentInfoDay1Mapper.selectCount(qw);
+
+        Map<String, Object> wxsslVoList = getWxsslSortVos(qw,total,resultList,TYPE_PROJECT,pageNum,pageSize);
         if (StringUtils.isNotEmpty(target) && StringUtils.isNotEmpty(sort)){
             if (sort.equals("1")){
                 SortUtils.sort(resultList,target,SortUtils.ASC);
@@ -692,9 +728,10 @@ public class BenchmarkingService {
         return wxsslVoList;
     }
 
-    public List<WxsslVo> xldb(String companys, String type, String wpids, String projectids, String lineids, String beginDate, String endDate, String target, String sort) {
+    public Map<String, Object> xldb(String companys, String type, String wpids, String projectids, String lineids, String beginDate, String endDate, String target, String sort,int pageNum, int pageSize) {
         List<WxsslVo> resultList = new ArrayList<>();
         QueryWrapper<ProEconEquipmentInfoDay1> qw = new QueryWrapper<>();
+        Integer total =0;
         qw.select("line_id,sum(rfdl) rfdl,sum(rllfdl) rllfdl,avg(rpjfs) rpjfs,sum(rjxssdl) rjxssdl,sum(rcnsljxssdl) rcnsljxssdl,sum(rgzssdl) rgzssdl,sum(rcnslgzssdl) rcnslgzssdl,sum(rxdtjssdl) rxdtjssdl,sum(rxdjclssdl) rxdjclssdl,sum(rdjssdl) rdjssdl,sum(rqxjclssdl) rqxjclssdl,sum(rsdtjssdl) rsdtjssdl,sum(rxnssdl) rxnssdl,sum(rcwsldwssdl) rcwsldwssdl,sum(rcwsltqssdl) rcwsltqssdl");
 
         qw.ge("record_date",DateUtils.parseDate(beginDate)).le("record_date",DateUtils.parseDate(endDate));
@@ -723,7 +760,10 @@ public class BenchmarkingService {
             qw.like("windturbine_id","_IN_");
         }
         qw.groupBy("line_id");
-        List<WxsslVo> wxsslVoList = getWxsslSortVos(qw,resultList,TYPE_LINE);
+
+//        total = proEconEquipmentInfoDay1Mapper.selectCount(qw);
+
+        Map<String, Object> wxsslVoList = getWxsslSortVos(qw,total,resultList,TYPE_LINE,pageNum,pageSize);
         if (StringUtils.isNotEmpty(target) && StringUtils.isNotEmpty(sort)){
             if (sort.equals("1")){
                 SortUtils.sort(resultList,target,SortUtils.ASC);
@@ -743,12 +783,21 @@ public class BenchmarkingService {
      * @param type
      * @return
      */
-    private List<WxsslVo> getWxsslSortVos(QueryWrapper<ProEconEquipmentInfoDay1> qw, List<WxsslVo> resultList, String type) {
+    private Map<String, Object> getWxsslSortVos(QueryWrapper<ProEconEquipmentInfoDay1> qw,Integer total, List<WxsslVo> resultList, String type,int pageNum, int pageSize) {
+        Map<String, Object> resultMap = new HashMap<>();
         HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
         List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
         Map<String,Integer> station =  wpls
                 .stream().collect(Collectors.toMap(ProBasicPowerstation::getId,ProBasicPowerstation::getOrderNum));
 
+        List<ProEconEquipmentInfoDay1> list1 = proEconEquipmentInfoDay1Service.list(qw);
+        // 添加分页逻辑
+//        qw.last("OFFSET " + (pageNum - 1) * pageSize + " ROWS FETCH NEXT " + pageSize + " ROWS ONLY");
+        int offset = (pageNum - 1) * pageSize;
+        int limit = pageSize;
+        qw.last("OFFSET " + offset + " ROWS FETCH NEXT " + limit + " ROWS ONLY");
+
+
         List<ProEconEquipmentInfoDay1> list = proEconEquipmentInfoDay1Service.list(qw);
         list.stream().forEach(i->{
             WxsslVo vo = new WxsslVo();
@@ -840,13 +889,23 @@ public class BenchmarkingService {
             resultList.get(i).setSlsslpm(i+1);
         }
 //        SortUtils.sort(resultList,"ordernum",SortUtils.ASC);
-        return resultList;
+        // 计算总记录数
+//        long total = proEconEquipmentInfoDay1Service.count(qw);
+        // 计算总记录数
+        Integer ls = list1.size();
+
+        resultMap.put("resultList", resultList);
+        resultMap.put("total", ls);
+        resultMap.put("pageNum", pageNum);
+        resultMap.put("pageSize", pageSize);
+        return resultMap;
     }
 
 
-    public List<WxsslVo> details(String id, String beginDate, String endDate, String target, String sort) {
+    public Map<String, Object> details(String id, String beginDate, String endDate, String target, String sort,int pageNum, int pageSize) {
         List<WxsslVo> resultList = new ArrayList<>();
         QueryWrapper<ProEconEquipmentInfoDay1> qw = new QueryWrapper<>();
+        Integer total =0;
         qw.select("windturbine_id,sum(rfdl) rfdl,sum(rllfdl) rllfdl,avg(rpjfs) rpjfs,sum(rjxssdl) rjxssdl,sum(rcnsljxssdl) rcnsljxssdl,sum(rgzssdl) rgzssdl,sum(rcnslgzssdl) rcnslgzssdl,sum(rxdtjssdl) rxdtjssdl,sum(rxdjclssdl) rxdjclssdl,sum(rdjssdl) rdjssdl,sum(rqxjclssdl) rqxjclssdl,sum(rsdtjssdl) rsdtjssdl,sum(rxnssdl) rxnssdl,sum(rcwsldwssdl) rcwsldwssdl,sum(rcwsltqssdl) rcwsltqssdl");
 
         qw.ge("record_date",DateUtils.parseDate(beginDate)).le("record_date",DateUtils.parseDate(endDate));
@@ -858,7 +917,8 @@ public class BenchmarkingService {
             qw.eq("line_id",id);
         }
         qw.groupBy("windturbine_id");
-        List<WxsslVo> wxsslVoList = getWxsslSortVos(qw,resultList,TYPE_WINDTURBINE);
+//        total = proEconEquipmentInfoDay1Service.count(qw);
+        Map<String, Object> wxsslVoList = getWxsslSortVos(qw,total,resultList,TYPE_WINDTURBINE,pageNum,pageSize);
         if (StringUtils.isNotEmpty(target) && StringUtils.isNotEmpty(sort)){
             if (sort.equals("1")){
                 SortUtils.sort(resultList,target,SortUtils.ASC);

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/goodness/WindturbinegoodnessService.java

@@ -128,7 +128,7 @@ public class WindturbinegoodnessService {
                 int count = 0;
                 double temp = 0;
                 for (int i = 0; i < vos.size(); i++) {
-                    vos.get(i).setTime(sjglls.get(i).getPointTime() * 1000);
+                    vos.get(i).setTime(sjglls.get(i).getPointTime());
 
                     if (i < sjglls.size() && StringUtils.notEmp(sjglls.get(i).getPointTime())) {
 
@@ -156,7 +156,7 @@ public class WindturbinegoodnessService {
                 int count = 0;
                 double temp = 0;
                 for (int i = 0; i < vos.size(); i++) {
-                    // vos.get(i).setTime(bzglls.get(i).getPointTime() * 1000);
+                     vos.get(i).setTime(bzglls.get(i).getPointTime());
                     if (i < bzglls.size() && StringUtils.notEmp(bzglls.get(i).getPointTime())) {
 
                         if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
@@ -183,7 +183,7 @@ public class WindturbinegoodnessService {
                 int count = 0;
                 double temp = 0;
                 for (int i = 0; i < vos.size(); i++) {
-                    vos.get(i).setTime(pjfsls.get(i).getPointTime() * 1000);
+                    vos.get(i).setTime(pjfsls.get(i).getPointTime());
                     if (i < pjfsls.size() && StringUtils.notEmp(pjfsls.get(i).getPointTime())) {
 
                         if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
@@ -589,7 +589,7 @@ public class WindturbinegoodnessService {
 
                     if (i < fdlls.size() && StringUtils.notEmp(fdlls.get(i + 1).getPointTime())) {
 
-                        vos.get(i).setTime(fdlls.get(i + 1).getPointTime() * 1000);
+                        vos.get(i).setTime(fdlls.get(i + 1).getPointTime());
                         if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
 
                             if (i != 0) {
@@ -613,7 +613,7 @@ public class WindturbinegoodnessService {
 
                             count++;
                         } else {
-                            vos.get(i).setTime(fdlls.get(i).getPointTime() * 1000);
+                            vos.get(i).setTime(fdlls.get(i).getPointTime());
                             vos.get(i).setValue1(0d);// 发电量
                         }
 
@@ -636,7 +636,7 @@ public class WindturbinegoodnessService {
 
                     if (i < whssls.size() && StringUtils.notEmp(whssls.get(i + 1).getPointTime())) {
 
-                        vos.get(i).setTime(whssls.get(i + 1).getPointTime() * 1000);
+                        vos.get(i).setTime(whssls.get(i + 1).getPointTime());
                         if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
                             if (i != 0) {
                                 temp1 = whssls.get(i + 1).getPointValueInDouble();
@@ -684,7 +684,7 @@ public class WindturbinegoodnessService {
 
                     if (i < gzssls.size() && StringUtils.notEmp(gzssls.get(i + 1).getPointTime())) {
 
-                        vos.get(i).setTime(gzssls.get(i + 1).getPointTime() * 1000);
+                        vos.get(i).setTime(gzssls.get(i + 1).getPointTime());
                         if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
                             if (i != 0) {
                                 temp1 = gzssls.get(i + 1).getPointValueInDouble();
@@ -733,7 +733,7 @@ public class WindturbinegoodnessService {
 
                     if (i < xdssls.size() && StringUtils.notEmp(xdssls.get(i + 1).getPointTime())) {
 
-                        vos.get(i).setTime(xdssls.get(i + 1).getPointTime() * 1000);
+                        vos.get(i).setTime(xdssls.get(i + 1).getPointTime());
                         if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
                             if (i != 0) {
                                 temp1 = xdssls.get(i + 1).getPointValueInDouble();
@@ -782,7 +782,7 @@ public class WindturbinegoodnessService {
 
                     if (i < qfssls.size() && StringUtils.notEmp(qfssls.get(i + 1).getPointTime())) {
 
-                        vos.get(i).setTime(qfssls.get(i + 1).getPointTime() * 1000);
+                        vos.get(i).setTime(qfssls.get(i + 1).getPointTime());
                         if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
                             if (i != 0) {
                                 temp1 = qfssls.get(i + 1).getPointValueInDouble();
@@ -831,7 +831,7 @@ public class WindturbinegoodnessService {
 
                     if (i < fsls.size() && StringUtils.notEmp(fsls.get(i + 1).getPointTime())) {
 
-                        vos.get(i).setTime(fsls.get(i + 1).getPointTime() * 1000);
+                        vos.get(i).setTime(fsls.get(i + 1).getPointTime());
                         if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
 
                             temp1 = fsls.get(i + 1).getPointValueInDouble();