Merge branch 'energy-manage-shiyue'

energy-manage-common/src/main/java/com/energy/manage/common/po/windenginemill/WindEngineMillPO.java

@@ -72,9 +72,21 @@ public class WindEngineMillPO {
     private Double rotorDiameter;
 
     /**
-     *传动比-转速比（无单位）
+     * 传动比-转速比（无单位）
      */
     private Double rotationalSpeedRatio;
+    /**
+     * 额定风速 （m/s）
+     */
+    private Double ratedWindSpeed;
+    /**
+     * 切入风速 （m/s）
+     */
+    private Double ratedCutInWindspeed;
+    /**
+     * 切出风速 （m/s）
+     */
+    private Double ratedCutOutWindspeed;
 
     /**
      * 创建人

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginemill/WindEngineMillCreateDto.java

@@ -72,4 +72,20 @@ public class WindEngineMillCreateDto {
     @ApiModelProperty(value = "创建人")
     private Integer createBy;
 
+    /**
+     * 额定风速 （m/s）
+     */
+    @ApiModelProperty("额定风速")
+    private Double ratedWindSpeed;
+    /**
+     * 切入风速 （m/s）
+     */
+    @ApiModelProperty("切入风速")
+    private Double ratedCutInWindspeed;
+    /**
+     * 切出风速 （m/s）
+     */
+    @ApiModelProperty("切出风速")
+    private Double ratedCutOutWindspeed;
+
 }

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

@@ -162,6 +162,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
         List<String> engineNamees = windEngineGroupExceVoList.stream().map(item -> item.getEngineName()).collect(Collectors.toList());
         Example queryExample = new Example(WindEngineGroupPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("fieldCode", fieldCode);
         criteria.andIn("engineName", engineNamees);
         criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
         int count = windEngineGroupMapper.selectCountByExample(queryExample);