Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/BoilerTechParamsDefine.java

@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 锅炉-技术参数定义
  *
@@ -19,51 +21,51 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "ratedEvaporationCapacityThermalPower", label = "额定蒸发量（热功率）", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "t/h(MW)")
-    private String ratedEvaporationCapacityThermalPower;
+    private BigDecimal ratedEvaporationCapacityThermalPower;
 
 
     @TechnicalParameter(key = "ratedWorkingPressure", label = "额定工作压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
-    private String ratedWorkingPressure;
+    private BigDecimal ratedWorkingPressure;
 
 
     @TechnicalParameter(key = "ratedOperatingTemperature", label = "额定工作温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
-    private String ratedOperatingTemperature;
+    private BigDecimal ratedOperatingTemperature;
 
 
     @TechnicalParameter(key = "designThermalEfficiency", label = "设计热效率", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "%")
-    private String designThermalEfficiency;
+    private BigDecimal designThermalEfficiency;
 
 
     @TechnicalParameter(key = "feedwaterTemperature", label = "给水温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
-    private String feedwaterTemperature;
+    private BigDecimal feedwaterTemperature;
 
 
     @TechnicalParameter(key = "ratedOutletReturnWaterOilTemperature", label = "额定出/回水(油)温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
-    private String ratedOutletReturnWaterOilTemperature;
+    private BigDecimal ratedOutletReturnWaterOilTemperature;
 
 
     @TechnicalParameter(key = "waterOilVolumeOfBoilerProper", label = "锅炉本体水（油）容积", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "L")
-    private String waterOilVolumeOfBoilerProper;
+    private BigDecimal waterOilVolumeOfBoilerProper;
 
 
     @TechnicalParameter(key = "hydraulicTestMediumPressureOfPackagedBoilerBody", label = "整装锅炉本体液压试验介质/压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
-    private String hydraulicTestMediumPressureOfPackagedBoilerBody;
+    private BigDecimal hydraulicTestMediumPressureOfPackagedBoilerBody;
 
 
     @TechnicalParameter(key = "inletOutletTemperatureOfReheater", label = "再热器进（出）口温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
-    private String inletOutletTemperatureOfReheater;
+    private BigDecimal inletOutletTemperatureOfReheater;
 
 
     @TechnicalParameter(key = "reheaterInletOutletPressure", label = "再热器进（出）口压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
-    private String reheaterInletOutletPressure;
+    private BigDecimal reheaterInletOutletPressure;
 
 
     @TechnicalParameter(key = "reheatSteamFlow", label = "再热蒸汽流量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "t/h")
-    private String reheatSteamFlow;
+    private BigDecimal reheatSteamFlow;
 
 
     @TechnicalParameter(key = "glAirtightTest", label = "有机热载体锅炉气密试验介质/压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
-    private String glAirtightTest;
+    private BigDecimal glAirtightTest;
 
 
     @TechnicalParameter(key = "fuelType", label = "燃料（热源）种类", type = TechnicalParameter.ParamType.STRING, dictCode = "GLZL")
@@ -79,7 +81,7 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "wallThicknessOfPressureParts", label = "受压部件壁厚", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
-    private String wallThicknessOfPressureParts;
+    private BigDecimal wallThicknessOfPressureParts;
 
 
     @TechnicalParameter(key = "nonDestructiveTestingMethodsForPressureParts", label = "受压部件无损检测方法", type = TechnicalParameter.ParamType.STRING, dictCode = "GLWSJCFF")
@@ -87,15 +89,15 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "proportionOfNdtForPressureParts", label = "受压部件无损检测比例", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "%")
-    private String proportionOfNdtForPressureParts;
+    private BigDecimal proportionOfNdtForPressureParts;
 
 
     @TechnicalParameter(key = "heatTreatmentTemperatureOfPressureParts", label = "受压部件热处理温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
-    private String heatTreatmentTemperatureOfPressureParts;
+    private BigDecimal heatTreatmentTemperatureOfPressureParts;
 
 
     @TechnicalParameter(key = "heatTreatmentTimeOfPressureParts", label = "受压部件热处理时间", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "h")
-    private String heatTreatmentTimeOfPressureParts;
+    private BigDecimal heatTreatmentTimeOfPressureParts;
 
 
     @TechnicalParameter(key = "hydrostaticTestMedium", label = "受压部件水（耐）压试验介质", type = TechnicalParameter.ParamType.STRING)
@@ -103,7 +105,7 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "hydrostaticTestPressure", label = "受压部件水（耐）压试验压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
-    private String hydrostaticTestPressure;
+    private BigDecimal hydrostaticTestPressure;
 
 
     @TechnicalParameter(key = "combustionMode", label = "燃烧方式", type = TechnicalParameter.ParamType.STRING)

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ElevatorTechParamDefine.java

@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 安全追溯-电梯
  *
@@ -16,31 +18,31 @@ public class ElevatorTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "ratedSpeedUp", label = "额定速度(上行)", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
-    private String ratedSpeedUp;
+    private BigDecimal ratedSpeedUp;
 
 
     @TechnicalParameter(key = "ratedSpeedDown", label = "额定速度(下行)", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
-    private String ratedSpeedDown;
+    private BigDecimal ratedSpeedDown;
 
 
     @TechnicalParameter(key = "ratedLoadCapacity", label = "额定载重量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "kg")
-    private String ratedLoadCapacity;
+    private BigDecimal ratedLoadCapacity;
 
 
     @TechnicalParameter(key = "liftingHeight", label = "提升高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String liftingHeight;
+    private BigDecimal liftingHeight;
 
 
     @TechnicalParameter(key = "deviceLevel", label = "层数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "层")
-    private Integer deviceLevel;
+    private BigDecimal deviceLevel;
 
 
     @TechnicalParameter(key = "stand", label = "站数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "站")
-    private Integer stand;
+    private BigDecimal stand;
 
 
     @TechnicalParameter(key = "numberDoors", label = "门数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "门数")
-    private Integer numberDoors;
+    private BigDecimal numberDoors;
 
 
     @TechnicalParameter(key = "controlMode", label = "控制方式", type = TechnicalParameter.ParamType.STRING, dictCode = "DSXS")
@@ -48,7 +50,7 @@ public class ElevatorTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "numberCylinders", label = "油缸数量", type = TechnicalParameter.ParamType.BIG_DECIMAL)
-    private Integer numberCylinders;
+    private BigDecimal numberCylinders;
 
 
     @TechnicalParameter(key = "jackingType", label = "顶升方式", type = TechnicalParameter.ParamType.STRING, dictCode = "DSXS")
@@ -64,22 +66,22 @@ public class ElevatorTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "nominalSpeed", label = "名义速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
-    private String nominalSpeed;
+    private BigDecimal nominalSpeed;
 
 
     @TechnicalParameter(key = "nominalWidth", label = "名义宽度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
-    private String nominalWidth;
+    private BigDecimal nominalWidth;
 
     @TechnicalParameter(key = "angleRoll", label = "倾斜角", type = TechnicalParameter.ParamType.BIG_DECIMAL)
-    private String angleRoll;
+    private BigDecimal angleRoll;
 
 
     @TechnicalParameter(key = "useSectionLength", label = "使用区段长度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String useSectionLength;
+    private BigDecimal useSectionLength;
 
 
     @TechnicalParameter(key = "conveyingCapacity", label = "输送能力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "P/h")
-    private String conveyingCapacity;
+    private BigDecimal conveyingCapacity;
 
 
     @TechnicalParameter(key = "doorPosition", label = "轿门位置", type = TechnicalParameter.ParamType.STRING)
@@ -87,5 +89,5 @@ public class ElevatorTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "ratedSpeed", label = "额定速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
-    private String ratedSpeed;
+    private BigDecimal ratedSpeed;
 }

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/LiftingTechParamDefine.java

@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 安全追溯-起重机械
  *
@@ -15,27 +17,27 @@ import lombok.Data;
 public class LiftingTechParamDefine implements ITechParamDefine {
 
     @TechnicalParameter(key = "ratedLiftingCapacity", label = "额定起重量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "t")
-    private String ratedLiftingCapacity;
+    private BigDecimal ratedLiftingCapacity;
 
 
     @TechnicalParameter(key = "maxLiftingCapacity", label = "最大起重量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "t")
-    private String maxLiftingCapacity;
+    private BigDecimal maxLiftingCapacity;
 
 
     @TechnicalParameter(key = "maxLiftingTorque", label = "最大起重力矩", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "KN.m")
-    private String maxLiftingTorque;
+    private BigDecimal maxLiftingTorque;
 
 
     @TechnicalParameter(key = "spanWorkingRange", label = "跨度（工作幅度）", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String spanWorkingRange;
+    private BigDecimal spanWorkingRange;
 
 
     @TechnicalParameter(key = "liftingSpeed", label = "起升速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
-    private String liftingSpeed;
+    private BigDecimal liftingSpeed;
 
 
     @TechnicalParameter(key = "liftingHeight", label = "起升高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String liftingHeight;
+    private BigDecimal liftingHeight;
 
 
     @TechnicalParameter(key = "workLevel", label = "工作级别", type = TechnicalParameter.ParamType.STRING, dictCode = "GZJB")
@@ -43,59 +45,59 @@ public class LiftingTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "ratedLiftingTorque", label = "额定起重力矩", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "KN.m")
-    private String ratedLiftingTorque;
+    private BigDecimal ratedLiftingTorque;
 
 
     @TechnicalParameter(key = "numberStorey", label = "层数/泊位数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "层")
-    private Integer numberStorey;
+    private BigDecimal numberStorey;
 
 
     @TechnicalParameter(key = "runningSpeed", label = "运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
-    private String runningSpeed;
+    private BigDecimal runningSpeed;
 
 
     @TechnicalParameter(key = "bigcarRunSpeed", label = "大车运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
-    private String bigcarRunSpeed;
+    private BigDecimal bigcarRunSpeed;
 
 
     @TechnicalParameter(key = "smallcarrunSpeed", label = "小车运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
-    private String smallcarrunSpeed;
+    private BigDecimal smallcarrunSpeed;
 
 
     @TechnicalParameter(key = "ratedMembers", label = "额定乘员数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "人")
-    private Integer ratedMembers;
+    private BigDecimal ratedMembers;
 
 
     @TechnicalParameter(key = "ratedLiftingSpeed", label = "额定提升速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
-    private String ratedLiftingSpeed;
+    private BigDecimal ratedLiftingSpeed;
 
 
     @TechnicalParameter(key = "heightFreeEnd", label = "自由端高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String heightFreeEnd;
+    private BigDecimal heightFreeEnd;
 
 
     @TechnicalParameter(key = "workStrokeCage", label = "吊笼工作行程", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String workStrokeCage;
+    private BigDecimal workStrokeCage;
 
 
     @TechnicalParameter(key = "storageCapacity", label = "存容量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "辆")
-    private Integer storageCapacity;
+    private BigDecimal storageCapacity;
 
 
     @TechnicalParameter(key = "ratedLiftSpeed", label = "额定升降速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
-    private String ratedLiftSpeed;
+    private BigDecimal ratedLiftSpeed;
 
 
     @TechnicalParameter(key = "ratedTraverseSpeed", label = "额定横移速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
-    private String ratedTraverseSpeed;
+    private BigDecimal ratedTraverseSpeed;
 
 
     @TechnicalParameter(key = "bicycleMaxExitTime", label = "单车最大进(出)车时间", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "s")
-    private String bicycleMaxExitTime;
+    private BigDecimal bicycleMaxExitTime;
 
 
     @TechnicalParameter(key = "bicycleMaxComeTime", label = "单车最大进车时间", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "s")
-    private String bicycleMaxComeTime;
+    private BigDecimal bicycleMaxComeTime;
 
 
     @TechnicalParameter(key = "explosionProofGrade", label = "区域防爆等级", type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
@@ -103,14 +105,14 @@ public class LiftingTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "cantileverLength", label = "悬臂长度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String cantileverLength;
+    private BigDecimal cantileverLength;
 
     @TechnicalParameter(key = "derrickingSpeed", label = "变幅速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
-    private String derrickingSpeed;
+    private BigDecimal derrickingSpeed;
 
 
     @TechnicalParameter(key = "hangingCagesNumber", label = "吊笼数量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "个")
-    private String hangingCagesNumber;
+    private BigDecimal hangingCagesNumber;
 
 
     @TechnicalParameter(key = "explosiveSubstance", label = "燃爆物质", type = TechnicalParameter.ParamType.STRING)
@@ -122,18 +124,18 @@ public class LiftingTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "ratedSpeedUp", label = "监检结束高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String ratedSpeedUp;
+    private BigDecimal ratedSpeedUp;
 
 
     @TechnicalParameter(key = "parkingVehicleHeight", label = "适停车辆尺寸高", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String parkingVehicleHeight;
+    private BigDecimal parkingVehicleHeight;
 
 
     @TechnicalParameter(key = "parkingVehicleWeight", label = "适停车辆尺寸宽", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String parkingVehicleWeight;
+    private BigDecimal parkingVehicleWeight;
 
 
     @TechnicalParameter(key = "parkingVehicleLength", label = "适停车辆尺寸长", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String parkingVehicleLength;
+    private BigDecimal parkingVehicleLength;
 
 }

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/PipelineTechParamDefine.java

@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 安全追溯-压力管道
  *
@@ -36,11 +38,11 @@ public class PipelineTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "pipeLength", label = "管道长度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private Double pipeLength;
+    private BigDecimal pipeLength;
 
 
     @TechnicalParameter(key = "pressure", label = "设计压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "Mpa")
-    private String pressure;
+    private BigDecimal pressure;
 
 
     @TechnicalParameter(key = "temperature", label = "设计温度", type = TechnicalParameter.ParamType.STRING)

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RidesTechParamDefine.java

@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 安全追溯-游乐设施
  *
@@ -16,46 +18,46 @@ public class RidesTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "trackHeight", label = "轨道高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String trackHeight;
+    private BigDecimal trackHeight;
 
 
     @TechnicalParameter(key = "runningSpeed", label = "运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "km/h (m/s)")
-    private String runningSpeed;
+    private BigDecimal runningSpeed;
 
 
     @TechnicalParameter(key = "numberOfPassengers", label = "乘坐人数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "人")
-    private Integer numberOfPassengers;
+    private BigDecimal numberOfPassengers;
 
 
     @TechnicalParameter(key = "slideLength", label = "滑道长度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String slideLength;
+    private BigDecimal slideLength;
 
 
     @TechnicalParameter(key = "operatingHeight", label = "运行高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String operatingHeight;
+    private BigDecimal operatingHeight;
 
 
     @TechnicalParameter(key = "slideHeight", label = "蹦极绳长度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String slideHeight;
+    private BigDecimal slideHeight;
 
 
     @TechnicalParameter(key = "rotaryDiameter", label = "回转直径", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String rotaryDiameter;
+    private BigDecimal rotaryDiameter;
 
 
     @TechnicalParameter(key = "unilateralSwingAngle", label = "单边摆角", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "°")
-    private String unilateralSwingAngle;
+    private BigDecimal unilateralSwingAngle;
 
 
     @TechnicalParameter(key = "numberOfVehicles", label = "车辆数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "个")
-    private Integer numberOfVehicles;
+    private BigDecimal numberOfVehicles;
 
 
     @TechnicalParameter(key = "dip", label = "倾角", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "°")
-    private String dip;
+    private BigDecimal dip;
 
 
     @TechnicalParameter(key = "equipmentHeight", label = "设备高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String equipmentHeight;
+    private BigDecimal equipmentHeight;
 
 }

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RopewayTechParamDefine.java

@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 安全追溯-索道
  *
@@ -15,15 +17,15 @@ import lombok.Data;
 public class RopewayTechParamDefine implements ITechParamDefine {
 
     @TechnicalParameter(key = "horizontalDistance", label = "平距", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String horizontalDistance;
+    private BigDecimal horizontalDistance;
 
 
     @TechnicalParameter(key = "supportsCount", label = "支架数目", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "座")
-    private Integer supportsCount;
+    private BigDecimal supportsCount;
 
 
     @TechnicalParameter(key = "obliqueLength", label = "斜长", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String obliqueLength;
+    private BigDecimal obliqueLength;
 
 
     @TechnicalParameter(key = "mainMotorModel", label = "主电机型式", type = TechnicalParameter.ParamType.STRING)
@@ -31,33 +33,33 @@ public class RopewayTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "mainMotorPower", label = "主电机功率", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "W")
-    private String mainMotorPower;
+    private BigDecimal mainMotorPower;
 
 
     @TechnicalParameter(key = "altitudeDifference", label = "高差", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String altitudeDifference;
+    private BigDecimal altitudeDifference;
 
 
     @TechnicalParameter(key = "freightVolume", label = "运量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "p/h")
-    private String freightVolume;
+    private BigDecimal freightVolume;
 
     @TechnicalParameter(key = "carrierLine", label = "运载索", type = TechnicalParameter.ParamType.STRING, dictCode = "YZS")
     private String carrierLine;
 
 
     @TechnicalParameter(key = "speed", label = "速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
-    private String speed;
+    private BigDecimal speed;
 
     @TechnicalParameter(key = "bearingCable", label = "承载索", type = TechnicalParameter.ParamType.STRING)
     private String bearingCable;
 
 
     @TechnicalParameter(key = "cablePitch", label = "索距", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
-    private String cablePitch;
+    private BigDecimal cablePitch;
 
 
     @TechnicalParameter(key = "oilPressureHeavyHammer", label = "张紧油压（重锤重量）", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
-    private String oilPressureHeavyHammer;
+    private BigDecimal oilPressureHeavyHammer;
 
 
     @TechnicalParameter(key = "numberAndTypeOfVehicles", label = "运载工具数量和类型", type = TechnicalParameter.ParamType.STRING)

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/VehicleTechParamDefine.java

@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 安全追溯-场内车辆
  *
@@ -24,7 +26,7 @@ public class VehicleTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "liftingCapacity", label = "额定起重量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "Kg")
-    private String liftingCapacity;
+    private BigDecimal liftingCapacity;
 
 
     @TechnicalParameter(key = "transmissionMode", label = "传动方式", type = TechnicalParameter.ParamType.STRING)
@@ -32,18 +34,18 @@ public class VehicleTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "weight", label = "自重", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "Kg")
-    private String weight;
+    private BigDecimal weight;
 
     @TechnicalParameter(key = "powerMode", label = "动力方式", type = TechnicalParameter.ParamType.STRING)
     private String powerMode;
 
 
     @TechnicalParameter(key = "maxRunningSpeed", label = "最大运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "km/h")
-    private String maxRunningSpeed;
+    private BigDecimal maxRunningSpeed;
 
 
     @TechnicalParameter(key = "maxLiftingHeight", label = "工作装置空载最大起升高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
-    private String maxLiftingHeight;
+    private BigDecimal maxLiftingHeight;
 
 
     @TechnicalParameter(key = "gasGroup", label = "气体/粉尘组别（防爆）", type = TechnicalParameter.ParamType.STRING)
@@ -59,7 +61,7 @@ public class VehicleTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "carryingIdlerMaxRunningSpeed", label = "空载最大运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "km/h")
-    private String carryingIdlerMaxRunningSpeed;
+    private BigDecimal carryingIdlerMaxRunningSpeed;
 
 
     @TechnicalParameter(key = "protectGrade", label = "设备保护等级（防爆）", type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
@@ -71,42 +73,42 @@ public class VehicleTechParamDefine implements ITechParamDefine {
 
 
     @TechnicalParameter(key = "passengersNumber", label = "额定载客人数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "人")
-    private Integer passengersNumber;
+    private BigDecimal passengersNumber;
 
 
     @TechnicalParameter(key = "maxDrivingSlope", label = "最大行驶坡度", type = TechnicalParameter.ParamType.BIG_DECIMAL)
-    private String maxDrivingSlope;
+    private BigDecimal maxDrivingSlope;
 
 
     @TechnicalParameter(key = "vehicleMass", label = "整车整备质量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "Kg")
-    private String vehicleMass;
+    private BigDecimal vehicleMass;
 
 
     @TechnicalParameter(key = "wheelBase", label = "轴距", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
-    private String wheelBase;
+    private BigDecimal wheelBase;
 
 
     @TechnicalParameter(key = "trackWidthFront", label = "轮距（前）", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
-    private String trackWidthFront;
+    private BigDecimal trackWidthFront;
 
 
     @TechnicalParameter(key = "trackWidthBehind", label = "轮距（后）", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
-    private String trackWidthBehind;
+    private BigDecimal trackWidthBehind;
 
 
     @TechnicalParameter(key = "carsNumber", label = "观光列车车厢数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "节")
-    private Integer carsNumber;
+    private BigDecimal carsNumber;
 
 
     @TechnicalParameter(key = "seatNumber", label = "观光列车每节车厢座位数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "个")
-    private Integer seatNumber;
+    private BigDecimal seatNumber;
 
 
     @TechnicalParameter(key = "tractorSeatNumber", label = "观光列车牵引车头座位数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "个")
-    private Integer tractorSeatNumber;
+    private BigDecimal tractorSeatNumber;
 
 
     @TechnicalParameter(key = "maxLiftingSpeed", label = "空载最大起升速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "km/h")
-    private String maxLiftingSpeed;
+    private BigDecimal maxLiftingSpeed;
 
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/UserRefreshHandler.java

@@ -6,23 +6,18 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.common.api.dao.EsUserInfoDao;
 import com.yeejoin.amos.boot.module.common.api.entity.EsUserInfo;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsDataRefreshMessage;
-import com.yeejoin.amos.boot.module.common.api.entity.TzsUserPermission;
 import com.yeejoin.amos.boot.module.common.api.service.IDataRefreshHandler;
 import com.yeejoin.amos.boot.module.common.biz.utils.RefreshDataUtils;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
-import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserPermissionMapper;
 import com.yeejoin.amos.boot.module.tcm.biz.refresh.CommonRefreshService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StopWatch;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Component
 @Slf4j
 @RequiredArgsConstructor
@@ -68,5 +63,4 @@ public class UserRefreshHandler implements IDataRefreshHandler {
         esUserInfo.setLicenses(commonRefreshService.buildUserLicenses(userInfo.getSequenceNbr()));
         esUserInfoDao.save(esUserInfo);
     }
-
 }