فهرست منبع

部件字典管理接口和部件po

shiyue 1 سال پیش
والد
کامیت
308417c75a
52فایلهای تغییر یافته به همراه2059 افزوده شده و 7 حذف شده
  1. 4 0
      energy-manage-common/src/main/java/com/energy/manage/common/constant/redis/ManagerRedisKeyConstant.java
  2. 3 1
      energy-manage-common/src/main/java/com/energy/manage/common/enums/IdPrefixEnum.java
  3. 73 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitBearingsPO.java
  4. 36 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitBrakeSystemPO.java
  5. 45 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitControlSystemPO.java
  6. 45 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitDictBrandModelPO.java
  7. 47 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitDictConstantsPO.java
  8. 98 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitDynamoPO.java
  9. 42 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitGantryPO.java
  10. 30 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitGearboxPO.java
  11. 64 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitGearboxSpecificationPO.java
  12. 42 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitGearboxSpurGearSpecificationPO.java
  13. 37 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitLightningProtectionPO.java
  14. 40 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitNodePO.java
  15. 66 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitTransducerPO.java
  16. 42 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitVariablePitchSystemPO.java
  17. 58 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitWindTurbinePO.java
  18. 48 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitYawSystemPO.java
  19. 180 0
      energy-manage-service/src/main/java/com/energy/manage/service/controller/units/UnitsDictController.java
  20. 29 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictBrandModelDto.java
  21. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictBrandModelIdDto.java
  22. 28 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictBrandModelPageDto.java
  23. 32 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictBrandModelUpdateDto.java
  24. 33 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictConstantsDelDto.java
  25. 62 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictConstantsDto.java
  26. 19 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictConstantsListDto.java
  27. 26 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictConstantsPDelDto.java
  28. 19 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictConstantsPageDto.java
  29. 30 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictConstantsUpdateDto.java
  30. 28 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/units/UnitDictBrandModelVo.java
  31. 89 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/units/UnitDictConstantsVo.java
  32. 17 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitBearingsMapper.java
  33. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitBrakeSystemMapper.java
  34. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitControlSystemMapper.java
  35. 10 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitDictBrandModelMapper.java
  36. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitDictConstantsMapper.java
  37. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitDynamoMapper.java
  38. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitGantryMapper.java
  39. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitGearboxMapper.java
  40. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitGearboxSpecificationMapper.java
  41. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitGearboxSpurGearSpecificationMapper.java
  42. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitLightningProtectionMapper.java
  43. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitNodeMapper.java
  44. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitTransducerMapper.java
  45. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitVariablePitchSystemMapper.java
  46. 17 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitWindTurbineMapper.java
  47. 16 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitYawSystemMapper.java
  48. 2 0
      energy-manage-service/src/main/java/com/energy/manage/service/service/cache/CacheService.java
  49. 8 0
      energy-manage-service/src/main/java/com/energy/manage/service/service/cache/impl/CacheServiceImpl.java
  50. 121 0
      energy-manage-service/src/main/java/com/energy/manage/service/service/units/UnitDictConstantsService.java
  51. 263 0
      energy-manage-service/src/main/java/com/energy/manage/service/service/units/impl/UnitDictConstantsServiceImpl.java
  52. 2 6
      energy-manage-service/src/test/java/client/SkfClientWebTest.java

+ 4 - 0
energy-manage-common/src/main/java/com/energy/manage/common/constant/redis/ManagerRedisKeyConstant.java

@@ -24,6 +24,10 @@ public class ManagerRedisKeyConstant {
      */
     public static final String IDGENERATOR_CONSTANTS_KEY = "energy:Idgenerator:{id}";
 
+    // 字典
+    public static final String IDGENERATOR_UDTC_KEY = "energy:Idgenerator:unit:udtc";
+    // 属性
+    public static final String IDGENERATOR_UDPC_KEY = "energy:Idgenerator:unit:{id}";
 
     private static final String PLACE_HOLDER = "{id}";
 

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

@@ -12,7 +12,9 @@ public enum IdPrefixEnum {
     WIND_EILL_NUMBER("WEM", "风机机型编号"),
     WIND_EILL_MF_NUMBER("WMF","风机机型厂商编号"),
     WIND_TOWER_NUMBER("WOT", "测风塔信息编号"),
-    WIND_ENGINE_BATCH_NUMBER("WOB","风机批次编号");
+    WIND_ENGINE_BATCH_NUMBER("WOB","风机批次编号"),
+
+    UNIT_DICT_TYPE_CODE("UDTC","部件字典编号");
 
     IdPrefixEnum(String code, String name) {
         this.code = code;

+ 73 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitBearingsPO.java

@@ -0,0 +1,73 @@
+package com.energy.manage.common.po.units;
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "unit_bearings")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitBearingsPO extends NewBaseDomain {
+    /**
+     * 主轴部件编号;主轴部件编号
+     */
+    private String code;
+    /**
+     * 轴杆;轴杆
+     */
+    private Integer axisRod;
+    /**
+     * 轴封;轴封
+     */
+    private Integer axisSeal;
+    /**
+     * 滚动轴承;滚动轴承
+     */
+    private Integer rollingBearing;
+    /**
+     * 推力轴承;推力轴承
+     */
+    private Integer thrustBearing;
+    /**
+     * 主轴前轴承;主轴前轴承
+     */
+    private Integer mainAxisFrontBearing;
+    /**
+     * 主轴后轴承;主轴后轴承
+     */
+    private Integer mainAxisRearBearing;
+    /**
+     * 轴承额定转速;轴承额定转速
+     */
+    private String bearingRatedSpeed;
+    /**
+     * 挠性轴承;挠性轴承
+     */
+    private Integer flexibleBearing;
+    /**
+     * 刚性联轴器;刚性联轴器
+     */
+    private Integer rigidCoupling;
+    /**
+     * 轴承温度;轴承温度
+     */
+    private String bearingTemperature;
+    /**
+     * 轴承最大转速;轴承最大转速
+     */
+    private String bearingMaxSpeed;
+    /**
+     * 挠性联轴器;挠性联轴器
+     */
+    private Integer flexibleCoupling;
+    /**
+     * 主轴型号;主轴型号
+     */
+    private String mainAxisModel;
+    /** 厂商;厂商 */
+
+}

+ 36 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitBrakeSystemPO.java

@@ -0,0 +1,36 @@
+package com.energy.manage.common.po.units;
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "unit_bearings")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitBrakeSystemPO extends NewBaseDomain {
+
+    /**
+     * 编码
+     */
+    private String code;
+    /**
+     * 主制动系统
+     */
+    private String mainBrakingSystem;
+    /**
+     * 第二制动系统
+     */
+    private Integer secondaryBrakingSystem;
+    /**
+     * 制动液型号
+     */
+    private String brakeFluidModel;
+    /**
+     * 删除状态
+     */
+    private Integer deleteStatus;
+}

+ 45 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitControlSystemPO.java

@@ -0,0 +1,45 @@
+package com.energy.manage.common.po.units;
+
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "unit_control_system")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitControlSystemPO extends NewBaseDomain {
+
+    /**
+     * 编码
+     */
+    private String code;
+    /**
+     * 型号/设计
+     */
+    private String modelDesign;
+    /**
+     * 控制中心
+     */
+    private String controlCenter;
+    /**
+     * 补偿电容容量
+     */
+    private String compensationCapacitance;
+    /**
+     * 额定功率因数
+     */
+    private String ratedPowerFactor;
+    /**
+     * 远距离控制
+     */
+    private String remoteControl;
+    /**
+     * 删除状态
+     */
+    private Integer deleteStatus;
+}

+ 45 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitDictBrandModelPO.java

@@ -0,0 +1,45 @@
+package com.energy.manage.common.po.units;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+@Data
+@Table(name = "unit_dict_brand_model")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitDictBrandModelPO {
+
+
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    @Column(name = "id")
+    private Integer id;
+
+    //1.轴承2.润滑油
+    private Integer unitType;
+
+    //品牌
+    private String manufacture;
+
+    //型号
+    private  String modelNumber;
+
+    //描述
+    private String description;
+
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+}

+ 47 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitDictConstantsPO.java

@@ -0,0 +1,47 @@
+package com.energy.manage.common.po.units;
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "unit_dict_constants")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitDictConstantsPO extends NewBaseDomain {
+
+    // 父级ID
+    private Long parentId;
+
+    /**
+     * 部件类型(字典表):1..轴承2.润滑油3.冷却方式
+     */
+    private Integer contentsDictKey;
+    // 常量名称
+    private String contentsName;
+
+    // 常量值
+    private Integer contentsValue;
+
+    /**
+     * 部件模块编号1.主轴2.齿轮箱3.发电机
+     */
+    private Integer unitModule;
+    /**
+     * 关联功能(0.普通字典模式1.品牌型号)
+     */
+    private Integer associatedFunctionType;
+
+    // 常量类型编号
+    private String contentsType;
+
+    // 常量描述
+    private String contentsDescribe;
+
+    // 删除状态
+    private Integer delState;
+
+}

+ 98 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitDynamoPO.java

@@ -0,0 +1,98 @@
+package com.energy.manage.common.po.units;
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "unit_dynamo")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitDynamoPO extends NewBaseDomain {
+
+    /**
+     * 发电机部件编号
+     */
+    private String code;
+    /**
+     * 转子类型
+     */
+    private Integer rotorType;
+    /**
+     * 定子类型
+     */
+    private Integer statorType;
+    /**
+     * 冷却方式
+     */
+    private Integer coolingMethod;
+    /**
+     * 轴
+     */
+    private Integer shaftType;
+    /**
+     * 轴承
+     */
+    private Integer bearingType;
+    /**
+     * 最大转速
+     */
+    private String maxSpeed;
+    /**
+     * 变频器功率
+     */
+    private String inverterPower;
+    /**
+     * 额定电流
+     */
+    private String ratedCurrent;
+    /**
+     * 额定频率
+     */
+    private String ratedFrequency;
+    /**
+     * 额定电压
+     */
+    private String ratedVoltage;
+    /**
+     * 绝缘等级
+     */
+    private Integer insulationClass;
+    /**
+     * 润滑方式
+     */
+    private Integer lubricationMethod;
+    /**
+     * 最大瞬时功率
+     */
+    private String maxInstantaneousPower;
+    /**
+     * 极对数
+     */
+    private Integer polePairsNumber;
+    /**
+     * 额定效率
+     */
+    private String ratedEfficiency;
+    /**
+     * 转子滑环防护等级
+     */
+    private Integer rotorSlipRingProtectionLevel;
+    /**
+     * 防护等级
+     */
+    private Integer protectionLevel;
+    /**
+     * 转子条数
+     */
+    private Integer numberOfRotorBars;
+    /**
+     * 删除状态
+     */
+    private Integer delState;
+
+
+}

+ 42 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitGantryPO.java

@@ -0,0 +1,42 @@
+package com.energy.manage.common.po.units;
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "unit_gantry")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitGantryPO extends NewBaseDomain {
+
+    /**
+     * 部件编号
+     */
+    private String code;
+    /**
+     * 塔架类型
+     */
+    private Integer towerType;
+    /**
+     * 顶部法兰直径
+     */
+    private String topFlangeDiameter;
+    /**
+     * 底部法兰直径
+     */
+    private String bottomFlangeDiameter;
+    /**
+     * 高度
+     */
+    private String height;
+    /**
+     * 删除状态
+     */
+    private Integer deleteStatus;
+
+
+}

+ 30 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitGearboxPO.java

@@ -0,0 +1,30 @@
+package com.energy.manage.common.po.units;
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "unit_gearbox")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitGearboxPO extends NewBaseDomain {
+
+    /**
+     * 部件编号
+     */
+    private String code;
+    /**
+     * 输入联轴器
+     */
+    private Integer inputCoupling;
+    /**
+     * 输出联轴器
+     */
+    private Integer outputCoupling;
+
+
+}

+ 64 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitGearboxSpecificationPO.java

@@ -0,0 +1,64 @@
+package com.energy.manage.common.po.units;
+
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "unit_gearbox_specification")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitGearboxSpecificationPO extends NewBaseDomain {
+
+
+    /**
+     * 齿轮箱编号
+     */
+    private String gearboxCode;
+    /**
+     * 行星轮等级
+     */
+    private Integer planetaryGearGrade;
+    /**
+     * 行星轮个数
+     */
+    private String planetaryGearCount;
+    /**
+     * 行星轮类型
+     */
+    private Integer planetaryGearType;
+    /**
+     * 行星轮齿数
+     */
+    private String planetaryGearTeethCount;
+    /**
+     * 内齿圈齿
+     */
+    private String internalGearTeeth;
+    /**
+     * 太阳轮类型
+     */
+    private Integer sunGearType;
+    /**
+     * 太阳轮齿数
+     */
+    private String sunGearTeethCount;
+    /**
+     * 行星架叶轮侧
+     */
+    private String planetCarrierRotorSide;
+    /**
+     * 行星架发电机侧
+     */
+    private String planetCarrierGeneratorSide;
+    /**
+     * 行星轮轴承
+     */
+    private String planetGearBearing;
+
+
+}

+ 42 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitGearboxSpurGearSpecificationPO.java

@@ -0,0 +1,42 @@
+package com.energy.manage.common.po.units;
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "unit_gearbox_spur_gear_specification")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitGearboxSpurGearSpecificationPO extends NewBaseDomain {
+
+    /**
+     * 大齿轮齿数
+     */
+    private String largeGearTeethCount;
+    /**
+     * 小齿轮齿数
+     */
+    private String smallGearTeethCount;
+    /**
+     * 低速轴前轴承
+     */
+    private String lowSpeedShaftFrontBearing;
+    /**
+     * 高速轴后轴承
+     */
+    private String highSpeedShaftRearBearing;
+    /**
+     * 低速轴后轴承
+     */
+    private String lowSpeedShaftRearBearing;
+    /**
+     * 高速轴前轴承
+     */
+    private String highSpeedShaftFrontBearing;
+
+
+}

+ 37 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitLightningProtectionPO.java

@@ -0,0 +1,37 @@
+package com.energy.manage.common.po.units;
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "unit_lightning_protection")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitLightningProtectionPO extends NewBaseDomain {
+
+    /**
+     * 编码
+     */
+    private String code;
+    /**
+     * 防雷设计标准
+     */
+    private String lightningDesignStandard;
+    /**
+     * 防雷措施
+     */
+    private String lightningProtectionMeasures;
+    /**
+     * 机组接地电阻值
+     */
+    private String groundingResistanceValue;
+    /**
+     * 删除状态
+     */
+    private Integer deleteStatus;
+
+}

+ 40 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitNodePO.java

@@ -0,0 +1,40 @@
+package com.energy.manage.common.po.units;
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "unit_node")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitNodePO extends NewBaseDomain {
+
+    /**
+     * 风场编号;风场编号
+     */
+    private String fieldCode;
+    /**
+     * 机型编号;机型编号
+     */
+    private String millTypeCode;
+    /**
+     * 部件编号;具体部件编号
+     */
+    private String unitCode;
+    /**
+     * 部件类型映射;具体部件表映射关系
+     */
+    private String unitType;
+    /**
+     * 排序
+     */
+    private Integer sort;
+    /**
+     * 删除状态
+     */
+    private Integer delState;
+}

+ 66 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitTransducerPO.java

@@ -0,0 +1,66 @@
+package com.energy.manage.common.po.units;
+
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+
+@Data
+@Table(name = "unit_transducer")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitTransducerPO extends NewBaseDomain {
+
+    /**
+     * 编号
+     */
+    private String code;
+    /**
+     * 容量-网侧
+     */
+    private String capacityGridSide;
+    /**
+     * 容量-转子侧
+     */
+    private String capacityRotorSide;
+    /**
+     * 输入电压
+     */
+    private String inputVoltage;
+    /**
+     * 输出电压
+     */
+    private String outputVoltage;
+    /**
+     * 输入电流
+     */
+    private String inputCurrent;
+    /**
+     * 输出电流
+     */
+    private String outputCurrent;
+    /**
+     * 输入频率范围开始
+     */
+    private String inputFrequencyRangeStart;
+    /**
+     * 输入频率范围结束
+     */
+    private String inputFrequencyRangeEnd;
+    /**
+     * 输出频率范围开始
+     */
+    private String outputFrequencyRangeStart;
+    /**
+     * 输出频率范围结束
+     */
+    private String outputFrequencyRangeEnd;
+    /**
+     * 删除状态
+     */
+    private Integer deleteStatus;
+}

+ 42 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitVariablePitchSystemPO.java

@@ -0,0 +1,42 @@
+package com.energy.manage.common.po.units;
+
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+
+@Data
+@Table(name = "unit_variable_pitch_system")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitVariablePitchSystemPO extends NewBaseDomain {
+
+    /**
+     * 编号
+     */
+    private String code;
+    /**
+     * 系统类型
+     */
+    private Integer systemType;
+    /**
+     * 原理
+     */
+    private Integer principle;
+    /**
+     * 功率控制
+     */
+    private Integer powerControl;
+    /**
+     * 安全停机时的变桨距角速度
+     */
+    private String safetyShutdownPitchRate;
+    /**
+     * 删除状态
+     */
+    private Integer deleteStatus;
+}

+ 58 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitWindTurbinePO.java

@@ -0,0 +1,58 @@
+package com.energy.manage.common.po.units;
+
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+
+@Data
+@Table(name = "unit_wind_turbine")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitWindTurbinePO extends NewBaseDomain {
+
+    /**
+     * 编号
+     */
+    private String code;
+    /**
+     * 叶片材料
+     */
+    private String bladeMaterial;
+    /**
+     * 叶片数量
+     */
+    private Integer bladeCount;
+    /**
+     * 叶轮转速
+     */
+    private String rotorSpeed;
+    /**
+     * 风轮轴倾度
+     */
+    private String windTurbineShaftTilt;
+    /**
+     * 风轮锥角
+     */
+    private String windTurbineConeAngle;
+    /**
+     * 扫风面积
+     */
+    private String sweptArea;
+    /**
+     * 旋转方向
+     */
+    private Integer rotationDirection;
+    /**
+     * 风轮高度
+     */
+    private String windTurbineHeight;
+    /**
+     * 删除状态
+     */
+    private Integer deleteStatus;
+}

+ 48 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/units/UnitYawSystemPO.java

@@ -0,0 +1,48 @@
+package com.energy.manage.common.po.units;
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "unit_yaw_system")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UnitYawSystemPO extends NewBaseDomain {
+
+    /**
+     * 编号
+     */
+    private String code;
+    /**
+     * 型号
+     */
+    private Integer model;
+    /**
+     * 齿轮型号
+     */
+    private Integer gearModel;
+    /**
+     * 控制
+     */
+    private Integer control;
+    /**
+     * 偏航控制速度
+     */
+    private String yawControlSpeed;
+    /**
+     * 风速风向仪型号
+     */
+    private String anemometerModel;
+    /**
+     * 轴承
+     */
+    private Integer bearing;
+    /**
+     * 删除状态
+     */
+    private Integer deleteStatus;
+}

+ 180 - 0
energy-manage-service/src/main/java/com/energy/manage/service/controller/units/UnitsDictController.java

@@ -0,0 +1,180 @@
+package com.energy.manage.service.controller.units;
+
+
+import com.energy.manage.common.base.Page;
+import com.energy.manage.common.enums.IdPrefixEnum;
+import com.energy.manage.common.reponse.ResultResp;
+import com.energy.manage.service.config.annotations.UserLoginToken;
+import com.energy.manage.service.controller.base.BaseServiceController;
+import com.energy.manage.service.domain.dto.units.*;
+import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupCreateDto;
+import com.energy.manage.service.domain.vo.units.UnitDictBrandModelVo;
+import com.energy.manage.service.domain.vo.units.UnitDictConstantsVo;
+import com.energy.manage.service.service.units.UnitDictConstantsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+@CrossOrigin
+@Api(value = "UnitsDictController", tags = "风机部件字典管理")
+@RequestMapping(value = "/api/units/dict")
+public class UnitsDictController extends BaseServiceController {
+
+
+    @Autowired
+    private UnitDictConstantsService unitDictConstantsService;
+
+
+    @UserLoginToken
+    @PostMapping(value = "/createUnitDict")
+    @ApiOperation(value = "创建数据字典")
+    public ResultResp createUnitDict(@RequestBody @Valid UnitDictConstantsDto unitDictConstantsDto) {
+        if (unitDictConstantsDto.getParentId()!=0) {
+            return ResultResp.FAIL("数据字典级别不对");
+        }
+        unitDictConstantsDto.setCreateBy(getUserId());
+        unitDictConstantsDto.setUpdateBy(getUserId());
+        boolean flg = unitDictConstantsService.saveUnitDict(unitDictConstantsDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
+    @UserLoginToken
+    @PostMapping(value = "/updateUnitDict")
+    @ApiOperation(value = "更新数据字典")
+    public ResultResp updateUnitDict(@RequestBody @Valid UnitDictConstantsUpdateDto unitDictConstantsUpdateDto) {
+        unitDictConstantsUpdateDto.setUpdateBy(getUserId());
+        boolean flg = unitDictConstantsService.updateUnitDict(unitDictConstantsUpdateDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
+    @UserLoginToken
+    @PostMapping(value = "/delUnitDict")
+    @ApiOperation(value = "删除数据字典")
+    public ResultResp delUnitDict(@RequestBody @Valid UnitDictConstantsDelDto unitDictConstantsDelDto) {
+        unitDictConstantsDelDto.setUpdateBy(getUserId());
+        boolean flg = unitDictConstantsService.delUnitDict(unitDictConstantsDelDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
+    @UserLoginToken
+    @PostMapping(value = "/getUnitDictConstantsPage")
+    @ApiOperation(value = "部件字典分页列表,通过字典名称询")
+    public ResultResp<Page<UnitDictConstantsVo>> getUnitDictConstantsPage(@RequestBody @Valid UnitDictConstantsPageDto unitDictConstantsPageDto) {
+        Page<UnitDictConstantsVo> page = unitDictConstantsService.getUnitDictConstantsPage(unitDictConstantsPageDto);
+        return ResultResp.SUCCESS(page);
+    }
+
+
+
+    @UserLoginToken
+    @PostMapping(value = "/createUnitDictProperty")
+    @ApiOperation(value = "创建数据字典属性-常规类型")
+    public ResultResp createUnitDictProperty(@RequestBody @Valid UnitDictConstantsDto unitDictConstantsDto) {
+        if (unitDictConstantsDto.getParentId()<=0) {
+            return ResultResp.FAIL("数据字典级别不对");
+        }
+        if (StringUtils.isEmpty(unitDictConstantsDto.getContentsType())) {
+            return ResultResp.FAIL("父级类型编号不能为空");
+        }
+        unitDictConstantsDto.setCreateBy(getUserId());
+        unitDictConstantsDto.setUpdateBy(getUserId());
+        unitDictConstantsDto.setContentsDictKey(0);
+        unitDictConstantsDto.setContentsDescribe("属性");
+        boolean flg = unitDictConstantsService.saveUnitDictProperty(unitDictConstantsDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
+    @UserLoginToken
+    @PostMapping(value = "/delUnitDictProperty")
+    @ApiOperation(value = "删除字典属性-常规类型")
+    public ResultResp delUnitDictProperty(@RequestBody @Valid UnitDictConstantsPDelDto unitDictConstantsPDelDto) {
+        unitDictConstantsPDelDto.setUpdateBy(getUserId());
+        boolean flg = unitDictConstantsService.delUnitDictProperty(unitDictConstantsPDelDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
+    @UserLoginToken
+    @PostMapping(value = "/updateUnitDictProperty")
+    @ApiOperation(value = "更新字典属性-常规类型")
+    public ResultResp updateUnitDictProperty(@RequestBody @Valid UnitDictConstantsUpdateDto unitDictConstantsUpdateDto) {
+        unitDictConstantsUpdateDto.setUpdateBy(getUserId());
+        boolean flg = unitDictConstantsService.updateUnitDictProperty(unitDictConstantsUpdateDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
+    @UserLoginToken
+    @PostMapping(value = "/getUnitDictConstantsList")
+    @ApiOperation(value = "查询字典属性集合-常规类型")
+    public ResultResp<List<UnitDictConstantsVo>> getUnitDictConstantsList(@RequestBody @Valid UnitDictConstantsListDto unitDictConstantsListDto) {
+        List<UnitDictConstantsVo> list = unitDictConstantsService.getUnitDictConstantsList(unitDictConstantsListDto.getContentsType());
+        return ResultResp.SUCCESS(list);
+    }
+
+
+
+    @UserLoginToken
+    @PostMapping(value = "/getUnitDictConstants")
+    @ApiOperation(value = "查询字典属性对象-品牌型号")
+    public ResultResp<UnitDictConstantsVo> getUnitDictConstants(@RequestBody @Valid UnitDictConstantsUpdateDto unitDictConstantsUpdateDto) {
+        UnitDictConstantsVo vo = unitDictConstantsService.getUnitDictConstants(unitDictConstantsUpdateDto.getId());
+        return ResultResp.SUCCESS(vo);
+    }
+
+
+    @UserLoginToken
+    @PostMapping(value = "/saveUnitDictBrandModel")
+    @ApiOperation(value = "创建部件品牌型号-品牌型号")
+    public ResultResp saveUnitDictBrandModel(@RequestBody @Valid UnitDictBrandModelDto unitDictBrandModelDto) {
+        boolean flg = unitDictConstantsService.saveUnitDictBrandModel(unitDictBrandModelDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
+    @UserLoginToken
+    @PostMapping(value = "/updateUnitDictBrandModel")
+    @ApiOperation(value = "更新部件品牌型号2-品牌型号")
+    public ResultResp updateUnitDictBrandModel(@RequestBody @Valid UnitDictBrandModelUpdateDto unitDictBrandModelUpdateDto) {
+        boolean flg = unitDictConstantsService.updateUnitDictBrandModel(unitDictBrandModelUpdateDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+    @UserLoginToken
+    @PostMapping(value = "/delUnitDictBrandModel")
+    @ApiOperation(value = "删除部件品牌型号-品牌型号")
+    public ResultResp delUnitDictBrandModel(@RequestBody @Valid UnitDictBrandModelIdDto unitDictBrandModelIdDto) {
+        boolean flg = unitDictConstantsService.delUnitDictBrandModel(unitDictBrandModelIdDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
+
+    @UserLoginToken
+    @PostMapping(value = "/getUnitDictBrandModelPage")
+    @ApiOperation(value = "查询品牌型号分页查询-品牌型号")
+    public ResultResp<Page<UnitDictBrandModelVo>> getUnitDictBrandModelPage(@RequestBody @Valid UnitDictBrandModelPageDto unitDictBrandModelPageDto) {
+        Page<UnitDictBrandModelVo> page = unitDictConstantsService.getUnitDictBrandModelPage(unitDictBrandModelPageDto);
+        return ResultResp.SUCCESS(page);
+    }
+
+
+
+
+
+
+
+
+}

+ 29 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictBrandModelDto.java

@@ -0,0 +1,29 @@
+package com.energy.manage.service.domain.dto.units;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@ApiModel("创建部件品牌参数")
+public class UnitDictBrandModelDto {
+
+    // 部件类型
+    @ApiModelProperty("部件类型")
+    private String unitType;
+
+    //  品牌
+    @ApiModelProperty("品牌")
+    private String manufacture;
+
+    //  型号
+    @ApiModelProperty("型号")
+    private  String modelNumber;
+
+    //  描述
+    @ApiModelProperty("描述")
+    private  String description;
+
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictBrandModelIdDto.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.domain.dto.units;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@ApiModel("删除部件品牌参数")
+public class UnitDictBrandModelIdDto {
+
+    @ApiModelProperty("主键")
+    private Integer id;
+
+}

+ 28 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictBrandModelPageDto.java

@@ -0,0 +1,28 @@
+package com.energy.manage.service.domain.dto.units;
+
+import com.energy.manage.service.domain.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@ApiModel("风机部件品牌分页参数")
+public class UnitDictBrandModelPageDto extends BaseDto {
+
+    /**
+     * 部件类型(字典表):1..轴承2.润滑油3.冷却方式
+     */
+    @ApiModelProperty("部件类型")
+    private Integer contentsDictKey;
+
+    //品牌
+    @ApiModelProperty("品牌")
+    private String manufacture;
+
+    //型号
+    @ApiModelProperty("型号")
+    private  String modelNumber;
+
+}

+ 32 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictBrandModelUpdateDto.java

@@ -0,0 +1,32 @@
+package com.energy.manage.service.domain.dto.units;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@ApiModel("更新风机部件品牌参数")
+public class UnitDictBrandModelUpdateDto {
+
+
+    @ApiModelProperty("主键")
+    private Integer id;
+
+    // 部件类型
+    @ApiModelProperty("部件类型")
+    private String unitType;
+
+    //  品牌
+    @ApiModelProperty("品牌")
+    private String manufacture;
+
+    //  型号
+    @ApiModelProperty("型号")
+    private String modelNumber;
+
+    //  描述
+    @ApiModelProperty("描述")
+    private String description;
+}

+ 33 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictConstantsDelDto.java

@@ -0,0 +1,33 @@
+package com.energy.manage.service.domain.dto.units;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ApiModel("风机部件字典删除参数")
+public class UnitDictConstantsDelDto {
+
+    /**
+     * 主键编号
+     */
+    @ApiModelProperty("主键id")
+    @NotNull(message = "主键id不能为空")
+    private Integer id;
+
+
+    // 字典/属性类型编号
+    @ApiModelProperty("字典/属性类型编号")
+    @NotNull(message = "字典/属性类型编号不能为空")
+    private String contentsType;
+
+
+    @ApiModelProperty(value = "修改人")
+    private Integer updateBy;
+
+}

+ 62 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictConstantsDto.java

@@ -0,0 +1,62 @@
+package com.energy.manage.service.domain.dto.units;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ApiModel("风机部件字典创建参数")
+public class UnitDictConstantsDto {
+
+    // 父级ID,当创建字典时传0 , 当创建属性值时传对应父节点对应id
+    @ApiModelProperty("父级ID,当创建字典时传0 , 当创建属性值时传对应父节点对应id")
+    @NotNull(message = "部件字典层级不能为空")
+    private Long parentId;
+
+    /**
+     * 部件类型(字典表):1..轴承2.润滑油3.冷却方式
+     */
+    @ApiModelProperty(" 部件类型(字典表):1.轴承2.润滑油3.冷却方式")
+    @NotNull(message = "部件类型不能为空")
+    private Integer contentsDictKey;
+
+    // 字典名称/属性名称
+    @ApiModelProperty("字典名称/属性名称")
+    @NotNull(message = "字典名称/属性名称不能为空")
+    private String contentsName;
+
+    // 字典或属性对应值
+    private Integer contentsValue;
+
+    // 字典/属性类型编号
+    private String contentsType;
+
+    /**
+     * 部件模块编号1.主轴2.齿轮箱3.发电机
+     */
+    @ApiModelProperty("部件模块编号1.主轴2.齿轮箱3.发电机")
+    @NotNull(message = "部件模块不能为空")
+    private Integer unitModule;
+
+    /**
+     * 关联功能(0.普通字典模式1.品牌型号)
+     */
+    @ApiModelProperty("关联功能")
+    private Integer associatedFunctionType = 0;
+
+    // 描述
+    private String contentsDescribe;
+
+    @ApiModelProperty(value = "创建人")
+    private Integer createBy;
+
+    @ApiModelProperty(value = "修改人")
+    private Integer updateBy;
+
+
+}

+ 19 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictConstantsListDto.java

@@ -0,0 +1,19 @@
+package com.energy.manage.service.domain.dto.units;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ApiModel("风机部件字典(属性)集合参数")
+public class UnitDictConstantsListDto {
+
+    // 字典/属性类型编号
+    @ApiModelProperty("字典/属性类型编号")
+    @NotNull(message = "字典/属性类型编号不能为空")
+    private String contentsType;
+}

+ 26 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictConstantsPDelDto.java

@@ -0,0 +1,26 @@
+package com.energy.manage.service.domain.dto.units;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ApiModel("风机部件字典(属性)删除参数")
+public class UnitDictConstantsPDelDto {
+
+
+    /**
+     * 主键编号
+     */
+    @ApiModelProperty(value = "主键")
+    @NotNull(message = "字典名称/属性名称不能为空")
+    private Integer id;
+
+    @ApiModelProperty(value = "修改人")
+    private Integer updateBy;
+
+}

+ 19 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictConstantsPageDto.java

@@ -0,0 +1,19 @@
+package com.energy.manage.service.domain.dto.units;
+
+
+import com.energy.manage.service.domain.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@ApiModel("风机部件字典分页参数")
+public class UnitDictConstantsPageDto  extends BaseDto {
+
+
+    // 字典名称/属性名称
+    private String contentsName;
+
+
+}

+ 30 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictConstantsUpdateDto.java

@@ -0,0 +1,30 @@
+package com.energy.manage.service.domain.dto.units;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ApiModel("风机部件(字典/属性)更新参数")
+public class UnitDictConstantsUpdateDto {
+
+    // 主键id
+    @ApiModelProperty("主键id")
+    @NotNull(message = "主键id不能为空")
+    private Integer id;
+
+    // 字典名称/属性名称
+    @ApiModelProperty("字典名称/属性名称")
+    @NotNull(message = "字典名称/属性名称不能为空")
+    private String contentsName;
+
+    @ApiModelProperty(value = "修改人")
+    private Integer updateBy;
+
+
+}

+ 28 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/units/UnitDictBrandModelVo.java

@@ -0,0 +1,28 @@
+package com.energy.manage.service.domain.vo.units;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+@ApiModel("风机部件品牌型号分页查询")
+public class UnitDictBrandModelVo {
+
+
+    @ApiModelProperty("主键id")
+    private Integer id;
+
+    //品牌
+    @ApiModelProperty("品牌")
+    private String manufacture;
+
+    //型号
+    @ApiModelProperty("型号")
+    private  String modelNumber;
+
+
+
+}

+ 89 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/units/UnitDictConstantsVo.java

@@ -0,0 +1,89 @@
+package com.energy.manage.service.domain.vo.units;
+
+import com.energy.manage.service.domain.dto.BaseDto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * 分页查询
+ */
+@Getter
+@Setter
+@ApiModel("风机部件字典分页查询")
+public class UnitDictConstantsVo {
+
+    // 主键id
+    @ApiModelProperty("主键id")
+    private Integer id;
+
+    // 父级ID,当创建字典时传0 , 当创建属性值时传对应父节点对应id
+    @ApiModelProperty("父级ID,当创建字典时传0 , 当创建属性值时传对应父节点对应id")
+    private Long parentId;
+
+    /**
+     * 部件类型(字典表):1..轴承2.润滑油3.冷却方式
+     */
+    @ApiModelProperty(" 部件类型(字典表):1.轴承2.润滑油3.冷却方式")
+    @NotNull(message = "部件类型不能为空")
+    private Integer contentsDictKey;
+
+    // 字典名称/属性名称
+    @ApiModelProperty("字典名称/属性名称")
+    private String contentsName;
+
+    // 字典或属性对应值
+    @ApiModelProperty("字典或属性对应值")
+    private Integer contentsValue;
+
+    // 字典/属性类型编号
+    @ApiModelProperty("字典/属性类型编号")
+    private String contentsType;
+
+    /**
+     * 部件模块编号1.主轴2.齿轮箱3.发电机
+     */
+    @ApiModelProperty("部件模块编号")
+    private Integer unitModule;
+
+    @ApiModelProperty("部件模块名称")
+    private String unitModuleName;
+
+    /**
+     * 关联功能(0.普通字典模式1.品牌型号)
+     */
+    @ApiModelProperty("关联功能")
+    private Integer associatedFunctionType;
+
+    @ApiModelProperty("关联功能名称")
+    private String associatedFunctionTypeName;
+
+    // 描述
+    private String contentsDescribe;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date updateTime;
+
+
+
+
+
+
+}

+ 17 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitBearingsMapper.java

@@ -0,0 +1,17 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitBearingsPO;
+import org.springframework.stereotype.Repository;
+import tk.mybatis.mapper.common.BaseMapper;
+
+/**
+ * 主轴承部件表 主轴承部件表
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitBearingsMapper extends MyMapper<UnitBearingsPO> {
+
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitBrakeSystemMapper.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitBrakeSystemPO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 制动系统 
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitBrakeSystemMapper extends MyMapper<UnitBrakeSystemPO> {
+
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitControlSystemMapper.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitControlSystemPO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 部件控制系统 
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitControlSystemMapper extends MyMapper<UnitControlSystemPO> {
+
+}

+ 10 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitDictBrandModelMapper.java

@@ -0,0 +1,10 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitDictBrandModelPO;
+import com.energy.manage.common.po.units.UnitDictConstantsPO;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UnitDictBrandModelMapper extends MyMapper<UnitDictBrandModelPO> {
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitDictConstantsMapper.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitDictConstantsPO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 部件带子集树结构的字典表
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitDictConstantsMapper extends MyMapper<UnitDictConstantsPO> {
+
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitDynamoMapper.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitDynamoPO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 发电机部件详情表 发电机部件详情表
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitDynamoMapper extends MyMapper<UnitDynamoPO> {
+
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitGantryMapper.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitGantryPO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 塔架部件表 塔架部件表
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitGantryMapper extends MyMapper<UnitGantryPO> {
+
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitGearboxMapper.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitGearboxPO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 齿轮箱部件表 齿轮箱部件表
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitGearboxMapper extends MyMapper<UnitGearboxPO> {
+
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitGearboxSpecificationMapper.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitGearboxSpecificationPO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 齿轮箱行星轮结构 
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitGearboxSpecificationMapper extends MyMapper<UnitGearboxSpecificationPO> {
+
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitGearboxSpurGearSpecificationMapper.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitGearboxSpurGearSpecificationPO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 齿轮箱平行轮 
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitGearboxSpurGearSpecificationMapper extends MyMapper<UnitGearboxSpurGearSpecificationPO> {
+
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitLightningProtectionMapper.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitLightningProtectionPO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 防雷保护 
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitLightningProtectionMapper extends MyMapper<UnitLightningProtectionPO> {
+
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitNodeMapper.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitNodePO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 部件节点信息表 部件节点信息表
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitNodeMapper extends MyMapper<UnitNodePO> {
+
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitTransducerMapper.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitTransducerPO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 变频器 
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitTransducerMapper extends MyMapper<UnitTransducerPO> {
+
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitVariablePitchSystemMapper.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitVariablePitchSystemPO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 变桨距系统 变桨距系统
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitVariablePitchSystemMapper extends MyMapper<UnitVariablePitchSystemPO> {
+
+}

+ 17 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitWindTurbineMapper.java

@@ -0,0 +1,17 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitWindTurbinePO;
+import org.springframework.stereotype.Repository;
+import tk.mybatis.mapper.common.BaseMapper;
+
+/**
+ * 风轮 风轮
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitWindTurbineMapper extends MyMapper<UnitWindTurbinePO> {
+
+}

+ 16 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/units/UnitYawSystemMapper.java

@@ -0,0 +1,16 @@
+package com.energy.manage.service.mappers.units;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.units.UnitYawSystemPO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 偏航系统 
+ * 
+ * @author sy
+ * @date 2024-11-05 17:37:45
+ */
+@Repository
+public interface UnitYawSystemMapper extends MyMapper<UnitYawSystemPO> {
+
+}

+ 2 - 0
energy-manage-service/src/main/java/com/energy/manage/service/service/cache/CacheService.java

@@ -16,4 +16,6 @@ public interface CacheService {
     void delete(String key);
 
     Long incr(String key);
+
+    Long incrBy(String key,long value);
 }

+ 8 - 0
energy-manage-service/src/main/java/com/energy/manage/service/service/cache/impl/CacheServiceImpl.java

@@ -92,5 +92,13 @@ public class CacheServiceImpl implements CacheService {
 
     }
 
+    @Override
+    public Long incrBy(String key,long value) {
+
+        return redisTemplate.execute(
+                (RedisCallback<Long>) connection -> connection.incrBy(redisTemplate.getStringSerializer().serialize(key),value));
+
+    }
+
 
 }

+ 121 - 0
energy-manage-service/src/main/java/com/energy/manage/service/service/units/UnitDictConstantsService.java

@@ -0,0 +1,121 @@
+package com.energy.manage.service.service.units;
+
+
+import com.energy.manage.common.base.Page;
+import com.energy.manage.service.domain.dto.units.*;
+import com.energy.manage.service.domain.vo.units.UnitDictBrandModelVo;
+import com.energy.manage.service.domain.vo.units.UnitDictConstantsVo;
+
+import java.util.List;
+
+/**
+ * 部件字典表接口
+ */
+public interface UnitDictConstantsService  {
+
+
+    /**
+     * 创建数据字典
+     * @param unitDictConstantsDto
+     * @return
+     */
+    boolean saveUnitDict(UnitDictConstantsDto unitDictConstantsDto);
+
+    /**
+     * 更新数据字典
+     * @param unitDictConstantsUpdateDto
+     * @return
+     */
+    boolean updateUnitDict(UnitDictConstantsUpdateDto unitDictConstantsUpdateDto);
+
+
+    /**
+     * 删除数据字典
+     * @param unitDictConstantsDelDto
+     * @return
+     */
+    boolean delUnitDict(UnitDictConstantsDelDto unitDictConstantsDelDto);
+
+
+
+
+    /**
+     * 部件字典分页列表,通过名字查询
+     * @return
+     */
+    Page<UnitDictConstantsVo> getUnitDictConstantsPage(UnitDictConstantsPageDto unitDictConstantsPageDto);
+
+
+    /**
+     * 创建部件属性数据
+     * @return
+     */
+    boolean saveUnitDictProperty(UnitDictConstantsDto unitDictConstantsDto);
+
+
+    /**
+     * 删除字典属性
+     * @param unitDictConstantsPDelDto
+     * @return
+     */
+    boolean delUnitDictProperty(UnitDictConstantsPDelDto unitDictConstantsPDelDto);
+
+
+    /**
+     * 更新字典属性名字
+     * @param unitDictConstantsUpdateDto
+     * @return
+     */
+    boolean updateUnitDictProperty(UnitDictConstantsUpdateDto unitDictConstantsUpdateDto);
+
+
+    /**
+     * 字典属性集合
+     * @param contentsType
+     * @return
+     */
+    List<UnitDictConstantsVo> getUnitDictConstantsList(String contentsType);
+
+
+    /**
+     * 通过主键id查询字典对象
+     * @param id
+     * @return
+     */
+    UnitDictConstantsVo getUnitDictConstants(Integer id);
+
+
+    /**
+     * 查询品牌型号分页查询
+     * @param unitDictBrandModelPageDto
+     * @return
+     */
+    Page<UnitDictBrandModelVo>  getUnitDictBrandModelPage(UnitDictBrandModelPageDto unitDictBrandModelPageDto);
+
+    /**
+     * 创建部件品牌型号
+     * @param unitDictBrandModelDto
+     * @return
+     */
+    boolean saveUnitDictBrandModel(UnitDictBrandModelDto unitDictBrandModelDto);
+
+    /**
+     * 更新部件品牌型号
+     * @param unitDictBrandModelUpdateDto
+     * @return
+     */
+    boolean updateUnitDictBrandModel(UnitDictBrandModelUpdateDto unitDictBrandModelUpdateDto);
+
+    /**
+     * 删除部件品牌型号
+     * @param unitDictBrandModelIdDto
+     * @return
+     */
+    boolean delUnitDictBrandModel(UnitDictBrandModelIdDto unitDictBrandModelIdDto);
+
+
+
+
+
+
+}

+ 263 - 0
energy-manage-service/src/main/java/com/energy/manage/service/service/units/impl/UnitDictConstantsServiceImpl.java

@@ -0,0 +1,263 @@
+package com.energy.manage.service.service.units.impl;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.energy.manage.common.base.BaseServiceImpl;
+import com.energy.manage.common.base.Page;
+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.units.UnitDictBrandModelPO;
+import com.energy.manage.common.po.units.UnitDictConstantsPO;
+import com.energy.manage.common.util.IdGeneratorUtil;
+import com.energy.manage.service.domain.dto.units.*;
+import com.energy.manage.service.domain.vo.units.UnitDictBrandModelVo;
+import com.energy.manage.service.domain.vo.units.UnitDictConstantsVo;
+import com.energy.manage.service.mappers.units.UnitDictBrandModelMapper;
+import com.energy.manage.service.mappers.units.UnitDictConstantsMapper;
+import com.energy.manage.service.service.cache.CacheService;
+import com.energy.manage.service.service.dict.DictConstantsService;
+import com.energy.manage.service.service.units.UnitDictConstantsService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 部件字典表接口
+ */
+@Slf4j
+@Service
+public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConstantsPO> implements UnitDictConstantsService {
+
+    @Autowired
+    private UnitDictConstantsMapper dictConstantsMapper;
+
+    @Autowired
+    private CacheService cacheService;
+
+    @Autowired
+    private DictConstantsService dictConstantsService;
+
+    @Autowired
+    private UnitDictBrandModelMapper unitDictBrandModelMapper;
+
+    // 定义字典中部件模块类型
+    private  final  int unit_module_number  = 3;
+
+    // 定义字典中部件类型
+    private  final  int associated_function_type_number  = 5;
+
+    @Override
+    public boolean saveUnitDict(UnitDictConstantsDto unitDictConstantsDto) {
+
+        UnitDictConstantsPO unitDictConstantsPO = new UnitDictConstantsPO();
+        BeanUtil.copyProperties(unitDictConstantsDto, unitDictConstantsPO);
+        unitDictConstantsPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
+        String contentsTypeCode = IdPrefixEnum.UNIT_DICT_TYPE_CODE.getCode().concat(IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.UNIT_DICT_TYPE_CODE.getCode()))));
+
+        // 初始化字典值
+        long contentsValue = 0;
+        UnitDictConstantsPO po = new UnitDictConstantsPO();
+        po.setParentId(0L);
+        int count = dictConstantsMapper.selectCount(po);
+        if (count == 0) {
+            contentsValue = cacheService.incrBy(ManagerRedisKeyConstant.IDGENERATOR_UDTC_KEY, 1000L);
+        }
+        contentsValue = cacheService.incr(ManagerRedisKeyConstant.IDGENERATOR_UDTC_KEY);
+
+        unitDictConstantsPO.setContentsValue(Integer.valueOf(String.valueOf(contentsValue)));
+        unitDictConstantsPO.setContentsType(contentsTypeCode);
+        unitDictConstantsPO.setCreateTime(new Date());
+        unitDictConstantsPO.setUpdateTime(new Date());
+
+        return dictConstantsMapper.insertUseGeneratedKeys(unitDictConstantsPO) > 0 ;
+    }
+
+    @Override
+    public boolean updateUnitDict(UnitDictConstantsUpdateDto unitDictConstantsUpdateDto) {
+
+        UnitDictConstantsPO po = new UnitDictConstantsPO();
+        po.setContentsName(unitDictConstantsUpdateDto.getContentsName());
+        po.setUpdateTime(new Date());
+        po.setUpdateBy(unitDictConstantsUpdateDto.getUpdateBy());
+        Example queryExample = new Example(UnitDictConstantsPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("id", unitDictConstantsUpdateDto.getId());
+        return dictConstantsMapper.updateByExampleSelective(po, queryExample) > 0;
+    }
+
+    @Override
+    public boolean delUnitDict(UnitDictConstantsDelDto unitDictConstantsDelDto) {
+        UnitDictConstantsPO po = new UnitDictConstantsPO();
+        po.setDelState(DeleteStatusEnum.DELETE.getCode());
+        po.setUpdateTime(new Date());
+        po.setUpdateBy(unitDictConstantsDelDto.getUpdateBy());
+        Example queryExample = new Example(UnitDictConstantsPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        // 当删除字典时同类型属性也删除
+        criteria.andEqualTo("contentsType", unitDictConstantsDelDto.getContentsType());
+        return dictConstantsMapper.updateByExampleSelective(po, queryExample) > 0;
+    }
+
+    @Override
+    public Page<UnitDictConstantsVo> getUnitDictConstantsPage(UnitDictConstantsPageDto unitDictConstantsPageDto) {
+
+        PageHelper.startPage(unitDictConstantsPageDto.getPageNum(), unitDictConstantsPageDto.getPageSize());
+        Example queryExample = new Example(UnitDictConstantsPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        if (!StringUtils.isEmpty(unitDictConstantsPageDto.getContentsName())) {
+            criteria.andLike("contentsName", "%" + unitDictConstantsPageDto.getContentsName() + "%");
+        }
+
+        criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
+        criteria.andEqualTo("parentId", 0);
+        List<UnitDictConstantsPO> list = dictConstantsMapper.selectByExample(queryExample);
+
+        UnitDictConstantsVo vo = null;
+        List<UnitDictConstantsVo> unitDictConstantsVoArrayList = Lists.newArrayList();
+        for (UnitDictConstantsPO po : list) {
+            vo = new UnitDictConstantsVo();
+            BeanUtil.copyProperties(po, vo);
+            vo.setUnitModuleName(dictConstantsService.getDictConstantsMap(this.unit_module_number).get(po.getUnitModule()));
+            vo.setAssociatedFunctionTypeName(dictConstantsService.getDictConstantsMap(this.associated_function_type_number).get(po.getAssociatedFunctionType()));
+            unitDictConstantsVoArrayList.add(vo);
+        }
+
+        Long total = org.apache.commons.collections.CollectionUtils.isEmpty(list) ? 0L : new PageInfo<>(list).getTotal();
+        return Page.build(unitDictConstantsPageDto.getPageNum(), unitDictConstantsPageDto.getPageSize(), total, unitDictConstantsVoArrayList);
+    }
+
+    @Override
+    public boolean saveUnitDictProperty(UnitDictConstantsDto unitDictConstantsDto) {
+
+        UnitDictConstantsPO unitDictConstantsPO = new UnitDictConstantsPO();
+        BeanUtil.copyProperties(unitDictConstantsDto, unitDictConstantsPO);
+        unitDictConstantsPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
+
+        // 初始化字典值
+       long contentsValue = cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_UDPC_KEY, unitDictConstantsDto.getContentsType()));
+
+        unitDictConstantsPO.setContentsValue(Integer.valueOf(String.valueOf(contentsValue)));
+        unitDictConstantsPO.setCreateTime(new Date());
+        unitDictConstantsPO.setUpdateTime(new Date());
+
+        return dictConstantsMapper.insertUseGeneratedKeys(unitDictConstantsPO) > 0 ;
+    }
+
+    @Override
+    public boolean delUnitDictProperty(UnitDictConstantsPDelDto unitDictConstantsPDelDto) {
+
+        UnitDictConstantsPO po = new UnitDictConstantsPO();
+        po.setDelState(DeleteStatusEnum.DELETE.getCode());
+        po.setUpdateTime(new Date());
+        po.setUpdateBy(unitDictConstantsPDelDto.getUpdateBy());
+        Example queryExample = new Example(UnitDictConstantsPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("id", unitDictConstantsPDelDto.getId());
+        return dictConstantsMapper.updateByExampleSelective(po, queryExample) > 0;
+
+    }
+
+
+    @Override
+    public boolean updateUnitDictProperty(UnitDictConstantsUpdateDto unitDictConstantsUpdateDto) {
+
+        UnitDictConstantsPO po = new UnitDictConstantsPO();
+        po.setContentsName(unitDictConstantsUpdateDto.getContentsName());
+        po.setUpdateTime(new Date());
+        po.setUpdateBy(unitDictConstantsUpdateDto.getUpdateBy());
+        Example queryExample = new Example(UnitDictConstantsPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("id", unitDictConstantsUpdateDto.getId());
+        return dictConstantsMapper.updateByExampleSelective(po, queryExample) > 0;
+    }
+
+
+    @Override
+    public List<UnitDictConstantsVo> getUnitDictConstantsList(String contentsType) {
+        Example queryExample = new Example(UnitDictConstantsPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
+        criteria.andEqualTo("contentsType", contentsType);
+        criteria.andGreaterThan("parentId", 0);
+        List<UnitDictConstantsPO> list = dictConstantsMapper.selectByExample(queryExample);
+        UnitDictConstantsVo vo = null;
+        List<UnitDictConstantsVo> unitDictConstantsVoArrayList = Lists.newArrayList();
+        for (UnitDictConstantsPO po : list) {
+            vo = new UnitDictConstantsVo();
+            BeanUtil.copyProperties(po, vo);
+            unitDictConstantsVoArrayList.add(vo);
+        }
+        return unitDictConstantsVoArrayList;
+    }
+
+    @Override
+    public UnitDictConstantsVo getUnitDictConstants(Integer id) {
+        UnitDictConstantsVo vo = new UnitDictConstantsVo();
+        UnitDictConstantsPO po =  dictConstantsMapper.selectByPrimaryKey(id);
+        BeanUtil.copyProperties(po,vo);
+        return vo;
+    }
+
+    @Override
+    public Page<UnitDictBrandModelVo> getUnitDictBrandModelPage(UnitDictBrandModelPageDto unitDictBrandModelPageDto) {
+
+        PageHelper.startPage(unitDictBrandModelPageDto.getPageNum(), unitDictBrandModelPageDto.getPageSize());
+        Example queryExample = new Example(UnitDictBrandModelPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        if (!StringUtils.isEmpty(unitDictBrandModelPageDto.getManufacture())) {
+            criteria.andLike("manufacture", "%" + unitDictBrandModelPageDto.getManufacture() + "%");
+        }
+        if (!StringUtils.isEmpty(unitDictBrandModelPageDto.getModelNumber())) {
+            criteria.andLike("modelNumber", "%" + unitDictBrandModelPageDto.getModelNumber() + "%");
+        }
+        // 部件类型
+        criteria.andEqualTo("unitType", unitDictBrandModelPageDto.getContentsDictKey());
+        List<UnitDictBrandModelPO> list = unitDictBrandModelMapper.selectByExample(queryExample);
+
+        UnitDictBrandModelVo vo = null;
+        List<UnitDictBrandModelVo> unitDictBrandModelVos = Lists.newArrayList();
+        for (UnitDictBrandModelPO po : list) {
+            vo = new UnitDictBrandModelVo();
+            BeanUtil.copyProperties(po, vo);
+            unitDictBrandModelVos.add(vo);
+        }
+
+        Long total = org.apache.commons.collections.CollectionUtils.isEmpty(list) ? 0L : new PageInfo<>(list).getTotal();
+        return Page.build(unitDictBrandModelPageDto.getPageNum(), unitDictBrandModelPageDto.getPageSize(), total, unitDictBrandModelVos);
+    }
+
+    @Override
+    public boolean saveUnitDictBrandModel(UnitDictBrandModelDto unitDictBrandModelDto) {
+        UnitDictBrandModelPO po = new UnitDictBrandModelPO();
+        BeanUtil.copyProperties(unitDictBrandModelDto, po);
+        po.setCreateTime(new Date());
+        return  unitDictBrandModelMapper.insertUseGeneratedKeys(po)>0;
+    }
+
+    @Override
+    public boolean updateUnitDictBrandModel(UnitDictBrandModelUpdateDto unitDictBrandModelUpdateDto) {
+        UnitDictBrandModelPO po = new UnitDictBrandModelPO();
+        po.setManufacture(unitDictBrandModelUpdateDto.getManufacture());
+        po.setModelNumber(unitDictBrandModelUpdateDto.getModelNumber());
+        Example queryExample = new Example(UnitDictBrandModelPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("id", unitDictBrandModelUpdateDto.getId());
+        return unitDictBrandModelMapper.updateByExampleSelective(po, queryExample) > 0;
+    }
+
+    @Override
+    public boolean delUnitDictBrandModel(UnitDictBrandModelIdDto unitDictBrandModelIdDto) {
+        return unitDictBrandModelMapper.deleteByPrimaryKey(unitDictBrandModelIdDto.getId())>0;
+    }
+
+
+}

+ 2 - 6
energy-manage-service/src/test/java/client/SkfClientWebTest.java

@@ -71,7 +71,8 @@ public class SkfClientWebTest {
             }
         }
 
-        Integer pointId = 138;
+        Integer pointId = 128;
+
         List<String> xlist = Lists.newArrayList();
         xlist.add("7");
         xlist.add("8");
@@ -108,12 +109,7 @@ public class SkfClientWebTest {
                     createCsvFile(doubleList, "/Users/shiyue/Downloads/sdk_data/"+x+"month","/Users/shiyue/Downloads/sdk_data/"+x+"month/"+"SKF_F004_4#风机_" + utctolocal(dynamicMeasurementsVo.getReadingTimeUTC()) + "_" + name + "_" + dynamicMeasurementsVo.getSpeed() + "_cms.csv");
                 }
             }
-
         }
-
-
-
-
     }