更改bug

energy-manage-service/src/main/java/com/energy/manage/service/controller/company/WindCompanyController.java

@@ -41,7 +41,7 @@ public class WindCompanyController extends BaseServiceController {
     @ApiOperation(value = "创建企业")
     public ResultResp addCompany(@RequestBody @Valid WindCompanyDto dto) {
         // 验证企业名称是否存在
-        WindCompanyPO po = windCompanyService.getWindCompanyPO(dto);
+        WindCompanyPO po = windCompanyService.getWindCompanyByCompanyName(dto);
         if (po != null) {
             return ResultResp.FAIL("企业名称已存在！");
         }

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

@@ -94,7 +94,7 @@ public class WindFieldController extends BaseServiceController {
     @PostMapping(value = "/delWindFieldById")
     @ApiOperation(value = "删除风场")
     public ResultResp delWindFieldById(@RequestBody @Valid WindFieldCodeDto windFieldCodeDto) {
-        if (windEngineGroupService.getWindEngineGroupCountByField(windFieldCodeDto.getFieldCode()) <= 0) {
+        if (windEngineGroupService.getWindEngineGroupCountByField(windFieldCodeDto.getFieldCode()) > 0) {
             return ResultResp.FAIL("风场下有绑定风机，不可删除！");
         }
         boolean flg = windFieldService.delWindFieldById(windFieldCodeDto.getFieldCode());

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

@@ -57,27 +57,32 @@ public class WindFieldDto {
      * 省编号
      */
     @ApiModelProperty("省编号")
+    @NotNull(message = "省编号不能为空")
     private Integer provinceId;
     /**
      * 省名字
      */
     @ApiModelProperty("省名字")
+    @NotNull(message = "省名字不能为空")
     private String provinceName;
     /**
      * 市编号
      */
     @ApiModelProperty("市编号")
+    @NotNull(message = "市编号不能为空")
     private Integer cityId;
     /**
      * 市名字
      */
     @ApiModelProperty("市名字")
+    @NotNull(message = "市名字不能为空")
     private String cityName;
 
     /**
      * 区号
      */
     @ApiModelProperty("区号")
+    @NotNull(message = "区号不能为空")
     private String areaCode;
     /**
      * 经度

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

@@ -18,6 +18,11 @@ import java.util.List;
 @ApiModel
 public class WindFieldVo extends WindFieldPO {
 
+    /**
+     * 企业name
+     */
+    @ApiModelProperty("企业name")
+    private String companyName;
 
     @ApiModelProperty("测风塔数据")
     private List<AnemometerTowerByFieldVo> anemometerTowerByFieldVos;

energy-manage-service/src/main/java/com/energy/manage/service/service/company/WindCompanyService.java

@@ -78,6 +78,6 @@ public interface WindCompanyService extends BaseService<WindCompanyPO> {
      * @param dto
      * @return
      */
-    WindCompanyPO getWindCompanyPO(WindCompanyDto dto);
+    WindCompanyPO getWindCompanyByCompanyName(WindCompanyDto dto);
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/company/impl/WindCompanyServiceImpl.java

@@ -163,7 +163,7 @@ public class WindCompanyServiceImpl extends BaseServiceImpl<WindCompanyPO> imple
     }
 
     @Override
-    public WindCompanyPO getWindCompanyPO(WindCompanyDto dto) {
+    public WindCompanyPO getWindCompanyByCompanyName(WindCompanyDto dto) {
         Example queryExample = new Example(WindCompanyPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("companyName", dto.getCompanyName());

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

@@ -19,11 +19,13 @@ import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.common.util.IdGeneratorUtil;
 import com.energy.manage.service.domain.dto.anemometertower.AnemometerTowerDto;
 import com.energy.manage.service.domain.dto.anemometertower.AnemometerTowerRelationDto;
+import com.energy.manage.service.domain.dto.company.WindCompanyDelDto;
 import com.energy.manage.service.domain.dto.company.WindCompanyDto;
 import com.energy.manage.service.domain.dto.windfield.*;
 import com.energy.manage.service.domain.dto.windrelation.WindRelationDelDto;
 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.company.WindCompanyVo;
 import com.energy.manage.service.domain.vo.excel.WindFieldExceVo;
 import com.energy.manage.service.domain.vo.windenginemill.WindEngineMillVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldNameVo;
@@ -35,6 +37,7 @@ import com.energy.manage.service.mappers.windfield.WindFieldMapper;
 import com.energy.manage.service.service.anemometertower.AnemometerTowerService;
 import com.energy.manage.service.service.area.AreaApiService;
 import com.energy.manage.service.service.cache.CacheService;
+import com.energy.manage.service.service.company.WindCompanyService;
 import com.energy.manage.service.service.windfield.WindFieldResourceService;
 import com.energy.manage.service.service.windfield.WindFieldService;
 import com.energy.manage.service.service.windrelation.WindRelationService;
@@ -69,6 +72,8 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
     @Autowired
     private CacheService cacheService;
 
+    @Autowired
+    private WindCompanyService windCompanyService;
 
     @Autowired
     private WindFieldMapper windFieldMapper;
@@ -82,7 +87,6 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
     @Autowired
     private WindFieldResourceService windFieldResourceService;
 
-
     @Autowired
     private WindRelationService windRelationService;
 
@@ -111,7 +115,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
             for (WindFieldDto.AnemometerTowerRelationDto anemometerTowerRelationDto1 : windFieldDto.getAnemometerTowerRelationDtos()) {
                 anemometerTowerRelationDto = new AnemometerTowerRelationDto();
                 BeanUtils.copyProperties(anemometerTowerRelationDto1, anemometerTowerRelationDto);
-                anemometerTowerRelationDto.setFieldCode(windFieldDto.getFieldCode());
+                anemometerTowerRelationDto.setFieldCode(windFieldPO.getFieldCode());
                 anemometerTowerDtos.add(anemometerTowerRelationDto);
             }
             anemometerTowerService.bathAnemometerTowerRelation(anemometerTowerDtos);
@@ -310,6 +314,14 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         WindFieldVo windFieldVo = new WindFieldVo();
         BeanUtil.copyProperties(po, windFieldVo);
 
+        // 查询企业对象
+        WindCompanyDelDto windCompanyDelDto = new WindCompanyDelDto();
+        windCompanyDelDto.setCompanyCode(po.getCompanyCode());
+        WindCompanyVo windCompanyVo =  windCompanyService.getWindCompany(windCompanyDelDto);
+        if(windCompanyVo!=null){
+            windFieldVo.setCompanyName(windCompanyVo.getCompanyName());
+        }
+
         //测风塔数据
         List<AnemometerTowerByFieldVo> list = anemometerTowerService.getAnemometerTowerByField(windFieldCodeDto.getFieldCode());
         if (!CollectionUtils.isEmpty(list)) {

energy-manage-service/src/main/resources/bootstrap.properties

@@ -62,3 +62,4 @@ analysis.properties=configAnalysis
 #拦截器是否生效
 energy.login.enabled=true
 
+

energy-manage-service/src/main/resources/mybatis/area/AreaMapper.xml

@@ -7,7 +7,8 @@
         id AS areaId,
         province AS province,
         city AS city,
-        area AS area
+        area AS area,
+        area_code as areaCode
     </sql>
 
     <select id="findAll" resultType="com.energy.manage.common.po.area.AreaPO">

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

@@ -23,6 +23,8 @@
         wf.city_name as cityName,
         wf.elevation_height as elevationHeight,
         wf.create_time as createTime,
+        wf.longitude as longitude,
+        wf.latitude as latitude,
         woeg.wegNumber,
         woatr.atrNumber
         FROM wind_field wf