Bladeren bron

minio下载

shiyue 1 jaar geleden
bovenliggende
commit
36dccb4cc3

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

@@ -81,6 +81,15 @@ public class WindEngineGroupController extends BaseServiceController {
         return ResultResp.SUCCESS(page);
     }
 
+    @UserLoginToken
+    @PostMapping(value = "/getWindEngineGroupListByFieldCode")
+    @ApiOperation(value = "通过风场code查询风机集合查询")
+    public ResultResp<List<WindEngineGroupPageVo>> getWindEngineGroupListByFieldCode(@RequestBody WindEngineGroupPageDto windEngineGroupPageDto) {
+        List<WindEngineGroupPageVo> list = windEngineGroupService.getWindEngineGroupListByFieldCode(windEngineGroupPageDto);
+        return ResultResp.SUCCESS(list);
+    }
+
+
 
     @UserLoginToken
     @PostMapping(value = "/getWindEngineGroupByFieldCode")
@@ -125,6 +134,15 @@ public class WindEngineGroupController extends BaseServiceController {
     }
 
 
+    @UserLoginToken
+    @PostMapping(value = "/bathUpdateWindEngineGroup")
+    @ApiOperation(value = "批量更改风机数据")
+    public ResultResp bathUpdateWindEngineGroup(@RequestBody WindEngineGroupBathUpdateDto windEngineGroupBathUpdateDto) {
+        boolean flg = windEngineGroupService.updateWindEngineGroupList(windEngineGroupBathUpdateDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
     @ApiOperation("根据角色获取风机")
     @UserLoginToken
     @GetMapping("/getWindEngineGroupByUser")

+ 21 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupBathUpdateDto.java

@@ -0,0 +1,21 @@
+package com.energy.manage.service.domain.dto.windenginegroup;
+
+import groovy.lang.GrabExclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Getter
+@Setter
+public class WindEngineGroupBathUpdateDto {
+
+    /**
+     * 更新参数集合
+     */
+    List<WindEngineGroupUpdateDto> windEngineGroupUpdateDtoList;
+
+
+}

+ 18 - 2
energy-manage-service/src/main/java/com/energy/manage/service/mappers/windenginegroup/WindEngineGroupMapper.java

@@ -4,6 +4,7 @@ package com.energy.manage.service.mappers.windenginegroup;
 import com.energy.manage.common.mapper.MyMapper;
 import com.energy.manage.common.po.windenginegroup.WindEngineGroupPO;
 import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupPageDto;
+import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupUpdateDto;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
 import org.apache.ibatis.annotations.Param;
@@ -16,10 +17,21 @@ import java.util.List;
 @Repository
 public interface WindEngineGroupMapper extends MyMapper<WindEngineGroupPO> {
 
-
+   /**
+    * 分页
+    * @param windEngineGroupPageDto
+    * @return
+    */
    List<WindEngineGroupPageVo> selectWindEngineGroupByNames(@Param("item") WindEngineGroupPageDto windEngineGroupPageDto);
 
    /**
+    * 集合
+    * @param fieldCode
+    * @return
+    */
+   List<WindEngineGroupPageVo> selectWindEngineGroupListByFieldCode(@Param("fieldCode") String fieldCode);
+
+   /**
     * 查看当前角色所关联的机组
     * @param roleId
     * @return
@@ -42,6 +54,10 @@ public interface WindEngineGroupMapper extends MyMapper<WindEngineGroupPO> {
     */
    BigDecimal selectMaxRatedCapacity(@Param("fieldCode") String fieldCode,@Param("engineCodes") List<String> engineCodes);
 
-
+   /**
+    * 批量更改风机信息
+    * @return
+    */
+   Integer updateWindEngineGroupList(@Param("list")List<WindEngineGroupUpdateDto> list);
 
 }

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

@@ -43,6 +43,16 @@ public interface WindEngineGroupService {
      */
     Page<WindEngineGroupPageVo> windEngineGrouPage(WindEngineGroupPageDto windEngineGroupPageDto);
 
+
+    /**
+     * 集合查询
+     * @param windEngineGroupPageDto
+     * @return
+     */
+    List<WindEngineGroupPageVo>  getWindEngineGroupListByFieldCode(WindEngineGroupPageDto windEngineGroupPageDto);
+
+
+
     /**
      * 通过风场code查询风机集合
      * @param fieldCode
@@ -76,6 +86,13 @@ public interface WindEngineGroupService {
     boolean updateWindEngineGroup(WindEngineGroupUpdateDto windEngineGroupUpdateDto);
 
     /**
+     * 批量更新数据
+     * @param windEngineGroupBathUpdateDto
+     * @return
+     */
+    boolean updateWindEngineGroupList(WindEngineGroupBathUpdateDto windEngineGroupBathUpdateDto);
+
+    /**
      * 查询风机对象
      *
      * @param windEngineGroupCodeDto

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

@@ -65,7 +65,6 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     @Autowired
     private AnemometerTowerService anemometerTowerService;
 
-
     @Autowired
     private WindEngineGroupMapper windEngineGroupMapper;
 
@@ -123,7 +122,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     @SneakyThrows
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResultResp windEngineGroupImportData(MultipartFile file, String fieldCode,Integer userId) {
+    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("未读取到文件数据,请核对数据准确性!");
@@ -134,30 +133,30 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
 
         // 校验数据非空
         for (WindEngineGroupExcelVo exceVo : windEngineGroupExceVoList) {
-            if (exceVo.getLongitude() == null || exceVo.getLatitude() == null||StringUtils.isEmpty(exceVo.getMachineTypeCode())) {
+            if (exceVo.getLongitude() == null || exceVo.getLatitude() == null || StringUtils.isEmpty(exceVo.getMachineTypeCode())) {
                 return ResultResp.FAIL("当前导入风机数据未填写经纬度,请核查导入数据!");
             }
         }
 
         // 校验是否有重复的风机编号
         Set<String> engineNames = windEngineGroupExceVoList.stream().map(item -> item.getEngineName()).collect(Collectors.toSet());
-        if(windEngineGroupExceVoList.size()!=engineNames.size()){
+        if (windEngineGroupExceVoList.size() != engineNames.size()) {
             return ResultResp.FAIL("当前导入风机数据有重复风机编号,请核查导入数据!");
         }
 
         // 处理机型编号
         List<String> millTypeCodes = windEngineGroupExceVoList.stream().map(item -> item.getMachineTypeCode()).collect(Collectors.toList());
-        List<WindEngineMillVo>  windEngineMillVoList =  windEngineMillService.getWindEngineMillListByInMachineTypeCode(millTypeCodes);
+        List<WindEngineMillVo> windEngineMillVoList = windEngineMillService.getWindEngineMillListByInMachineTypeCode(millTypeCodes);
         //校验机型准确性
-        for(String millTypeCode : millTypeCodes){
-           boolean flg =  windEngineMillVoList.stream().anyMatch(item -> item.getMachineTypeCode().equals(millTypeCode));
-           if(!flg){
-               return ResultResp.FAIL("当前导入机型编号系统中不存在,请核查导入数据!");
-           }
+        for (String millTypeCode : millTypeCodes) {
+            boolean flg = windEngineMillVoList.stream().anyMatch(item -> item.getMachineTypeCode().equals(millTypeCode));
+            if (!flg) {
+                return ResultResp.FAIL("当前导入机型编号系统中不存在,请核查导入数据!");
+            }
         }
-        for(WindEngineGroupExcelVo windEngineGroupExcelVo : windEngineGroupExceVoList){
-            for(WindEngineMillVo windEngineMillVo : windEngineMillVoList){
-                if(windEngineGroupExcelVo.getMachineTypeCode().equals(windEngineMillVo.getMachineTypeCode())){
+        for (WindEngineGroupExcelVo windEngineGroupExcelVo : windEngineGroupExceVoList) {
+            for (WindEngineMillVo windEngineMillVo : windEngineMillVoList) {
+                if (windEngineGroupExcelVo.getMachineTypeCode().equals(windEngineMillVo.getMachineTypeCode())) {
                     windEngineGroupExcelVo.setMillTypeCode(windEngineMillVo.getMillTypeCode());
                 }
             }
@@ -187,10 +186,10 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
             windEngineGroupPO.setUpdateTime(new Date());
             windEngineGroupPO.setState(Constants.GLOBAL_IN_USE);
             windEngineGroupPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
-            if(windFieldExceVos.getSightcingString().equals("是")){
+            if (windFieldExceVos.getSightcingString().equals("是")) {
                 windEngineGroupPO.setSightcing(1);
             }
-            if(windFieldExceVos.getSightcingString().equals("否")){
+            if (windFieldExceVos.getSightcingString().equals("否")) {
                 windEngineGroupPO.setSightcing(2);
             }
             windEngineGroupPO.setCreateBy(userId);
@@ -216,7 +215,12 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     }
 
     @Override
-    public WindFieldGroupTowerVo getWindEngineGroupByFieldCode(String fieldCode,String batchCode) {
+    public List<WindEngineGroupPageVo> getWindEngineGroupListByFieldCode(WindEngineGroupPageDto windEngineGroupPageDto) {
+        return windEngineGroupMapper.selectWindEngineGroupListByFieldCode(windEngineGroupPageDto.getFieldCode());
+    }
+
+    @Override
+    public WindFieldGroupTowerVo getWindEngineGroupByFieldCode(String fieldCode, String batchCode) {
 
         WindFieldGroupTowerVo windFieldGroupTowerVo = new WindFieldGroupTowerVo();
 
@@ -233,7 +237,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
         List<WindEngineGroupVo> engineGroupVoArrayList = Lists.newArrayList();
         for (WindEngineGroupPO po : engineGroupPOS) {
             windEngineGroupVo = new WindEngineGroupVo();
-            BeanUtil.copyProperties(po,windEngineGroupVo);
+            BeanUtil.copyProperties(po, windEngineGroupVo);
             if (windEngineGroupVo.getLongitude() != null && windEngineGroupVo.getLatitude() != null) {
                 DecimalFormat df = new DecimalFormat("#.00000");
                 String longitude = df.format(windEngineGroupVo.getLongitude());
@@ -246,8 +250,8 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
 
         // 处理测风塔信息
         List<AnemometerTowerByFieldVo> anemometerTowerByFields = anemometerTowerService.getAnemometerTowerByField(fieldCode);
-        if(!CollectionUtils.isEmpty(anemometerTowerByFields)){
-            for(AnemometerTowerByFieldVo vo : anemometerTowerByFields){
+        if (!CollectionUtils.isEmpty(anemometerTowerByFields)) {
+            for (AnemometerTowerByFieldVo vo : anemometerTowerByFields) {
                 if (vo.getLongitude() != null && vo.getLatitude() != null) {
                     DecimalFormat df = new DecimalFormat("#.00000");
                     String longitude = df.format(vo.getLongitude());
@@ -259,11 +263,11 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
         }
 
         // 处理批次异常状体
-        List<AnalysisErrorCodeVo> analysisErrorCodeVoList =  analysisErrService.AnalysisErrorCodeQuery(batchCode);
-        if(!CollectionUtils.isEmpty(analysisErrorCodeVoList)){
-            for(WindEngineGroupVo wgVo : windFieldGroupTowerVo.getWindEngineGroupVoList()){
-                for(AnalysisErrorCodeVo errorCodeVo :analysisErrorCodeVoList ){
-                    if(wgVo.getEngineCode().equals(errorCodeVo.getEngineCode())){
+        List<AnalysisErrorCodeVo> analysisErrorCodeVoList = analysisErrService.AnalysisErrorCodeQuery(batchCode);
+        if (!CollectionUtils.isEmpty(analysisErrorCodeVoList)) {
+            for (WindEngineGroupVo wgVo : windFieldGroupTowerVo.getWindEngineGroupVoList()) {
+                for (AnalysisErrorCodeVo errorCodeVo : analysisErrorCodeVoList) {
+                    if (wgVo.getEngineCode().equals(errorCodeVo.getEngineCode())) {
                         wgVo.setErrorState(true);
                     }
                 }
@@ -370,6 +374,11 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     }
 
     @Override
+    public boolean updateWindEngineGroupList(WindEngineGroupBathUpdateDto windEngineGroupBathUpdateDto) {
+        return windEngineGroupMapper.updateWindEngineGroupList(windEngineGroupBathUpdateDto.getWindEngineGroupUpdateDtoList()) > 0 ? true : false;
+    }
+
+    @Override
     public WindEngineGroupVo getWindEngineGroup(WindEngineGroupCodeDto windEngineGroupCodeDto) {
         WindEngineGroupPO po = new WindEngineGroupPO();
         po.setEngineCode(windEngineGroupCodeDto.getEngineCode());

+ 64 - 0
energy-manage-service/src/main/resources/mybatis/windenginegroup/WindEngineGroupMapper.xml

@@ -47,6 +47,38 @@
         order by weg.id
     </select>
 
+
+    <select id="selectWindEngineGroupListByFieldCode" resultType="com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo">
+        SELECT
+        wf.field_code as fieldCode,
+        wf.field_name as fieldName,
+        weg.engine_code AS engineCode,
+        weg.engine_name as engineName,
+        weg.rated_capacity as ratedCapacity,
+        weg.elevation_height as elevationHeight,
+        weg.hub_height as hubHeight,
+        weg.longitude,
+        weg.latitude,
+        weg.sightcing,
+        weg.state,
+        wem.machine_type_code as machineTypeCode,
+        wem.manufacturer_name as manufacturerName,
+        weg.create_time as createTime
+        from
+        wind_field wf
+        inner join
+        wind_engine_group weg on wf.field_code = weg.field_code
+        left JOIN
+        wind_engine_mill wem on weg.mill_type_code = wem.mill_type_code and wem.del_state = 0
+        where 1=1 and weg.del_state = 0
+        <if test="fieldCode!=null">
+            and  wf.field_code = #{fieldCode}
+        </if>
+        order by weg.id
+    </select>
+
+
+
     <select id="selectWindEngineGroupByRoleId" parameterType="java.lang.Integer" resultType="com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo">
         select
             engine.field_code as fieldCode,
@@ -85,4 +117,36 @@
     </select>
 
 
+
+    <update id="updateWindEngineGroupList" parameterType="java.util.List">
+        <foreach collection="list" item="item" index="index" separator=";">
+            UPDATE
+            wind_engine_group
+            <set>
+            <if test="item.engineName!=null">
+                engine_name = #{item.engineName},
+            </if>
+            <if test="item.ratedCapacity!=null">
+                rated_capacity = #{item.ratedCapacity},
+            </if>
+            <if test="item.elevationHeight!=null">
+                elevation_height = #{item.elevationHeight},
+            </if>
+            <if test="item.hubHeight!=null">
+                hub_height = #{item.hubHeight},
+            </if>
+            <if test="item.longitude!=null">
+                longitude = #{item.longitude},
+            </if>
+            <if test="item.latitude!=null">
+                latitude = #{item.latitude},
+            </if>
+            update_time = now()
+            </set>
+            where
+            engine_code = #{item.engineCode}
+        </foreach>
+    </update>
+
+
 </mapper>