更改bug

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

@@ -12,6 +12,7 @@ import com.energy.manage.service.domain.vo.windfield.WindFieldNameVo;
 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.windenginegroup.WindEngineGroupService;
 import com.energy.manage.service.service.windfield.WindFieldResourceService;
 import com.energy.manage.service.service.windfield.WindFieldService;
 import io.swagger.annotations.Api;
@@ -36,6 +37,9 @@ public class WindFieldController {
     private WindFieldService windFieldService;
 
     @Autowired
+    private WindEngineGroupService windEngineGroupService;
+
+    @Autowired
     private WindFieldResourceService windFieldResourceService;
 
 
@@ -64,7 +68,7 @@ public class WindFieldController {
         WindFieldImportDataDto windFieldImportDataDto = new WindFieldImportDataDto();
         windFieldImportDataDto.setCompanyCode(companyCode);
 
-        return  windFieldService.windFieldImportData(file, windFieldImportDataDto);
+        return windFieldService.windFieldImportData(file, windFieldImportDataDto);
     }
 
     @Deprecated
@@ -90,7 +94,9 @@ public class WindFieldController {
     @PostMapping(value = "/delWindFieldById")
     @ApiOperation(value = "删除风场")
     public ResultResp delWindFieldById(@RequestBody @Valid WindFieldCodeDto windFieldCodeDto) {
-
+        if (windEngineGroupService.getWindEngineGroupCountByField(windFieldCodeDto.getFieldCode()) <= 0) {
+            return ResultResp.FAIL("风场下有绑定风机，不可删除！");
+        }
         boolean flg = windFieldService.delWindFieldById(windFieldCodeDto.getFieldCode());
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -100,7 +106,7 @@ public class WindFieldController {
     @ApiOperation(value = "通过企业编号查询关联风场")
     public ResultResp<List<WindFieldVo>> getWindFieldVos(@RequestParam(required = true) String companyCode) {
 
-        List<WindFieldVo>  list = windFieldService.getWindFieldVos(companyCode);
+        List<WindFieldVo> list = windFieldService.getWindFieldVos(companyCode);
         return ResultResp.SUCCESS(list);
     }
 
@@ -132,7 +138,7 @@ public class WindFieldController {
     @UserLoginToken
     @PostMapping(value = "/getWindFieldTree")
     @ApiOperation(value = "查询风场树")
-    public ResultResp< List<Map<String, Object>>> getWindFieldTree() {
+    public ResultResp<List<Map<String, Object>>> getWindFieldTree() {
         List<Map<String, Object>> list = windFieldService.getWindFieldTree();
         return ResultResp.SUCCESS(list);
     }
@@ -160,12 +166,9 @@ public class WindFieldController {
     @PostMapping(value = "/getWindFieldNames")
     @ApiOperation(value = "查询风场集合")
     public ResultResp<List<WindFieldNameVo>> getWindFieldNames() {
-        List<WindFieldNameVo>  list = windFieldService.getWindFieldNames();
-        return  ResultResp.SUCCESS(list);
+        List<WindFieldNameVo> list = windFieldService.getWindFieldNames();
+        return ResultResp.SUCCESS(list);
     }
 
 
-
-
-
 }

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

@@ -1,11 +1,14 @@
 package com.energy.manage.service.domain.vo.windfield;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * 导入参数
  */
@@ -106,6 +109,8 @@ public class WindFieldPageVo {
     @ApiModelProperty("测风塔数量")
     private Integer atrNumber = 0;
 
-
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
+    private Date createTime;
 
 }

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

@@ -81,5 +81,12 @@ public interface WindEngineGroupService {
      */
     WindEngineGroupVo getWindEngineGroup(WindEngineGroupCodeDto windEngineGroupCodeDto);
 
+    /**
+     * 通过风场code查询风机数量
+     * @param fieldCode
+     * @return
+     */
+    int getWindEngineGroupCountByField(String fieldCode);
+
 
 }

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

@@ -288,4 +288,13 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
         BeanUtil.copyProperties(windEngineGroupPO, windEngineGroupVo);
         return windEngineGroupVo;
     }
+
+    @Override
+    public int getWindEngineGroupCountByField(String fieldCode) {
+        Example queryExample = new Example(WindEngineGroupPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("fieldCode",fieldCode);
+        return windEngineGroupMapper.selectCountByExample(queryExample);
+
+    }
 }