电站管理添加筛选

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationDto.java

@@ -33,6 +33,9 @@ public class PowerStationDto  extends BaseDto {
     @ApiModelProperty(value = "服务代理商")
     private String serviceAgent;
     
+    @ApiModelProperty(value = "区域公司")
+    private String regionalCompaniesName;
+
     @ApiModelProperty(value = "电站类型")
     private String powerStationType;
 

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

@@ -19,5 +19,6 @@ public interface PowerStationMapper extends BaseMapper<PowerStation> {
     @UserEmpower(field ={"regional_companies_code"} ,dealerField={"a.developer_code","a.regional_companies_code","a.developer_user_id"} ,fieldConditions ={"in","in","in"}, relationship="and")
     List<PowerStationDto> queryPage(@Param("powerStationCode") String powerStationCode,
                                     @Param("ownersName")String ownersName,
-                                    @Param("serviceAgent")String serviceAgent);
+                                    @Param("serviceAgent")String serviceAgent,
+                                    @Param("regionalCompaniesName")String regionalCompaniesName);
 }

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

@@ -100,12 +100,14 @@ public class PowerStationController extends BaseController {
 	public ResponseModel<Page<PowerStationDto>> queryForPage(@RequestParam(value = "current") int current,
                                                             @RequestParam(value = "size") int size,
                                                             @RequestParam(value = "powerStationCode",required = false)String powerStationCode,
-                                                            @RequestParam(value = "ownersName",required = false)String ownersName) {
+                                                            @RequestParam(value = "ownersName",required = false)String ownersName,
+                                                            @RequestParam(value = "serviceAgent",required = false)String serviceAgent,
+                                                            @RequestParam(value = "regionalCompaniesName",required = false)String regionalCompaniesName) {
 	    Page<PowerStationDto> page = new Page<PowerStationDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 		AgencyUserModel userInfo = getUserInfo();
-		return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo));
+		return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo,serviceAgent,regionalCompaniesName));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/kafka/Constant.java

@@ -13,20 +13,21 @@ import java.util.Date;
 public interface Constant {
 
     // 风电相关性消费者
-    String kafkaTopicConsumer = "FanConditionVariables";
+    String kafkaTopicConsumer = "FAN_XGX";
     // 光伏相关性消费者
-    String kafkaTopicConsumerPv = "PvConditionVariables";
+    String kafkaTopicConsumerPv = "PV_XGX";
 
 
     // 风电 工况区间划分
-    String kafkaTopicConsumerGKHFFan = "FanConditionVariablesGKHF";
+    String kafkaTopicConsumerGKHFFan = "FAN_QJHF";
     // 光伏 工况区间划分
-    String kafkaTopicConsumerGKHFPv = "PvConditionVariablesGKHF";
+    String kafkaTopicConsumerGKHFPv = "PV_QJHF";
 
 
     // 风电 中心值计算
-    String kafkaTopicConsumerZXZFan = "FanConditionVariablesGZXZ";
+    String kafkaTopicConsumerZXZFan = "FAN_ZXZ";
     // 光伏 中心值计算
-    String kafkaTopicConsumerZXZPv = "PvConditionVariablesZXZ";
+    String kafkaTopicConsumerZXZPv = "PV_ZXZ";
+    
 
 }