迭代功率曲线

energy-manage-service/src/main/java/com/energy/manage/service/controller/windenginegroup/WindEngineGroupController.java

@@ -92,6 +92,14 @@ public class WindEngineGroupController extends BaseServiceController {
         return ResultResp.SUCCESS(list);
     }
 
+    @UserLoginToken
+    @PostMapping(value = "/getWindEngineGroupRatedListByFieldCodePage")
+    @ApiOperation(value = "通过风场code查询风机风速-分析展示集合查询")
+    public ResultResp<Page<WindEngineGroupPageVo>> getWindEngineGroupRatedListByFieldCodePage(@RequestBody WindEngineGroupPageDto windEngineGroupPageDto) {
+        Page<WindEngineGroupPageVo> page = windEngineGroupService.getWindEngineGroupRatedListByFieldCodePage(windEngineGroupPageDto);
+        return ResultResp.SUCCESS(page);
+    }
+
 
     @UserLoginToken
     @PostMapping(value = "/getWindEngineGroupByFieldCode")

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windenginegroup/WindEngineGroupPageVo.java

@@ -88,7 +88,7 @@ public class WindEngineGroupPageVo {
      * 额定风速 （m/s）
      */
     @ApiModelProperty("额定风速")
-    private Double rated_wind_speed;
+    private Double ratedWindSpeed;
     /**
      * 切入风速 （m/s）
      */

energy-manage-service/src/main/java/com/energy/manage/service/mappers/windenginegroup/WindEngineGroupMapper.java

@@ -32,6 +32,13 @@ public interface WindEngineGroupMapper extends MyMapper<WindEngineGroupPO> {
    List<WindEngineGroupPageVo> selectWindEngineGroupListByFieldCode(@Param("fieldCode") String fieldCode);
 
    /**
+    * 集合
+    * @param fieldCode
+    * @return
+    */
+   List<WindEngineGroupPageVo> selectWindEngineGroupRatedListByFieldCode(@Param("fieldCode") String fieldCode);
+
+   /**
     * 查看当前角色所关联的机组
     * @param roleId
     * @return

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

@@ -51,7 +51,12 @@ public interface WindEngineGroupService {
      */
     List<WindEngineGroupPageVo>  getWindEngineGroupListByFieldCode(WindEngineGroupPageDto windEngineGroupPageDto);
 
-
+    /**
+     * 集合查询
+     * @param windEngineGroupPageDto
+     * @return
+     */
+    Page<WindEngineGroupPageVo> getWindEngineGroupRatedListByFieldCodePage(WindEngineGroupPageDto windEngineGroupPageDto);
 
     /**
      * 通过风场code查询风机集合

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

@@ -220,6 +220,16 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     }
 
     @Override
+    public Page<WindEngineGroupPageVo> getWindEngineGroupRatedListByFieldCodePage(WindEngineGroupPageDto windEngineGroupPageDto) {
+
+        PageHelper.startPage(windEngineGroupPageDto.getPageNum(), windEngineGroupPageDto.getPageSize());
+        List<WindEngineGroupPageVo> list = windEngineGroupMapper.selectWindEngineGroupRatedListByFieldCode(windEngineGroupPageDto.getFieldCode());
+        Long total = org.apache.commons.collections.CollectionUtils.isEmpty(list) ? 0L : new PageInfo<>(list).getTotal();
+        return Page.build(windEngineGroupPageDto.getPageNum(), windEngineGroupPageDto.getPageSize(), total, list);
+
+    }
+
+    @Override
     public WindFieldGroupTowerVo getWindEngineGroupByFieldCode(String fieldCode, String batchCode) {
 
         WindFieldGroupTowerVo windFieldGroupTowerVo = new WindFieldGroupTowerVo();

energy-manage-service/src/main/resources/mybatis/windenginegroup/WindEngineGroupMapper.xml

@@ -78,6 +78,39 @@
     </select>
 
 
+    <select id="selectWindEngineGroupRatedListByFieldCode" resultType="com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo">
+        SELECT
+        wf.field_code as fieldCode,
+        wf.field_name as fieldName,
+        weg.engine_code AS engineCode,
+        weg.engine_name as engineName,
+        weg.rated_capacity as ratedCapacity,
+        weg.elevation_height as elevationHeight,
+        weg.hub_height as hubHeight,
+        weg.longitude,
+        weg.latitude,
+        weg.sightcing,
+        weg.state,
+        wem.machine_type_code as machineTypeCode,
+        wem.manufacturer_name as manufacturerName,
+        wem.rated_wind_speed as ratedWindSpeed,
+        wem.rated_cut_in_windspeed as ratedCutInWindspeed,
+        wem.rated_cut_out_windspeed as ratedCutOutWindspeed,
+        weg.create_time as createTime
+        from
+        wind_field wf
+        inner join
+        wind_engine_group weg on wf.field_code = weg.field_code
+        left JOIN
+        wind_engine_mill wem on weg.mill_type_code = wem.mill_type_code and wem.del_state = 0
+        where 1=1 and weg.del_state = 0
+        <if test="fieldCode!=null">
+            and  wf.field_code = #{fieldCode}
+        </if>
+        order by weg.id
+    </select>
+
+
 
     <select id="selectWindEngineGroupByRoleId" parameterType="java.lang.Integer" resultType="com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo">
         select

energy-manage-service/src/test/java/StringText.java

@@ -16,7 +16,7 @@ public class StringText {
 
       String inHex = "";
 
-        byte[] imageBytes = hexStringToByteArray(inHex); // 将16进制字符串转换为字节数组
+       byte[] imageBytes = hexStringToByteArray(inHex); // 将16进制字符串转换为字节数组
 
         System.out.println(imageBytes);
         int hexlen = inHex.length();