修改电站列表接口

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserEmpowerInterceptor.java

@@ -90,7 +90,7 @@ public class UserEmpowerInterceptor implements Interceptor {
                         }
                     }
                 }else{
-                    throw new BadRequest("权限认证失败！参数之间关系不能为空");
+                    sqldata=" ";
                 }
             }
         }
@@ -144,8 +144,6 @@ public class UserEmpowerInterceptor implements Interceptor {
                 sq= getCondition(filed[i],fileCondition[i],data);
                 sql.add(sq);
             }
-        }else{
-            throw new BadRequest("权限认证失败！");
         }
         return sql;
     }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/StdUserEmpower.java

@@ -36,4 +36,6 @@ public class StdUserEmpower extends BaseEntity {
     private List<String> amosOrgCode;
 
 
+
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.DropDown;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
@@ -51,5 +53,6 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
     Map<String,Object> getcount( JpStationDto reviewDto);
 
     @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
-    List<JpStationDto> queryForDealerReviewPagenew(@Param("dto") JpStationDto reviewDto);
+    @UserLimits
+    List<JpStationDto> queryForDealerReviewPagenew(@Param("dto") JpStationDto reviewDto, Page<JpStationDto> pa);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml

@@ -504,7 +504,7 @@
         `cumulative_income` cumulativeIncome,
         `email`,
         rated_power ratedPower,
-        ROUND(`real_time_power`/ratedPower,3) fullhour,
+        ROUND(`real_time_power`/rated_power,3) fullhour,
         (select privilege_company.COMPANY_NAME  from   privilege_company where privilege_company.ORG_CODE=hygf_jp_station.regional_companies_code)           regionalCompaniesName
         from hygf_jp_station
         <where>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -606,8 +606,8 @@ public class JpStationController extends BaseController {
     @GetMapping(value = "/test")
     public Object getPowerqx(JpStationDto reviewDto) {
 
-
-        return jpStationMapper.getJpStation(null);
+            List<JpStation> list=  jpStationServiceImpl.getJpStation(new JpStationDto());
+        return list;
     }
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java

@@ -77,17 +77,22 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
     /**
      * 分页查询
      */
-    @UserLimits
+
     public Page<JpStationDto> queryForJpStationPagenew(int pageNum, int pageSize, JpStationDto reviewDto)   {
-        PageHelper.startPage(pageNum, pageSize);
-        List<JpStationDto> list = jpStationMapper.queryForDealerReviewPagenew(reviewDto);
-        PageInfo<JpStationDto> page = new PageInfo(list);
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto>();
-        pagenew.setCurrent(pageNum);
-        pagenew.setTotal(page.getTotal());
-        pagenew.setSize(pageSize);
-        pagenew.setRecords(page.getList());
-        return pagenew;
+
+
+        Page<JpStationDto> page = new Page<>(pageNum, pageSize);
+
+        List<JpStationDto> list = jpStationMapper.queryForDealerReviewPagenew(reviewDto,  page );
+
+        page.setRecords(list);
+//        PageInfo<JpStationDto> page = new PageInfo(list);
+//        com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto>();
+//        pagenew.setCurrent(pageNum);
+//        pagenew.setTotal(page.getTotal());
+//        pagenew.setSize(pageSize);
+//        pagenew.setRecords(page.getList());
+        return page;
     }
 
     @Override