Skip to content

A
amos-boot-biz
Commit 06778e93 authored by yangyang's avatar yangyang
Browse files
Options

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

parents 75aee235 835f83a5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 299 additions and 98 deletions
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
View file @ 06778e93
......@@ -18,51 +18,51 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
private String deviceLevel;
@TechnicalParameter(key = "ratedEvaporationCapacityThermalPower", label = "额定蒸发量（热功率）", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedEvaporationCapacityThermalPower", label = "额定蒸发量（热功率）", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "t/h(MW)")
private String ratedEvaporationCapacityThermalPower;
@TechnicalParameter(key = "ratedWorkingPressure", label = "额定工作压力", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedWorkingPressure", label = "额定工作压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
private String ratedWorkingPressure;
@TechnicalParameter(key = "ratedOperatingTemperature", label = "额定工作温度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedOperatingTemperature", label = "额定工作温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
private String ratedOperatingTemperature;
@TechnicalParameter(key = "designThermalEfficiency", label = "设计热效率", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "designThermalEfficiency", label = "设计热效率", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "%")
private String designThermalEfficiency;
@TechnicalParameter(key = "feedwaterTemperature", label = "给水温度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "feedwaterTemperature", label = "给水温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
private String feedwaterTemperature;
@TechnicalParameter(key = "ratedOutletReturnWaterOilTemperature", label = "额定出/回水(油)温度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedOutletReturnWaterOilTemperature", label = "额定出/回水(油)温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
private String ratedOutletReturnWaterOilTemperature;
@TechnicalParameter(key = "waterOilVolumeOfBoilerProper", label = "锅炉本体水（油）容积", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "waterOilVolumeOfBoilerProper", label = "锅炉本体水（油）容积", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "L")
private String waterOilVolumeOfBoilerProper;
@TechnicalParameter(key = "hydraulicTestMediumPressureOfPackagedBoilerBody", label = "整装锅炉本体液压试验介质/压力", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "hydraulicTestMediumPressureOfPackagedBoilerBody", label = "整装锅炉本体液压试验介质/压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
private String hydraulicTestMediumPressureOfPackagedBoilerBody;
@TechnicalParameter(key = "inletOutletTemperatureOfReheater", label = "再热器进（出）口温度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "inletOutletTemperatureOfReheater", label = "再热器进（出）口温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
private String inletOutletTemperatureOfReheater;
@TechnicalParameter(key = "reheaterInletOutletPressure", label = "再热器进（出）口压力", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "reheaterInletOutletPressure", label = "再热器进（出）口压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
private String reheaterInletOutletPressure;
@TechnicalParameter(key = "reheatSteamFlow", label = "再热蒸汽流量", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "reheatSteamFlow", label = "再热蒸汽流量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "t/h")
private String reheatSteamFlow;
@TechnicalParameter(key = "glAirtightTest", label = "有机热载体锅炉气密试验介质/压力", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "glAirtightTest", label = "有机热载体锅炉气密试验介质/压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
private String glAirtightTest;
......@@ -78,7 +78,7 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
private String materialOfPressureParts;
@TechnicalParameter(key = "wallThicknessOfPressureParts", label = "受压部件壁厚", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "wallThicknessOfPressureParts", label = "受压部件壁厚", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
private String wallThicknessOfPressureParts;
......@@ -86,15 +86,15 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
private String nonDestructiveTestingMethodsForPressureParts;
@TechnicalParameter(key = "proportionOfNdtForPressureParts", label = "受压部件无损检测比例", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "proportionOfNdtForPressureParts", label = "受压部件无损检测比例", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "%")
private String proportionOfNdtForPressureParts;
@TechnicalParameter(key = "heatTreatmentTemperatureOfPressureParts", label = "受压部件热处理温度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "heatTreatmentTemperatureOfPressureParts", label = "受压部件热处理温度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "℃")
private String heatTreatmentTemperatureOfPressureParts;
@TechnicalParameter(key = "heatTreatmentTimeOfPressureParts", label = "受压部件热处理时间", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "heatTreatmentTimeOfPressureParts", label = "受压部件热处理时间", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "h")
private String heatTreatmentTimeOfPressureParts;
......@@ -102,7 +102,7 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
private String hydrostaticTestMedium;
@TechnicalParameter(key = "hydrostaticTestPressure", label = "受压部件水（耐）压试验压力", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "hydrostaticTestPressure", label = "受压部件水（耐）压试验压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
private String hydrostaticTestPressure;
......
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
View file @ 06778e93
......@@ -15,31 +15,31 @@ import lombok.Data;
public class ElevatorTechParamDefine implements ITechParamDefine {
@TechnicalParameter(key = "ratedSpeedUp", label = "额定速度(上行)", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedSpeedUp", label = "额定速度(上行)", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
private String ratedSpeedUp;
@TechnicalParameter(key = "ratedSpeedDown", label = "额定速度(下行)", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedSpeedDown", label = "额定速度(下行)", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
private String ratedSpeedDown;
@TechnicalParameter(key = "ratedLoadCapacity", label = "额定载重量", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedLoadCapacity", label = "额定载重量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "kg")
private String ratedLoadCapacity;
@TechnicalParameter(key = "liftingHeight", label = "提升高度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "liftingHeight", label = "提升高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String liftingHeight;
@TechnicalParameter(key = "deviceLevel", label = "层数", type = TechnicalParameter.ParamType.INTEGER)
@TechnicalParameter(key = "deviceLevel", label = "层数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "层")
private Integer deviceLevel;
@TechnicalParameter(key = "stand", label = "站数", type = TechnicalParameter.ParamType.INTEGER)
@TechnicalParameter(key = "stand", label = "站数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "站")
private Integer stand;
@TechnicalParameter(key = "numberDoors", label = "门数", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "numberDoors", label = "门数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "门数")
private Integer numberDoors;
......@@ -47,7 +47,7 @@ public class ElevatorTechParamDefine implements ITechParamDefine {
private String controlMode;
@TechnicalParameter(key = "numberCylinders", label = "油缸数量", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "numberCylinders", label = "油缸数量", type = TechnicalParameter.ParamType.BIG_DECIMAL)
private Integer numberCylinders;
......@@ -63,22 +63,22 @@ public class ElevatorTechParamDefine implements ITechParamDefine {
private String explosionproofSignComplete;
@TechnicalParameter(key = "nominalSpeed", label = "名义速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "nominalSpeed", label = "名义速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
private String nominalSpeed;
@TechnicalParameter(key = "nominalWidth", label = "名义宽度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "nominalWidth", label = "名义宽度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
private String nominalWidth;
@TechnicalParameter(key = "angleRoll", label = "倾斜角", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "angleRoll", label = "倾斜角", type = TechnicalParameter.ParamType.BIG_DECIMAL)
private String angleRoll;
@TechnicalParameter(key = "useSectionLength", label = "使用区段长度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "useSectionLength", label = "使用区段长度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String useSectionLength;
@TechnicalParameter(key = "conveyingCapacity", label = "输送能力", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "conveyingCapacity", label = "输送能力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "P/h")
private String conveyingCapacity;
......@@ -86,6 +86,6 @@ public class ElevatorTechParamDefine implements ITechParamDefine {
private String doorPosition;
@TechnicalParameter(key = "ratedSpeed", label = "额定速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedSpeed", label = "额定速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
private String 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
View file @ 06778e93
......@@ -14,27 +14,27 @@ import lombok.Data;
@Group("4000")
public class LiftingTechParamDefine implements ITechParamDefine {
@TechnicalParameter(key = "ratedLiftingCapacity", label = "额定起重量", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedLiftingCapacity", label = "额定起重量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "t")
private String ratedLiftingCapacity;
@TechnicalParameter(key = "maxLiftingCapacity", label = "最大起重量", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "maxLiftingCapacity", label = "最大起重量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "t")
private String maxLiftingCapacity;
@TechnicalParameter(key = "maxLiftingTorque", label = "最大起重力矩", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "maxLiftingTorque", label = "最大起重力矩", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "KN.m")
private String maxLiftingTorque;
@TechnicalParameter(key = "spanWorkingRange", label = "跨度（工作幅度）", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "spanWorkingRange", label = "跨度（工作幅度）", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String spanWorkingRange;
@TechnicalParameter(key = "liftingSpeed", label = "起升速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "liftingSpeed", label = "起升速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
private String liftingSpeed;
@TechnicalParameter(key = "liftingHeight", label = "起升高度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "liftingHeight", label = "起升高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String liftingHeight;
......@@ -42,59 +42,59 @@ public class LiftingTechParamDefine implements ITechParamDefine {
private String workLevel;
@TechnicalParameter(key = "ratedLiftingTorque", label = "额定起重力矩", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedLiftingTorque", label = "额定起重力矩", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "KN.m")
private String ratedLiftingTorque;
@TechnicalParameter(key = "numberStorey", label = "层数/泊位数", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "numberStorey", label = "层数/泊位数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "层")
private Integer numberStorey;
@TechnicalParameter(key = "runningSpeed", label = "运行速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "runningSpeed", label = "运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
private String runningSpeed;
@TechnicalParameter(key = "bigcarRunSpeed", label = "大车运行速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "bigcarRunSpeed", label = "大车运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
private String bigcarRunSpeed;
@TechnicalParameter(key = "smallcarrunSpeed", label = "小车运行速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "smallcarrunSpeed", label = "小车运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
private String smallcarrunSpeed;
@TechnicalParameter(key = "ratedMembers", label = "额定成员数", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedMembers", label = "额定乘员数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "人")
private Integer ratedMembers;
@TechnicalParameter(key = "ratedLiftingSpeed", label = "额定提升速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedLiftingSpeed", label = "额定提升速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
private String ratedLiftingSpeed;
@TechnicalParameter(key = "heightFreeEnd", label = "自由端高度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "heightFreeEnd", label = "自由端高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String heightFreeEnd;
@TechnicalParameter(key = "workStrokeCage", label = "吊笼工作行程", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "workStrokeCage", label = "吊笼工作行程", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String workStrokeCage;
@TechnicalParameter(key = "storageCapacity", label = "存容量", type = TechnicalParameter.ParamType.INTEGER)
@TechnicalParameter(key = "storageCapacity", label = "存容量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "辆")
private Integer storageCapacity;
@TechnicalParameter(key = "ratedLiftSpeed", label = "额定升降速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedLiftSpeed", label = "额定升降速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
private String ratedLiftSpeed;
@TechnicalParameter(key = "ratedTraverseSpeed", label = "额定横移速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedTraverseSpeed", label = "额定横移速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
private String ratedTraverseSpeed;
@TechnicalParameter(key = "bicycleMaxExitTime", label = "单车最大进(出)车时间", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "bicycleMaxExitTime", label = "单车最大进(出)车时间", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "s")
private String bicycleMaxExitTime;
@TechnicalParameter(key = "bicycleMaxComeTime", label = "单车最大进车时间", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "bicycleMaxComeTime", label = "单车最大进车时间", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "s")
private String bicycleMaxComeTime;
......@@ -102,14 +102,14 @@ public class LiftingTechParamDefine implements ITechParamDefine {
private String explosionProofGrade;
@TechnicalParameter(key = "cantileverLength", label = "悬臂长度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "cantileverLength", label = "悬臂长度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String cantileverLength;
@TechnicalParameter(key = "derrickingSpeed", label = "变幅速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "derrickingSpeed", label = "变幅速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/min")
private String derrickingSpeed;
@TechnicalParameter(key = "hangingCagesNumber", label = "吊笼数量", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "hangingCagesNumber", label = "吊笼数量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "个")
private String hangingCagesNumber;
......@@ -121,19 +121,19 @@ public class LiftingTechParamDefine implements ITechParamDefine {
private String explosionproofSignComplete;
@TechnicalParameter(key = "ratedSpeedUp", label = "监检结束高度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "ratedSpeedUp", label = "监检结束高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String ratedSpeedUp;
@TechnicalParameter(key = "parkingVehicleHeight", label = "适停车辆尺寸高", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "parkingVehicleHeight", label = "适停车辆尺寸高", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String parkingVehicleHeight;
@TechnicalParameter(key = "parkingVehicleWeight", label = "适停车辆尺寸宽", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "parkingVehicleWeight", label = "适停车辆尺寸宽", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String parkingVehicleWeight;
@TechnicalParameter(key = "parkingVehicleLength", label = "适停车辆尺寸长", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "parkingVehicleLength", label = "适停车辆尺寸长", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String 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
View file @ 06778e93
......@@ -35,11 +35,11 @@ public class PipelineTechParamDefine implements ITechParamDefine {
private String wallThickness;
@TechnicalParameter(key = "pipeLength", label = "管道长度", type = TechnicalParameter.ParamType.FLOAT)
@TechnicalParameter(key = "pipeLength", label = "管道长度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private Double pipeLength;
@TechnicalParameter(key = "pressure", label = "设计压力", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "pressure", label = "设计压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "Mpa")
private String pressure;
......
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
View file @ 06778e93
......@@ -15,47 +15,47 @@ import lombok.Data;
public class RidesTechParamDefine implements ITechParamDefine {
@TechnicalParameter(key = "trackHeight", label = "轨道高度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "trackHeight", label = "轨道高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String trackHeight;
@TechnicalParameter(key = "runningSpeed", label = "运行速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "runningSpeed", label = "运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "km/h (m/s)")
private String runningSpeed;
@TechnicalParameter(key = "numberOfPassengers", label = "乘坐人数", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "numberOfPassengers", label = "乘坐人数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "人")
private Integer numberOfPassengers;
@TechnicalParameter(key = "slideLength", label = "滑道长度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "slideLength", label = "滑道长度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String slideLength;
@TechnicalParameter(key = "operatingHeight", label = "运行高度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "operatingHeight", label = "运行高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String operatingHeight;
@TechnicalParameter(key = "slideHeight", label = "蹦极绳长度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "slideHeight", label = "蹦极绳长度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String slideHeight;
@TechnicalParameter(key = "rotaryDiameter", label = "回转直径", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "rotaryDiameter", label = "回转直径", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String rotaryDiameter;
@TechnicalParameter(key = "unilateralSwingAngle", label = "单边摆角", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "unilateralSwingAngle", label = "单边摆角", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "°")
private String unilateralSwingAngle;
@TechnicalParameter(key = "numberOfVehicles", label = "车辆数", type = TechnicalParameter.ParamType.INTEGER)
@TechnicalParameter(key = "numberOfVehicles", label = "车辆数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "个")
private Integer numberOfVehicles;
@TechnicalParameter(key = "dip", label = "倾角", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "dip", label = "倾角", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "°")
private String dip;
@TechnicalParameter(key = "equipmentHeight", label = "设备高度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "equipmentHeight", label = "设备高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String 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
View file @ 06778e93
......@@ -14,15 +14,15 @@ import lombok.Data;
@Group("9000")
public class RopewayTechParamDefine implements ITechParamDefine {
@TechnicalParameter(key = "horizontalDistance", label = "平距", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "horizontalDistance", label = "平距", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String horizontalDistance;
@TechnicalParameter(key = "supportsCount", label = "支架数目", type = TechnicalParameter.ParamType.INTEGER)
@TechnicalParameter(key = "supportsCount", label = "支架数目", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "座")
private Integer supportsCount;
@TechnicalParameter(key = "obliqueLength", label = "斜长", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "obliqueLength", label = "斜长", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String obliqueLength;
......@@ -30,33 +30,33 @@ public class RopewayTechParamDefine implements ITechParamDefine {
private String mainMotorModel;
@TechnicalParameter(key = "mainMotorPower", label = "主电机功率", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "mainMotorPower", label = "主电机功率", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "W")
private String mainMotorPower;
@TechnicalParameter(key = "altitudeDifference", label = "高差", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "altitudeDifference", label = "高差", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String altitudeDifference;
@TechnicalParameter(key = "freightVolume", label = "运量", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "freightVolume", label = "运量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "p/h")
private String freightVolume;
@TechnicalParameter(key = "carrierLine", label = "运载索", type = TechnicalParameter.ParamType.STRING, dictCode = "YZS")
private String carrierLine;
@TechnicalParameter(key = "speed", label = "速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "speed", label = "速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
private String speed;
@TechnicalParameter(key = "bearingCable", label = "承载索", type = TechnicalParameter.ParamType.STRING)
private String bearingCable;
@TechnicalParameter(key = "cablePitch", label = "索距", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "cablePitch", label = "索距", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
private String cablePitch;
@TechnicalParameter(key = "oilPressureHeavyHammer", label = "张紧油压（重锤重量）", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "oilPressureHeavyHammer", label = "张紧油压（重锤重量）", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "MPa")
private String oilPressureHeavyHammer;
......
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
View file @ 06778e93
......@@ -23,7 +23,7 @@ public class VehicleTechParamDefine implements ITechParamDefine {
private String engineNo;
@TechnicalParameter(key = "liftingCapacity", label = "额定起重量", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "liftingCapacity", label = "额定起重量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "Kg")
private String liftingCapacity;
......@@ -31,18 +31,18 @@ public class VehicleTechParamDefine implements ITechParamDefine {
private String transmissionMode;
@TechnicalParameter(key = "weight", label = "自重", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "weight", label = "自重", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "Kg")
private String weight;
@TechnicalParameter(key = "powerMode", label = "动力方式", type = TechnicalParameter.ParamType.STRING)
private String powerMode;
@TechnicalParameter(key = "maxRunningSpeed", label = "最大运行速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "maxRunningSpeed", label = "最大运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "km/h")
private String maxRunningSpeed;
@TechnicalParameter(key = "maxLiftingHeight", label = "工作装置空载最大起升高度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "maxLiftingHeight", label = "工作装置空载最大起升高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
private String maxLiftingHeight;
......@@ -58,7 +58,7 @@ public class VehicleTechParamDefine implements ITechParamDefine {
private String drivingMode;
@TechnicalParameter(key = "carryingIdlerMaxRunningSpeed", label = "空载最大运行速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "carryingIdlerMaxRunningSpeed", label = "空载最大运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "km/h")
private String carryingIdlerMaxRunningSpeed;
......@@ -70,43 +70,43 @@ public class VehicleTechParamDefine implements ITechParamDefine {
private String temperatureGroup;
@TechnicalParameter(key = "passengersNumber", label = "额定载客人数", type = TechnicalParameter.ParamType.INTEGER)
@TechnicalParameter(key = "passengersNumber", label = "额定载客人数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "人")
private Integer passengersNumber;
@TechnicalParameter(key = "maxDrivingSlope", label = "最大行驶坡度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "maxDrivingSlope", label = "最大行驶坡度", type = TechnicalParameter.ParamType.BIG_DECIMAL)
private String maxDrivingSlope;
@TechnicalParameter(key = "vehicleMass", label = "整车整备质量", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "vehicleMass", label = "整车整备质量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "Kg")
private String vehicleMass;
@TechnicalParameter(key = "wheelBase", label = "轴距", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "wheelBase", label = "轴距", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
private String wheelBase;
@TechnicalParameter(key = "trackWidthFront", label = "轮距（前）", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "trackWidthFront", label = "轮距（前）", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
private String trackWidthFront;
@TechnicalParameter(key = "trackWidthBehind", label = "轮距（后）", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "trackWidthBehind", label = "轮距（后）", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
private String trackWidthBehind;
@TechnicalParameter(key = "carsNumber", label = "观光列车车厢数", type = TechnicalParameter.ParamType.INTEGER)
@TechnicalParameter(key = "carsNumber", label = "观光列车车厢数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "节")
private Integer carsNumber;
@TechnicalParameter(key = "seatNumber", label = "观光列车每节车厢座位数", type = TechnicalParameter.ParamType.INTEGER)
@TechnicalParameter(key = "seatNumber", label = "观光列车每节车厢座位数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "个")
private Integer seatNumber;
@TechnicalParameter(key = "tractorSeatNumber", label = "观光列车牵引车头座位数", type = TechnicalParameter.ParamType.INTEGER)
@TechnicalParameter(key = "tractorSeatNumber", label = "观光列车牵引车头座位数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "个")
private Integer tractorSeatNumber;
@TechnicalParameter(key = "maxLiftingSpeed", label = "空载最大起升速度", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "maxLiftingSpeed", label = "空载最大起升速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "km/h")
private String maxLiftingSpeed;
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/EsBaseEnterpriseInfo.java
View file @ 06778e93
......@@ -8,6 +8,7 @@ import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
......@@ -131,6 +132,13 @@ public class EsBaseEnterpriseInfo {
@Field(type = FieldType.Nested)
private List<License> licenses;
/**
* 创建时间
*/
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second)
private LocalDateTime createDate;
@Data
public static class License {
......@@ -204,5 +212,6 @@ public class EsBaseEnterpriseInfo {
*/
@Field(type = FieldType.Date, format = DateFormat.date)
private LocalDate issueDate;
}
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/EsUserInfo.java
View file @ 06778e93
......@@ -8,6 +8,7 @@ import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
......@@ -176,6 +177,12 @@ public class EsUserInfo {
@Field(type = FieldType.Nested)
private List<License> licenses;
/**
* 创建时间
*/
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second)
private LocalDateTime createDate;
@Data
public static class License {
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataHandlerServiceImpl.java
View file @ 06778e93
......@@ -1424,6 +1424,7 @@ public class DataHandlerServiceImpl {
EsBaseEnterpriseInfo esBaseEnterpriseInfo = new EsBaseEnterpriseInfo();
BeanUtil.copyProperties(enterpriseInfo, esBaseEnterpriseInfo);
esBaseEnterpriseInfo.setSequenceNbr(enterpriseInfo.getSequenceNbr() + "");
esBaseEnterpriseInfo.setEquipCategory(StatisticsDataUpdateService.castStrList2String(enterpriseInfo.getEquipCategory()));
List<TzBaseUnitLicence> unitLicences = licenceMapper.selectList(new LambdaQueryWrapper<TzBaseUnitLicence>()
.eq(TzBaseUnitLicence::getUnitCode, enterpriseInfo.getUseUnitCode())
.eq(TzBaseUnitLicence::getIsDelete, false));
......@@ -1465,6 +1466,10 @@ public class DataHandlerServiceImpl {
List<EsUserInfo> esUserInfos = tzsUserInfoPage.getRecords().stream().map(u -> {
EsUserInfo esUserInfo = new EsUserInfo();
BeanUtil.copyProperties(u, esUserInfo);
esUserInfo.setPost(StatisticsDataUpdateService.castStrList2String(u.getPost()));
esUserInfo.setNewPost(StatisticsDataUpdateService.castStrList2String(u.getNewPost()));
esUserInfo.setSubPost(StatisticsDataUpdateService.castStrList2String(u.getSubPost()));
esUserInfo.setEquipType(StatisticsDataUpdateService.castStrList2String(u.getEquipType()));
esUserInfo.setUnitType(useCodeEnterpriseMap.getOrDefault(u.getUnitCode(), new TzBaseEnterpriseInfo()).getUnitType());
esUserInfo.setSuperviseOrgName(useCodeEnterpriseMap.getOrDefault(u.getUnitCode(), new TzBaseEnterpriseInfo()).getSuperviseOrgName());
esUserInfo.setSuperviseOrgCode(useCodeEnterpriseMap.getOrDefault(u.getUnitCode(), new TzBaseEnterpriseInfo()).getSuperviseOrgCode());
......@@ -1483,6 +1488,8 @@ public class DataHandlerServiceImpl {
return permissions.stream().map(p -> {
EsUserInfo.License license = new EsUserInfo.License();
BeanUtil.copyProperties(p, license);
license.setPermissionItem(StatisticsDataUpdateService.castStrList2String(p.getPermissionItem()));
license.setJobItem(StatisticsDataUpdateService.castStrList2String(p.getJobItem()));
return license;
}).collect(Collectors.toList());
}
......@@ -1550,4 +1557,5 @@ public class DataHandlerServiceImpl {
private List<ESEquipmentInfo.TechParam> buildTechParamByEquList(String record, String equListCode) {
return StringUtils.isNotEmpty(equListCode) ? statisticsDataUpdateService.getTechParams(equListCode, record) : new ArrayList<>();
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/statistics/service/StatisticsDataUpdateService.java
View file @ 06778e93
package com.yeejoin.amos.boot.module.jg.biz.statistics.service;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.boot.module.common.api.dto.TechParamItem;
import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo;
import com.yeejoin.amos.boot.module.common.biz.utils.TechParamUtil;
import com.yeejoin.amos.boot.module.jg.biz.edit.backup.TechParamsBackupService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
......@@ -31,4 +33,36 @@ public class StatisticsDataUpdateService {
return techParams;
}
/**
* 判断字符串是否为合法的 JSON 格式
*/
public static boolean isJSONValid(String test) {
try {
JSON.parseArray(test);
return true;
} catch (Exception ex) {
return false;
}
}
public static String castList2String(List<String> posts){
return String.join(",", posts);
}
public static String castStrList2String(String jsonTypesStr){
if(!isNullOrEmpty(jsonTypesStr)){
if(isJSONValid(jsonTypesStr)){
List<String> posts = JSON.parseArray(jsonTypesStr, String.class);
return String.join(",", posts);
}
return jsonTypesStr;
}
return null;
}
public static boolean isNullOrEmpty(String str) {
return str == null || str.trim().isEmpty() || "null".equals(str);
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/CompanyAdvanceSearchEnum.java
View file @ 06778e93
......@@ -16,7 +16,7 @@ public enum CompanyAdvanceSearchEnum {
ADDRESS("详细地址", "address", TechnicalParameter.ParamType.STRING,"",null,null),
EXPIRYDATE("许可有效期", "expiryDate",TechnicalParameter.ParamType.DATE,"",null,null),
UNIT_TYPE("企业类型", "unitType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitType",null,null),
REGULATORY_LABELS("企业等级", "regulatoryLabels",null,"",null,null),
REGULATORY_LABELS("企业等级", "regulatoryLabels",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","QYBQ",null),
INDUSTRY_SUPERVISOR("行业主管部门", "industrySupervisor",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","HYZGBM",null),
ITEM_CODE("许可项目", "itemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK",null,null),
SUB_ITEM_CODE("许可子项目", "subItemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK?type={type}",null,"itemCode"),
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/PersonAdvanceSearchEnum.java
View file @ 06778e93
......@@ -20,7 +20,8 @@ public enum PersonAdvanceSearchEnum {
// REGULATORY_LABELS("资质状态", "regulatoryLabels",null,""),
CERT_TYPE("证书类型", "certType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryCertType",null,null),
PERMISSION_LEVEL("证书级别", "permissionLevel",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryPermissionLevel",null,null),
JOB_ITEM("作业项目", "jobItem",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}",null,"certType|permissionLevel"),
JOB_ITEM("作业项目", "jobItem",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}",null,"certType"),
PERMISSION_ITEM("项目", "permissionItem",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}",null,"permissionLevel"),
ISSUE_DATE("发证日期", "issueDate",TechnicalParameter.ParamType.DATE,"",null,null),
EDUCATION("学历", "education",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData","XLLX",null),
ADDRESS("住址", "address",TechnicalParameter.ParamType.STRING,"",null,null),
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/TzsCustomFilterMapper.xml
View file @ 06778e93
......@@ -11,7 +11,7 @@
where parent_id = #{parentId}
</select>
<select id="queryEquCategory" resultType="com.alibaba.fastjson.JSONArray">
<select id="queryEquCategory" resultType="com.alibaba.fastjson.JSONObject">
SELECT
code AS value,
code AS key,
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/factory/DynamicQueryBuilder.java 0 → 100644
View file @ 06778e93
package com.yeejoin.amos.boot.module.statistcs.factory;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import java.util.ArrayList;
import java.util.List;
public class DynamicQueryBuilder {
private final List<QueryBuilder> shouldClauses = new ArrayList<>();
private final List<QueryBuilder> mustClauses = new ArrayList<>();
private final List<QueryBuilder> mustNotClauses = new ArrayList<>();
// 添加OR条件
public DynamicQueryBuilder or(QueryBuilder query) {
shouldClauses.add(query);
return this;
}
// 添加AND条件
public DynamicQueryBuilder and(QueryBuilder query) {
mustClauses.add(query);
return this;
}
// 添加NOT条件
public DynamicQueryBuilder not(QueryBuilder query) {
mustNotClauses.add(query);
return this;
}
// 构建最终查询
public BoolQueryBuilder build() {
BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
if (!shouldClauses.isEmpty()) {
shouldClauses.forEach(boolQuery::should);
boolQuery.minimumShouldMatch(1);
}
mustClauses.forEach(boolQuery::must);
mustNotClauses.forEach(boolQuery::mustNot);
return boolQuery;
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/factory/EnhancedDynamicQueryBuilder.java 0 → 100644
View file @ 06778e93
package com.yeejoin.amos.boot.module.statistcs.factory;
import org.elasticsearch.index.query.*;
import java.util.*;
public class EnhancedDynamicQueryBuilder {
private final List<QueryBuilder> initialClauses = new ArrayList<>();
private String groupLogic; // "AND" 或 "OR"
private final List<QueryBuilder> mustClauses = new ArrayList<>();
private final List<QueryBuilder> shouldClauses = new ArrayList<>();
private final List<QueryBuilder> mustNotClauses = new ArrayList<>();
public EnhancedDynamicQueryBuilder() {
this("AND"); // 默认组间关系为AND
}
public EnhancedDynamicQueryBuilder(String groupLogic) {
this.groupLogic = groupLogic != null ? groupLogic : "AND";
}
/**
* 添加条件，自动处理第一个条件为null的情况
* @param query 查询条件
* @param logic 逻辑关系 (AND/OR/NOT)，第一个条件可为null
*/
public EnhancedDynamicQueryBuilder add(QueryBuilder query, String logic) {
if (logic == null) {
if (isEmpty()) {
// 第一个条件，默认作为must条件
mustClauses.add(query);
} else {
// 后续条件未指定逻辑，使用组间默认逻辑
if ("OR".equalsIgnoreCase(groupLogic)) {
shouldClauses.add(query);
} else {
mustClauses.add(query);
}
}
} else {
switch (logic.toUpperCase()) {
case "AND":
mustClauses.add(query);
break;
case "OR":
shouldClauses.add(query);
break;
case "NOT":
mustNotClauses.add(query);
break;
default:
throw new IllegalArgumentException("Unsupported logic: " + logic);
}
}
return this;
}
public BoolQueryBuilder build() {
BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
// 处理must条件
mustClauses.forEach(boolQuery::must);
// 处理should条件
if (!shouldClauses.isEmpty()) {
shouldClauses.forEach(boolQuery::should);
// 如果没有must条件，至少满足一个should
if (mustClauses.isEmpty()) {
boolQuery.minimumShouldMatch(1);
}
}
// 处理mustNot条件
mustNotClauses.forEach(boolQuery::mustNot);
return boolQuery;
}
private boolean isEmpty() {
return mustClauses.isEmpty() && shouldClauses.isEmpty() && mustNotClauses.isEmpty();
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/TzBaseEnterpriseInfo.java
View file @ 06778e93
......@@ -202,4 +202,10 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
@ApiModelProperty(value = "省内详细办公地址")
private String officeAddress;
/**
* 创建时间
*/
@TableField(value = "create_date")
private Date createDate;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/TzsUserInfo.java
View file @ 06778e93
......@@ -235,4 +235,10 @@ public class TzsUserInfo extends BaseEntity {
*/
@TableField(value = "transfer_out_time")
protected Date transferOutTime;
/**
* 创建时间
*/
@TableField(value = "create_date")
private Date createDate;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment