自测机型模块功能

energy-manage-common/src/main/java/com/energy/manage/common/enums/IdPrefixEnum.java

@@ -9,6 +9,7 @@ public enum IdPrefixEnum {
     COMPANY_NUMBER("COM", "企业信息编号"),
     WIND_FIELD_NUMBER("WOF", "风场信息编号"),
     WIND_GROUP_NUMBER("WOG", "风机信息编号"),
+    WIND_EILL_NUMBER("WEM", "风机机型编号"),
     WIND_TOWER_NUMBER("WOT", "测风塔信息编号");
 
     IdPrefixEnum(String code, String name) {

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

@@ -4,6 +4,7 @@ package com.energy.manage.common.po.windenginemill;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import javax.persistence.Table;
 import java.util.Date;
 
@@ -45,6 +46,11 @@ public class WindEngineMillPO {
      * 叶片长度
      */
     private String vaneLong;
+
+    /**
+     * 驱动类型
+     */
+    private Integer curvedMotionType;
     /**
      * 删除状态
      */
@@ -53,7 +59,7 @@ public class WindEngineMillPO {
     /**
      * 组合字段
      */
-    private String combinationc;
+    private String combination;
     /**
      * 创建人
      */

energy-manage-service/src/main/java/com/energy/manage/service/controller/windenginemill/WindEngineMillController.java

@@ -29,8 +29,10 @@ public class WindEngineMillController {
     @UserLoginToken
     @PostMapping(value = "/createEngineMill")
     @ApiOperation(value = "手动创建机型信息")
-    public ResultResp createEngineMill(@RequestPart WindEngineMillCreateDto windEngineMillCreateDto) {
-
+    public ResultResp createEngineMill(@RequestBody WindEngineMillCreateDto windEngineMillCreateDto) {
+        if(!windEngineMillService.verificationData(windEngineMillCreateDto.getMachineTypeCode(),windEngineMillCreateDto.getManufacturerCode())){
+            return ResultResp.FAIL("该厂商对应机型已经存在！");
+        }
         boolean flg = windEngineMillService.createEngineMill(windEngineMillCreateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -77,7 +79,7 @@ public class WindEngineMillController {
 
     @UserLoginToken
     @PostMapping(value = "/updateWindEngineMill")
-    @ApiOperation(value = "查询机型对象")
+    @ApiOperation(value = "更新机型")
     public ResultResp updateWindEngineMill(@RequestBody WindEngineMillDto windEngineMillDto) {
 
         boolean flg = windEngineMillService.updateWindEngineMill(windEngineMillDto);

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/dict/DictConstantsQueryDto.java

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull;
 public class DictConstantsQueryDto {
 
 
-    @ApiModelProperty(value = "字典类型 ")
+    @ApiModelProperty(value = "字典类型 1-双驱类型")
     @NotNull
     private Integer dictType;
 

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

@@ -1,55 +1,54 @@
 package com.energy.manage.service.domain.dto.windenginemill;
 
 import com.energy.manage.common.po.windenginemill.WindEngineMillPO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
+@ApiModel
 public class WindEngineMillCreateDto {
 
     /**
      * 编号
      */
-
+    @ApiModelProperty("编号")
     private String millTypeCode;
     /**
      * 机型型号
      */
+    @ApiModelProperty("机型型号")
     private String machineTypeCode;
     /**
      * 厂商名称
      */
+    @ApiModelProperty("厂商名称")
     private String manufacturerName;
     /**
      * 厂商编号
      */
+    @ApiModelProperty("厂商编号")
     private String manufacturerCode;
     /**
      * 品牌名称
      */
+    @ApiModelProperty("品牌名称")
     private String brand;
     /**
-     * 状态
-     */
-    private Integer state;
-    /**
      * 塔筒高度
      */
+    @ApiModelProperty("塔筒高度")
     private String towerHeight;
     /**
      * 叶片长度
      */
+    @ApiModelProperty("叶片长度")
     private String vaneLong;
-    /**
-     * 删除状态
-     */
-    private Integer delState;
 
-    /**
-     * 组合字段
-     */
-    private String combinationc;
+    @ApiModelProperty("驱动类型")
+    private Integer curvedMotionType;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginemill/WindEngineMillService.java

@@ -61,4 +61,13 @@ public interface WindEngineMillService  {
     boolean updateWindEngineMill(WindEngineMillDto windEngineMillDto);
 
 
+    /**
+     * 校验数据是否存在
+     * @param machineTypeCode
+     * @param manufacturerCode
+     * @return
+     */
+    boolean verificationData(String machineTypeCode,String manufacturerCode);
+
+
 }

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

@@ -6,8 +6,11 @@ import com.alibaba.excel.EasyExcel;
 import com.energy.manage.common.base.BaseServiceImpl;
 import com.energy.manage.common.base.Page;
 import com.energy.manage.common.constant.Constants;
+import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
 import com.energy.manage.common.enums.DeleteStatusEnum;
+import com.energy.manage.common.enums.IdPrefixEnum;
 import com.energy.manage.common.po.windenginemill.WindEngineMillPO;
+import com.energy.manage.common.util.IdGeneratorUtil;
 import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillCodeDto;
 import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillCreateDto;
 import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillDto;
@@ -48,9 +51,9 @@ public class WindEngineMillServiceImpl extends BaseServiceImpl<com.energy.manage
     private WindEngineMillMapper windEngineMillMapper;
 
 
-
     /**
      * 手动创建机型信息
+     *
      * @param windEngineMillCreateDto
      * @return
      */
@@ -71,12 +74,13 @@ public class WindEngineMillServiceImpl extends BaseServiceImpl<com.energy.manage
 
         WindEngineMillPO windEngineMillPO = new WindEngineMillPO();
         BeanUtil.copyProperties(windEngineMillCreateDto, windEngineMillPO);
-        windEngineMillPO.setMillTypeCode(UUIDUtil.getShortUUID());
-        windEngineMillPO.setCombinationc(StrUtil.format("{},{}", windEngineMillCreateDto.getMachineTypeCode(), windEngineMillCreateDto.getManufacturerCode()));
+        String number = IdPrefixEnum.WIND_EILL_NUMBER.getCode().concat(IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.WIND_EILL_NUMBER.getCode()))));
+        windEngineMillPO.setMillTypeCode(number);
+        windEngineMillPO.setCombination(StrUtil.format("{},{}", windEngineMillCreateDto.getMachineTypeCode(), windEngineMillCreateDto.getManufacturerCode()));
         windEngineMillPO.setCreateTime(new Date());
         windEngineMillPO.setUpdateTime(new Date());
-        windEngineMillPO.setState(DeleteStatusEnum.NODELETE.getCode());
-        windEngineMillPO.setDelState(Constants.GLOBAL_IN_USE);
+        windEngineMillPO.setState(Constants.GLOBAL_IN_USE);
+        windEngineMillPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
 
         return windEngineMillMapper.insertUseGeneratedKeys(windEngineMillPO) > 0;
     }
@@ -106,7 +110,7 @@ public class WindEngineMillServiceImpl extends BaseServiceImpl<com.energy.manage
             windEngineMillPO = new com.energy.manage.common.po.windenginemill.WindEngineMillPO();
             BeanUtil.copyProperties(windEngineMillExcelVo, windEngineMillPO);
             windEngineMillPO.setMillTypeCode(UUIDUtil.getShortUUID());
-            windEngineMillPO.setCombinationc(StrUtil.format("{},{}", windEngineMillExcelVo.getMachineTypeCode(), windEngineMillExcelVo.getManufacturerCode()));
+            windEngineMillPO.setCombination(StrUtil.format("{},{}", windEngineMillExcelVo.getMachineTypeCode(), windEngineMillExcelVo.getManufacturerCode()));
             windEngineMillPO.setCreateTime(new Date());
             windEngineMillPO.setUpdateTime(new Date());
             windEngineMillPO.setState(DeleteStatusEnum.NODELETE.getCode());
@@ -131,7 +135,6 @@ public class WindEngineMillServiceImpl extends BaseServiceImpl<com.energy.manage
             criteria.andEqualTo("brand", windEngineMillPageDto.getBrand());
         }
         criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
-        criteria.andEqualTo("state", Constants.GLOBAL_IN_USE);
         List<WindEngineMillPO> list = windEngineMillMapper.selectByExample(queryExample);
 
         WindEngineMillPageVo windEngineMillPageVo = null;
@@ -139,6 +142,7 @@ public class WindEngineMillServiceImpl extends BaseServiceImpl<com.energy.manage
         for (WindEngineMillPO po : list) {
             windEngineMillPageVo = new WindEngineMillPageVo();
             BeanUtil.copyProperties(po, windEngineMillPageVo);
+            windEngineMillPageVos.add(windEngineMillPageVo);
         }
         Long total = org.apache.commons.collections.CollectionUtils.isEmpty(list) ? 0L : new PageInfo<>(list).getTotal();
         return Page.build(windEngineMillPageDto.getPageNum(), windEngineMillPageDto.getPageSize(), total, windEngineMillPageVos);
@@ -182,4 +186,17 @@ public class WindEngineMillServiceImpl extends BaseServiceImpl<com.energy.manage
     }
 
 
+    @Override
+    public boolean verificationData(String machineTypeCode, String manufacturerCode) {
+
+        Example queryExample = new Example(WindEngineMillPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("machineTypeCode", machineTypeCode);
+        criteria.andEqualTo("manufacturerCode", manufacturerCode);
+        int num = windEngineMillMapper.selectCountByExample(queryExample);
+        return num > 0 ? false : true;
+
+    }
+
+
 }