修改部分风场管理部分问题

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

@@ -67,6 +67,7 @@ public class WindFieldController {
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
+    @Deprecated
     @UserLoginToken
     @PostMapping(value = "/afreshWindFieldImportData")
     @ApiOperation(value = "重新导入风场信息")
@@ -78,16 +79,17 @@ public class WindFieldController {
                                                 @RequestParam(required = true) String cityName,
                                                 @RequestParam(required = true) String areaCode) {
 
-        WindFieldImportDataDto windFieldImportDataDto = new WindFieldImportDataDto();
-        windFieldImportDataDto.setCompanyCode(companyCode);
-        windFieldImportDataDto.setProvinceId(provinceId);
-        windFieldImportDataDto.setProvinceName(provinceName);
-        windFieldImportDataDto.setCityId(cityId);
-        windFieldImportDataDto.setCityName(cityName);
-        windFieldImportDataDto.setAreaCode(areaCode);
-
-        boolean flg = windFieldService.afreshWindFieldImportData(file, windFieldImportDataDto);
-        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+//        WindFieldImportDataDto windFieldImportDataDto = new WindFieldImportDataDto();
+//        windFieldImportDataDto.setCompanyCode(companyCode);
+//        windFieldImportDataDto.setProvinceId(provinceId);
+//        windFieldImportDataDto.setProvinceName(provinceName);
+//        windFieldImportDataDto.setCityId(cityId);
+//        windFieldImportDataDto.setCityName(cityName);
+//        windFieldImportDataDto.setAreaCode(areaCode);
+//
+//        boolean flg = windFieldService.afreshWindFieldImportData(file, windFieldImportDataDto);
+//        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+        return null;
     }
 
     @UserLoginToken
@@ -101,10 +103,10 @@ public class WindFieldController {
 
     @UserLoginToken
     @PostMapping(value = "/delWindFieldById")
-    @ApiOperation(value = "通过风场编号删除风场")
-    public ResultResp delWindFieldById(@RequestParam(required = true) String fieldCode) {
+    @ApiOperation(value = "删除风场")
+    public ResultResp delWindFieldById(@RequestBody WindFieldCodeDto windFieldCodeDto) {
 
-        boolean flg = windFieldService.delWindFieldById(fieldCode);
+        boolean flg = windFieldService.delWindFieldById(windFieldCodeDto.getFieldCode());
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 

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

@@ -15,7 +15,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-@ApiModel("")
+@ApiModel
 public class WindFieldDto {
 
     /**
@@ -100,17 +100,16 @@ public class WindFieldDto {
     private List<AnemometerTowerRelationDto> anemometerTowerRelationDtos;
 
 
+    @Setter
+    @Getter
+    @ApiModel
     public static class AnemometerTowerRelationDto{
 
-
         /**
          * 测风塔编号
          */
+        @ApiModelProperty("测风塔编号")
         private String towerCode;
-        /**
-         * 风场编号
-         */
-        private String fieldCode;
 
     }
 

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

@@ -54,5 +54,11 @@ public class WindFieldPageDto extends BaseDto {
     @ApiModelProperty("风场编号")
     private String fieldCode;
 
+    @ApiModelProperty("开始时间")
+    private String beginTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
 
 }

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

@@ -90,22 +90,18 @@ public class WindFieldUpdateDto {
      * 测风塔
      */
     @ApiModelProperty("测风塔")
-    private List<WindFieldDto.AnemometerTowerRelationDto> anemometerTowerRelationDtos;
+    private List<AnemometerTowerRelationDto> anemometerTowerRelationDtos;
 
 
+    @Getter
+    @Setter
     public static class AnemometerTowerRelationDto{
 
-
         /**
          * 测风塔编号
          */
         @ApiModelProperty("测风塔编号")
         private String towerCode;
-        /**
-         * 风场编号
-         */
-        @ApiModelProperty("风场编号")
-        private String fieldCode;
 
     }
 

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

@@ -24,7 +24,11 @@ public class WindFieldPageVo {
      * 企业编号
      */
     @ApiModelProperty("企业编号")
-    private Integer companyId;
+    private String companyCode;
+
+    @ApiModelProperty("企业名称")
+    private String windCompany;
+
     /**
      * 风场编号
      */
@@ -75,6 +79,14 @@ public class WindFieldPageVo {
      */
     @ApiModelProperty("纬度")
     private String latitude;
+
+    /**
+     * 总额定容量
+     */
+    @ApiModelProperty("总额定容量")
+    private String ratedCapacityNumber;
+
+
     /**
      * 海拔高度
      */
@@ -85,14 +97,14 @@ public class WindFieldPageVo {
      * 机组数量
      */
     @ApiModelProperty("机组数量")
-    private Integer wegNumber;
+    private Integer wegNumber = 0;
 
 
     /**
      * 测风塔数量
      */
     @ApiModelProperty("测风塔数量")
-    private Integer atrNumber;
+    private Integer atrNumber = 0;
 
 
 

energy-manage-service/src/main/java/com/energy/manage/service/service/anemometertower/impl/AnemometerTowerServiceImpl.java

@@ -228,6 +228,8 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
         for (AnemometerTowerRelationDto dto : anemometerTowerRelationDtos) {
             po = new AnemometerTowerRelationPO();
             BeanUtil.copyProperties(dto, po);
+            po.setCreateTime(new Date());
+            po.setUpdateTime(new Date());
             list.add(po);
         }
         return anemometerTowerRelationMapper.insertList(list) > 0;

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

@@ -89,8 +89,14 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
 
         // 处理测风塔数据
         if (!CollectionUtils.isEmpty(windFieldDto.getAnemometerTowerRelationDtos())) {
+            AnemometerTowerRelationDto anemometerTowerRelationDto = null;
             List<AnemometerTowerRelationDto> anemometerTowerDtos = Lists.newArrayList();
-            BeanUtils.copyProperties(windFieldDto.getAnemometerTowerRelationDtos(), anemometerTowerDtos);
+            for(WindFieldDto.AnemometerTowerRelationDto anemometerTowerRelationDto1 : windFieldDto.getAnemometerTowerRelationDtos()){
+                anemometerTowerRelationDto = new AnemometerTowerRelationDto();
+                BeanUtils.copyProperties(anemometerTowerRelationDto1, anemometerTowerRelationDto);
+                anemometerTowerRelationDto.setFieldCode(windFieldDto.getFieldCode());
+                anemometerTowerDtos.add(anemometerTowerRelationDto);
+            }
             anemometerTowerService.bathAnemometerTowerRelation(anemometerTowerDtos);
         }
         return createWindRelation(windFieldPO);
@@ -293,9 +299,18 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         if (!CollectionUtils.isEmpty(windFieldUpdateDto.getAnemometerTowerRelationDtos())) {
             anemometerTowerService.deltAnemometerTowerRelationByField(windFieldUpdateDto.getFieldCode());
 
-            List<AnemometerTowerRelationDto> anemometerTowerDtos = Lists.newArrayList();
-            BeanUtils.copyProperties(windFieldUpdateDto.getAnemometerTowerRelationDtos(), anemometerTowerDtos);
-            anemometerTowerService.bathAnemometerTowerRelation(anemometerTowerDtos);
+            // 处理测风塔数据
+            if (!CollectionUtils.isEmpty(windFieldUpdateDto.getAnemometerTowerRelationDtos())) {
+                AnemometerTowerRelationDto anemometerTowerRelationDto = null;
+                List<AnemometerTowerRelationDto> anemometerTowerDtos = Lists.newArrayList();
+                for(WindFieldUpdateDto.AnemometerTowerRelationDto anemometerTowerRelationDto1 : windFieldUpdateDto.getAnemometerTowerRelationDtos()){
+                    anemometerTowerRelationDto = new AnemometerTowerRelationDto();
+                    BeanUtils.copyProperties(anemometerTowerRelationDto1, anemometerTowerRelationDto);
+                    anemometerTowerRelationDto.setFieldCode(windFieldUpdateDto.getFieldCode());
+                    anemometerTowerDtos.add(anemometerTowerRelationDto);
+                }
+                anemometerTowerService.bathAnemometerTowerRelation(anemometerTowerDtos);
+            }
         }
 
         return windRelationServic.updateWindRelationName(windRelationDto);

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

@@ -14,23 +14,25 @@
         SELECT
         wf.id as id,
         wf.company_code as companyCode,
+        wc.company_name as windCompany,
         wf.field_code as fieldCode,
         wf.field_name as fieldName,
         wf.density as density,
         wf.state as state,
         wf.province_name as provinceName,
         wf.city_name as cityName,
-        wf.elevation_height as elevationHeight
+        wf.elevation_height as elevationHeight,
         wf.create_time as createTime,
         woeg.wegNumber,
         woatr.atrNumber
         FROM wind_field wf
         left join (SELECT weg.field_code,count(1) as wegNumber FROM  wind_engine_group weg group by field_code) woeg on wf.field_code =woeg.field_code
         left join (SELECT atr.field_code,count(1) as atrNumber FROM  anemometer_tower_relation atr group by atr.field_code) woatr on wf.field_code  = woatr.field_code
-        where 1=1 and del_state = 1
+        left join wind_company wc on wf.company_code = wc.company_code
+        where 1=1 and wf.del_state = 0
         <if test="item.fieldName!=null">
             and
-            wf.field_name = #{item.fieldName}
+            wf.field_name like CONCAT("%", #{item.fieldName} ,"%")
         </if>
         <if test="item.fieldCode!=null">
         and
@@ -40,6 +42,12 @@
         and
         wf.company_code = #{item.companyCode}
         </if>
+        <if test="item.beginTime != null and item.beginTime != ''">
+            and wf.create_time  <![CDATA[>= ]]>  #{item.beginTime}
+        </if>
+        <if test="item.endTime != null and item.endTime != ''">
+            and wf.create_time <![CDATA[<= ]]> #{item.endTime}
+        </if>
     </select>
 
 </mapper>