待办任务，队列数

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

@@ -12,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -45,4 +46,19 @@ public class UnitDictBrandModelPO {
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
+    // 滚动数量
+    private BigDecimal rollsNumber;
+
+    // 滚动直径
+    private BigDecimal rollsDiameter;
+
+    // 圆直径
+    private BigDecimal circleDiameter;
+
+    // 接触角
+    private BigDecimal thetaDeg;
+
+
+
+
 }

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

@@ -6,6 +6,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 @Getter
 @Setter
@@ -29,4 +30,21 @@ public class UnitDictBrandModelDto {
     @ApiModelProperty("描述")
     private  String description;
 
+
+    // 滚动数量
+    @ApiModelProperty("滚动数量")
+    private BigDecimal rollsNumber;
+
+    // 滚动直径
+    @ApiModelProperty("滚动直径")
+    private BigDecimal rollsDiameter;
+
+    // 圆直径
+    @ApiModelProperty("描圆直径述")
+    private BigDecimal circleDiameter;
+
+    // 接触角
+    @ApiModelProperty("接触角")
+    private BigDecimal thetaDeg;
+
 }

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

@@ -6,6 +6,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 @Getter
 @Setter
@@ -33,4 +34,20 @@ public class UnitDictBrandModelUpdateDto {
     //  描述
     @ApiModelProperty("描述")
     private String description;
+
+    // 滚动数量
+    @ApiModelProperty("滚动数量")
+    private BigDecimal rollsNumbe;
+
+    // 滚动直径
+    @ApiModelProperty("滚动直径")
+    private BigDecimal rollsDiameter;
+
+    // 圆直径
+    @ApiModelProperty("描圆直径述")
+    private BigDecimal circleDiameter;
+
+    // 接触角
+    @ApiModelProperty("接触角")
+    private BigDecimal thetaDeg;
 }

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 
 @Getter
 @Setter
@@ -23,6 +25,22 @@ public class UnitDictBrandModelVo {
     @ApiModelProperty("型号")
     private  String modelNumber;
 
+    // 滚动数量
+    @ApiModelProperty("滚动数量")
+    private BigDecimal rollsNumber;
+
+    // 滚动直径
+    @ApiModelProperty("滚动直径")
+    private BigDecimal rollsDiameter;
+
+    // 圆直径
+    @ApiModelProperty("描圆直径述")
+    private BigDecimal circleDiameter;
+
+    // 接触角
+    @ApiModelProperty("接触角")
+    private BigDecimal thetaDeg;
+
 
 
 }

energy-manage-service/src/main/resources/bootstrap.properties

@@ -1,4 +1,3 @@
-#大唐部署环境
 #============================nacos配置=========================================
 spring.cloud.nacos.config.server-addr = 192.168.50.234:8848
 spring.cloud.nacos.config.namespace = 79c42a7a-2c7d-4dcf-8a2c-b334271e2191