处理权限

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

@@ -90,6 +90,8 @@ public class WindFieldController extends BaseServiceController {
     @PostMapping(value = "/WindFieldListPage")
     @ApiOperation(value = "分页查询风场信息")
     public ResultResp<Page<WindFieldPageVo>> WindFieldListPage(@RequestBody WindFieldPageDto windFieldPageDto) {
+        windFieldPageDto.setUserId(getUserId());
+        windFieldPageDto.setRoleId(getRoleId());
         Page<WindFieldPageVo> page = windFieldService.WindFieldListPage(windFieldPageDto);
         return ResultResp.SUCCESS(page);
     }
@@ -175,7 +177,7 @@ public class WindFieldController extends BaseServiceController {
     @PostMapping(value = "/getWindFieldNames")
     @ApiOperation(value = "查询风场集合")
     public ResultResp<List<WindFieldNameVo>> getWindFieldNames() {
-        List<WindFieldNameVo> list = windFieldService.getWindFieldNames();
+        List<WindFieldNameVo> list = windFieldService.getWindFieldNames(getUserId(), getRoleId());
         return ResultResp.SUCCESS(list);
     }
 

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

@@ -60,5 +60,9 @@ public class WindFieldPageDto extends BaseDto {
     @ApiModelProperty("结束时间")
     private String endTime;
 
+    private Integer userId;
+
+    private Integer roleId;
+
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/mappers/windfield/WindFieldMapper.java

@@ -4,6 +4,7 @@ import com.energy.manage.common.mapper.MyMapper;
 import com.energy.manage.common.po.system.SysUserRolePO;
 import com.energy.manage.common.po.windfield.WindFieldPO;
 import com.energy.manage.service.domain.dto.windfield.WindFieldPageDto;
+import com.energy.manage.service.domain.vo.windfield.WindFieldNameVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldPageVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -19,8 +20,8 @@ public interface WindFieldMapper extends MyMapper<WindFieldPO> {
 
     int updateWindFieldEngineNumberByFieldCode(@Param("fieldCode") String fieldCode);
 
-
     List<WindFieldPageVo> selectWindFieldPageByfield(@Param("item") WindFieldPageDto windFieldPageDto);
 
+    List<WindFieldNameVo> selectWindFieldNamesByUserId(@Param("userId") Integer userId,@Param("roleId") Integer roleId);
 
 }

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

@@ -99,7 +99,7 @@ public interface WindFieldService {
      * 查询风场集合
      * @return
      */
-    List<WindFieldNameVo> getWindFieldNames();
+    List<WindFieldNameVo> getWindFieldNames(Integer userId, Integer roleId);
 
 
     /**

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

@@ -47,6 +47,7 @@ import com.google.common.collect.Lists;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -88,7 +89,6 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
     private WindRelationService windRelationService;
 
 
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean createWindField(WindFieldDto windFieldDto) {
@@ -149,7 +149,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
 
         // 校验数据非空
         for (WindFieldExceVo exceVo : windFieldExceVoList) {
-            if (StringUtils.isEmpty(exceVo.getCityName()) || StringUtils.isEmpty(exceVo.getProvinceName())||StringUtils.isEmpty(exceVo.getAreaCode())) {
+            if (StringUtils.isEmpty(exceVo.getCityName()) || StringUtils.isEmpty(exceVo.getProvinceName()) || StringUtils.isEmpty(exceVo.getAreaCode())) {
                 return ResultResp.FAIL("当前导入风场数据未填写区域，请核查导入数据！");
             }
             if (exceVo.getLongitude() == null || exceVo.getLatitude() == null) {
@@ -159,7 +159,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
 
         // 校验是否有重复的风场名称
         Set<String> fieldNameStrings = windFieldExceVoList.stream().map(item -> item.getFieldName()).collect(Collectors.toSet());
-        if(windFieldExceVoList.size()!=fieldNameStrings.size()){
+        if (windFieldExceVoList.size() != fieldNameStrings.size()) {
             return ResultResp.FAIL("当前导入风场数据有重复风场名称，请核查导入数据！");
         }
         // 数据校验是否有重名风场
@@ -281,7 +281,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("fieldCode", fieldCode);
 
-        if(windFieldMapper.updateByExampleSelective(windFieldPO, queryExample) <=0){
+        if (windFieldMapper.updateByExampleSelective(windFieldPO, queryExample) <= 0) {
             return false;
         }
         WindRelationDelDto windRelationDelDto = new WindRelationDelDto();
@@ -322,8 +322,8 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         // 查询企业对象
         WindCompanyDelDto windCompanyDelDto = new WindCompanyDelDto();
         windCompanyDelDto.setCompanyCode(po.getCompanyCode());
-        WindCompanyVo windCompanyVo =  windCompanyService.getWindCompany(windCompanyDelDto);
-        if(windCompanyVo!=null){
+        WindCompanyVo windCompanyVo = windCompanyService.getWindCompany(windCompanyDelDto);
+        if (windCompanyVo != null) {
             windFieldVo.setCompanyName(windCompanyVo.getCompanyName());
         }
 
@@ -409,21 +409,9 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
     }
 
     @Override
-    public List<WindFieldNameVo> getWindFieldNames() {
-
-        Example queryExample = new Example(WindFieldPO.class);
-        Example.Criteria criteria = queryExample.createCriteria();
-        criteria.andEqualTo("state", Constants.GLOBAL_IN_USE);
-        criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
-        List<WindFieldPO> list = windFieldMapper.selectByExample(queryExample);
-        WindFieldNameVo windFieldNameVo = null;
-        List<WindFieldNameVo> windFieldNameVos = Lists.newArrayList();
-        for(WindFieldPO po : list){
-            windFieldNameVo = new WindFieldNameVo();
-            BeanUtil.copyProperties(po,windFieldNameVo);
-            windFieldNameVos.add(windFieldNameVo);
-        }
-        return windFieldNameVos;
+    public List<WindFieldNameVo> getWindFieldNames(Integer userId, Integer roleId) {
+        List<WindFieldNameVo> list = windFieldMapper.selectWindFieldNamesByUserId(userId, roleId);
+        return list;
     }
 
     @Override

energy-manage-service/src/main/resources/mybatis/windfield/WindFieldMapper.xml

@@ -50,6 +50,23 @@
         <if test="item.endTime != null and item.endTime != ''">
             and wf.create_time <![CDATA[<= ]]> #{item.endTime}
         </if>
+        and
+        wf.create_by = #{item.userId}
+        or
+        wf.field_code in (select code_number from sys_organization_auth where role_id =#{item.roleId} and code_type = 'field')
     </select>
 
+
+    <select id="selectWindFieldNamesByUserId" resultType="com.energy.manage.service.domain.vo.windfield.WindFieldNameVo">
+         SELECT
+        wf.field_code as fieldCode,
+        wf.field_name as fieldName
+        FROM wind_field wf
+        where 1=1
+        and wf.del_state = 0
+        and wf.state = 1
+        and wf.create_by = #{userId}
+        or
+        wf.field_code in (select code_number from sys_organization_auth where role_id = #{roleId} and code_type = 'field')
+    </select>
 </mapper>