fix(jyjc): 报检规则4.0开发

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

@@ -20,51 +20,51 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
     private String deviceLevel;
 
 
-    @TechnicalParameter(key = "ratedEvaporationCapacityThermalPower", label = "额定蒸发量（热功率）", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "t/h(MW)")
+    @TechnicalParameter(key = "ratedEvaporationCapacityThermalPower", label = "额定蒸发量（热功率）", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "t/h(MW)")
     private BigDecimal ratedEvaporationCapacityThermalPower;
 
 
-    @TechnicalParameter(key = "ratedWorkingPressure", label = "额定工作压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
+    @TechnicalParameter(key = "ratedWorkingPressure", label = "额定工作压力", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "MPa")
     private BigDecimal ratedWorkingPressure;
 
 
-    @TechnicalParameter(key = "ratedOperatingTemperature", label = "额定工作温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
+    @TechnicalParameter(key = "ratedOperatingTemperature", label = "额定工作温度", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "℃")
     private BigDecimal ratedOperatingTemperature;
 
 
-    @TechnicalParameter(key = "designThermalEfficiency", label = "设计热效率", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "%")
+    @TechnicalParameter(key = "designThermalEfficiency", label = "设计热效率", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "%")
     private BigDecimal designThermalEfficiency;
 
 
-    @TechnicalParameter(key = "feedwaterTemperature", label = "给水温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
+    @TechnicalParameter(key = "feedwaterTemperature", label = "给水温度", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "℃")
     private BigDecimal feedwaterTemperature;
 
 
-    @TechnicalParameter(key = "ratedOutletReturnWaterOilTemperature", label = "额定出/回水(油)温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
+    @TechnicalParameter(key = "ratedOutletReturnWaterOilTemperature", label = "额定出/回水(油)温度", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "℃")
     private BigDecimal ratedOutletReturnWaterOilTemperature;
 
 
-    @TechnicalParameter(key = "waterOilVolumeOfBoilerProper", label = "锅炉本体水（油）容积", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "L")
+    @TechnicalParameter(key = "waterOilVolumeOfBoilerProper", label = "锅炉本体水（油）容积", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "L")
     private BigDecimal waterOilVolumeOfBoilerProper;
 
 
-    @TechnicalParameter(key = "hydraulicTestMediumPressureOfPackagedBoilerBody", label = "整装锅炉本体液压试验介质/压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
+    @TechnicalParameter(key = "hydraulicTestMediumPressureOfPackagedBoilerBody", label = "整装锅炉本体液压试验介质/压力", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "MPa")
     private BigDecimal hydraulicTestMediumPressureOfPackagedBoilerBody;
 
 
-    @TechnicalParameter(key = "inletOutletTemperatureOfReheater", label = "再热器进（出）口温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
+    @TechnicalParameter(key = "inletOutletTemperatureOfReheater", label = "再热器进（出）口温度", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "℃")
     private BigDecimal inletOutletTemperatureOfReheater;
 
 
-    @TechnicalParameter(key = "reheaterInletOutletPressure", label = "再热器进（出）口压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
+    @TechnicalParameter(key = "reheaterInletOutletPressure", label = "再热器进（出）口压力", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "MPa")
     private BigDecimal reheaterInletOutletPressure;
 
 
-    @TechnicalParameter(key = "reheatSteamFlow", label = "再热蒸汽流量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "t/h")
+    @TechnicalParameter(key = "reheatSteamFlow", label = "再热蒸汽流量", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "t/h")
     private BigDecimal reheatSteamFlow;
 
 
-    @TechnicalParameter(key = "glAirtightTest", label = "有机热载体锅炉气密试验介质/压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
+    @TechnicalParameter(key = "glAirtightTest", label = "有机热载体锅炉气密试验介质/压力", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "MPa")
     private BigDecimal glAirtightTest;
 
 
@@ -80,7 +80,7 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
     private String materialOfPressureParts;
 
 
-    @TechnicalParameter(key = "wallThicknessOfPressureParts", label = "受压部件壁厚", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
+    @TechnicalParameter(key = "wallThicknessOfPressureParts", label = "受压部件壁厚", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "mm")
     private BigDecimal wallThicknessOfPressureParts;
 
 
@@ -88,15 +88,15 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
     private String nonDestructiveTestingMethodsForPressureParts;
 
 
-    @TechnicalParameter(key = "proportionOfNdtForPressureParts", label = "受压部件无损检测比例", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "%")
+    @TechnicalParameter(key = "proportionOfNdtForPressureParts", label = "受压部件无损检测比例", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "%")
     private BigDecimal proportionOfNdtForPressureParts;
 
 
-    @TechnicalParameter(key = "heatTreatmentTemperatureOfPressureParts", label = "受压部件热处理温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
+    @TechnicalParameter(key = "heatTreatmentTemperatureOfPressureParts", label = "受压部件热处理温度", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "℃")
     private BigDecimal heatTreatmentTemperatureOfPressureParts;
 
 
-    @TechnicalParameter(key = "heatTreatmentTimeOfPressureParts", label = "受压部件热处理时间", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "h")
+    @TechnicalParameter(key = "heatTreatmentTimeOfPressureParts", label = "受压部件热处理时间", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "h")
     private BigDecimal heatTreatmentTimeOfPressureParts;
 
 
@@ -104,10 +104,29 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
     private String hydrostaticTestMedium;
 
 
-    @TechnicalParameter(key = "hydrostaticTestPressure", label = "受压部件水（耐）压试验压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
+    @TechnicalParameter(key = "hydrostaticTestPressure", label = "受压部件水（耐）压试验压力", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "MPa")
     private BigDecimal hydrostaticTestPressure;
 
 
     @TechnicalParameter(key = "combustionMode", label = "燃烧方式", type = TechnicalParameter.ParamType.STRING)
     private String combustionMode;
+
+    @TechnicalParameter(key = "safetyValveVerificationReportNo", label = "安全阀效验报告编号", type = TechnicalParameter.ParamType.STRING)
+    private String safetyValveVerificationReportNo;
+
+
+    @TechnicalParameter(key = "safetyValveSettingPressure", label = "安全阀整定压力", type = TechnicalParameter.ParamType.STRING, unit = "Mpa")
+    private String safetyValveSettingPressure;
+
+
+    @TechnicalParameter(key = "waterTreatmentRegularInspectionReportNo", label = "水处理定期检验报告编号", type = TechnicalParameter.ParamType.STRING)
+    private String waterTreatmentRegularInspectionReportNo;
+
+
+    @TechnicalParameter(key = "waterTreatmentRegularInspectionResult", label = "水处理定期检验结论", type = TechnicalParameter.ParamType.STRING)
+    private String waterTreatmentRegularInspectionResult;
+
+
+    @TechnicalParameter(key = "energyEfficiencyTestReportNo", label = "能效测试报告编号", type = TechnicalParameter.ParamType.STRING)
+    private String energyEfficiencyTestReportNo;
 }

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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
 import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
 import lombok.Data;
@@ -96,14 +97,6 @@ public class LiftingTechParamDefine implements ITechParamDefine {
     private BigDecimal ratedTraverseSpeed;
 
 
-    @TechnicalParameter(key = "bicycleMaxExitTime", label = "单车最大(出)车时间", equCategory = {"4D00"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "s")
-    private BigDecimal bicycleMaxExitTime;
-
-
-    @TechnicalParameter(key = "bicycleMaxComeTime", label = "单车最大(进)车时间", equCategory = {"4D00"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "s")
-    private BigDecimal bicycleMaxComeTime;
-
-
     @TechnicalParameter(key = "explosionProofGrade", label = "区域防爆等级", equCategory = {"4100", "4200", "4400", "4800", "4900", "4A00"}, equDefine = {"4110", "4130", "4140", "4150", "4190", "4210", "4220", "4230", "4240", "4250", "4260", "4270", "4280", "4290", "4410", "4420", "4440", "4450", "4870", "4170"}, type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
     private String explosionProofGrade;
 
@@ -142,4 +135,18 @@ public class LiftingTechParamDefine implements ITechParamDefine {
     @TechnicalParameter(key = "parkingVehicleLength", label = "适停车辆尺寸长", equCategory = {"4D00"}, type = TechnicalParameter.ParamType.STRING, unit = "m")
     private String parkingVehicleLength;
 
+
+
+    @TechnicalParameter(key = "maxSpanWorkingRange", label = "最大工作幅度", equCategory = {"4300", "4700"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
+    private BigDecimal maxSpanWorkingRange;
+
+
+    @TechnicalParameter(key = "minSpanWorkingRange", label = "最小工作幅度", equCategory = {"4300", "4700"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
+    private BigDecimal minSpanWorkingRange;
+
+
+    @TechnicalParameter(key = "bicycleMaxComeExitTime", label = "单车最大进（出）车时间", equCategory = {"4D00"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "s")
+    private BigDecimal bicycleMaxComeExitTime;
 }
+
+

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

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 public class VesselTechParamsDefine implements ITechParamDefine {
 
 
-    @TechnicalParameter(key = "singleBottleVolume", label = "单瓶容积", equCategory = {"2300"} , tags = "vehicleCylinder", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "L")
+    @TechnicalParameter(key = "singleBottleVolume", label = "单瓶容积", equCategory = {"2300"}, tags = "vehicleCylinder", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "L")
     private BigDecimal singleBottleVolume;
 
     @TechnicalParameter(key = "chargingMedium", label = "充装介质", equCategory = {"2300"}, tags = "vehicleCylinder", type = TechnicalParameter.ParamType.STRING)
@@ -183,7 +183,7 @@ public class VesselTechParamsDefine implements ITechParamDefine {
     private String support;
 
 
-    @TechnicalParameter(key = "installation", label = "安装型式", equCategory = {"2100", "2200", }, type = TechnicalParameter.ParamType.STRING)
+    @TechnicalParameter(key = "installation", label = "安装型式", equCategory = {"2100", "2200",}, type = TechnicalParameter.ParamType.STRING)
     private String installation;
 
 
@@ -287,4 +287,31 @@ public class VesselTechParamsDefine implements ITechParamDefine {
     private BigDecimal perCapitaCabinCapacity;
 
 
+    @TechnicalParameter(key = "losslessRatio", label = "无损检测比例", equCategory = {"2100", "2200"}, type = TechnicalParameter.ParamType.BIG_DECIMAL)
+    private BigDecimal losslessRatio;
+
+
+    @TechnicalParameter(key = "losslessMethod", label = "无损检测方法", equCategory = {"2200"}, type = TechnicalParameter.ParamType.STRING)
+    private String losslessMethod;
+
+
+    @TechnicalParameter(key = "yearReportNo", label = "年度检查报告编号", equCategory = {"2100", "2400"}, type = TechnicalParameter.ParamType.STRING)
+    private String yearReportNo;
+
+
+    @TechnicalParameter(key = "airTightnessPressure", label = "气密性试验压力", equCategory = {"2200", "2400"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "MPa")
+    private BigDecimal airTightnessPressure;
+
+
+    @TechnicalParameter(key = "airTightnessMedium", label = "气密性试验介质", equCategory = {"2200"}, type = TechnicalParameter.ParamType.STRING)
+    private String airTightnessMedium;
+
+
+    @TechnicalParameter(key = "isElectricalMod", label = "是否电气改造", equCategory = {"2400"}, type = TechnicalParameter.ParamType.STRING)
+    private String isElectricalMod;
+
+
+    @TechnicalParameter(key = "setPressure", label = "安全阀整定压力", equCategory = {"2200"}, type = TechnicalParameter.ParamType.STRING)
+    private String setPressure;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TechParamsBoilerChangeFieldDto.java

@@ -90,4 +90,22 @@ public class TechParamsBoilerChangeFieldDto extends BaseTechParamsFieldDto {
     @FieldDisplayDefine(value = "燃烧方式")
     private String combustionMode;
 
+    @FieldDisplayDefine(value = "安全阀效验报告编号")
+    private String safetyValveVerificationReportNo;
+
+
+    @FieldDisplayDefine(value = "安全阀整定压力")
+    private String safetyValveSettingPressure;
+
+
+    @FieldDisplayDefine(value = "水处理定期检验报告编号")
+    private String waterTreatmentRegularInspectionReportNo;
+
+    @FieldDisplayDefine(value = "水处理定期检验结论")
+    private String waterTreatmentRegularInspectionResult;
+
+
+    @FieldDisplayDefine(value = "能效测试报告编号")
+    private String energyEfficiencyTestReportNo;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TechParamsLiftingChangeFieldDto.java

@@ -119,4 +119,16 @@ public class TechParamsLiftingChangeFieldDto extends BaseTechParamsFieldDto {
     @FieldDisplayDefine(value = "适停车辆尺寸长")
     private String parkingVehicleLength;
 
+
+    @FieldDisplayDefine(value = "最大工作幅度")
+    private String maxSpanWorkingRange;
+
+
+    @FieldDisplayDefine(value = "最小工作幅度")
+    private String minSpanWorkingRange;
+
+
+    @FieldDisplayDefine(value = "单车最大进（出）车时间")
+    private String bicycleMaxComeExitTime;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TechParamsRidesChangeFieldDto.java

@@ -51,5 +51,4 @@ public class TechParamsRidesChangeFieldDto extends BaseTechParamsFieldDto {
     @FieldDisplayDefine(value = "设备高度")
     private String equipmentHeight;
 
-
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TechParamsVesselChangeFieldDto.java

@@ -264,4 +264,31 @@ public class TechParamsVesselChangeFieldDto extends BaseTechParamsFieldDto {
     @FieldDisplayDefine(value = "车辆VIN码")
     private String vin;
 
+
+    @FieldDisplayDefine(value = "无损检测比例")
+    private String losslessRatio;
+
+
+    @FieldDisplayDefine(value = "无损检测方法")
+    private String losslessMethod;
+
+
+    @FieldDisplayDefine(value = "年度检查报告编号")
+    private String yearReportNo;
+
+
+    @FieldDisplayDefine(value = "气密性试验压力")
+    private String airTightnessPressure;
+
+
+    @FieldDisplayDefine(value = "气密性试验介质")
+    private String airTightnessMedium;
+
+
+    @FieldDisplayDefine(value = " 是否电气改造")
+    private String isElectricalMod;
+
+
+    @FieldDisplayDefine(value = "安全阀整定压力")
+    private String setPressure;
 }