测风塔自测

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

@@ -33,12 +33,13 @@ public class AnemometerTowerCreateDto {
     private String latitude;
 
 
-    @ApiModelProperty("测风塔高度")
-    private List<AnemometerTowerHeightDto> list;
+    @ApiModelProperty("测风塔高度集合")
+    private List<AnemometerTowerHeightListDto> anemometerTowerHeightDtoList;
 
 
     @Getter
     @Setter
+    @ApiModel
     public static class AnemometerTowerHeightListDto {
 
         /**

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

@@ -15,6 +15,11 @@ import lombok.Setter;
 @ApiModel("查询测风塔分页信息")
 public class AnemometerTowerPageDto extends BaseDto {
 
+
+    @ApiModelProperty("测风塔编号")
+    private String anemometerCode;
+
+
     /**
      * 测风塔名称
      */

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

@@ -38,7 +38,7 @@ public class AnemometerTowerUpdateDto {
 
 
     @ApiModelProperty("测风塔高度")
-    private List<AnemometerTowerHeightDto> list;
+    private List<AnemometerTowerHeightListDto> anemometerTowerHeightListDtos;
 
 
     @Getter

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

@@ -69,12 +69,15 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
         anemometerTowerPO.setAnemometerCode(IdPrefixEnum.WIND_TOWER_NUMBER.getCode().concat(IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.WIND_TOWER_NUMBER.getCode())))));
         int count = anemometerTowerMapper.insertUseGeneratedKeys(anemometerTowerPO);
 
-        if (!CollectionUtils.isEmpty(anemometerTowerCreateDto.getList())) {
+        if (!CollectionUtils.isEmpty(anemometerTowerCreateDto.getAnemometerTowerHeightDtoList())) {
             AnemometerTowerHeightPO anemometerTowerHeightPO = null;
             List<AnemometerTowerHeightPO> anemometerTowerHeightPOS = Lists.newArrayList();
-            for (AnemometerTowerHeightDto anemometerTowerHeight : anemometerTowerCreateDto.getList()) {
+            for (AnemometerTowerCreateDto.AnemometerTowerHeightListDto anemometerTowerHeight : anemometerTowerCreateDto.getAnemometerTowerHeightDtoList()) {
                 anemometerTowerHeightPO = new AnemometerTowerHeightPO();
                 BeanUtil.copyProperties(anemometerTowerHeight, anemometerTowerHeightPO);
+                anemometerTowerHeightPO.setAnemometerCode(anemometerTowerPO.getAnemometerCode());
+                anemometerTowerHeightPO.setCreateTime(new Date());
+                anemometerTowerHeightPO.setUpdateTime(new Date());
                 anemometerTowerHeightPOS.add(anemometerTowerHeightPO);
             }
             anemometerTowerHeightMapper.insertList(anemometerTowerHeightPOS);
@@ -105,7 +108,7 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
         criteria.andEqualTo("anemometerCode", anemometerTowerUpdateDto.getAnemometerCode());
         int count = anemometerTowerMapper.updateByExampleSelective(po, queryExample);
 
-        if (!CollectionUtils.isEmpty(anemometerTowerUpdateDto.getList())) {
+        if (!CollectionUtils.isEmpty(anemometerTowerUpdateDto.getAnemometerTowerHeightListDtos())) {
             Example queryHExample = new Example(AnemometerTowerHeightPO.class);
             Example.Criteria criteriaH = queryHExample.createCriteria();
             criteriaH.andEqualTo("anemometerCode", anemometerTowerUpdateDto.getAnemometerCode());
@@ -113,9 +116,12 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
 
             AnemometerTowerHeightPO anemometerTowerHeightPO = null;
             List<AnemometerTowerHeightPO> anemometerTowerHeightPOS = Lists.newArrayList();
-            for (AnemometerTowerHeightDto anemometerTowerHeight : anemometerTowerUpdateDto.getList()) {
+            for (AnemometerTowerUpdateDto.AnemometerTowerHeightListDto anemometerTowerHeightListDto : anemometerTowerUpdateDto.getAnemometerTowerHeightListDtos()) {
                 anemometerTowerHeightPO = new AnemometerTowerHeightPO();
-                BeanUtil.copyProperties(anemometerTowerHeight, anemometerTowerHeightPO);
+                BeanUtil.copyProperties(anemometerTowerHeightListDto, anemometerTowerHeightPO);
+                anemometerTowerHeightPO.setAnemometerCode(anemometerTowerUpdateDto.getAnemometerCode());
+                anemometerTowerHeightPO.setCreateTime(new Date());
+                anemometerTowerHeightPO.setUpdateTime(new Date());
                 anemometerTowerHeightPOS.add(anemometerTowerHeightPO);
             }
             anemometerTowerHeightMapper.insertList(anemometerTowerHeightPOS);
@@ -132,7 +138,7 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
         Example queryExample = new Example(AnemometerTowerPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("anemometerCode", anemometerTowerStateDto.getAnemometerCode());
-
+        criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
         return anemometerTowerMapper.updateByExampleSelective(po, queryExample) > 0;
     }
 
@@ -163,6 +169,7 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
     public AnemometerTowerVo getAnemometerTowerVo(AnemometerTowerDto anemometerTowerDto) {
         AnemometerTowerPO anemometerTowerPO = new AnemometerTowerPO();
         anemometerTowerPO.setAnemometerCode(anemometerTowerDto.getAnemometerCode());
+        anemometerTowerPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
         AnemometerTowerPO po = anemometerTowerMapper.selectOne(anemometerTowerPO);
         if (null == po) {
             return null;