处理权限

energy-manage-service/src/main/java/com/energy/manage/service/controller/company/WindCompanyController.java

@@ -104,7 +104,7 @@ public class WindCompanyController extends BaseServiceController {
     @PostMapping(value = "/getAllWindCompany")
     @ApiOperation(value = "查询企业树")
     public ResultResp<List<Map<String, Object>>> getAllWindCompany(@RequestBody WindCompanyPageDto windCompanyPageDto) {
-        List<Map<String, Object>> list = windCompanyService.getAllWindCompany(windCompanyPageDto.getState(), windCompanyPageDto.getCompanyName());
+        List<Map<String, Object>> list = windCompanyService.getAllWindCompany(windCompanyPageDto.getState(), windCompanyPageDto.getCompanyName(),getRoleId(),getUserId());
         return ResultResp.SUCCESS(list);
     }
 

energy-manage-service/src/main/java/com/energy/manage/service/controller/windenginegroup/WindEngineGroupController.java

@@ -40,7 +40,7 @@ public class WindEngineGroupController extends BaseServiceController {
     @PostMapping(value = "/createWindEngineGroup")
     @ApiOperation(value = "创建风机机组")
     public ResultResp createWindEngineGroup(@RequestBody @Valid WindEngineGroupCreateDto windEngineGroupCreateDto) {
-        if(!windEngineGroupCreateDto.getFieldCode().contains(IdPrefixEnum.WIND_FIELD_NUMBER.getCode())){
+        if (!windEngineGroupCreateDto.getFieldCode().contains(IdPrefixEnum.WIND_FIELD_NUMBER.getCode())) {
             return ResultResp.FAIL("未绑定风场信息！");
         }
         windEngineGroupCreateDto.setCreateBy(getUserId());
@@ -53,10 +53,10 @@ public class WindEngineGroupController extends BaseServiceController {
     @PostMapping(value = "/windEngineGroupImportData")
     @ApiOperation(value = "导入风机信息")
     public ResultResp windEngineGroupImportData(@RequestPart MultipartFile file, @RequestParam("fieldCode") String fieldCode) {
-        if(!fieldCode.contains(IdPrefixEnum.WIND_FIELD_NUMBER.getCode())){
+        if (!fieldCode.contains(IdPrefixEnum.WIND_FIELD_NUMBER.getCode())) {
             return ResultResp.FAIL("未绑定风场信息！");
         }
-        return  windEngineGroupService.windEngineGroupImportData(file, fieldCode);
+        return windEngineGroupService.windEngineGroupImportData(file, fieldCode, getUserId());
     }
 
     @Deprecated

energy-manage-service/src/main/java/com/energy/manage/service/controller/windfield/WindFieldController.java

@@ -72,7 +72,7 @@ public class WindFieldController extends BaseServiceController {
 
         WindFieldImportDataDto windFieldImportDataDto = new WindFieldImportDataDto();
         windFieldImportDataDto.setCompanyCode(companyCode);
-
+        windFieldImportDataDto.setCreateBy(getUserId());
         return windFieldService.windFieldImportData(file, windFieldImportDataDto);
     }
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyPageDto.java

@@ -28,4 +28,5 @@ public class WindCompanyPageDto  {
      */
     @ApiModelProperty("状态")
     private Integer state;
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldImportDataDto.java

@@ -18,8 +18,8 @@ public class WindFieldImportDataDto {
     @ApiModelProperty("企业编号")
     private String companyCode;
 
-
-
+    @ApiModelProperty("用户id")
+    private Integer createBy;
 
 
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windfield/WindFieldResourceVo.java

@@ -18,6 +18,9 @@ import java.util.List;
 @ApiModel
 public class WindFieldResourceVo {
 
+    @ApiModelProperty("资源id")
+    private Integer id;
+
     /**
      * 风场编号
      */

energy-manage-service/src/main/java/com/energy/manage/service/mappers/windrelation/WindRelationMapper.java

@@ -20,7 +20,11 @@ public interface WindRelationMapper extends MyMapper<WindRelationPO> {
      * 查询全部项目公司
      * @return
      */
-    List<WindCompanyPageVo> selectWindRelationCompanyByType(@Param("type") String type,@Param("state")Integer state,@Param("companyName")String companyName);
+    List<WindCompanyPageVo> selectWindRelationCompanyByType(@Param("type") String type,
+                                                            @Param("state")Integer state,
+                                                            @Param("companyName")String companyName,
+                                                            @Param("roleId")Integer roleId,
+                                                            @Param("userId")Integer userId);
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/company/WindCompanyService.java

@@ -55,7 +55,7 @@ public interface WindCompanyService extends BaseService<WindCompanyPO> {
      * 查询企业树关系
      * @return
      */
-    List<Map<String, Object>> getAllWindCompany(Integer state,String companyName);
+    List<Map<String, Object>> getAllWindCompany(Integer state,String companyName,Integer roleId,Integer userId);
 
 
     /**

energy-manage-service/src/main/java/com/energy/manage/service/service/company/impl/WindCompanyServiceImpl.java

@@ -138,8 +138,8 @@ public class WindCompanyServiceImpl extends BaseServiceImpl<WindCompanyPO> imple
     }
 
     @Override
-    public List<Map<String, Object>> getAllWindCompany(Integer state,String companyName) {
-        return windRelationService.getWindRelationCompany(state,companyName);
+    public List<Map<String, Object>> getAllWindCompany(Integer state,String companyName,Integer roleId,Integer userId) {
+        return windRelationService.getWindRelationCompany(state,companyName,roleId,userId);
     }
 
 

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginegroup/WindEngineGroupService.java

@@ -32,7 +32,7 @@ public interface WindEngineGroupService {
      * @param file,fieldCode
      * @return
      */
-    ResultResp windEngineGroupImportData(MultipartFile file, String fieldCode);
+    ResultResp windEngineGroupImportData(MultipartFile file, String fieldCode,Integer userId);
 
 
     /**

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginegroup/impl/WindEngineGroupServiceImpl.java

@@ -116,7 +116,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     @SneakyThrows
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResultResp windEngineGroupImportData(MultipartFile file, String fieldCode) {
+    public ResultResp windEngineGroupImportData(MultipartFile file, String fieldCode,Integer userId) {
         List<WindEngineGroupExcelVo> windEngineGroupExcelVos = EasyExcel.read(file.getInputStream()).head(WindEngineGroupExcelVo.class).sheet().doReadSync();
         if (CollectionUtils.isEmpty(windEngineGroupExcelVos)) {
             return ResultResp.FAIL("未读取到文件数据，请核对数据准确性！");
@@ -184,7 +184,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
             }
             if(windFieldExceVos.getSightcingString().equals("否")){
                 windEngineGroupPO.setSightcing(2);
-            }
+            }windEngineGroupPO.setCreateBy(userId);
             list.add(windEngineGroupPO);
         }
         if (CollectionUtils.isEmpty(list)) {

energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/impl/WindFieldServiceImpl.java

@@ -189,6 +189,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
             windFieldPO.setUpdateTime(new Date());
             windFieldPO.setState(Constants.GLOBAL_IN_USE);
             windFieldPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
+            windFieldPO.setCreateBy(windFieldImportDataDto.getCreateBy());
             list.add(windFieldPO);
         }
         if (CollectionUtils.isEmpty(list)) {

energy-manage-service/src/main/java/com/energy/manage/service/service/windrelation/WindRelationService.java

@@ -50,7 +50,7 @@ public interface WindRelationService {
      *
      * @return
      */
-    List<Map<String, Object>> getWindRelationCompany(Integer state,String companyName);
+    List<Map<String, Object>> getWindRelationCompany(Integer state,String companyName,Integer roleId,Integer userId);
 
 
     /**

energy-manage-service/src/main/java/com/energy/manage/service/service/windrelation/impl/WindRelationServiceImpl.java

@@ -87,9 +87,9 @@ public class WindRelationServiceImpl extends BaseServiceImpl<WindRelationPO> imp
 
 
     @Override
-    public  List<Map<String, Object>> getWindRelationCompany(Integer state,String companyName) {
+    public  List<Map<String, Object>> getWindRelationCompany(Integer state,String companyName,Integer roleId,Integer userId) {
 
-        List<WindCompanyPageVo> windCompanyPageVos = windRelationMapper.selectWindRelationCompanyByType(TypeRelationEnum.COMPANY_NUMBER.getCode(),state,companyName);
+        List<WindCompanyPageVo> windCompanyPageVos = windRelationMapper.selectWindRelationCompanyByType(TypeRelationEnum.COMPANY_NUMBER.getCode(),state,companyName,roleId,userId);
         // 转化为Map集合
         List<Map<String, Object>> mapList = BeanMapUtils.listBeanToListMap(windCompanyPageVos);
         // 获取树形结构

energy-manage-service/src/main/resources/mybatis/windrelation/WindRelationMapper.xml

@@ -54,6 +54,9 @@
         <if test="companyName!=null">
         and wc.company_name like CONCAT("%", #{companyName} ,"%")
         </if>
+        and wc.del_state = 0
+        and wc.company_code in (select code_number from sys_organization_auth where role_id =#{roleId} and code_type = 'company')
+        or wc.create_by = #{userId}
     </select>