Skip to content

A
amos-boot-biz
Commit bee59c90 authored by suhuiguang's avatar suhuiguang
Browse files
Options

refact(综合搜索)：数据同步调整

1.技术参数由之前的按照设备种类过滤调整为按照设备种类、设备类别、设备品种、是否车用气瓶进行过滤
parent 5c9988b7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 73 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotation/TechnicalParameter.java
View file @ bee59c90
package com.yeejoin.amos.boot.biz.common.annotation;
import com.baomidou.mybatisplus.annotation.TableField;
import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
......@@ -23,18 +21,30 @@ public @interface TechnicalParameter {
String unit() default "";
/**
* 设备类别code
* 匹配条件-设备类别code
* @return 设备类别
*/
String[] equCategory() default {};
/**
* 设备品种code，设备品种配置空时代表，全部都有
* 匹配条件-设备品种code，设备品种配置空时代表，全部都有
* @return 设备品种
*/
String[] equDefine() default {};
/**
* 匹配条件-标签如车用气瓶、球罐
* @return 标签数组
*/
String[] tags() default {};
/**
* 匹配条件-设备类型下默认隐藏字段配置
* @return 在指定设备类型下需要的隐藏字段
*/
String[] ignoreCategoryConf() default {};
enum ParamType {
STRING, INTEGER, FLOAT, BIG_DECIMAL, BOOLEAN, OBJECT, DATE
......
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 @ bee59c90
......@@ -17,77 +17,77 @@ import java.math.BigDecimal;
public class ElevatorTechParamDefine implements ITechParamDefine {
@TechnicalParameter(key = "ratedSpeedUp", label = "额定速度(上行)", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
@TechnicalParameter(key = "ratedSpeedUp", label = "额定速度(上行)", equCategory = {"3200", "3400"}, equDefine = {"3210", "3220", "3410", "3420"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m/s")
private BigDecimal ratedSpeedUp;
@TechnicalParameter(key = "ratedSpeedDown", label = "额定速度(下行)", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
@TechnicalParameter(key = "ratedSpeedDown", label = "额定速度(下行)", equCategory = {"3200", "3400"}, equDefine = {"3210", "3220", "3410", "3420"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m/s")
private BigDecimal ratedSpeedDown;
@TechnicalParameter(key = "ratedLoadCapacity", label = "额定载重量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "kg")
@TechnicalParameter(key = "ratedLoadCapacity", label = "额定载重量", equCategory = {"3100", "3200", "3400"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "kg")
private BigDecimal ratedLoadCapacity;
@TechnicalParameter(key = "liftingHeight", label = "提升高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
@TechnicalParameter(key = "liftingHeight", label = "提升高度", equCategory = {"3300"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
private BigDecimal liftingHeight;
@TechnicalParameter(key = "deviceLevel", label = "层数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "层")
@TechnicalParameter(key = "deviceLevel", label = "层数", equCategory = {"3100", "3200", "3400"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "层")
private BigDecimal deviceLevel;
@TechnicalParameter(key = "stand", label = "站数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "站")
@TechnicalParameter(key = "stand", label = "站数", equCategory = {"3100", "3200", "3400"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "站")
private BigDecimal stand;
@TechnicalParameter(key = "numberDoors", label = "门数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "门数")
@TechnicalParameter(key = "numberDoors", label = "门数", equCategory = {"3100", "3200", "3400"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "门数")
private BigDecimal numberDoors;
@TechnicalParameter(key = "controlMode", label = "控制方式", type = TechnicalParameter.ParamType.STRING, dictCode = "DSXS")
@TechnicalParameter(key = "controlMode", label = "控制方式", equCategory = {"3100", "3200", "3400"}, type = TechnicalParameter.ParamType.STRING, dictCode = "DSXS")
private String controlMode;
@TechnicalParameter(key = "numberCylinders", label = "油缸数量", type = TechnicalParameter.ParamType.BIG_DECIMAL)
@TechnicalParameter(key = "numberCylinders", label = "油缸数量", equCategory = {"3200", "3400"}, equDefine = {"3210", "3220", "3420"}, type = TechnicalParameter.ParamType.BIG_DECIMAL)
private BigDecimal numberCylinders;
@TechnicalParameter(key = "jackingType", label = "顶升方式", type = TechnicalParameter.ParamType.STRING, dictCode = "DSXS")
@TechnicalParameter(key = "jackingType", label = "顶升方式", equCategory = {"3200", "3400"}, equDefine = {"3210", "3220", "3420"}, type = TechnicalParameter.ParamType.STRING, dictCode = "DSXS")
private String jackingType;
@TechnicalParameter(key = "explosionproofGrade", label = "区域防爆等级", type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
@TechnicalParameter(key = "explosionproofGrade", label = "区域防爆等级", equCategory = {"3400"}, equDefine = {"3410"}, type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
private String explosionproofGrade;
@TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", equCategory = {"3400"}, equDefine = {"3410"}, type = TechnicalParameter.ParamType.STRING)
private String explosionproofSignComplete;
@TechnicalParameter(key = "nominalSpeed", label = "名义速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
@TechnicalParameter(key = "nominalSpeed", label = "名义速度", equCategory = {"3300"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m/s")
private BigDecimal nominalSpeed;
@TechnicalParameter(key = "nominalWidth", label = "名义宽度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
@TechnicalParameter(key = "nominalWidth", label = "名义宽度", equCategory = {"3300"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "mm")
private BigDecimal nominalWidth;
@TechnicalParameter(key = "angleRoll", label = "倾斜角", type = TechnicalParameter.ParamType.BIG_DECIMAL)
@TechnicalParameter(key = "angleRoll", label = "倾斜角", equCategory = {"3100", "3300"}, type = TechnicalParameter.ParamType.BIG_DECIMAL)
private BigDecimal angleRoll;
@TechnicalParameter(key = "useSectionLength", label = "使用区段长度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
@TechnicalParameter(key = "useSectionLength", label = "使用区段长度", equCategory = {"3300"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
private BigDecimal useSectionLength;
@TechnicalParameter(key = "conveyingCapacity", label = "输送能力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "P/h")
@TechnicalParameter(key = "conveyingCapacity", label = "输送能力", equCategory = {"3300"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "P/h")
private BigDecimal conveyingCapacity;
@TechnicalParameter(key = "doorPosition", label = "轿门位置", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "doorPosition", label = "轿门位置", equCategory = {"3100"}, type = TechnicalParameter.ParamType.STRING)
private String doorPosition;
@TechnicalParameter(key = "ratedSpeed", label = "额定速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m/s")
@TechnicalParameter(key = "ratedSpeed", label = "额定速度", equCategory = {"3100", "3400"}, equDefine = {"3110", "3120", "3130", "3430"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m/s")
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/RidesTechParamDefine.java
View file @ bee59c90
......@@ -17,47 +17,47 @@ import java.math.BigDecimal;
public class RidesTechParamDefine implements ITechParamDefine {
@TechnicalParameter(key = "trackHeight", label = "轨道高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
@TechnicalParameter(key = "trackHeight", label = "轨道高度", equCategory = {"6B00", "6300", "6200"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
private BigDecimal trackHeight;
@TechnicalParameter(key = "runningSpeed", label = "运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "km/h (m/s)")
@TechnicalParameter(key = "runningSpeed", label = "运行速度", equCategory = {"6B00", "6300", "6100", "6700", "6800", "6500", "6200", "6600", "6400", "6E00", "6D00"}, equDefine = {"6D10", "6D20", "6D40", "6E20"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "km/h (m/s)")
private BigDecimal runningSpeed;
@TechnicalParameter(key = "numberOfPassengers", label = "乘坐人数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "人")
@TechnicalParameter(key = "numberOfPassengers", label = "承载人数", equCategory = {"6B00", "6A00", "6300", "6900", "6100", "6700", "6800", "6500", "6200", "6600", "6400", "6E00", "6D00"}, equDefine = {"6E20", "6E30", "6D10", "6D40"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "人")
private BigDecimal numberOfPassengers;
@TechnicalParameter(key = "slideLength", label = "滑道长度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
@TechnicalParameter(key = "slideLength", label = "滑索(道)长度", equCategory = {"6B00", "6E00"}, equDefine = {"6E20"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
private BigDecimal slideLength;
@TechnicalParameter(key = "operatingHeight", label = "运行高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
@TechnicalParameter(key = "operatingHeight", label = "运行高度", equCategory = {"6500", "6E00", "6D00", "6D00"}, equDefine = {"6D10", "6D20", "6E10", "6E40"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
private BigDecimal operatingHeight;
@TechnicalParameter(key = "slideHeight", label = "蹦极绳长度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
@TechnicalParameter(key = "slideHeight", label = "蹦极绳长度", equCategory = {"6E00"}, equDefine = {"6E10"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
private BigDecimal slideHeight;
@TechnicalParameter(key = "rotaryDiameter", label = "回转直径", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
@TechnicalParameter(key = "rotaryDiameter", label = "回转直径", equCategory = {"6100", "6700", "6500", "6600", "6400", "6E00"}, equDefine = {"6E30"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
private BigDecimal rotaryDiameter;
@TechnicalParameter(key = "unilateralSwingAngle", label = "单边摆角", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "°")
@TechnicalParameter(key = "unilateralSwingAngle", label = "单边摆角", equCategory = {"6E00"}, equDefine = {"6E30"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "°")
private BigDecimal unilateralSwingAngle;
@TechnicalParameter(key = "numberOfVehicles", label = "车辆数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "个")
@TechnicalParameter(key = "numberOfVehicles", label = "车辆数", equCategory = {"6A00"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "个")
private BigDecimal numberOfVehicles;
@TechnicalParameter(key = "dip", label = "倾角", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "°")
@TechnicalParameter(key = "dip", label = "倾角", equCategory = {"6400"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "°")
private BigDecimal dip;
@TechnicalParameter(key = "equipmentHeight", label = "设备高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "m")
@TechnicalParameter(key = "equipmentHeight", label = "设备高度", equCategory = {"6100"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
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/VehicleTechParamDefine.java
View file @ bee59c90
......@@ -25,90 +25,85 @@ public class VehicleTechParamDefine implements ITechParamDefine {
private String engineNo;
@TechnicalParameter(key = "liftingCapacity", label = "额定起重量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "Kg")
@TechnicalParameter(key = "liftingCapacity", equCategory = "5100", label = "额定起重量", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "Kg")
private BigDecimal liftingCapacity;
@TechnicalParameter(key = "transmissionMode", label = "传动方式", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "transmissionMode", label = "传动方式", equCategory = "5100", type = TechnicalParameter.ParamType.STRING)
private String transmissionMode;
@TechnicalParameter(key = "weight", label = "自重", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "Kg")
@TechnicalParameter(key = "weight", label = "自重", equCategory = "5100", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "Kg")
private BigDecimal weight;
@TechnicalParameter(key = "powerMode", label = "动力方式", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "powerMode", label = "动力方式", equCategory = "5100", type = TechnicalParameter.ParamType.STRING)
private String powerMode;
@TechnicalParameter(key = "maxRunningSpeed", label = "最大运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "km/h")
@TechnicalParameter(key = "maxRunningSpeed", label = "最大运行速度", equCategory = {"5100", "5200"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "km/h")
private BigDecimal maxRunningSpeed;
@TechnicalParameter(key = "maxLiftingHeight", label = "工作装置空载最大起升高度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
private BigDecimal maxLiftingHeight;
@TechnicalParameter(key = "gasGroup", label = "气体/粉尘组别（防爆）", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "gasGroup", label = "气体/粉尘组别（防爆）", equCategory = "5100", type = TechnicalParameter.ParamType.STRING)
private String gasGroup;
@TechnicalParameter(key = "frameStructure", label = "车架结构", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "frameStructure", label = "车架结构", equCategory = "5100", type = TechnicalParameter.ParamType.STRING)
private String frameStructure;
@TechnicalParameter(key = "drivingMode", label = "驾驶方式", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "drivingMode", label = "驾驶方式", equCategory = "5100", type = TechnicalParameter.ParamType.STRING)
private String drivingMode;
@TechnicalParameter(key = "carryingIdlerMaxRunningSpeed", label = "空载最大运行速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "km/h")
private BigDecimal carryingIdlerMaxRunningSpeed;
@TechnicalParameter(key = "protectGrade", label = "设备保护等级（防爆）", type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
@TechnicalParameter(key = "protectGrade", label = "设备保护等级（防爆）", equCategory = "5100", type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
private String protectGrade;
@TechnicalParameter(key = "temperatureGroup", label = "温度组别（防爆）", type = TechnicalParameter.ParamType.STRING)
@TechnicalParameter(key = "temperatureGroup", label = "温度组别（防爆）", equCategory = "5100", type = TechnicalParameter.ParamType.STRING)
private String temperatureGroup;
@TechnicalParameter(key = "passengersNumber", label = "额定载客人数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "人")
@TechnicalParameter(key = "passengersNumber", label = "额定载客人数", equCategory = "5200", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "人")
private BigDecimal passengersNumber;
@TechnicalParameter(key = "maxDrivingSlope", label = "最大行驶坡度", type = TechnicalParameter.ParamType.BIG_DECIMAL)
@TechnicalParameter(key = "maxDrivingSlope", label = "最大行驶坡度", equCategory = "5200", type = TechnicalParameter.ParamType.BIG_DECIMAL)
private BigDecimal maxDrivingSlope;
@TechnicalParameter(key = "vehicleMass", label = "整车整备质量", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "Kg")
@TechnicalParameter(key = "vehicleMass", label = "整车整备质量", equCategory = "5200", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "Kg")
private BigDecimal vehicleMass;
@TechnicalParameter(key = "wheelBase", label = "轴距", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
@TechnicalParameter(key = "wheelBase", label = "轴距", equCategory = "5200", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "mm")
private BigDecimal wheelBase;
@TechnicalParameter(key = "trackWidthFront", label = "轮距（前）", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
@TechnicalParameter(key = "trackWidthFront", label = "轮距（前）", equCategory = "5200", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "mm")
private BigDecimal trackWidthFront;
@TechnicalParameter(key = "trackWidthBehind", label = "轮距（后）", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "mm")
@TechnicalParameter(key = "trackWidthBehind", label = "轮距（后）", equCategory = "5200", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "mm")
private BigDecimal trackWidthBehind;
@TechnicalParameter(key = "carsNumber", label = "观光列车车厢数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "节")
@TechnicalParameter(key = "carsNumber", label = "观光列车车厢数", equCategory = "5200", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "节")
private BigDecimal carsNumber;
@TechnicalParameter(key = "seatNumber", label = "观光列车每节车厢座位数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "个")
@TechnicalParameter(key = "seatNumber", label = "观光列车每节车厢座位数", equCategory = "5200", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "个")
private BigDecimal seatNumber;
@TechnicalParameter(key = "tractorSeatNumber", label = "观光列车牵引车头座位数", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "个")
@TechnicalParameter(key = "tractorSeatNumber", label = "观光列车牵引车头座位数", equCategory = "5200", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "个")
private BigDecimal tractorSeatNumber;
@TechnicalParameter(key = "carryingIdlerMaxRunningSpeed", label = "空载最大运行速度", equCategory = "5100", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "km/h")
private BigDecimal carryingIdlerMaxRunningSpeed;
@TechnicalParameter(key = "maxLiftingHeight", label = "工作装置空载最大起升高度", equCategory = "5100", type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "mm")
private BigDecimal maxLiftingHeight;
@TechnicalParameter(key = "maxLiftingSpeed", label = "空载最大起升速度", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "km/h")
private BigDecimal maxLiftingSpeed;
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/utils/TechParamUtil.java
View file @ bee59c90
......@@ -41,7 +41,7 @@ public class TechParamUtil {
}
public static void main(String[] args) {
List<TechParamItem> techParamItems = getParamMetaList("3000", "3400", "3420", false);
List<TechParamItem> techParamItems = getParamMetaList("2000", "2300", "23T0", "vehicleCylinder");
System.out.println(techParamItems);
}
......@@ -57,7 +57,7 @@ public class TechParamUtil {
return techParamItem;
}
public static List<TechParamItem> getParamMetaList(String equListCode, String equCategoryCode, String equDefineCode, Boolean whetherVehicleCylinder) {
public static List<TechParamItem> getParamMetaList(String equListCode, String equCategoryCode, String equDefineCode, String... tags) {
List<TechParamItem> techParamItems = new ArrayList<>();
for (Class<? extends ITechParamDefine> subClass : subClasses) {
Field[] fields = subClass.getDeclaredFields();
......@@ -70,7 +70,18 @@ public class TechParamUtil {
boolean equCategoryMatch = technicalParameter.equCategory().length == 0 || StringUtils.isEmpty(equCategoryCode) || Arrays.asList(technicalParameter.equCategory()).contains(equCategoryCode);
// 设备品种配置空时代表，全部都有
boolean equDefineMatch = technicalParameter.equDefine().length == 0 || StringUtils.isEmpty(equDefineCode) || Arrays.asList(technicalParameter.equDefine()).contains(equDefineCode);
if (equCategoryMatch && equDefineMatch) {
// 标签是否匹配, 默认匹配
boolean tagMatch = true;
if (tags != null && tags.length > 0) {
List<String> filterTags = Arrays.asList(tags);
tagMatch = filterTags.stream().allMatch(tag-> Arrays.stream(technicalParameter.tags()).sequential().anyMatch(e->e.contains(tag)));
}
// 指定设备类别下默认字段设置
boolean ignoreField = false;
if (StringUtils.isEmpty(equDefineCode) && StringUtils.isNotEmpty(equCategoryCode) && technicalParameter.ignoreCategoryConf().length > 0) {
ignoreField = Arrays.asList(technicalParameter.ignoreCategoryConf()).contains(equCategoryCode);
}
if (!ignoreField && equCategoryMatch && equDefineMatch && tagMatch) {
TechParamItem techParamItem = getTechParamItem(equListCode, field);
techParamItems.add(techParamItem);
}
......
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
View file @ bee59c90
......@@ -20,6 +20,9 @@ import lombok.experimental.Accessors;
@Group(value = "tech_params_lifting")
public class TechParamsLiftingChangeFieldDto extends BaseTechParamsFieldDto {
@FieldDisplayDefine(value = "额定载重量")
private String ratedLoadCapacity;
@FieldDisplayDefine(value = "额定起重量")
private String ratedLiftingCapacity;
......@@ -79,11 +82,11 @@ public class TechParamsLiftingChangeFieldDto extends BaseTechParamsFieldDto {
@FieldDisplayDefine(value = "额定横移速度")
private String ratedTraverseSpeed;
@FieldDisplayDefine(value = "单车最大进(出)车时间")
@FieldDisplayDefine(value = "单车最大(出)车时间")
@TableField("BICYCLE_MAX_EXIT_TIME")
private String bicycleMaxExitTime;
@FieldDisplayDefine(value = "单车最大进车时间")
@FieldDisplayDefine(value = "单车最大(进)车时间")
private String bicycleMaxComeTime;
@FieldDisplayDefine(value = "区域防爆等级", dictCode = "FBDJ")
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java
View file @ bee59c90
......@@ -142,8 +142,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
String equList = jsonObject.getString("EQU_LIST");
String equCategory = jsonObject.getString("EQU_CATEGORY");
String equDefine = jsonObject.getString("EQU_DEFINE");
Boolean whetherVehicleCylinder = "1".equals(jsonObject.getString("WHETHER_VEHICLE_CYLINDER")) ? Boolean.TRUE : Boolean.FALSE;
List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(equList, equCategory, equDefine, whetherVehicleCylinder);
String vehicleCylinder = "1".equals(jsonObject.getString("WHETHER_VEHICLE_CYLINDER")) ? "vehicleCylinder" : null;
List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(equList, equCategory, equDefine, vehicleCylinder);
JSONArray list = new JSONArray();
for (int i = 0; i < paramMetaList.size(); i++) {
JSONObject object = new JSONObject();
......@@ -2431,12 +2431,11 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
String equList = jsonObject.getString("EQU_LIST");
String equCategory = jsonObject.getString("EQU_CATEGORY");
String equDefine = jsonObject.getString("EQU_DEFINE");
Boolean whetherVehicleCylinder = "1".equals(jsonObject.getString("WHETHER_VEHICLE_CYLINDER")) ? Boolean.TRUE : Boolean.FALSE;
String vehicleCylinder = "1".equals(jsonObject.getString("WHETHER_VEHICLE_CYLINDER")) ? "vehicleCylinder" : null;
if ("".equals(equList) || null == equList) {
throw new BaseException("需要先选择设备种类，才能选择技术参数", "200", "需要先选择设备种类，才能选择技术参数");
}
List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(equList, equCategory, equDefine, whetherVehicleCylinder);
List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(equList, equCategory, equDefine, vehicleCylinder);
JSONArray list = new JSONArray();
for (int i = 0; i < paramMetaList.size(); i++) {
JSONObject object = new JSONObject();
......
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