更改bug

energy-manage-service/src/main/java/com/energy/manage/service/controller/anemometertower/AnemometerTowerController.java

@@ -73,7 +73,7 @@ public class AnemometerTowerController extends BaseServiceController {
     @UserLoginToken
     @PostMapping(value = "/getAnemometerTowerNameList")
     @ApiOperation(value = "查询测风塔集合")
-    public ResultResp<List<AnemometerTowerNameVo> > getAnemometerTowerNameList() {
+    public ResultResp<List<AnemometerTowerNameVo>> getAnemometerTowerNameList() {
         List<AnemometerTowerNameVo>  list = anemometerTowerService.getAnemometerTowerNameList();
         return ResultResp.SUCCESS(list);
     }

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

@@ -263,7 +263,11 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
 
         AnemometerTowerNameVo anemometerTowerNameVo = null;
         List<AnemometerTowerNameVo> list = Lists.newArrayList();
-        List<AnemometerTowerPO> anemometerTowerPOList =  anemometerTowerMapper.selectAll();
+        Example queryExample = new Example(AnemometerTowerPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
+        criteria.andEqualTo("state",Constants.GLOBAL_IN_USE);
+        List<AnemometerTowerPO> anemometerTowerPOList =  anemometerTowerMapper.selectByExample(queryExample);
         for(AnemometerTowerPO po : anemometerTowerPOList){
             anemometerTowerNameVo = new AnemometerTowerNameVo();
             BeanUtil.copyProperties(po,anemometerTowerNameVo);

energy-manage-service/src/main/java/com/energy/manage/service/service/company/impl/WindCompanyServiceImpl.java

@@ -80,15 +80,12 @@ public class WindCompanyServiceImpl extends BaseServiceImpl<WindCompanyPO> imple
         Example queryExample = new Example(WindCompanyPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("companyCode", dto.getCompanyCode());
-
         if (windCompanyMapper.updateByExampleSelective(po, queryExample) <= 0) {
             return false;
         }
-
         WindRelationDelDto windRelationDelDto = new WindRelationDelDto();
         windRelationDelDto.setCodeNumber(dto.getCompanyCode());
         windRelationDelDto.setType(TypeRelationEnum.COMPANY_NUMBER.getCode());
-
         return windRelationService.delWindRelation(windRelationDelDto);
     }
 

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginemill/impl/WindEngineMillServiceImpl.java

@@ -59,7 +59,6 @@ public class WindEngineMillServiceImpl extends BaseServiceImpl<com.energy.manage
      * @param windEngineMillCreateDto
      * @return
      */
-    @SneakyThrows
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean createEngineMill(WindEngineMillCreateDto windEngineMillCreateDto) {
@@ -178,7 +177,12 @@ public class WindEngineMillServiceImpl extends BaseServiceImpl<com.energy.manage
 
     @Override
     public List<WindEngineMillVo> getWindEngineMillList() {
-        List<WindEngineMillPO> list = windEngineMillMapper.selectAll();
+
+        Example queryExample = new Example(WindEngineMillPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
+        criteria.andEqualTo("state",Constants.GLOBAL_IN_USE);
+        List<WindEngineMillPO> list = windEngineMillMapper.selectByExample(queryExample);
         WindEngineMillVo windEngineMillVo = null;
         List<WindEngineMillVo> windEngineMillVos = Lists.newArrayList();
         for(WindEngineMillPO windEngineMillPO : list){

energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/impl/WindFieldServiceImpl.java

@@ -21,6 +21,7 @@ import com.energy.manage.service.domain.dto.anemometertower.AnemometerTowerDto;
 import com.energy.manage.service.domain.dto.anemometertower.AnemometerTowerRelationDto;
 import com.energy.manage.service.domain.dto.company.WindCompanyDto;
 import com.energy.manage.service.domain.dto.windfield.*;
+import com.energy.manage.service.domain.dto.windrelation.WindRelationDelDto;
 import com.energy.manage.service.domain.dto.windrelation.WindRelationDto;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
 import com.energy.manage.service.domain.vo.excel.WindFieldExceVo;
@@ -82,6 +83,11 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
     private WindFieldResourceService windFieldResourceService;
 
 
+    @Autowired
+    private WindRelationService windRelationService;
+
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean createWindField(WindFieldDto windFieldDto) {
@@ -265,7 +271,14 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         Example queryExample = new Example(WindFieldPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("fieldCode", fieldCode);
-        return windFieldMapper.updateByExampleSelective(windFieldPO, queryExample) > 0;
+
+        if(windFieldMapper.updateByExampleSelective(windFieldPO, queryExample) <=0){
+            return false;
+        }
+        WindRelationDelDto windRelationDelDto = new WindRelationDelDto();
+        windRelationDelDto.setCodeNumber(fieldCode);
+        windRelationDelDto.setType(TypeRelationEnum.WIND_FIELD_NUMBER.getCode());
+        return windRelationService.delWindRelation(windRelationDelDto);
     }
 
     @Override