设置类型

energy-manage-common/src/main/java/com/energy/manage/common/po/anemometertower/AnemometerTowerHeightPO.java

@@ -24,7 +24,7 @@ public class AnemometerTowerHeightPO extends NewBaseDomain {
     /**
      * 测风塔高度
      */
-    private String anemometerHeight;
+    private Double anemometerHeight;
 
 
 

energy-manage-common/src/main/java/com/energy/manage/common/po/anemometertower/AnemometerTowerPO.java

@@ -28,11 +28,11 @@ public class AnemometerTowerPO extends NewBaseDomain {
     /**
      * 经度
      */
-    private String longitude;
+    private Double longitude;
     /**
      * 纬度
      */
-    private String latitude;
+    private Double latitude;
     /**
      * 状态
      */

energy-manage-common/src/main/java/com/energy/manage/common/po/powerwordcontract/PowerWordContractPO.java

@@ -25,11 +25,11 @@ public class PowerWordContractPO extends NewBaseDomain {
     /**
      * 有功功率
      */
-    private String activePower;
+    private Double activePower;
     /**
      * 风速
      */
-    private String windSpeed;
+    private Double windSpeed;
     /**
      * 删除状态
      */

energy-manage-common/src/main/java/com/energy/manage/common/po/powerwordcriterion/PowerWordCriterionPO.java

@@ -20,15 +20,15 @@ public class PowerWordCriterionPO extends NewBaseDomain {
     /**
      * 风速
      */
-    private String windSpeed;
+    private Double windSpeed;
     /**
      * 有功功率
      */
-    private String activePower;
+    private Double activePower;
     /**
      * 空气密度
      */
-    private String density;
+    private Double density;
     /**
      * 删除状态
      */

energy-manage-common/src/main/java/com/energy/manage/common/po/windenginegroup/WindEngineGroupPO.java

@@ -33,23 +33,23 @@ public class WindEngineGroupPO extends NewBaseDomain {
     /**
      * 额定容量
      */
-    private String ratedCapacity;
+    private Double ratedCapacity;
     /**
      * 海拔高度
      */
-    private String elevationHeight;
+    private Double elevationHeight;
     /**
      * 轮毂高度
      */
-    private String hubHeight;
+    private Double hubHeight;
     /**
      * 经度
      */
-    private String longitude;
+    private Double longitude;
     /**
      * 维度
      */
-    private String latitude;
+    private Double latitude;
     /**
      * 状态
      */

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

@@ -41,11 +41,11 @@ public class WindEngineMillPO {
     /**
      * 塔筒高度
      */
-    private String towerHeight;
+    private Double towerHeight;
     /**
      * 叶片长度
      */
-    private String vaneLong;
+    private Double vaneLong;
 
     /**
      * 驱动类型

energy-manage-common/src/main/java/com/energy/manage/common/po/windfield/WindFieldPO.java

@@ -33,7 +33,7 @@ public class WindFieldPO extends NewBaseDomain {
     /**
      * 空气密度 - 合同功率曲线
      */
-    private String density;
+    private Double density;
 
     /**
      * 风机数量
@@ -43,7 +43,7 @@ public class WindFieldPO extends NewBaseDomain {
     /**
      * 总额定容量
      */
-    private String ratedCapacityNumber;
+    private Double ratedCapacityNumber;
 
     /**
      * 启用状态
@@ -68,15 +68,15 @@ public class WindFieldPO extends NewBaseDomain {
     /**
      * 经度
      */
-    private String longitude;
+    private Double longitude;
     /**
      * 纬度
      */
-    private String latitude;
+    private Double latitude;
     /**
      * 海拔高度
      */
-    private String elevationHeight;
+    private Double elevationHeight;
     /**
      * 删除状态
      */

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

@@ -28,7 +28,6 @@ public class WindEngineGroupController {
     private WindEngineGroupService windEngineGroupService;
 
 
-
     @UserLoginToken
     @PostMapping(value = "/createWindEngineGroup")
     @ApiOperation(value = "创建风机机组")

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerCreateDto.java

@@ -25,12 +25,12 @@ public class AnemometerTowerCreateDto {
      * 经度
      */
     @ApiModelProperty("经度")
-    private String longitude;
+    private Double longitude;
     /**
      * 纬度
      */
     @ApiModelProperty("纬度")
-    private String latitude;
+    private Double latitude;
 
 
     @ApiModelProperty("测风塔高度集合")
@@ -46,7 +46,7 @@ public class AnemometerTowerCreateDto {
          * 测风塔高度
          */
         @ApiModelProperty("测风塔高度")
-        private String anemometerHeight;
+        private Double anemometerHeight;
 
 
     }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerHeightDto.java

@@ -35,7 +35,7 @@ public class AnemometerTowerHeightDto {
          * 测风塔高度
          */
         @ApiModelProperty("测风塔高度")
-        private String anemometerHeight;
+        private Double anemometerHeight;
 
 
     }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerUpdateDto.java

@@ -29,12 +29,12 @@ public class AnemometerTowerUpdateDto {
      * 经度
      */
     @ApiModelProperty("经度")
-    private String longitude;
+    private Double longitude;
     /**
      * 纬度
      */
     @ApiModelProperty("纬度")
-    private String latitude;
+    private Double latitude;
 
 
     @ApiModelProperty("测风塔高度")
@@ -49,7 +49,7 @@ public class AnemometerTowerUpdateDto {
          * 测风塔高度
          */
         @ApiModelProperty("测风塔高度")
-        private String anemometerHeight;
+        private Double anemometerHeight;
 
 
     }

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

@@ -41,12 +41,12 @@ public class WindEngineMillCreateDto {
      * 塔筒高度
      */
     @ApiModelProperty("塔筒高度")
-    private String towerHeight;
+    private Double towerHeight;
     /**
      * 叶片长度
      */
     @ApiModelProperty("叶片长度")
-    private String vaneLong;
+    private Double vaneLong;
 
     @ApiModelProperty("驱动类型")
     private Integer curvedMotionType;

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

@@ -37,13 +37,13 @@ public class WindFieldDto {
      * 空气密度 - 合同
      */
     @ApiModelProperty("空气密度 - 合同")
-    private String density;
+    private Double density;
 
     /**
      * 总额定容量
      */
     @ApiModelProperty("总额定容量")
-    private Integer ratedCapacityNumber;
+    private Double ratedCapacityNumber;
 
     /**
      * 启用状态
@@ -80,17 +80,17 @@ public class WindFieldDto {
      * 经度
      */
     @ApiModelProperty("经度")
-    private String longitude;
+    private Double longitude;
     /**
      * 纬度
      */
     @ApiModelProperty("纬度")
-    private String latitude;
+    private Double latitude;
     /**
      * 海拔高度
      */
     @ApiModelProperty("海拔高度")
-    private String elevationHeight;
+    private Double elevationHeight;
 
 
     /**

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

@@ -31,7 +31,7 @@ public class WindFieldUpdateDto {
      * 空气密度 - 合同
      */
     @ApiModelProperty(" 空气密度 - 合同")
-    private String density;
+    private Double density;
 
     /**
      * 风机数量
@@ -43,7 +43,7 @@ public class WindFieldUpdateDto {
      * 总额定容量
      */
     @ApiModelProperty("总额定容量")
-    private Integer ratedCapacityNumber;
+    private Double ratedCapacityNumber;
 
     /**
      * 启用状态
@@ -74,17 +74,17 @@ public class WindFieldUpdateDto {
      * 经度
      */
     @ApiModelProperty("经度")
-    private String longitude;
+    private Double longitude;
     /**
      * 纬度
      */
     @ApiModelProperty("纬度")
-    private String latitude;
+    private Double latitude;
     /**
      * 海拔高度
      */
     @ApiModelProperty("海拔高度")
-    private String elevationHeight;
+    private Double elevationHeight;
 
     /**
      * 合同功率曲线地址

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/anemometertower/AnemometerTowerByFieldVo.java

@@ -27,11 +27,11 @@ public class AnemometerTowerByFieldVo {
     private String anemometerName;
 
     @ApiModelProperty("经度")
-    private String longitude;
+    private Double longitude;
 
 
     @ApiModelProperty("纬度")
-    private String latitude;
+    private Double latitude;
 
     /**
      * 测风塔高度集合字符串

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/anemometertower/AnemometerTowerHeightVo.java

@@ -35,7 +35,7 @@ public class AnemometerTowerHeightVo {
          * 测风塔高度
          */
         @ApiModelProperty("测风塔高度")
-        private String anemometerHeight;
+        private Double anemometerHeight;
 
         /**
          * 高度类型

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/anemometertower/AnemometerTowerPageVo.java

@@ -32,12 +32,12 @@ public class AnemometerTowerPageVo  {
      * 经度
      */
     @ApiModelProperty("经度")
-    private String longitude;
+    private Double longitude;
     /**
      * 纬度
      */
     @ApiModelProperty("纬度")
-    private String latitude;
+    private Double latitude;
     /**
      * 状态
      */

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/anemometertower/AnemometerTowerVo.java

@@ -31,12 +31,12 @@ public class AnemometerTowerVo {
      * 经度
      */
     @ApiModelProperty("经度")
-    private String longitude;
+    private Double longitude;
     /**
      * 纬度
      */
     @ApiModelProperty("纬度")
-    private String latitude;
+    private Double latitude;
     /**
      * 状态
      */
@@ -54,7 +54,7 @@ public class AnemometerTowerVo {
          * 测风塔高度
          */
         @ApiModelProperty("测风塔高度")
-        private String anemometerHeight;
+        private Double anemometerHeight;
 
 
     }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/excel/PowerWordContractExcelVo.java

@@ -20,18 +20,18 @@ public class PowerWordContractExcelVo {
      * 风速
      */
     @ExcelProperty(value = "风速",index = 1)
-    private String windSpeed;
+    private Double windSpeed;
 
     /**
      * 有功功率
      */
     @ExcelProperty(value = "有功功率",index = 2)
-    private String activePower;
+    private Double activePower;
 
     /**
      * 空气密度
      */
     @ExcelProperty(value = "当地空气密度",index = 3)
-    private String density;
+    private Double density;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/excel/PowerWordCriterionExcelVo.java

@@ -13,18 +13,18 @@ public class PowerWordCriterionExcelVo {
      * 风速
      */
     @ExcelProperty(value = "风速",index = 0)
-    private String windSpeed;
+    private Double windSpeed;
     /**
      * 有功功率
      */
     @ExcelProperty(value = "有功功率",index = 1)
-    private String activePower;
+    private Double activePower;
 
     /**
      * 空气密度
      */
     @ExcelProperty(value = "标准空气密度",index = 2)
-    private String density;
+    private Double density;
 
 
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/excel/WindFieldExceVo.java

@@ -18,22 +18,22 @@ public class WindFieldExceVo {
      * 空气密度
      */
     @ExcelProperty(value = "空气密度", index = 2)
-    private String density;
+    private Double density;
     /**
      * 经度
      */
     @ExcelProperty(value = "经度", index = 3)
-    private String longitude;
+    private Double longitude;
     /**
      * 纬度
      */
     @ExcelProperty(value = "纬度", index = 4)
-    private String latitude;
+    private Double latitude;
     /**
      * 海拔高度
      */
     @ExcelProperty(value = "海拔高度", index = 5)
-    private String elevationHeight;
+    private Double elevationHeight;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/powerwordcontract/PowerWordContractPageVo.java

@@ -29,11 +29,11 @@ public class PowerWordContractPageVo {
      * 有功功率
      */
     @ApiModelProperty("有功功率")
-    private String activePower;
+    private Double activePower;
     /**
      * 有功功率
      */
     @ApiModelProperty("有功功率")
-    private String windSpeed;
+    private Double windSpeed;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/powerwordcriterion/PowerWordCriterionPageVo.java

@@ -25,18 +25,18 @@ public class PowerWordCriterionPageVo {
      * 有功功率
      */
     @ApiModelProperty("有功功率")
-    private String activePower;
+    private Double activePower;
     /**
      * 风速
      */
     @ApiModelProperty("风速")
-    private String windSpeed;
+    private Double windSpeed;
 
     /**
      * 空气密度
      */
     @ApiModelProperty("空气密度")
-    private String density;
+    private Double density;
 
     /**
      * 创建时间

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

@@ -40,27 +40,27 @@ public class WindEngineGroupPageVo {
      * 额定容量
      */
     @ApiModelProperty("额定容量")
-    private String ratedCapacity;
+    private Double ratedCapacity;
     /**
      * 海拔高度
      */
     @ApiModelProperty("海拔高度")
-    private String elevationHeight;
+    private Double elevationHeight;
     /**
      * 轮毂高度
      */
     @ApiModelProperty("轮毂高度")
-    private String hubHeight;
+    private Double hubHeight;
     /**
      * 经度
      */
     @ApiModelProperty("经度")
-    private String longitude;
+    private Double longitude;
     /**
      * 维度
      */
     @ApiModelProperty("维度")
-    private String latitude;
+    private Double latitude;
     /**
      * 状态
      */

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

@@ -38,27 +38,27 @@ public class WindEngineGroupVo {
      * 额定容量
      */
     @ApiModelProperty("额定容量")
-    private String ratedCapacity;
+    private Double ratedCapacity;
     /**
      * 海拔高度
      */
     @ApiModelProperty("海拔高度")
-    private String elevationHeight;
+    private Double elevationHeight;
     /**
      * 轮毂高度
      */
     @ApiModelProperty("轮毂高度")
-    private String hubHeight;
+    private Double hubHeight;
     /**
      * 经度
      */
     @ApiModelProperty("经度")
-    private String longitude;
+    private Double longitude;
     /**
      * 维度
      */
     @ApiModelProperty("维度")
-    private String latitude;
+    private Double latitude;
     /**
      * 状态
      */

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

@@ -61,12 +61,12 @@ public class WindEngineMillPageVo {
      * 塔筒高度
      */
     @ApiModelProperty("塔筒高度")
-    private String towerHeight;
+    private Double towerHeight;
     /**
      * 叶片长度
      */
     @ApiModelProperty("叶片长度")
-    private String vaneLong;
+    private Double vaneLong;
 
     /**
      * 组合字段

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

@@ -43,7 +43,7 @@ public class WindFieldPageVo {
      * 空气密度
      */
     @ApiModelProperty("空气密度")
-    private String density;
+    private Double density;
     /**
      * 启用状态
      */
@@ -73,25 +73,25 @@ public class WindFieldPageVo {
      * 经度
      */
     @ApiModelProperty("经度")
-    private String longitude;
+    private Double longitude;
     /**
      * 纬度
      */
     @ApiModelProperty("纬度")
-    private String latitude;
+    private Double latitude;
 
     /**
      * 总额定容量
      */
     @ApiModelProperty("总额定容量")
-    private String ratedCapacityNumber;
+    private Double ratedCapacityNumber;
 
 
     /**
      * 海拔高度
      */
     @ApiModelProperty("海拔高度")
-    private String elevationHeight;
+    private Double elevationHeight;
 
     /**
      * 机组数量