控制额定功率

energy-manage-service/src/main/java/com/energy/manage/service/controller/windenginemill/WindEngineMillController.java

@@ -73,7 +73,7 @@ public class WindEngineMillController {
     @UserLoginToken
     @PostMapping(value = "/getWindEngineMillPageVo")
     @ApiOperation(value = "查询机型对象")
-    public ResultResp getWindEngineMillPageVo(@RequestBody @Valid WindEngineMillCodeDto windEngineMillCodeDto) {
+    public ResultResp<WindEngineMillPageVo> getWindEngineMillPageVo(@RequestBody @Valid WindEngineMillCodeDto windEngineMillCodeDto) {
 
         WindEngineMillPageVo windEngineMillPageVo = windEngineMillService.getWindEngineMillPageVo(windEngineMillCodeDto);
         return  ResultResp.SUCCESS(windEngineMillPageVo) ;

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windenginemill/WindEngineMillPageVo.java

@@ -20,80 +20,71 @@ public class WindEngineMillPageVo {
     /**
      * 编号
      */
-    @ApiModelProperty("编号")
+    @ApiModelProperty(value = "编号")
     private String millTypeCode;
     /**
-     * 机型编号
+     * 机型型号
      */
-    @ApiModelProperty("机型编号")
+    @ApiModelProperty(value = "机型型号")
     private String machineTypeCode;
     /**
-     * 机型名称
-     */
-    @ApiModelProperty("机型名称")
-    private String machineTypeName;
-    /**
      * 厂商名称
      */
-    @ApiModelProperty("厂商名称")
+    @ApiModelProperty(value = "厂商名称")
     private String manufacturerName;
     /**
      * 厂商编号
      */
-    @ApiModelProperty("厂商编号")
+    @ApiModelProperty(value = "厂商编号")
     private String manufacturerCode;
     /**
-     * 品牌
+     * 品牌名称
      */
-    @ApiModelProperty("品牌")
+    @ApiModelProperty(value = "品牌名称")
     private String brand;
     /**
-     * 机型类型
-     */
-    @ApiModelProperty("机型类型")
-    private Integer type;
-    /**
      * 状态
      */
-    @ApiModelProperty("状态")
+    @ApiModelProperty(value = "状态")
     private Integer state;
     /**
      * 塔筒高度
      */
-    @ApiModelProperty("塔筒高度")
+    @ApiModelProperty(value = "塔筒高度")
     private Double towerHeight;
     /**
      * 叶片长度
      */
-    @ApiModelProperty("叶片长度")
+    @ApiModelProperty(value = "叶片长度")
     private Double vaneLong;
 
     /**
+     * 驱动类型
+     */
+    @ApiModelProperty(value = "驱动类型")
+    private Integer curvedMotionType;
+
+
+    /**
      * 组合字段
      */
-    @ApiModelProperty("组合字段")
-    private String combinationc;
+    @ApiModelProperty(value = "组合字段")
+    private String combination;
+
     /**
-     * 创建人
+     * 标注功率曲线地址
      */
-    @ApiModelProperty("创建人")
-    private Integer createBy;
+    @ApiModelProperty(value = "标注功率曲线地址")
+    private String powerCriterionUrl;
+
+
     /**
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty("更新人")
-    private Integer updateBy;
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty("更新时间")
-    private Date updateTime;
+
 
 
 }