关联kafka依赖包

energy-manage-common/src/main/java/com/energy/manage/common/po/windfield/WindFieldResoucePO.java → energy-manage-common/src/main/java/com/energy/manage/common/po/windfield/WindFieldResourcePO.java

@@ -8,10 +8,10 @@ import lombok.experimental.Accessors;
 import javax.persistence.Table;
 
 @Data
-@Table(name = "wind_field_resouce")
+@Table(name = "wind_field_resource")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class WindFieldResoucePO extends NewBaseDomain {
+public class WindFieldResourcePO extends NewBaseDomain {
 
 
     /**

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

@@ -9,6 +9,7 @@ import com.energy.manage.service.domain.vo.company.WindCompanyPageVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldPageVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
 import com.energy.manage.service.domain.vo.windrelation.WindRelationVo;
+import com.energy.manage.service.service.windfield.WindFieldResourceService;
 import com.energy.manage.service.service.windfield.WindFieldService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,6 +30,9 @@ public class WindFieldController {
     @Autowired
     private WindFieldService windFieldService;
 
+    @Autowired
+    private WindFieldResourceService windFieldResourceService;
+
 
     @UserLoginToken
     @PostMapping(value = "/createWindField")
@@ -137,4 +141,22 @@ public class WindFieldController {
     }
 
 
+    @UserLoginToken
+    @PostMapping(value = "/saveWindFieldResource")
+    @ApiOperation(value = "保存上传风场资源文件")
+    public ResultResp saveWindFieldResource(@RequestBody WindFieldResourceCreateDto windFieldResourceCreateDto) {
+        boolean flg = windFieldResourceService.saveWindFieldResource(windFieldResourceCreateDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
+    @UserLoginToken
+    @PostMapping(value = "/delWindFieldResource")
+    @ApiOperation(value = "删除风场资源文件")
+    public ResultResp delWindFieldResource(@RequestBody WindFieldResourceDelDto windFieldResourceDelDto) {
+        boolean flg = windFieldResourceService.delWindFieldResource(windFieldResourceDelDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
 }

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

@@ -0,0 +1,37 @@
+package com.energy.manage.service.domain.dto.windfield;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@ApiModel("创建风场资源参数")
+public class WindFieldResourceCreateDto {
+
+
+    /**
+     * 风场编号
+     */
+    @ApiModelProperty("风场编号")
+    private String fieldCode;
+    /**
+     * 上传文件名称
+     */
+    @ApiModelProperty("上传文件名称")
+    private String fileName;
+    /**
+     * 上传类型
+     */
+    @ApiModelProperty("上传类型")
+    private String type;
+    /**
+     * 上传文件地址
+     */
+    @ApiModelProperty("上传文件地址")
+    private String resourceUrl;
+
+
+
+}

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

@@ -0,0 +1,20 @@
+package com.energy.manage.service.domain.dto.windfield;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@ApiModel("删除风场资源参数")
+public class WindFieldResourceDelDto {
+
+
+    /**
+     * 资源文件id
+     */
+    @ApiModelProperty("编号")
+    private Integer id;
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windfield/WindFieldResourceVo.java

@@ -0,0 +1,35 @@
+package com.energy.manage.service.domain.vo.windfield;
+
+import com.energy.manage.common.po.windfield.WindFieldPO;
+import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 风场对象
+ */
+@Data
+public class WindFieldResourceVo {
+
+    /**
+     * 风场编号
+     */
+    private String fieldCode;
+    /**
+     * 上传文件名称
+     */
+    private String fileName;
+    /**
+     * 上传类型
+     */
+    private String type;
+    /**
+     * 上传文件地址
+     */
+    private String resourceUrl;
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windfield/WindFieldVo.java

@@ -2,7 +2,10 @@ package com.energy.manage.service.domain.vo.windfield;
 
 import com.energy.manage.common.po.windfield.WindFieldPO;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 
@@ -13,8 +16,11 @@ import java.util.List;
 public class WindFieldVo extends WindFieldPO {
 
 
+    @ApiModelProperty("测风塔数据")
     private List<AnemometerTowerByFieldVo> anemometerTowerByFieldVos;
 
+    @ApiModelProperty("风场资源文件集合")
+    private List<WindFieldResourceVo> windFieldResourceVos;
 
 
 

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

@@ -1,15 +0,0 @@
-package com.energy.manage.service.mappers.windfield;
-
-import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.windfield.WindFieldPO;
-import com.energy.manage.common.po.windfield.WindFieldResoucePO;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface WindFieldResouceMapper extends MyMapper<WindFieldResoucePO> {
-
-
-
-
-
-}

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

@@ -0,0 +1,14 @@
+package com.energy.manage.service.mappers.windfield;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.windfield.WindFieldResourcePO;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WindFieldResourceMapper extends MyMapper<WindFieldResourcePO> {
+
+
+
+
+
+}

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

@@ -0,0 +1,39 @@
+package com.energy.manage.service.service.windfield;
+
+
+import com.energy.manage.service.domain.dto.windfield.WindFieldResourceCreateDto;
+import com.energy.manage.service.domain.dto.windfield.WindFieldResourceDelDto;
+import com.energy.manage.service.domain.vo.windfield.WindFieldResourceVo;
+
+import java.util.List;
+
+/**
+ * 风场资源信息接口
+ */
+public interface WindFieldResourceService {
+
+
+    /**
+     *
+     * @param windFieldResourceCreateDto
+     * @return
+     */
+    boolean saveWindFieldResource(WindFieldResourceCreateDto windFieldResourceCreateDto);
+
+
+    /**
+     *
+     * @param windFieldResourceDelDto
+     * @return
+     */
+    boolean delWindFieldResource(WindFieldResourceDelDto windFieldResourceDelDto);
+
+
+    /**
+     * 通过风场编号查询资源文件信息集合
+     * @param FieldCode
+     * @return
+     */
+    List<WindFieldResourceVo> getWindFieldResourceByFieldCode(String FieldCode);
+
+}

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

@@ -0,0 +1,80 @@
+package com.energy.manage.service.service.windfield.impl;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.energy.manage.common.base.BaseServiceImpl;
+import com.energy.manage.common.po.windfield.WindFieldPO;
+import com.energy.manage.common.po.windfield.WindFieldResourcePO;
+import com.energy.manage.service.domain.dto.windfield.*;
+import com.energy.manage.service.domain.vo.windfield.WindFieldResourceVo;
+import com.energy.manage.service.mappers.windfield.WindFieldResourceMapper;
+import com.energy.manage.service.service.windfield.WindFieldResourceService;
+import com.google.common.collect.Lists;
+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.util.CollectionUtils;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.Date;
+import java.util.List;
+
+
+@Slf4j
+@Service
+public class WindFieldResourceServiceImpl extends BaseServiceImpl<WindFieldResourcePO> implements WindFieldResourceService {
+
+    @Autowired
+    private WindFieldResourceMapper windFieldResourceMapper;
+
+
+    @Override
+    public boolean saveWindFieldResource(WindFieldResourceCreateDto windFieldResourceCreateDto) {
+
+        WindFieldResourcePO windFieldResourcePO = new WindFieldResourcePO();
+        BeanUtil.copyProperties(windFieldResourceCreateDto, windFieldResourcePO);
+        if (windFieldResourcePO == null) {
+            return false;
+        }
+        windFieldResourcePO.setCreateTime(new Date());
+        windFieldResourcePO.setUpdateTime(new Date());
+        return windFieldResourceMapper.insertUseGeneratedKeys(windFieldResourcePO) > 0;
+
+    }
+
+    @Override
+    public boolean delWindFieldResource(WindFieldResourceDelDto windFieldResourceDelDto) {
+        if (windFieldResourceDelDto.getId() == null) {
+            return false;
+        }
+        WindFieldResourcePO windFieldResourcePO = new WindFieldResourcePO();
+        windFieldResourcePO.setId(windFieldResourceDelDto.getId());
+        return windFieldResourceMapper.delete(windFieldResourcePO) > 0;
+    }
+
+
+    @Override
+    public List<WindFieldResourceVo> getWindFieldResourceByFieldCode(String FieldCode) {
+        if (StringUtils.isEmpty(FieldCode)) {
+            return null;
+        }
+        Example queryExample = new Example(WindFieldResourcePO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("fieldCode", FieldCode);
+        List<WindFieldResourcePO> list = windFieldResourceMapper.selectByExample(queryExample);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        WindFieldResourceVo windFieldResourceVo = null;
+        List<WindFieldResourceVo> windFieldResourceVos = Lists.newArrayList();
+        for (WindFieldResourcePO windFieldResourcePO : list) {
+            windFieldResourceVo = new WindFieldResourceVo();
+            BeanUtil.copyProperties(windFieldResourcePO,windFieldResourceVo);
+            windFieldResourceVos.add(windFieldResourceVo);
+        }
+        return windFieldResourceVos;
+    }
+
+
+}

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

@@ -22,11 +22,13 @@ import com.energy.manage.service.domain.dto.windrelation.WindRelationDto;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
 import com.energy.manage.service.domain.vo.excel.WindFieldExceVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldPageVo;
+import com.energy.manage.service.domain.vo.windfield.WindFieldResourceVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
 import com.energy.manage.service.domain.vo.windrelation.WindRelationVo;
 import com.energy.manage.service.mappers.windfield.WindFieldMapper;
 import com.energy.manage.service.service.anemometertower.AnemometerTowerService;
 import com.energy.manage.service.service.cache.CacheService;
+import com.energy.manage.service.service.windfield.WindFieldResourceService;
 import com.energy.manage.service.service.windfield.WindFieldService;
 import com.energy.manage.service.service.windrelation.WindRelationService;
 import com.github.pagehelper.PageHelper;
@@ -64,6 +66,9 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
     @Autowired
     private AnemometerTowerService anemometerTowerService;
 
+    @Autowired
+    private WindFieldResourceService windFieldResourceService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -71,7 +76,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
 
         WindFieldPO windFieldPO = new WindFieldPO();
         BeanUtil.copyProperties(windFieldDto, windFieldPO);
-        String number = IdPrefixEnum.WIND_FIELD_NUMBER.getCode().concat(windFieldDto.getAreaCode()+IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.WIND_FIELD_NUMBER.getCode()))));
+        String number = IdPrefixEnum.WIND_FIELD_NUMBER.getCode().concat(windFieldDto.getAreaCode() + IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.WIND_FIELD_NUMBER.getCode()))));
         windFieldPO.setFieldCode(number);
         windFieldPO.setCreateTime(new Date());
         windFieldPO.setUpdateTime(new Date());
@@ -82,9 +87,9 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         }
 
         // 处理测风塔数据
-        if(!CollectionUtils.isEmpty(windFieldDto.getAnemometerTowerRelationDtos())){
+        if (!CollectionUtils.isEmpty(windFieldDto.getAnemometerTowerRelationDtos())) {
             List<AnemometerTowerRelationDto> anemometerTowerDtos = Lists.newArrayList();
-            BeanUtils.copyProperties(windFieldDto.getAnemometerTowerRelationDtos(),anemometerTowerDtos);
+            BeanUtils.copyProperties(windFieldDto.getAnemometerTowerRelationDtos(), anemometerTowerDtos);
             anemometerTowerService.bathAnemometerTowerRelation(anemometerTowerDtos);
         }
         return createWindRelation(windFieldPO);
@@ -178,7 +183,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
     private WindFieldPO createWindFieldPO(WindFieldImportDataDto windFieldImportDataDto) {
         WindFieldPO windFieldPO = new WindFieldPO();
         BeanUtil.copyProperties(windFieldImportDataDto, windFieldPO);
-        String number = IdPrefixEnum.WIND_FIELD_NUMBER.getCode().concat(windFieldImportDataDto.getAreaCode()+IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.WIND_FIELD_NUMBER.getCode()))));
+        String number = IdPrefixEnum.WIND_FIELD_NUMBER.getCode().concat(windFieldImportDataDto.getAreaCode() + IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.WIND_FIELD_NUMBER.getCode()))));
         windFieldPO.setFieldCode(number);
         windFieldPO.setCreateTime(new Date());
         windFieldPO.setUpdateTime(new Date());
@@ -251,9 +256,16 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
 
         //测风塔数据
         List<AnemometerTowerByFieldVo> list = anemometerTowerService.getAnemometerTowerByField(windFieldCodeDto.getFieldCode());
-        if(!CollectionUtils.isEmpty(list)){
+        if (!CollectionUtils.isEmpty(list)) {
             windFieldVo.setAnemometerTowerByFieldVos(list);
         }
+
+        //查询风场对应资源信息
+        List<WindFieldResourceVo> windFieldResourceVos = windFieldResourceService.getWindFieldResourceByFieldCode(windFieldCodeDto.getFieldCode());
+        if (!CollectionUtils.isEmpty(windFieldResourceVos)) {
+            windFieldVo.setWindFieldResourceVos(windFieldResourceVos);
+        }
+
         return windFieldVo;
     }
 
@@ -268,7 +280,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("fieldCode", windFieldPO.getFieldCode());
 
-        if(windFieldMapper.updateByExampleSelective(windFieldPO, queryExample) <= 0){
+        if (windFieldMapper.updateByExampleSelective(windFieldPO, queryExample) <= 0) {
             return false;
         }
 
@@ -277,11 +289,11 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         windRelationDto.setCodeNumber(windFieldUpdateDto.getFieldCode());
 
         // 处理测风塔数据
-        if(!CollectionUtils.isEmpty(windFieldUpdateDto.getAnemometerTowerRelationDtos())){
+        if (!CollectionUtils.isEmpty(windFieldUpdateDto.getAnemometerTowerRelationDtos())) {
             anemometerTowerService.deltAnemometerTowerRelationByField(windFieldUpdateDto.getFieldCode());
 
             List<AnemometerTowerRelationDto> anemometerTowerDtos = Lists.newArrayList();
-            BeanUtils.copyProperties(windFieldUpdateDto.getAnemometerTowerRelationDtos(),anemometerTowerDtos);
+            BeanUtils.copyProperties(windFieldUpdateDto.getAnemometerTowerRelationDtos(), anemometerTowerDtos);
             anemometerTowerService.bathAnemometerTowerRelation(anemometerTowerDtos);
         }