驾驶舱

energy-manage-service/src/main/java/com/energy/manage/service/controller/powerwordcontract/PowerWordContractController.java

@@ -2,6 +2,7 @@ package com.energy.manage.service.controller.powerwordcontract;
 
 
 import com.energy.manage.common.base.Page;
+import com.energy.manage.common.enums.IdPrefixEnum;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.controller.base.BaseServiceController;
@@ -35,7 +36,9 @@ public class PowerWordContractController extends BaseServiceController {
     @ApiOperation(value = " 同步合同功率,（选择风场编号，导入功率曲线）")
     public ResultResp powerWordContractImportData(@RequestPart("file") MultipartFile file,
                                                   @RequestParam("fieldCode") String fieldCode) {
-
+        if(!fieldCode.contains(IdPrefixEnum.WIND_FIELD_NUMBER.getCode())){
+            return ResultResp.FAIL("风场编号不正确，请确认数据！");
+        }
         PowerWordContractExcelDto powerWordContractExcelDto = new PowerWordContractExcelDto();
         powerWordContractExcelDto.setFieldCode(fieldCode);
         powerWordContractExcelDto.setCreateBy(getUserId());

energy-manage-service/src/main/java/com/energy/manage/service/controller/powerwordcriterion/PowerWordCriterionController.java

@@ -1,6 +1,7 @@
 package com.energy.manage.service.controller.powerwordcriterion;
 
 import com.energy.manage.common.base.Page;
+import com.energy.manage.common.enums.IdPrefixEnum;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.controller.base.BaseServiceController;
@@ -40,7 +41,9 @@ public class PowerWordCriterionController extends BaseServiceController {
     @ApiOperation(value = " 同步标准功率,（机型编号导入功率曲线）")
     public ResultResp powerWordCriterionImportData(@RequestPart MultipartFile file,
                                                    @RequestParam("millTypeCode") String millTypeCode) {
-
+        if(!millTypeCode.contains(IdPrefixEnum.WIND_EILL_NUMBER.getCode())){
+            return ResultResp.FAIL("风场编号不正确，请确认数据！");
+        }
         PowerWordCriterionExcelDto powerWordCriterionExcelDto = new PowerWordCriterionExcelDto();
         powerWordCriterionExcelDto.setMillTypeCode(millTypeCode);
         powerWordCriterionExcelDto.setCreateBy(getUserId());

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/cockpit/CompanyFieldGroupNumberVo.java

@@ -0,0 +1,26 @@
+package com.energy.manage.service.domain.vo.cockpit;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CompanyFieldGroupNumberVo {
+
+    /**
+     * 风场code
+     */
+    private String fieldCode;
+
+    /**
+     * 状态
+     */
+    private Integer analysisState;
+
+    /**
+     *风机数量
+     */
+    private Integer engineGroupNumber;
+
+
+}

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

@@ -3,6 +3,7 @@ package com.energy.manage.service.mappers.system;
 
 import com.energy.manage.common.mapper.MyMapper;
 import com.energy.manage.common.po.system.SysOrganizationAuthPO;
+import com.energy.manage.service.domain.vo.cockpit.CompanyFieldGroupNumberVo;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -22,5 +23,6 @@ public interface SysOrganizationAuthMapper extends MyMapper<SysOrganizationAuthP
     List<CompanyFieldTreeRoleVo> selectSysOrganizationAuthListByRoleId(@Param("roleId") Integer roleId);
 
 
+    List<CompanyFieldGroupNumberVo> selectFieldAndGrooupNumberByRoleId(@Param("roleId") Integer roleId);
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/powerwordcontract/impl/PowerWordContractServiceImpl.java

@@ -78,6 +78,7 @@ public class PowerWordContractServiceImpl extends BaseServiceImpl<PowerWordContr
             powerWordContractPO = this.createPowerWordContractPO();
             BeanUtil.copyProperties(powerWordContractExcelVo, powerWordContractPO);
             powerWordContractPO.setFieldCode(powerWordContractExcelDto.getFieldCode());
+            powerWordContractPO.setMillTypeCode(powerWordContractExcelVo.getMillTypeCode());
             list.add(powerWordContractPO);
         }
         if (CollectionUtils.isEmpty(list)) {

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

@@ -74,9 +74,7 @@ public class SysOrganizationAuthServiceImpl implements SysOrganizationAuthServic
 
     @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/windfield/impl/WindFieldServiceImpl.java

@@ -181,6 +181,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
             BeanUtil.copyProperties(windFieldExceVo, windFieldPO);
             String number = IdPrefixEnum.WIND_FIELD_NUMBER.getCode().concat(windFieldExceVo.getAreaCode() + IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.WIND_FIELD_NUMBER.getCode()))));
             windFieldPO.setFieldCode(number);
+            windFieldPO.setCompanyCode(windFieldImportDataDto.getCompanyCode());
             windFieldPO.setCreateTime(new Date());
             windFieldPO.setUpdateTime(new Date());
             windFieldPO.setState(Constants.GLOBAL_IN_USE);

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

@@ -107,7 +107,32 @@
         where 1=1
         </select>
 
-
+        <select id="selectFieldAndGrooupNumberByRoleId" resultType="com.energy.manage.service.domain.vo.cockpit.CompanyFieldGroupNumberVo">
+            select
+            weg.field_code as fieldCode,
+            ANY_VALUE(wfbr.analysis_state) as analysisState,
+            count(weg.field_code) as engineGroupNumber
+            from sys_organization_auth a
+            left join wind_engine_group weg on a.code_number = weg.field_code and  weg.del_state = 0
+            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 a.code_number = wfbr.field_code
+            where 1=1
+            and a.role_id = #{roleId}
+            and a.code_type = 'field'
+            group by weg.field_code
+        </select>
 
 
 </mapper>