增加来源

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

@@ -55,7 +55,7 @@ public class WindCompanyController extends BaseServiceController {
             return ResultResp.NOTNULLPARAM();
         }
         dto.setCreateBy(getUserId());
-        boolean flg = windCompanyService.addCompany(dto);
+        boolean flg = windCompanyService.addCompany(dto,getRoleId(),getUserId());
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 

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

@@ -66,7 +66,7 @@ public class WindFieldController extends BaseServiceController {
             return ResultResp.FAIL("风场名称已经存在！");
         }
         windFieldDto.setCreateBy(getUserId());
-        boolean flg = windFieldService.createWindField(windFieldDto);
+        boolean flg = windFieldService.createWindField(windFieldDto,getRoleId(),getUserId());
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
@@ -80,7 +80,7 @@ public class WindFieldController extends BaseServiceController {
         WindFieldImportDataDto windFieldImportDataDto = new WindFieldImportDataDto();
         windFieldImportDataDto.setCompanyCode(companyCode);
         windFieldImportDataDto.setCreateBy(getUserId());
-        return windFieldService.windFieldImportData(file, windFieldImportDataDto);
+        return windFieldService.windFieldImportData(file, windFieldImportDataDto,getRoleId(),getUserId());
     }
 
     @Deprecated

energy-manage-service/src/main/java/com/energy/manage/service/service/anemometertower/impl/AnemometerTowerServiceImpl.java

@@ -31,6 +31,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import tk.mybatis.mapper.entity.Example;
 
@@ -57,6 +58,7 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
     private AnemometerTowerRelationMapper anemometerTowerRelationMapper;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean createAnemometerTower(AnemometerTowerCreateDto anemometerTowerCreateDto) {
         AnemometerTowerPO anemometerTowerPO = new AnemometerTowerPO();
         BeanUtil.copyProperties(anemometerTowerCreateDto, anemometerTowerPO);
@@ -85,6 +87,7 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean delAnemometerTower(AnemometerTowerDelDto anemometerTowerDelDto) {
 
         AnemometerTowerPO po = new AnemometerTowerPO();
@@ -97,6 +100,7 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean updateAnemometerTower(AnemometerTowerUpdateDto anemometerTowerUpdateDto) {
 
         AnemometerTowerPO po = new AnemometerTowerPO();
@@ -130,6 +134,7 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean updateAnemometerTowerState(AnemometerTowerStateDto anemometerTowerStateDto) {
 
         AnemometerTowerPO po = new AnemometerTowerPO();
@@ -150,6 +155,7 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean bathAnemometerTowerHeight(AnemometerTowerHeightDto anemometerTowerHeightDto) {
         if (CollectionUtils.isEmpty(anemometerTowerHeightDto.getList())) {
             return false;
@@ -218,6 +224,7 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean bathAnemometerTowerRelation(List<AnemometerTowerRelationDto> anemometerTowerRelationDtos) {
         if (CollectionUtils.isEmpty(anemometerTowerRelationDtos)) {
             return false;
@@ -243,6 +250,7 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean deltAnemometerTowerRelationByField(String fieldCode) {
 
         Example queryExample = new Example(AnemometerTowerRelationPO.class);

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

@@ -23,7 +23,7 @@ public interface WindCompanyService extends BaseService<WindCompanyPO> {
      * @param dto
      * @return
      */
-    boolean addCompany(WindCompanyDto dto);
+    boolean addCompany(WindCompanyDto dto,Integer roleId,Integer userId);
 
     /**
      * 删除企业

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

@@ -14,6 +14,7 @@ import com.energy.manage.common.po.system.SysRolePermissionPO;
 import com.energy.manage.common.po.system.SysUserInfoPO;
 import com.energy.manage.common.util.IdGeneratorUtil;
 import com.energy.manage.service.domain.dto.company.*;
+import com.energy.manage.service.domain.dto.system.RoleUpdateOrganizationDto;
 import com.energy.manage.service.domain.dto.windrelation.WindRelationDelDto;
 import com.energy.manage.service.domain.dto.windrelation.WindRelationDto;
 import com.energy.manage.service.domain.vo.company.WindCompanyPageVo;
@@ -30,6 +31,7 @@ import com.energy.manage.service.service.windrelation.WindRelationService;
 import com.energy.manage.service.util.BeanMapUtils;
 import com.energy.manage.service.util.SplitUtil;
 import com.energy.manage.service.util.TreeUtil;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,10 +60,12 @@ public class WindCompanyServiceImpl extends BaseServiceImpl<WindCompanyPO> imple
     @Autowired
     private SysOrganizationAuthService sysOrganizationAuthService;
 
+    @Autowired
+    private SysPermissionService permissionService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean addCompany(WindCompanyDto dto) {
+    public boolean addCompany(WindCompanyDto dto,Integer roleId,Integer userId) {
         WindCompanyPO po = new WindCompanyPO();
         BeanUtil.copyProperties(dto, po);
         po.setCreateTime(new Date());
@@ -73,6 +77,15 @@ public class WindCompanyServiceImpl extends BaseServiceImpl<WindCompanyPO> imple
         if (windCompanyMapper.insertUseGeneratedKeys(po) <= 0) {
             return false;
         }
+
+        // 处理创建企业对应角色权限
+        RoleUpdateOrganizationDto.OrganizationCode organizationCode = new RoleUpdateOrganizationDto.OrganizationCode();
+        List<RoleUpdateOrganizationDto.OrganizationCode> organizationCodes = Lists.newArrayList();
+        organizationCode.setCodeNumber(po.getCompanyCode());
+        organizationCode.setCodeType(TypeRelationEnum.COMPANY_NUMBER.getCode());
+        organizationCodes.add(organizationCode);
+        permissionService.updateRoleOrganization(roleId,organizationCodes,userId);
+
         return this.createWindRelation(dto, po);
     }
 
@@ -99,6 +112,7 @@ public class WindCompanyServiceImpl extends BaseServiceImpl<WindCompanyPO> imple
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean updateStateCompany(WindCompanyStateDto dto) {
 
         WindCompanyPO po = new WindCompanyPO();
@@ -153,6 +167,7 @@ public class WindCompanyServiceImpl extends BaseServiceImpl<WindCompanyPO> imple
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean updateWindCompanyBySort(WindCompanyCustomDto dto) {
         return windCompanyMapper.updateWindCompanySort(dto.getWindCompanyUpdateSortList()) > 0;
     }

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

@@ -254,6 +254,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean delWindEngineGroup(WindEngineGroupCodeDto windEngineGroupCodeDto) {
         WindEngineGroupPO po = new WindEngineGroupPO();
         po.setDelState(DeleteStatusEnum.DELETE.getCode());
@@ -287,6 +288,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean updateStateWindEngineGroup(WindEngineGroupStateDto windEngineGroupStateDto) {
         WindEngineGroupPO po = new WindEngineGroupPO();
         po.setState(windEngineGroupStateDto.getState());
@@ -297,6 +299,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean updateWindEngineGroup(WindEngineGroupUpdateDto windEngineGroupUpdateDto) {
 
         WindEngineGroupPO po = new WindEngineGroupPO();

energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/WindFieldService.java

@@ -22,7 +22,7 @@ public interface WindFieldService {
      * 创建风场信息
      * @return
      */
-    boolean createWindField(WindFieldDto windFieldDto);
+    boolean createWindField(WindFieldDto windFieldDto,Integer roleId,Integer userId);
 
 
     /**
@@ -31,7 +31,7 @@ public interface WindFieldService {
      * @param windFieldImportDataDto
      * @return
      */
-    ResultResp windFieldImportData(MultipartFile file, WindFieldImportDataDto windFieldImportDataDto);
+    ResultResp windFieldImportData(MultipartFile file, WindFieldImportDataDto windFieldImportDataDto,Integer roleId,Integer userId);
 
 
     /**

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

@@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import tk.mybatis.mapper.entity.Example;
 
@@ -30,6 +31,7 @@ public class WindFieldResourceServiceImpl extends BaseServiceImpl<WindFieldResou
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean saveWindFieldResource(WindFieldResourceCreateDto windFieldResourceCreateDto) {
 
         WindFieldResourcePO windFieldResourcePO = new WindFieldResourcePO();
@@ -43,6 +45,7 @@ public class WindFieldResourceServiceImpl extends BaseServiceImpl<WindFieldResou
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean delWindFieldResource(WindFieldResourceDelDto windFieldResourceDelDto) {
         if (windFieldResourceDelDto.getId() == null) {
             return false;

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

@@ -22,6 +22,7 @@ import com.energy.manage.service.domain.dto.anemometertower.AnemometerTowerDto;
 import com.energy.manage.service.domain.dto.anemometertower.AnemometerTowerRelationDto;
 import com.energy.manage.service.domain.dto.company.WindCompanyDelDto;
 import com.energy.manage.service.domain.dto.company.WindCompanyDto;
+import com.energy.manage.service.domain.dto.system.RoleUpdateOrganizationDto;
 import com.energy.manage.service.domain.dto.windfield.*;
 import com.energy.manage.service.domain.dto.windrelation.WindRelationDelDto;
 import com.energy.manage.service.domain.dto.windrelation.WindRelationDto;
@@ -40,6 +41,7 @@ import com.energy.manage.service.service.area.AreaApiService;
 import com.energy.manage.service.service.cache.CacheService;
 import com.energy.manage.service.service.company.WindCompanyService;
 import com.energy.manage.service.service.system.SysOrganizationAuthService;
+import com.energy.manage.service.service.system.SysPermissionService;
 import com.energy.manage.service.service.windfield.WindFieldResourceService;
 import com.energy.manage.service.service.windfield.WindFieldService;
 import com.energy.manage.service.service.windrelation.WindRelationService;
@@ -94,10 +96,13 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
     @Autowired
     private SysOrganizationAuthService sysOrganizationAuthService;
 
+    @Autowired
+    private SysPermissionService permissionService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean createWindField(WindFieldDto windFieldDto) {
+    public boolean createWindField(WindFieldDto windFieldDto, Integer roleId, Integer userId) {
 
         WindFieldPO windFieldPO = new WindFieldPO();
         BeanUtil.copyProperties(windFieldDto, windFieldPO);
@@ -124,6 +129,15 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
             }
             anemometerTowerService.bathAnemometerTowerRelation(anemometerTowerDtos);
         }
+
+        // 处理风场对应角色数据权限
+        RoleUpdateOrganizationDto.OrganizationCode organizationCode = new RoleUpdateOrganizationDto.OrganizationCode();
+        List<RoleUpdateOrganizationDto.OrganizationCode> organizationCodes = Lists.newArrayList();
+        organizationCode.setCodeNumber(windFieldPO.getFieldCode());
+        organizationCode.setCodeType(TypeRelationEnum.WIND_FIELD_NUMBER.getCode());
+        organizationCodes.add(organizationCode);
+        permissionService.updateRoleOrganization(roleId, organizationCodes, userId);
+
         return createWindRelation(windFieldPO);
     }
 
@@ -146,7 +160,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
     @SneakyThrows
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResultResp windFieldImportData(MultipartFile file, WindFieldImportDataDto windFieldImportDataDto) {
+    public ResultResp windFieldImportData(MultipartFile file, WindFieldImportDataDto windFieldImportDataDto, Integer roleId, Integer userId) {
         List<WindFieldExceVo> windFieldExceVos = EasyExcel.read(file.getInputStream()).head(WindFieldExceVo.class).sheet().doReadSync();
         if (CollectionUtils.isEmpty(windFieldExceVos)) {
             return ResultResp.FAIL("未读取到文件数据，请核对数据准确性！");
@@ -206,6 +220,18 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         if (windFieldMapper.insertList(list) <= 0) {
             return ResultResp.FAIL();
         }
+
+        // 处理风场对应角色数据权限
+        RoleUpdateOrganizationDto.OrganizationCode organizationCode = null;
+        List<RoleUpdateOrganizationDto.OrganizationCode> organizationCodes = Lists.newArrayList();
+        for (WindFieldPO po : list) {
+            organizationCode = new RoleUpdateOrganizationDto.OrganizationCode();
+            organizationCode.setCodeNumber(po.getFieldCode());
+            organizationCode.setCodeType(TypeRelationEnum.WIND_FIELD_NUMBER.getCode());
+            organizationCodes.add(organizationCode);
+        }
+        permissionService.updateRoleOrganization(roleId, organizationCodes, userId);
+
         return bathCreateWindRelation(list) ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
@@ -294,7 +320,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         }
 
         // 删除数据权限
-        sysOrganizationAuthService.delSysOrganizationAuth(fieldCode,TypeRelationEnum.WIND_FIELD_NUMBER.getCode());
+        sysOrganizationAuthService.delSysOrganizationAuth(fieldCode, TypeRelationEnum.WIND_FIELD_NUMBER.getCode());
 
         WindRelationDelDto windRelationDelDto = new WindRelationDelDto();
         windRelationDelDto.setCodeNumber(fieldCode);