控制额定功率

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

@@ -2,6 +2,7 @@ package com.energy.manage.service.controller.anemometertower;
 
 
 import com.energy.manage.common.base.Page;
+import com.energy.manage.common.po.anemometertower.AnemometerTowerPO;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.domain.dto.anemometertower.*;
@@ -35,17 +36,21 @@ public class AnemometerTowerController {
     @UserLoginToken
     @PostMapping(value = "/createAnemometerTower")
     @ApiOperation(value = "创建测风塔数据")
-    public ResultResp createAnemometerTower(@RequestBody  @Valid AnemometerTowerCreateDto anemometerTowerCreateDto) {
+    public ResultResp createAnemometerTower(@RequestBody @Valid AnemometerTowerCreateDto anemometerTowerCreateDto) {
+        AnemometerTowerPO po = anemometerTowerService.getAnemometerTowerPO(anemometerTowerCreateDto.getAnemometerName());
+        if (po != null) {
+            return ResultResp.FAIL("测风塔名称已经存在！");
+        }
+
         boolean flg = anemometerTowerService.createAnemometerTower(anemometerTowerCreateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
 
-
     @UserLoginToken
     @PostMapping(value = "/delAnemometerTower")
     @ApiOperation(value = "删除测风塔数据")
-    public ResultResp delAnemometerTower(@RequestBody  @Valid AnemometerTowerDelDto anemometerTowerDelDto) {
+    public ResultResp delAnemometerTower(@RequestBody @Valid AnemometerTowerDelDto anemometerTowerDelDto) {
         boolean flg = anemometerTowerService.delAnemometerTower(anemometerTowerDelDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -54,7 +59,7 @@ public class AnemometerTowerController {
     @UserLoginToken
     @PostMapping(value = "/updateAnemometerTowerState")
     @ApiOperation(value = "修改测风塔状态")
-    public ResultResp updateAnemometerTowerState(@RequestBody  @Valid AnemometerTowerStateDto anemometerTowerStateDto) {
+    public ResultResp updateAnemometerTowerState(@RequestBody @Valid AnemometerTowerStateDto anemometerTowerStateDto) {
         boolean flg = anemometerTowerService.updateAnemometerTowerState(anemometerTowerStateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -63,7 +68,7 @@ public class AnemometerTowerController {
     @PostMapping(value = "/getAnemometerTowerPage")
     @ApiOperation(value = "查询测风塔分页信息")
     public ResultResp<Page<AnemometerTowerPageVo>> getAnemometerTowerPage(@RequestBody AnemometerTowerPageDto anemometerTowerPageDto) {
-        Page<AnemometerTowerPageVo>  page = anemometerTowerService.getAnemometerTowerPage(anemometerTowerPageDto);
+        Page<AnemometerTowerPageVo> page = anemometerTowerService.getAnemometerTowerPage(anemometerTowerPageDto);
         return ResultResp.SUCCESS(page);
     }
 
@@ -72,7 +77,7 @@ public class AnemometerTowerController {
     @PostMapping(value = "/bathAnemometerTowerHeight")
     @ApiOperation(value = "批量绑定测风塔层高数据")
     public ResultResp bathAnemometerTowerHeight(@RequestBody AnemometerTowerHeightDto anemometerTowerHeightDto) {
-        boolean flg  = anemometerTowerService.bathAnemometerTowerHeight(anemometerTowerHeightDto);
+        boolean flg = anemometerTowerService.bathAnemometerTowerHeight(anemometerTowerHeightDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
@@ -81,22 +86,20 @@ public class AnemometerTowerController {
     @PostMapping(value = "/getAnemometerTower")
     @ApiOperation(value = "查询测风塔数据详情对象")
     public ResultResp<AnemometerTowerVo> getAnemometerTowerVo(@RequestBody AnemometerTowerDto anemometerTowerDto) {
-        AnemometerTowerVo vo  = anemometerTowerService.getAnemometerTowerVo(anemometerTowerDto);
+        AnemometerTowerVo vo = anemometerTowerService.getAnemometerTowerVo(anemometerTowerDto);
         return ResultResp.SUCCESS(vo);
     }
 
 
-
     @UserLoginToken
     @PostMapping(value = "/getAnemometerTowerByField")
     @ApiOperation(value = "通过风场编号查询测风塔信息")
-    public ResultResp<List<AnemometerTowerByFieldVo>> getAnemometerTowerByField(@RequestBody  @Valid AnemometerTowerByFieldDto anemometerTowerByFieldDto) {
-        List<AnemometerTowerByFieldVo> anemometerTowerByField  = anemometerTowerService.getAnemometerTowerByField(anemometerTowerByFieldDto.getFieldCode());
+    public ResultResp<List<AnemometerTowerByFieldVo>> getAnemometerTowerByField(@RequestBody @Valid AnemometerTowerByFieldDto anemometerTowerByFieldDto) {
+        List<AnemometerTowerByFieldVo> anemometerTowerByField = anemometerTowerService.getAnemometerTowerByField(anemometerTowerByFieldDto.getFieldCode());
         return ResultResp.SUCCESS(anemometerTowerByField);
     }
 
 
-
     @UserLoginToken
     @PostMapping(value = "/updateAnemometerTower")
     @ApiOperation(value = "修改测风塔数据")
@@ -111,12 +114,9 @@ public class AnemometerTowerController {
     @PostMapping(value = "/getAnemometerTowerHeight")
     @ApiOperation(value = "查询测风塔下层高数据")
     public ResultResp<AnemometerTowerHeightVo> getAnemometerTowerHeight(@RequestBody AnemometerTowerDto anemometerTowerDto) {
-        AnemometerTowerHeightVo vo  = anemometerTowerService.getAnemometerTowerHeight(anemometerTowerDto);
+        AnemometerTowerHeightVo vo = anemometerTowerService.getAnemometerTowerHeight(anemometerTowerDto);
         return ResultResp.SUCCESS(vo);
     }
 
 
-
-
-
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/company/WindCompanyController.java

@@ -1,6 +1,7 @@
 package com.energy.manage.service.controller.company;
 
 
+import com.energy.manage.common.po.company.WindCompanyPO;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.domain.dto.company.*;
@@ -40,9 +41,11 @@ public class WindCompanyController {
     public ResultResp addCompany(@RequestBody @Valid WindCompanyDto dto) {
 
         // 验证企业名称是否存在
-
-
-        if(StringUtils.isEmpty(dto.getParentCode())||StringUtils.isEmpty(dto.getCompanyName())){
+        WindCompanyPO po = windCompanyService.getWindCompanyPO(dto);
+        if (po != null) {
+            return ResultResp.FAIL("企业名称已存在！");
+        }
+        if (StringUtils.isEmpty(dto.getParentCode()) || StringUtils.isEmpty(dto.getCompanyName())) {
             return ResultResp.NOTNULLPARAM();
         }
         boolean flg = windCompanyService.addCompany(dto);
@@ -76,7 +79,7 @@ public class WindCompanyController {
     @ApiOperation(value = "查询企业对象")
     public ResultResp<WindCompanyVo> getWindCompany(@RequestBody @Valid WindCompanyDelDto dto) {
         WindCompanyVo vo = windCompanyService.getWindCompany(dto);
-        return ResultResp.SUCCESS(vo) ;
+        return ResultResp.SUCCESS(vo);
     }
 
     @UserLoginToken
@@ -97,6 +100,4 @@ public class WindCompanyController {
     }
 
 
-
-
 }

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

@@ -15,14 +15,8 @@ import java.util.Date;
 @Setter
 public class WindEngineMillPageDto extends BaseDto {
 
-    @ApiModelProperty("机型名称")
-    private String machineTypeName;
-
-    @ApiModelProperty("厂商名称")
-    private String manufacturerName;
-
-    @ApiModelProperty("品牌")
-    private String brand;
+    @ApiModelProperty("机型型号")
+    private String machineTypeCode;
 
     @ApiModelProperty("开始时间")
     private String beginTime;

energy-manage-service/src/main/java/com/energy/manage/service/service/anemometertower/AnemometerTowerService.java

@@ -2,6 +2,7 @@ package com.energy.manage.service.service.anemometertower;
 
 
 import com.energy.manage.common.base.Page;
+import com.energy.manage.common.po.anemometertower.AnemometerTowerPO;
 import com.energy.manage.service.domain.dto.anemometertower.*;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerHeightVo;
@@ -101,24 +102,12 @@ public interface AnemometerTowerService {
      */
     boolean deltAnemometerTowerRelationByField(String fieldCode);
 
-
-
     /**
-     * 通过测风塔编号查询风场数量
-     * @param anemometerTowerDto
+     * 通过测风塔名称查询对象
+     * @param anemometerTowerName
      * @return
      */
-    Integer getAnemometerTowerFieldCount(AnemometerTowerDto anemometerTowerDto);
-
-
-    /**
-     * 通过风场查询测风塔数量
-     * @param anemometerTowerDto
-     * @return
-     */
-    Integer getFieldAnemometerTowerCount(AnemometerTowerDto anemometerTowerDto);
-
-
+    AnemometerTowerPO getAnemometerTowerPO(String anemometerTowerName);
 
 
 

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

@@ -14,6 +14,7 @@ import com.energy.manage.common.po.company.WindCompanyPO;
 import com.energy.manage.common.po.windenginemill.WindEngineMillPO;
 import com.energy.manage.common.util.IdGeneratorUtil;
 import com.energy.manage.service.domain.dto.anemometertower.*;
+import com.energy.manage.service.domain.dto.company.WindCompanyDto;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerHeightVo;
 import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerPageVo;
@@ -252,16 +253,14 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
         return anemometerTowerRelationMapper.deleteByExample(queryExample) > 0;
     }
 
-
     @Override
-    public Integer getAnemometerTowerFieldCount(AnemometerTowerDto anemometerTowerDto) {
-        return null;
+    public AnemometerTowerPO getAnemometerTowerPO(String anemometerTowerName) {
+        Example queryExample = new Example(AnemometerTowerPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("anemometerName", anemometerTowerName);
+        return anemometerTowerMapper.selectOneByExample(queryExample);
     }
 
-    @Override
-    public Integer getFieldAnemometerTowerCount(AnemometerTowerDto anemometerTowerDto) {
-        return null;
-    }
 
 
 }

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

@@ -126,14 +126,8 @@ public class WindEngineMillServiceImpl extends BaseServiceImpl<com.energy.manage
         PageHelper.startPage(windEngineMillPageDto.getPageNum(), windEngineMillPageDto.getPageSize());
         Example queryExample = new Example(WindEngineMillPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
-        if (!StringUtils.isEmpty(windEngineMillPageDto.getMachineTypeName())) {
-            criteria.andEqualTo("machineTypeName", windEngineMillPageDto.getMachineTypeName());
-        }
-        if (!StringUtils.isEmpty(windEngineMillPageDto.getManufacturerName())) {
-            criteria.andEqualTo("manufacturerName", windEngineMillPageDto.getManufacturerName());
-        }
-        if (!StringUtils.isEmpty(windEngineMillPageDto.getBrand())) {
-            criteria.andEqualTo("brand", windEngineMillPageDto.getBrand());
+        if (!StringUtils.isEmpty(windEngineMillPageDto.getMachineTypeCode())) {
+            criteria.andLike("machineTypeCode", "%" + windEngineMillPageDto.getMachineTypeCode() + "%");
         }
 
         if (!StringUtils.isEmpty(windEngineMillPageDto.getBeginTime())&&!StringUtils.isEmpty(windEngineMillPageDto.getEndTime())) {
@@ -141,7 +135,6 @@ public class WindEngineMillServiceImpl extends BaseServiceImpl<com.energy.manage
             criteria.andLessThanOrEqualTo("createTime", windEngineMillPageDto.getEndTime());
         }
 
-
         criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
         List<WindEngineMillPO> list = windEngineMillMapper.selectByExample(queryExample);