更改bug

energy-manage-service/src/main/java/com/energy/manage/service/controller/system/SysOrganizationAuthController.java

@@ -2,6 +2,7 @@ package com.energy.manage.service.controller.system;
 
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.controller.base.BaseServiceController;
+import com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo;
 import com.energy.manage.service.service.system.SysOrganizationAuthService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -40,5 +41,10 @@ public class SysOrganizationAuthController extends BaseServiceController {
     }
 
 
+    @ApiOperation(value = "根据角色查询风场集合（驾驶仓）")
+    @PostMapping("/getSysOrganizationAuthListByRoleId")
+    public ResultResp<List<CompanyFieldTreeRoleVo>> getSysOrganizationAuthListByRoleId() {
+        return success(sysOrganizationAuthService.getSysOrganizationAuthListByRoleId(getRoleId()));
+    }
 
 }

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

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -75,6 +76,15 @@ public class WindEngineGroupController extends BaseServiceController {
         return ResultResp.SUCCESS(page);
     }
 
+
+    @UserLoginToken
+    @PostMapping(value = "/getWindEngineGroupByFieldCode")
+    @ApiOperation(value = "通过风场code查询风机集合(jsc)")
+    public ResultResp<List<WindEngineGroupVo>> getWindEngineGroupByFieldCode(@RequestBody WindEngineGroupFieldCodeDto windEngineGroupFieldCodeDto) {
+        List<WindEngineGroupVo> list = windEngineGroupService.getWindEngineGroupByFieldCode(windEngineGroupFieldCodeDto.getFieldCode());
+        return ResultResp.SUCCESS(list);
+    }
+
     @UserLoginToken
     @PostMapping(value = "/getWindEngineGroup")
     @ApiOperation(value = "查询风机对象")

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupFieldCodeDto.java

@@ -0,0 +1,20 @@
+package com.energy.manage.service.domain.dto.windenginegroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ApiModel
+public class WindEngineGroupFieldCodeDto {
+    /**
+     * 风场编号
+     */
+    @NotNull(message = "风场编号不能为空")
+    @ApiModelProperty("风场编号")
+    private String fieldCode;
+}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/system/SysOrganizationAuthMapper.java

@@ -19,6 +19,8 @@ public interface SysOrganizationAuthMapper extends MyMapper<SysOrganizationAuthP
     List<CompanyFieldTreeRoleVo> selectSysOrganizationAuthTreeByRoleId(@Param("roleId") Integer roleId);
 
 
+    List<CompanyFieldTreeRoleVo> selectSysOrganizationAuthListByRoleId(@Param("roleId") Integer roleId);
+
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/system/SysOrganizationAuthService.java

@@ -1,6 +1,7 @@
 package com.energy.manage.service.service.system;
 
 import com.energy.manage.common.po.system.SysOrganizationAuthPO;
+import com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo;
 
 import java.util.List;
 import java.util.Map;
@@ -38,6 +39,12 @@ public interface SysOrganizationAuthService {
      */
     List<Map<String, Object>> getSysOrganizationAuthTreeByRoleId(Integer roleId);
 
+    /**
+     * 驾驶舱通过roleid查询集合风场
+     * @param roleId
+     * @return
+     */
+    List<CompanyFieldTreeRoleVo> getSysOrganizationAuthListByRoleId(Integer roleId);
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/system/impl/SysOrganizationAuthServiceImpl.java

@@ -72,5 +72,13 @@ public class SysOrganizationAuthServiceImpl implements SysOrganizationAuthServic
         return java8ResultTree;
     }
 
+    @Override
+    public List<CompanyFieldTreeRoleVo> getSysOrganizationAuthListByRoleId(Integer roleId) {
+
+        List<CompanyFieldTreeRoleVo> list =  sysOrganizationAuthMapper.selectSysOrganizationAuthListByRoleId(roleId);
+
+        return list;
+    }
+
 
 }

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

@@ -42,14 +42,13 @@ public interface WindEngineGroupService {
      */
     Page<WindEngineGroupPageVo> windEngineGrouPage(WindEngineGroupPageDto windEngineGroupPageDto);
 
-
     /**
-     * 删除风场下风机
-     *
+     * 通过风场code查询风机集合
      * @param fieldCode
      * @return
      */
-    boolean delFieldWindEngineGroup(String fieldCode);
+    List<WindEngineGroupVo> getWindEngineGroupByFieldCode(String fieldCode);
+
 
     /**
      * 删除风机
@@ -91,7 +90,7 @@ public interface WindEngineGroupService {
     int getWindEngineGroupCountByField(String fieldCode);
 
     /**
-     * 获取登录用户能看到的风机
+     * 获取登录用户role能看到的风机
      * @param roleId
      * @return
      */

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

@@ -114,7 +114,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
         }
         // 过滤空数据
         List<WindEngineGroupExcelVo> windFieldExceVoList = windEngineGroupExcelVos.stream().filter(item ->
-                !StringUtils.isEmpty(item.getEngineName())&&!StringUtils.isEmpty(item.getMillTypeCode())).collect(Collectors.toList());
+                !StringUtils.isEmpty(item.getEngineName()) && !StringUtils.isEmpty(item.getMillTypeCode())).collect(Collectors.toList());
 
         // 校验数据非空
         for (WindEngineGroupExcelVo exceVo : windFieldExceVoList) {
@@ -159,7 +159,6 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     }
 
 
-
     @Override
     public Page<WindEngineGroupPageVo> windEngineGrouPage(WindEngineGroupPageDto windEngineGroupPageDto) {
         PageHelper.startPage(windEngineGroupPageDto.getPageNum(), windEngineGroupPageDto.getPageSize());
@@ -169,30 +168,36 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     }
 
     @Override
-    public boolean delFieldWindEngineGroup(String fieldCode) {
-
-        WindEngineGroupPO po = new WindEngineGroupPO();
-        po.setDelState(DeleteStatusEnum.DELETE.getCode());
-        Example queryExample = new Example(WindEngineMillPO.class);
+    public List<WindEngineGroupVo> getWindEngineGroupByFieldCode(String fieldCode) {
+        Example queryExample = new Example(WindEngineGroupPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("fieldCode", fieldCode);
-
-        return windEngineGroupMapper.updateByExampleSelective(po, queryExample) > 0;
+        criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
+        List<WindEngineGroupPO> engineGroupPOS = windEngineGroupMapper.selectByExample(queryExample);
+        if (CollectionUtils.isEmpty(engineGroupPOS)) {
+            return null;
+        }
+        WindEngineGroupVo windEngineGroupVo = null;
+        List<WindEngineGroupVo> list = Lists.newArrayList();
+        for (WindEngineGroupPO po : engineGroupPOS) {
+            windEngineGroupVo = new WindEngineGroupVo();
+            BeanUtil.copyProperties(po,windEngineGroupVo);
+            list.add(windEngineGroupVo);
+        }
+        return list;
     }
 
+
     @Override
     public boolean delWindEngineGroup(WindEngineGroupCodeDto windEngineGroupCodeDto) {
-
         WindEngineGroupPO po = new WindEngineGroupPO();
         po.setDelState(DeleteStatusEnum.DELETE.getCode());
         Example queryExample = new Example(WindEngineGroupPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("engineCode", windEngineGroupCodeDto.getEngineCode());
-
         if (windEngineGroupMapper.updateByExampleSelective(po, queryExample) <= 0) {
             return false;
         }
-
         // 处理总额定功率
         WindEngineGroupPO windEngineGroupPO = new WindEngineGroupPO();
         windEngineGroupPO.setEngineCode(windEngineGroupCodeDto.getEngineCode());
@@ -213,7 +218,6 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
                 windFieldService.updateWindField(windFieldUpdateDto);
             }
         }
-
         return true;
     }
 
@@ -260,12 +264,12 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
             windFieldUpdateDto.setFieldCode(windFieldCodeDto.getFieldCode());
             double value = windFieldVo.getRatedCapacityNumber() == null ? 0 : windFieldVo.getRatedCapacityNumber().doubleValue();
             if (windEngineGroup.getRatedCapacity().doubleValue() < windEngineGroupUpdateDto.getRatedCapacity().doubleValue()) {
-                double less = NumberUtil.round(windEngineGroupUpdateDto.getRatedCapacity().doubleValue() - windEngineGroup.getRatedCapacity().doubleValue(),2).doubleValue();
+                double less = NumberUtil.round(windEngineGroupUpdateDto.getRatedCapacity().doubleValue() - windEngineGroup.getRatedCapacity().doubleValue(), 2).doubleValue();
                 windFieldUpdateDto.setRatedCapacityNumber(value + less);
                 windFieldService.updateWindField(windFieldUpdateDto);
             }
             if (windEngineGroup.getRatedCapacity().doubleValue() > windEngineGroupUpdateDto.getRatedCapacity().doubleValue()) {
-                double greater =  NumberUtil.round(windEngineGroup.getRatedCapacity().doubleValue() - windEngineGroupUpdateDto.getRatedCapacity().doubleValue(),2).doubleValue();
+                double greater = NumberUtil.round(windEngineGroup.getRatedCapacity().doubleValue() - windEngineGroupUpdateDto.getRatedCapacity().doubleValue(), 2).doubleValue();
                 if (value > windEngineGroup.getRatedCapacity()) {
                     windFieldUpdateDto.setRatedCapacityNumber(value - greater);
                     windFieldService.updateWindField(windFieldUpdateDto);
@@ -293,14 +297,14 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     public int getWindEngineGroupCountByField(String fieldCode) {
         Example queryExample = new Example(WindEngineGroupPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
-        criteria.andEqualTo("fieldCode",fieldCode);
+        criteria.andEqualTo("fieldCode", fieldCode);
         return windEngineGroupMapper.selectCountByExample(queryExample);
 
     }
 
 
     @Override
-    public List<WindEngineGroupVo> getWindEngineGroupByRoleId(Integer roleId){
+    public List<WindEngineGroupVo> getWindEngineGroupByRoleId(Integer roleId) {
         return windEngineGroupMapper.selectWindEngineGroupByRoleId(roleId);
     }
 

energy-manage-service/src/main/resources/mybatis/system/OrganizationAuthMapper.xml

@@ -63,4 +63,51 @@
         order by wfb.create_time desc limit 1) wfbr on wf.field_code = wfbr.field_code
         where 1=1
         </select>
+
+    <select id="selectSysOrganizationAuthListByRoleId" resultType="com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo">
+        select
+        soa.role_id as roleId,
+        soa.code_number as codeNumber,
+        soa.parent_code as parentCode,
+        soa.code_type as codeType,
+        wc.company_name as companyName,
+        wf.field_name as fieldName,
+        wf.longitude as longitude,
+        wf.latitude as latitude,
+        wf.density,
+        wf.rated_capacity_number as ratedCapacityNumber,
+        wf.elevation_height as elevationHeight,
+        wfbr.batch_code as batchCode,
+        wfbr.batch_name as batchName,
+        wfbr.analysis_state as analysisState
+        from
+        (select a.role_id,
+        wr.code_number,
+        wr.parent_code,
+        wr.type as code_type
+        from sys_organization_auth a
+        inner join wind_relation wr on a.code_number = wr.code_number where 1=1 and a.role_id =#{roleId} and wr.type = 'field') soa
+        left join
+        wind_company wc on soa.code_number = wc.company_code
+        left join
+        wind_field wf on soa.code_number = wf.field_code
+        left join
+        (select
+        wfb.batch_code,
+        wfb.batch_name,
+        wfb.field_code,
+        ar.analysis_state
+        from
+        wind_field_batch wfb
+        left join
+        analysis_result ar on wfb.batch_code = ar.batch_code
+        where 1=1
+        and wfb.is_delete = 0
+        order by wfb.create_time desc limit 1) wfbr on wf.field_code = wfbr.field_code
+        where 1=1
+        </select>
+
+
+
+
 </mapper>