feat(综合搜索)：实体类创建

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotation/TechnicalParameter.java

@@ -12,6 +12,12 @@ public @interface TechnicalParameter {
 
     ParamType type();
 
+    /**
+     *  cb_data_dictionary表的type
+     * @return 字典code
+     */
+    String dictCode() default "";
+
     enum ParamType {
         STRING, INTEGER, FLOAT, BIG_DECIMAL, BOOLEAN
     }

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

 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;
 
 /**
@@ -10,70 +11,81 @@ import lombok.Data;
  * @date 2023-08-17
  */
 @Data
+@Group("3000")
 public class ElevatorTechParamDefine implements ITechParamDefine {
 
-    @FieldDisplayDefine(value = "额定速度(上行)")
+
+    @TechnicalParameter(key = "ratedSpeedUp", label = "额定速度(上行)", type = TechnicalParameter.ParamType.STRING)
     private String ratedSpeedUp;
 
-    @FieldDisplayDefine(value = "额定速度(下行)")
+
+    @TechnicalParameter(key = "ratedSpeedDown", label = "额定速度(下行)", type = TechnicalParameter.ParamType.STRING)
     private String ratedSpeedDown;
 
-    @FieldDisplayDefine(value = "额定载重量")
+
+    @TechnicalParameter(key = "ratedLoadCapacity", label = "额定载重量", type = TechnicalParameter.ParamType.STRING)
     private String ratedLoadCapacity;
 
-    @FieldDisplayDefine(value = "提升高度")
+
+    @TechnicalParameter(key = "liftingHeight", label = "提升高度", type = TechnicalParameter.ParamType.STRING)
     private String liftingHeight;
 
-    @FieldDisplayDefine(value = "层数")
-    private Integer storey;
 
-    @FieldDisplayDefine(value = "站数")
+    @TechnicalParameter(key = "deviceLevel", label = "层数", type = TechnicalParameter.ParamType.INTEGER)
+    private Integer deviceLevel;
+
+
+    @TechnicalParameter(key = "stand", label = "站数", type = TechnicalParameter.ParamType.INTEGER)
     private Integer stand;
 
-    @FieldDisplayDefine(value = "门数")
+
+    @TechnicalParameter(key = "numberDoors", label = "门数", type = TechnicalParameter.ParamType.STRING)
     private Integer numberDoors;
 
-    @FieldDisplayDefine(value = "控制方式", dictCode = "KZFS")
+
+    @TechnicalParameter(key = "controlMode", label = "控制方式", type = TechnicalParameter.ParamType.STRING, dictCode = "DSXS")
     private String controlMode;
 
-    @FieldDisplayDefine(value = "油缸数量")
+
+    @TechnicalParameter(key = "numberCylinders", label = "油缸数量", type = TechnicalParameter.ParamType.STRING)
     private Integer numberCylinders;
 
-    @FieldDisplayDefine(value = "顶升方式", dictCode = "DSXS")
+
+    @TechnicalParameter(key = "jackingType", label = "顶升方式", type = TechnicalParameter.ParamType.STRING, dictCode = "DSXS")
     private String jackingType;
 
 
-    @FieldDisplayDefine(value = "区域防爆等级", dictCode = "FBDJ")
+    @TechnicalParameter(key = "explosionproofGrade", label = "区域防爆等级", type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
     private String explosionproofGrade;
 
 
-    @FieldDisplayDefine(value = "整机防爆标志")
+    @TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", type = TechnicalParameter.ParamType.STRING)
     private String explosionproofSignComplete;
 
 
-    @FieldDisplayDefine(value = "名义速度")
+    @TechnicalParameter(key = "nominalSpeed", label = "名义速度", type = TechnicalParameter.ParamType.STRING)
     private String nominalSpeed;
 
-    @FieldDisplayDefine(value = "名义宽度")
-    private String nominalWidth;
 
+    @TechnicalParameter(key = "nominalWidth", label = "名义宽度", type = TechnicalParameter.ParamType.STRING)
+    private String nominalWidth;
 
-    @FieldDisplayDefine(value = "倾斜角")
+    @TechnicalParameter(key = "angleRoll", label = "倾斜角", type = TechnicalParameter.ParamType.STRING)
     private String angleRoll;
 
 
-    @FieldDisplayDefine(value = "使用区段长度")
+    @TechnicalParameter(key = "useSectionLength", label = "使用区段长度", type = TechnicalParameter.ParamType.STRING)
     private String useSectionLength;
 
 
-    @FieldDisplayDefine(value = "输送能力")
+    @TechnicalParameter(key = "conveyingCapacity", label = "输送能力", type = TechnicalParameter.ParamType.STRING)
     private String conveyingCapacity;
 
 
-    @FieldDisplayDefine(value = "轿门位置")
+    @TechnicalParameter(key = "doorPosition", label = "轿门位置", type = TechnicalParameter.ParamType.STRING)
     private String doorPosition;
 
 
-    @FieldDisplayDefine(value = "额定速度")
+    @TechnicalParameter(key = "ratedSpeed", label = "额定速度", type = TechnicalParameter.ParamType.STRING)
     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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.annotation.TableField;
-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;
 
 /**
@@ -12,102 +11,129 @@ import lombok.Data;
  * @date 2023-08-17
  */
 @Data
+@Group("4000")
 public class LiftingTechParamDefine implements ITechParamDefine {
 
-    @FieldDisplayDefine(value = "额定起重量")
+    @TechnicalParameter(key = "ratedLiftingCapacity", label = "额定起重量", type = TechnicalParameter.ParamType.STRING)
     private String ratedLiftingCapacity;
 
-    @FieldDisplayDefine(value = "最大起重量")
-    @TableField("MAX_LIFTING_CAPACITY")
+
+    @TechnicalParameter(key = "maxLiftingCapacity", label = "最大起重量", type = TechnicalParameter.ParamType.STRING)
     private String maxLiftingCapacity;
 
-    @FieldDisplayDefine(value = "最大起重力矩")
-    @TableField("MAX_LIFTING_TORQUE")
+
+    @TechnicalParameter(key = "maxLiftingTorque", label = "最大起重力矩", type = TechnicalParameter.ParamType.STRING)
     private String maxLiftingTorque;
 
-    @FieldDisplayDefine(value = "跨度（工作幅度）")
+
+    @TechnicalParameter(key = "spanWorkingRange", label = "跨度（工作幅度）", type = TechnicalParameter.ParamType.STRING)
     private String spanWorkingRange;
 
-    @FieldDisplayDefine(value = "起升速度")
+
+    @TechnicalParameter(key = "liftingSpeed", label = "起升速度", type = TechnicalParameter.ParamType.STRING)
     private String liftingSpeed;
 
-    @FieldDisplayDefine(value = "起升高度")
+
+    @TechnicalParameter(key = "liftingHeight", label = "起升高度", type = TechnicalParameter.ParamType.STRING)
     private String liftingHeight;
 
-    @FieldDisplayDefine(value = "工作级别", dictCode = "GZJB")
+
+    @TechnicalParameter(key = "workLevel", label = "工作级别", type = TechnicalParameter.ParamType.STRING, dictCode = "GZJB")
     private String workLevel;
 
-    @FieldDisplayDefine(value = "额定起重力矩")
+
+    @TechnicalParameter(key = "ratedLiftingTorque", label = "额定起重力矩", type = TechnicalParameter.ParamType.STRING)
     private String ratedLiftingTorque;
 
-    @FieldDisplayDefine(value = "层数/泊位数")
+
+    @TechnicalParameter(key = "numberStorey", label = "层数/泊位数", type = TechnicalParameter.ParamType.STRING)
     private Integer numberStorey;
 
-    @FieldDisplayDefine(value = "运行速度")
+
+    @TechnicalParameter(key = "runningSpeed", label = "运行速度", type = TechnicalParameter.ParamType.STRING)
     private String runningSpeed;
 
-    @FieldDisplayDefine(value = "大车运行速度")
+
+    @TechnicalParameter(key = "bigcarRunSpeed", label = "大车运行速度", type = TechnicalParameter.ParamType.STRING)
     private String bigcarRunSpeed;
 
-    @FieldDisplayDefine(value = "小车运行速度")
+
+    @TechnicalParameter(key = "smallcarrunSpeed", label = "小车运行速度", type = TechnicalParameter.ParamType.STRING)
     private String smallcarrunSpeed;
 
-    @FieldDisplayDefine(value = "额定成员数")
+
+    @TechnicalParameter(key = "ratedMembers", label = "额定成员数", type = TechnicalParameter.ParamType.STRING)
     private Integer ratedMembers;
 
-    @FieldDisplayDefine(value = "额定提升速度")
+
+    @TechnicalParameter(key = "ratedLiftingSpeed", label = "额定提升速度", type = TechnicalParameter.ParamType.STRING)
     private String ratedLiftingSpeed;
 
-    @FieldDisplayDefine(value = "自由端高度")
+
+    @TechnicalParameter(key = "heightFreeEnd", label = "自由端高度", type = TechnicalParameter.ParamType.STRING)
     private String heightFreeEnd;
 
-    @FieldDisplayDefine(value = "吊笼工作行程")
+
+    @TechnicalParameter(key = "workStrokeCage", label = "吊笼工作行程", type = TechnicalParameter.ParamType.STRING)
     private String workStrokeCage;
 
-    @FieldDisplayDefine(value = "存容量")
+
+    @TechnicalParameter(key = "storageCapacity", label = "存容量", type = TechnicalParameter.ParamType.INTEGER)
     private Integer storageCapacity;
 
-    @FieldDisplayDefine(value = "额定升降速度")
+
+    @TechnicalParameter(key = "ratedLiftSpeed", label = "额定升降速度", type = TechnicalParameter.ParamType.STRING)
     private String ratedLiftSpeed;
 
-    @FieldDisplayDefine(value = "额定横移速度")
+
+    @TechnicalParameter(key = "ratedTraverseSpeed", label = "额定横移速度", type = TechnicalParameter.ParamType.STRING)
     private String ratedTraverseSpeed;
 
-    @FieldDisplayDefine(value = "单车最大进(出)车时间")
-    @TableField("BICYCLE_MAX_EXIT_TIME")
+
+    @TechnicalParameter(key = "bicycleMaxExitTime", label = "单车最大进(出)车时间", type = TechnicalParameter.ParamType.STRING)
     private String bicycleMaxExitTime;
 
-    @FieldDisplayDefine(value = "单车最大进车时间")
+
+    @TechnicalParameter(key = "bicycleMaxComeTime", label = "单车最大进车时间", type = TechnicalParameter.ParamType.STRING)
     private String bicycleMaxComeTime;
 
-    @FieldDisplayDefine(value = "区域防爆等级", dictCode = "FBDJ")
+
+    @TechnicalParameter(key = "explosionProofGrade", label = "区域防爆等级", type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
     private String explosionProofGrade;
 
-    @FieldDisplayDefine(value = "悬臂长度")
+
+    @TechnicalParameter(key = "cantileverLength", label = "悬臂长度", type = TechnicalParameter.ParamType.STRING)
     private String cantileverLength;
 
-    @FieldDisplayDefine(value = "变幅速度")
+    @TechnicalParameter(key = "derrickingSpeed", label = "变幅速度", type = TechnicalParameter.ParamType.STRING)
     private String derrickingSpeed;
 
-    @FieldDisplayDefine(value = "吊笼数量")
+
+    @TechnicalParameter(key = "hangingCagesNumber", label = "吊笼数量", type = TechnicalParameter.ParamType.STRING)
     private String hangingCagesNumber;
 
-    @FieldDisplayDefine(value = "燃爆物质")
+
+    @TechnicalParameter(key = "explosiveSubstance", label = "燃爆物质", type = TechnicalParameter.ParamType.STRING)
     private String explosiveSubstance;
 
-    @FieldDisplayDefine(value = "整机防爆标志", type = JSON.class)
+
+    @TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", type = TechnicalParameter.ParamType.STRING)
     private String explosionproofSignComplete;
 
-    @FieldDisplayDefine(value = "监检结束高度")
-    private String checkFinishedHeight;
 
-    @FieldDisplayDefine(value = "适停车辆尺寸高")
+    @TechnicalParameter(key = "ratedSpeedUp", label = "监检结束高度", type = TechnicalParameter.ParamType.STRING)
+    private String ratedSpeedUp;
+
+
+    @TechnicalParameter(key = "parkingVehicleHeight", label = "适停车辆尺寸高", type = TechnicalParameter.ParamType.STRING)
     private String parkingVehicleHeight;
 
-    @FieldDisplayDefine(value = "适停车辆尺寸宽")
+
+    @TechnicalParameter(key = "parkingVehicleWeight", label = "适停车辆尺寸宽", type = TechnicalParameter.ParamType.STRING)
     private String parkingVehicleWeight;
 
-    @FieldDisplayDefine(value = "适停车辆尺寸长")
+
+    @TechnicalParameter(key = "parkingVehicleLength", label = "适停车辆尺寸长", type = TechnicalParameter.ParamType.STRING)
     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

 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;
 
 /**
@@ -10,59 +11,59 @@ import lombok.Data;
  * @date 2023-08-17
  */
 @Data
+@Group("8000")
 public class PipelineTechParamDefine implements ITechParamDefine {
 
 
-    @FieldDisplayDefine(value = "唯一标识", isExist = false)
-    private String record;
-
-
-    @FieldDisplayDefine(value = "管道名称（登记单元）")
+    @TechnicalParameter(key = "pipeName", label = "管道名称（登记单元）", type = TechnicalParameter.ParamType.STRING)
     private String pipeName;
 
 
-    @FieldDisplayDefine(value = "管道编号")
+    @TechnicalParameter(key = "pipelineNumber", label = "管道编号", type = TechnicalParameter.ParamType.STRING)
     private String pipelineNumber;
 
 
-    @FieldDisplayDefine(value = "管道级别", typeHandler = "pieLineLevelTypeHandler")
+    @TechnicalParameter(key = "deviceLevel", label = "管道级别", type = TechnicalParameter.ParamType.STRING)
     private String deviceLevel;
 
 
-    @FieldDisplayDefine(value = "公称直径")
+    @TechnicalParameter(key = "nominalDiameter", label = "公称直径", type = TechnicalParameter.ParamType.STRING)
     private String nominalDiameter;
 
 
-    @FieldDisplayDefine(value = "公称壁厚")
+    @TechnicalParameter(key = "wallThickness", label = "公称壁厚", type = TechnicalParameter.ParamType.STRING)
     private String wallThickness;
 
 
-    @FieldDisplayDefine(value = "管道长度")
+    @TechnicalParameter(key = "pipeLength", label = "管道长度", type = TechnicalParameter.ParamType.FLOAT)
     private Double pipeLength;
 
 
-    @FieldDisplayDefine(value = "设计压力")
+    @TechnicalParameter(key = "pressure", label = "设计压力", type = TechnicalParameter.ParamType.STRING)
     private String pressure;
 
 
-    @FieldDisplayDefine(value = "设计温度")
+    @TechnicalParameter(key = "temperature", label = "设计温度", type = TechnicalParameter.ParamType.STRING)
     private String temperature;
 
 
-    @FieldDisplayDefine(value = "设计介质")
+    @TechnicalParameter(key = "medium", label = "设计介质", type = TechnicalParameter.ParamType.STRING)
     private String medium;
 
-    @FieldDisplayDefine(value = "工作压力")
+
+    @TechnicalParameter(key = "workPressure", label = "工作压力", type = TechnicalParameter.ParamType.STRING)
     private String workPressure;
 
-    @FieldDisplayDefine(value = "工作温度")
+
+    @TechnicalParameter(key = "workTemperature", label = "工作温度", type = TechnicalParameter.ParamType.STRING)
     private String workTemperature;
 
 
-    @FieldDisplayDefine(value = "工作介质")
+    @TechnicalParameter(key = "workMedium", label = "工作介质", type = TechnicalParameter.ParamType.STRING)
     private String workMedium;
 
-    @FieldDisplayDefine(value = "备注")
+
+    @TechnicalParameter(key = "remarks", label = "备注", type = TechnicalParameter.ParamType.STRING)
     private String remarks;
 
 }

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

 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;
 
 /**
@@ -10,40 +11,51 @@ import lombok.Data;
  * @date 2023-08-17
  */
 @Data
+@Group("6000")
 public class RidesTechParamDefine implements ITechParamDefine {
 
-    @FieldDisplayDefine(value = "轨道高度")
+
+    @TechnicalParameter(key = "trackHeight", label = "轨道高度", type = TechnicalParameter.ParamType.STRING)
     private String trackHeight;
 
-    @FieldDisplayDefine(value = "运行速度")
+
+    @TechnicalParameter(key = "runningSpeed", label = "运行速度", type = TechnicalParameter.ParamType.STRING)
     private String runningSpeed;
 
-    @FieldDisplayDefine(value = "乘坐人数")
+
+    @TechnicalParameter(key = "numberOfPassengers", label = "乘坐人数", type = TechnicalParameter.ParamType.STRING)
     private Integer numberOfPassengers;
 
-    @FieldDisplayDefine(value = "滑道长度")
+
+    @TechnicalParameter(key = "slideLength", label = "滑道长度", type = TechnicalParameter.ParamType.STRING)
     private String slideLength;
 
-    @FieldDisplayDefine(value = "运行高度")
+
+    @TechnicalParameter(key = "operatingHeight", label = "运行高度", type = TechnicalParameter.ParamType.STRING)
     private String operatingHeight;
 
-    @FieldDisplayDefine(value = "蹦极绳长度")
+
+    @TechnicalParameter(key = "slideHeight", label = "蹦极绳长度", type = TechnicalParameter.ParamType.STRING)
     private String slideHeight;
 
-    @FieldDisplayDefine(value = "回转直径")
+
+    @TechnicalParameter(key = "rotaryDiameter", label = "回转直径", type = TechnicalParameter.ParamType.STRING)
     private String rotaryDiameter;
 
-    @FieldDisplayDefine(value = "单边摆角")
+
+    @TechnicalParameter(key = "unilateralSwingAngle", label = "单边摆角", type = TechnicalParameter.ParamType.STRING)
     private String unilateralSwingAngle;
 
-    @FieldDisplayDefine(value = "车辆数")
+
+    @TechnicalParameter(key = "numberOfVehicles", label = "车辆数", type = TechnicalParameter.ParamType.INTEGER)
     private Integer numberOfVehicles;
 
-    @FieldDisplayDefine(value = "倾角")
+
+    @TechnicalParameter(key = "dip", label = "倾角", type = TechnicalParameter.ParamType.STRING)
     private String dip;
 
-    @FieldDisplayDefine(value = "设备高度")
-    private String equipmentHeight;
 
+    @TechnicalParameter(key = "equipmentHeight", label = "设备高度", type = TechnicalParameter.ParamType.STRING)
+    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

 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;
 
 /**
@@ -10,45 +11,56 @@ import lombok.Data;
  * @date 2023-08-17
  */
 @Data
+@Group("9000")
 public class RopewayTechParamDefine implements ITechParamDefine {
 
-    @FieldDisplayDefine(value = "平距")
+    @TechnicalParameter(key = "horizontalDistance", label = "平距", type = TechnicalParameter.ParamType.STRING)
     private String horizontalDistance;
 
-    @FieldDisplayDefine(value = "支架数目")
+
+    @TechnicalParameter(key = "supportsCount", label = "支架数目", type = TechnicalParameter.ParamType.INTEGER)
     private Integer supportsCount;
 
-    @FieldDisplayDefine(value = "斜长")
+
+    @TechnicalParameter(key = "obliqueLength", label = "斜长", type = TechnicalParameter.ParamType.STRING)
     private String obliqueLength;
 
-    @FieldDisplayDefine(value = "主电机型式")
+
+    @TechnicalParameter(key = "mainMotorModel", label = "主电机型式", type = TechnicalParameter.ParamType.STRING)
     private String mainMotorModel;
 
-    @FieldDisplayDefine(value = "主电机功率")
+
+    @TechnicalParameter(key = "mainMotorPower", label = "主电机功率", type = TechnicalParameter.ParamType.STRING)
     private String mainMotorPower;
 
-    @FieldDisplayDefine(value = "高差")
+
+    @TechnicalParameter(key = "altitudeDifference", label = "高差", type = TechnicalParameter.ParamType.STRING)
     private String altitudeDifference;
 
-    @FieldDisplayDefine(value = "运量")
+
+    @TechnicalParameter(key = "freightVolume", label = "运量", type = TechnicalParameter.ParamType.STRING)
     private String freightVolume;
 
-    @FieldDisplayDefine(value = "运载索", dictCode = "YZS")
+    @TechnicalParameter(key = "carrierLine", label = "运载索", type = TechnicalParameter.ParamType.STRING, dictCode = "YZS")
     private String carrierLine;
 
-    @FieldDisplayDefine(value = "速度")
+
+    @TechnicalParameter(key = "speed", label = "速度", type = TechnicalParameter.ParamType.STRING)
     private String speed;
 
-    @FieldDisplayDefine(value = "承载索")
+    @TechnicalParameter(key = "bearingCable", label = "承载索", type = TechnicalParameter.ParamType.STRING)
     private String bearingCable;
 
-    @FieldDisplayDefine(value = "索距")
+
+    @TechnicalParameter(key = "cablePitch", label = "索距", type = TechnicalParameter.ParamType.STRING)
     private String cablePitch;
 
-    @FieldDisplayDefine(value = "张紧油压（重锤重量）")
+
+    @TechnicalParameter(key = "oilPressureHeavyHammer", label = "张紧油压（重锤重量）", type = TechnicalParameter.ParamType.STRING)
     private String oilPressureHeavyHammer;
 
-    @FieldDisplayDefine(value = "运载工具数量和类型")
+
+    @TechnicalParameter(key = "numberAndTypeOfVehicles", label = "运载工具数量和类型", type = TechnicalParameter.ParamType.STRING)
     private String numberAndTypeOfVehicles;
 
 }

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

 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;
 
 /**
@@ -10,79 +11,102 @@ import lombok.Data;
  * @date 2023-08-17
  */
 @Data
+@Group("5000")
 public class VehicleTechParamDefine implements ITechParamDefine {
 
 
-    @FieldDisplayDefine(value = "车架编号")
+    @TechnicalParameter(key = "frameNo", label = "车架编号", type = TechnicalParameter.ParamType.STRING)
     private String frameNo;
 
-    @FieldDisplayDefine(value = "发动机（行走电机）编号")
+
+    @TechnicalParameter(key = "engineNo", label = "发动机（行走电机）编号", type = TechnicalParameter.ParamType.STRING)
     private String engineNo;
 
-    @FieldDisplayDefine(value = "额定起重量")
+
+    @TechnicalParameter(key = "liftingCapacity", label = "额定起重量", type = TechnicalParameter.ParamType.STRING)
     private String liftingCapacity;
 
-    @FieldDisplayDefine(value = "传动方式")
+
+    @TechnicalParameter(key = "transmissionMode", label = "传动方式", type = TechnicalParameter.ParamType.STRING)
     private String transmissionMode;
 
-    @FieldDisplayDefine(value = "自重")
+
+    @TechnicalParameter(key = "weight", label = "自重", type = TechnicalParameter.ParamType.STRING)
     private String weight;
 
-    @FieldDisplayDefine(value = "动力方式")
+    @TechnicalParameter(key = "powerMode", label = "动力方式", type = TechnicalParameter.ParamType.STRING)
     private String powerMode;
 
-    @FieldDisplayDefine(value = "最大运行速度")
+
+    @TechnicalParameter(key = "maxRunningSpeed", label = "最大运行速度", type = TechnicalParameter.ParamType.STRING)
     private String maxRunningSpeed;
 
-    @FieldDisplayDefine(value = "工作装置空载最大起升高度")
+
+    @TechnicalParameter(key = "maxLiftingHeight", label = "工作装置空载最大起升高度", type = TechnicalParameter.ParamType.STRING)
     private String maxLiftingHeight;
 
-    @FieldDisplayDefine(value = "气体/粉尘组别（防爆）")
+
+    @TechnicalParameter(key = "gasGroup", label = "气体/粉尘组别（防爆）", type = TechnicalParameter.ParamType.STRING)
     private String gasGroup;
 
-    @FieldDisplayDefine(value = "车架结构")
+
+    @TechnicalParameter(key = "frameStructure", label = "车架结构", type = TechnicalParameter.ParamType.STRING)
     private String frameStructure;
 
-    @FieldDisplayDefine(value = "驾驶方式")
+
+    @TechnicalParameter(key = "drivingMode", label = "驾驶方式", type = TechnicalParameter.ParamType.STRING)
     private String drivingMode;
 
-    @FieldDisplayDefine(value = "空载最大运行速度")
+
+    @TechnicalParameter(key = "carryingIdlerMaxRunningSpeed", label = "空载最大运行速度", type = TechnicalParameter.ParamType.STRING)
     private String carryingIdlerMaxRunningSpeed;
 
-    @FieldDisplayDefine(value = "设备保护等级（防爆）", dictCode = "FBDJ")
+
+    @TechnicalParameter(key = "protectGrade", label = "设备保护等级（防爆）", type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
     private String protectGrade;
 
-    @FieldDisplayDefine(value = "温度组别（防爆）")
+
+    @TechnicalParameter(key = "temperatureGroup", label = "温度组别（防爆）", type = TechnicalParameter.ParamType.STRING)
     private String temperatureGroup;
 
-    @FieldDisplayDefine(value = "额定载客人数")
+
+    @TechnicalParameter(key = "passengersNumber", label = "额定载客人数", type = TechnicalParameter.ParamType.INTEGER)
     private Integer passengersNumber;
 
-    @FieldDisplayDefine(value = "最大行驶坡度")
+
+    @TechnicalParameter(key = "maxDrivingSlope", label = "最大行驶坡度", type = TechnicalParameter.ParamType.STRING)
     private String maxDrivingSlope;
 
-    @FieldDisplayDefine(value = "整车整备质量")
+
+    @TechnicalParameter(key = "vehicleMass", label = "整车整备质量", type = TechnicalParameter.ParamType.STRING)
     private String vehicleMass;
 
-    @FieldDisplayDefine(value = "轴距")
+
+    @TechnicalParameter(key = "wheelBase", label = "轴距", type = TechnicalParameter.ParamType.STRING)
     private String wheelBase;
 
-    @FieldDisplayDefine(value = "轮距（前）")
+
+    @TechnicalParameter(key = "trackWidthFront", label = "轮距（前）", type = TechnicalParameter.ParamType.STRING)
     private String trackWidthFront;
 
-    @FieldDisplayDefine(value = "轮距（后）")
+
+    @TechnicalParameter(key = "trackWidthBehind", label = "轮距（后）", type = TechnicalParameter.ParamType.STRING)
     private String trackWidthBehind;
 
-    @FieldDisplayDefine(value = "观光列车车厢数")
+
+    @TechnicalParameter(key = "carsNumber", label = "观光列车车厢数", type = TechnicalParameter.ParamType.INTEGER)
     private Integer carsNumber;
 
-    @FieldDisplayDefine(value = "观光列车每节车厢座位数")
+
+    @TechnicalParameter(key = "seatNumber", label = "观光列车每节车厢座位数", type = TechnicalParameter.ParamType.INTEGER)
     private Integer seatNumber;
 
-    @FieldDisplayDefine(value = "观光列车牵引车头座位数")
+
+    @TechnicalParameter(key = "tractorSeatNumber", label = "观光列车牵引车头座位数", type = TechnicalParameter.ParamType.INTEGER)
     private Integer tractorSeatNumber;
 
-    @FieldDisplayDefine(value = "空载最大起升速度")
+
+    @TechnicalParameter(key = "maxLiftingSpeed", label = "空载最大起升速度", type = TechnicalParameter.ParamType.STRING)
     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/ESEquipmentInfo.java

@@ -548,7 +548,7 @@ public class ESEquipmentInfo {
          * 维保合同结束日期
          */
         @Field(type = FieldType.Date, format = DateFormat.date)
-        private String informEnd;
+        private Date informEnd;
         /**
          * 维保负责人姓名
          */

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DataHandlerController.java

@@ -229,6 +229,7 @@ public class DataHandlerController extends BaseController {
         return ResponseHelper.buildResponse(dataHandlerService.initDataQualityScore());
     }
 
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "初始化综合搜索数据-企业", notes = "初始化综合搜索数据-企业")
     @PutMapping(value = "/company/initStatistData2Es")
@@ -236,6 +237,7 @@ public class DataHandlerController extends BaseController {
         return ResponseHelper.buildResponse(dataHandlerService.initCompanyStatistData2Es());
     }
 
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "初始化综合搜索数据-人员", notes = "初始化综合搜索数据-人员")
     @PutMapping(value = "/user/initStatistData2Es")
@@ -243,6 +245,7 @@ public class DataHandlerController extends BaseController {
         return ResponseHelper.buildResponse(dataHandlerService.initUserStatistData2Es());
     }
 
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "初始化综合搜索数据-设备", notes = "初始化综合搜索数据-设备")
     @PutMapping(value = "/equip/initStatistData2Es")
@@ -250,6 +253,4 @@ public class DataHandlerController extends BaseController {
         return ResponseHelper.buildResponse(dataHandlerService.initEquipStatistData2Es());
     }
 
-
-
 }
\ No newline at end of file