测风塔自测

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

@@ -13,7 +13,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-@ApiModel("创建功率曲线参数")
+@ApiModel
 public class AnemometerTowerCreateDto {
 
     /**

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

@@ -12,7 +12,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-@ApiModel("创建功率曲线参数")
+@ApiModel
 public class AnemometerTowerUpdateDto {
 
     /**

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

@@ -2,6 +2,7 @@ package com.energy.manage.service.domain.vo.anemometertower;
 
 
 import com.energy.manage.common.po.anemometertower.AnemometerTowerPO;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,13 +15,44 @@ import java.util.Date;
 @Getter
 @Setter
 @ApiModel
-public class AnemometerTowerPageVo extends AnemometerTowerPO {
+public class AnemometerTowerPageVo  {
+
+
+    /**
+     * 测风塔编号
+     */
+    @ApiModelProperty("测风塔编号")
+    private String anemometerCode;
+    /**
+     * 测风塔名称
+     */
+    @ApiModelProperty("测风塔名称")
+    private String anemometerName;
+    /**
+     * 经度
+     */
+    @ApiModelProperty("经度")
+    private String longitude;
+    /**
+     * 纬度
+     */
+    @ApiModelProperty("纬度")
+    private String latitude;
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
+    private Date createTime;
 
     /**
      * 风场数量
      */
     @ApiModelProperty("风场数量")
-    private Integer fieldNumber;
+    private Integer fieldNumber = 0;
 
 
 }

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

@@ -1,5 +1,6 @@
 package com.energy.manage.service.domain.vo.windenginemill;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -66,11 +67,6 @@ public class WindEngineMillPageVo {
      */
     @ApiModelProperty("叶片长度")
     private String vaneLong;
-    /**
-     * 删除状态
-     */
-    @ApiModelProperty("删除状态")
-    private Integer delState;
 
     /**
      * 组合字段
@@ -85,7 +81,8 @@ public class WindEngineMillPageVo {
     /**
      * 创建时间
      */
-    @ApiModelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
     /**
      * 更新人

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

@@ -103,6 +103,7 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
 
         AnemometerTowerPO po = new AnemometerTowerPO();
         BeanUtil.copyProperties(anemometerTowerUpdateDto, po);
+        po.setUpdateTime(new Date());
         Example queryExample = new Example(AnemometerTowerPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("anemometerCode", anemometerTowerUpdateDto.getAnemometerCode());
@@ -120,7 +121,6 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
                 anemometerTowerHeightPO = new AnemometerTowerHeightPO();
                 BeanUtil.copyProperties(anemometerTowerHeightListDto, anemometerTowerHeightPO);
                 anemometerTowerHeightPO.setAnemometerCode(anemometerTowerUpdateDto.getAnemometerCode());
-                anemometerTowerHeightPO.setCreateTime(new Date());
                 anemometerTowerHeightPO.setUpdateTime(new Date());
                 anemometerTowerHeightPOS.add(anemometerTowerHeightPO);
             }

energy-manage-service/src/main/resources/mybatis/anemometertower/AnemometerTowerMapper.xml

@@ -21,7 +21,7 @@
         count(1) as fieldNumber
         from anemometer_tower_relation atr
         group by tower_code) aotr on at.anemometer_code = aotr.tower_code
-        where 1=1 and del_state  = 1
+        where 1=1 and del_state  = 0
         <if test="item.anemometerName!=null">
             and anemometer_name = #{item.anemometerName}
         </if>