Merge remote-tracking branch 'origin/developer' into developer

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

@@ -35,7 +35,7 @@ public class Region  {
      * 等级
      */
 	@TableField("LEVEL_")
-    private String level_;
+    private String level;
 
     /**
      * 上级编码

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/EnergyAccessController.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptor;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.EnergyAccessServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -12,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.Map;
 
@@ -28,17 +29,17 @@ public class EnergyAccessController extends BaseController {
     @RequestMapping(value = "/getInstalledCapacity", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "获取并网容量", notes = "获取并网容量")
-    public Page<Map<String, Object>> getInstalledCapacity(String current, String pageSize, String code,String sourceStationId,String tp) {
+    public ResponseModel<Page<Map<String, Object>>> getInstalledCapacity(String current, String pageSize, String code, String sourceStationId, String tp) {
         logger.info("获取并网容量接口入参：current ={}，pageSize ={}，code = {},sourceStationId = {},tp = {}",current,pageSize,code,sourceStationId,tp);
-        return energyAccessServiceImpl.getInstalledCapacity(current, pageSize, code,sourceStationId,tp);
+        return ResponseHelper.buildResponse(energyAccessServiceImpl.getInstalledCapacity(current, pageSize, code,sourceStationId,tp));
     }
 
     @RequestMapping(value = "/getQuotaCompleteInfo", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "获取片区指标完成情况", notes = "获取片区指标完成情况")
-    public Page<Map<String, Object>> getQuotaCompleteInfo(String current, String pageSize, String code,String sourceStationId,String tp) {
+    public ResponseModel<Page<Map<String, Object>>> getQuotaCompleteInfo(String current, String pageSize, String code,String sourceStationId,String tp) {
         logger.info("获取片区指标完成情况入参：current ={}，pageSize ={}，code = {},sourceStationId = {},tp = {}",current,pageSize,code,sourceStationId,tp);
-        return energyAccessServiceImpl.getQuotaCompleteInfo(current, pageSize, code,sourceStationId,tp);
+        return ResponseHelper.buildResponse(energyAccessServiceImpl.getQuotaCompleteInfo(current, pageSize, code,sourceStationId,tp));
     }
 }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/initdata/StationCacheDataInit.java

@@ -44,7 +44,7 @@ public class StationCacheDataInit implements CommandLineRunner {
     public void run(String... args) throws Exception {
         redisTemplate.delete("station_info_cache_bigscreen");
         List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
-        List<Region> regionList = regionMapper.selectList(new LambdaQueryWrapper<Region>().eq(Region::getLevel_, 1));
+        List<Region> regionList = regionMapper.selectList(new LambdaQueryWrapper<Region>().eq(Region::getLevel, 1));
         List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
         stationBasicList.forEach(stationBasic -> {

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

@@ -225,7 +225,7 @@ public class CommonServiceImpl {
 
     public List<StationCacheInfoDto> getListStationCacheInfoDto() {
         List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
-        List<Region> regionList = regionMapper.selectList(new LambdaQueryWrapper<Region>().eq(Region::getLevel_, 1));
+        List<Region> regionList = regionMapper.selectList(new LambdaQueryWrapper<Region>().eq(Region::getLevel, 1));
         List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
         for (int i = 0; i < stationBasicList.size(); i++) {

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/PrivilegeCompany.java

@@ -23,7 +23,7 @@ public class PrivilegeCompany extends BaseEntity {
     @TableField("REGION_SEQ")
     private String regionSeq;
     @TableField("LEVEL_")
-    private String level_;
+    private String level;
     @TableField("EMAIL")
     private String email;
     @TableField("LONGITUDE")

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

@@ -191,9 +191,9 @@ public class IPermissionServiceImpl implements IPermissionService {
 
 		//outer_company 外部公司 当前特殊区域公司标记为 级别为 外部公司来区分
 		if (type.equals("outer_company")){
-			areaCompany= areaCompany.stream().filter(e -> e.getLevel_().equals("outer_company")).collect(Collectors.toList());
+			areaCompany= areaCompany.stream().filter(e -> e.getLevel().equals("outer_company")).collect(Collectors.toList());
 		}else {
-			areaCompany= areaCompany.stream().filter(e -> !e.getLevel_().equals("outer_company")).collect(Collectors.toList());
+			areaCompany= areaCompany.stream().filter(e -> !e.getLevel().equals("outer_company")).collect(Collectors.toList());
 //			PrivilegeCompany all = new PrivilegeCompany();
 //			all.setCompanyName("全部");
 //			all.setOrgCode("all");