Skip to content

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

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

1.人员、企业、设备 2.技术参数整理
parent f8229574
Hide whitespace changes
Inline Side-by-side
Showing with 382 additions and 240 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotation/TechnicalParameter.java
View file @ 74cfb15f
......@@ -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
View file @ 74cfb15f
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
View file @ 74cfb15f
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
View file @ 74cfb15f
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
View file @ 74cfb15f
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
View file @ 74cfb15f
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
View file @ 74cfb15f
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/dto/VesselTechParamsDefine.java
View file @ 74cfb15f
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,252 +11,286 @@ import lombok.Data;
* @date 2023-08-17
*/
@Data
@Group("2000")
public class VesselTechParamsDefine implements ITechParamDefine {
@FieldDisplayDefine(value = "额定质量")
@TechnicalParameter(key = "ratedQuality", label = "额定质量", type = TechnicalParameter.ParamType.STRING)
private String ratedQuality;
@FieldDisplayDefine(value = "使用环境温度")
@TechnicalParameter(key = "ambientTemperature", label = "使用环境温度", type = TechnicalParameter.ParamType.STRING)
private String ambientTemperature;
@FieldDisplayDefine(value = "型号")
@TechnicalParameter(key = "modelNumber", label = "型号", type = TechnicalParameter.ParamType.STRING)
private String modelNumber;
@FieldDisplayDefine(value = "数量")
@TechnicalParameter(key = "num", label = "数量", type = TechnicalParameter.ParamType.STRING)
private Integer num;
@FieldDisplayDefine(value = "单瓶容积")
@TechnicalParameter(key = "singleBottleVolume", label = "单瓶容积", type = TechnicalParameter.ParamType.STRING)
private String singleBottleVolume;
@FieldDisplayDefine(value = "总容积")
@TechnicalParameter(key = "totalVolume", label = "总容积", type = TechnicalParameter.ParamType.STRING)
private String totalVolume;
@FieldDisplayDefine(value = "充装介质")
@TechnicalParameter(key = "chargingMedium", label = "充装介质", type = TechnicalParameter.ParamType.STRING)
private String chargingMedium;
@FieldDisplayDefine(value = "规格")
@TechnicalParameter(key = "specification", label = "规格", type = TechnicalParameter.ParamType.STRING)
private String specification;
@FieldDisplayDefine(value = "外径")
@TechnicalParameter(key = "outsideDiameter", label = "外径", type = TechnicalParameter.ParamType.STRING)
private String outsideDiameter;
@FieldDisplayDefine(value = "壁厚")
@TechnicalParameter(key = "wallThickness", label = "壁厚", type = TechnicalParameter.ParamType.STRING)
private String wallThickness;
@FieldDisplayDefine(value = "长度")
@TechnicalParameter(key = "length", label = "长度", type = TechnicalParameter.ParamType.STRING)
private String length;
@FieldDisplayDefine(value = "公称工作压力")
@TechnicalParameter(key = "nominalWorkingPressure", label = "公称工作压力", type = TechnicalParameter.ParamType.STRING)
private String nominalWorkingPressure;
@FieldDisplayDefine(value = "材料（瓶体）")
@TechnicalParameter(key = "bottleBody", label = "材料（瓶体）", type = TechnicalParameter.ParamType.STRING)
private String bottleBody;
@FieldDisplayDefine(value = "材料（端塞）")
@TechnicalParameter(key = "endPlug", label = "材料（端塞）", type = TechnicalParameter.ParamType.STRING)
private String endPlug;
@FieldDisplayDefine(value = "材料（管路）")
@TechnicalParameter(key = "piping", label = "材料（管路）", type = TechnicalParameter.ParamType.STRING)
private String piping;
@FieldDisplayDefine(value = "无损检测方法（气瓶）")
@TechnicalParameter(key = "qpLossless", label = "无损检测方法（气瓶）", type = TechnicalParameter.ParamType.STRING)
private String qpLossless;
@FieldDisplayDefine(value = "无损检测方法（管路）")
@TechnicalParameter(key = "glLossless", label = "无损检测方法（管路）", type = TechnicalParameter.ParamType.STRING)
private String glLossless;
@FieldDisplayDefine(value = "无损检测比例（气瓶）")
@TechnicalParameter(key = "qpRatio", label = "无损检测比例（气瓶）", type = TechnicalParameter.ParamType.STRING)
private String qpRatio;
@FieldDisplayDefine(value = "无损检测比例（管路）")
@TechnicalParameter(key = "glRatio", label = "无损检测比例（管路）", type = TechnicalParameter.ParamType.STRING)
private String glRatio;
@FieldDisplayDefine(value = "耐压试验压力（气瓶）")
@TechnicalParameter(key = "qpPressure", label = "耐压试验压力（气瓶）", type = TechnicalParameter.ParamType.STRING)
private String qpPressure;
@FieldDisplayDefine(value = "耐压试验压力（管路）")
@TechnicalParameter(key = "glPressure", label = "耐压试验压力（管路）", type = TechnicalParameter.ParamType.STRING)
private String glPressure;
@FieldDisplayDefine(value = "气密性试验压力（气瓶）")
@TechnicalParameter(key = "qpAirTightness", label = "气密性试验压力（气瓶）", type = TechnicalParameter.ParamType.STRING)
private String qpAirTightness;
@FieldDisplayDefine(value = "气密性试验压力（管路）")
@TechnicalParameter(key = "glAirTightness", label = "气密性试验压力（管路）", type = TechnicalParameter.ParamType.STRING)
private String glAirTightness;
@FieldDisplayDefine(value = "气体置换后压力")
@TechnicalParameter(key = "displacementPressure", label = "气体置换后压力", type = TechnicalParameter.ParamType.STRING)
private String displacementPressure;
@FieldDisplayDefine(value = "瓶体内含氧量")
@TechnicalParameter(key = "oxygen", label = "瓶体内含氧量", type = TechnicalParameter.ParamType.STRING)
private String oxygen;
@FieldDisplayDefine(value = "瓶体内含氧量")
@TechnicalParameter(key = "heatTreatmentMethod", label = "瓶体内含氧量", type = TechnicalParameter.ParamType.STRING)
private String heatTreatmentMethod;
@FieldDisplayDefine(value = "热处理温度")
@TechnicalParameter(key = "qpHeatTreatmentTemperature", label = "热处理温度", type = TechnicalParameter.ParamType.STRING)
private String qpHeatTreatmentTemperature;
@FieldDisplayDefine(value = "气瓶安装位置")
@TechnicalParameter(key = "installationPosition", label = "气瓶安装位置", type = TechnicalParameter.ParamType.STRING)
private String installationPosition;
@FieldDisplayDefine(value = "容器容积")
@TechnicalParameter(key = "containerVolume", label = "容器容积", type = TechnicalParameter.ParamType.STRING)
private String containerVolume;
@FieldDisplayDefine(value = "容器内径")
@TechnicalParameter(key = "pressureVesselDiameter", label = "容器内径", type = TechnicalParameter.ParamType.STRING)
private String pressureVesselDiameter;
@FieldDisplayDefine(value = "容器高(长)")
@TechnicalParameter(key = "height", label = "容器高(长)", type = TechnicalParameter.ParamType.STRING)
private String height;
@FieldDisplayDefine(value = "材料（筒体(球壳)）")
@TechnicalParameter(key = "materialCylinderShell", label = "材料（筒体(球壳)）", type = TechnicalParameter.ParamType.STRING)
private String materialCylinderShell;
@FieldDisplayDefine(value = "材料（封头）")
@TechnicalParameter(key = "pressureMaterialHead", label = "材料（封头）", type = TechnicalParameter.ParamType.STRING)
private String pressureMaterialHead;
@FieldDisplayDefine(value = "材料（衬里）")
@TechnicalParameter(key = "pressureMaterialLining", label = "材料（衬里）", type = TechnicalParameter.ParamType.STRING)
private String pressureMaterialLining;
@FieldDisplayDefine(value = "材料（夹套）")
@TechnicalParameter(key = "materialJacket", label = "材料（夹套）", type = TechnicalParameter.ParamType.STRING)
private String materialJacket;
@FieldDisplayDefine(value = "厚度（筒体(球壳)）")
@TechnicalParameter(key = "thickness", label = "厚度（筒体(球壳)）", type = TechnicalParameter.ParamType.STRING)
private String thickness;
@FieldDisplayDefine(value = "厚度（封头）")
@TechnicalParameter(key = "fixedHead", label = "厚度（封头）", type = TechnicalParameter.ParamType.STRING)
private String fixedHead;
@FieldDisplayDefine(value = "厚度（衬里）")
@TechnicalParameter(key = "fixedLining", label = "厚度（衬里）", type = TechnicalParameter.ParamType.STRING)
private String fixedLining;
@FieldDisplayDefine(value = "厚度（夹套）")
@TechnicalParameter(key = "fixedJacket", label = "厚度（夹套）", type = TechnicalParameter.ParamType.STRING)
private String fixedJacket;
@FieldDisplayDefine(value = "容器自重")
@TechnicalParameter(key = "selfWeight", label = "容器自重", type = TechnicalParameter.ParamType.STRING)
private String selfWeight;
@FieldDisplayDefine(value = "盛装介质重量")
@TechnicalParameter(key = "mediumWeight", label = "盛装介质重量", type = TechnicalParameter.ParamType.STRING)
private String mediumWeight;
@FieldDisplayDefine(value = "设计压力（壳程）")
@TechnicalParameter(key = "pressureHousingPath", label = "设计压力（壳程）", type = TechnicalParameter.ParamType.STRING)
private String pressureHousingPath;
@FieldDisplayDefine(value = "设计压力（管程）")
@TechnicalParameter(key = "pressurePipe", label = "设计压力（管程）", type = TechnicalParameter.ParamType.STRING)
private String pressurePipe;
@FieldDisplayDefine(value = "设计压力（夹套）")
@TechnicalParameter(key = "pressureJacket", label = "设计压力（夹套）", type = TechnicalParameter.ParamType.STRING)
private String pressureJacket;
@FieldDisplayDefine(value = "设计温度（壳程）")
@TechnicalParameter(key = "temperatureShell", label = "设计温度（壳程）", type = TechnicalParameter.ParamType.STRING)
private String temperatureShell;
@FieldDisplayDefine(value = "设计温度（管程）")
@TechnicalParameter(key = "temperaturePipe", label = "设计温度（管程）", type = TechnicalParameter.ParamType.STRING)
private String temperaturePipe;
@FieldDisplayDefine(value = "设计温度（夹套）")
@TechnicalParameter(key = "temperatureJacket", label = "设计温度（夹套）", type = TechnicalParameter.ParamType.STRING)
private String temperatureJacket;
@FieldDisplayDefine(value = "最高允许工作压力（壳程）")
@TechnicalParameter(key = "maxPressureShell", label = "最高允许工作压力（壳程）", type = TechnicalParameter.ParamType.STRING)
private String maxPressureShell;
@FieldDisplayDefine(value = "最高允许工作压力（管程）")
@TechnicalParameter(key = "maxPressurePipe", label = "最高允许工作压力（管程）", type = TechnicalParameter.ParamType.STRING)
private String maxPressurePipe;
@FieldDisplayDefine(value = "最高允许工作压力（夹套）")
@TechnicalParameter(key = "maxPressureJacket", label = "最高允许工作压力（夹套）", type = TechnicalParameter.ParamType.STRING)
private String maxPressureJacket;
@FieldDisplayDefine(value = "介质（壳程）")
@TechnicalParameter(key = "mediumShell", label = "介质（壳程）", type = TechnicalParameter.ParamType.STRING)
private String mediumShell;
@FieldDisplayDefine(value = "介质（管程）")
@TechnicalParameter(key = "mediumPipe", label = "介质（管程）", type = TechnicalParameter.ParamType.STRING)
private String mediumPipe;
@FieldDisplayDefine(value = "介质（夹套）")
@TechnicalParameter(key = "mediumJacket", label = "介质（夹套）", type = TechnicalParameter.ParamType.STRING)
private String mediumJacket;
@FieldDisplayDefine(value = "主体结构型式", dictCode = "RQJG")
@TechnicalParameter(key = "mainStructureType", label = "主体结构型式", type = TechnicalParameter.ParamType.STRING, dictCode = "RQJG")
private String mainStructureType;
@FieldDisplayDefine(value = "支座型式")
@TechnicalParameter(key = "support", label = "支座型式", type = TechnicalParameter.ParamType.STRING)
private String support;
@FieldDisplayDefine(value = "安装型式")
@TechnicalParameter(key = "installation", label = "安装型式", type = TechnicalParameter.ParamType.STRING)
private String installation;
@FieldDisplayDefine(value = "保温绝热方式")
@TechnicalParameter(key = "insulation", label = "保温绝热方式", type = TechnicalParameter.ParamType.STRING)
private String insulation;
@FieldDisplayDefine(value = "无损检测方法", dictCode = "RQJCFF")
@TechnicalParameter(key = "checkLossless", label = "无损检测方法", type = TechnicalParameter.ParamType.STRING , dictCode = "RQJCFF")
private String checkLossless;
@FieldDisplayDefine(value = "耐压试验种类")
@TechnicalParameter(key = "withstandVoltage", label = "耐压试验种类", type = TechnicalParameter.ParamType.STRING)
private String withstandVoltage;
@FieldDisplayDefine(value = "泄漏试验种类")
@TechnicalParameter(key = "leakage", label = "泄漏试验种类", type = TechnicalParameter.ParamType.STRING)
private String leakage;
@FieldDisplayDefine(value = "耐压试验压力")
@TechnicalParameter(key = "withstandPressureTest", label = "泄漏试验压力", type = TechnicalParameter.ParamType.STRING)
private String withstandPressureTest;
@FieldDisplayDefine(value = "泄漏试验压力")
@TechnicalParameter(key = "leakPressure", label = "泄漏试验压力", type = TechnicalParameter.ParamType.STRING)
private String leakPressure;
@FieldDisplayDefine(value = "容器型号")
@TechnicalParameter(key = "container", label = "罐车编号", type = TechnicalParameter.ParamType.STRING)
private String container;
@FieldDisplayDefine(value = "罐车编号")
@TechnicalParameter(key = "carNum", label = "罐车编号", type = TechnicalParameter.ParamType.STRING)
private String carNum;
@FieldDisplayDefine(value = "容积")
@TechnicalParameter(key = "volume", label = "容积", type = TechnicalParameter.ParamType.STRING)
private String volume;
@FieldDisplayDefine(value = "最大充装量")
@TechnicalParameter(key = "maxFill", label = "最大充装量", type = TechnicalParameter.ParamType.STRING)
private String maxFill;
@FieldDisplayDefine(value = "设计压力")
@TechnicalParameter(key = "designPressure", label = "设计压力", type = TechnicalParameter.ParamType.STRING)
private String designPressure;
@FieldDisplayDefine(value = "设计温度")
@TechnicalParameter(key = "designTemperature", label = "设计温度", type = TechnicalParameter.ParamType.STRING)
private String designTemperature;
@FieldDisplayDefine(value = "工作压力")
@TechnicalParameter(key = "workingPressure", label = "工作压力", type = TechnicalParameter.ParamType.STRING)
private String workingPressure;
@FieldDisplayDefine(value = "工作温度")
@TechnicalParameter(key = "workTemperature", label = "工作温度", type = TechnicalParameter.ParamType.STRING)
private String workTemperature;
@FieldDisplayDefine(value = "材料（筒体）")
@TechnicalParameter(key = "materialCylinder", label = "材料（筒体）", type = TechnicalParameter.ParamType.STRING)
private String materialCylinder;
@FieldDisplayDefine(value = "厚度（筒体）")
@TechnicalParameter(key = "thicknessCylinder", label = "厚度（筒体）", type = TechnicalParameter.ParamType.STRING)
private String thicknessCylinder;
@FieldDisplayDefine(value = "腐蚀裕量")
@TechnicalParameter(key = "corrosionMargin", label = "腐蚀裕量", type = TechnicalParameter.ParamType.STRING)
private String corrosionMargin;
@FieldDisplayDefine(value = "介质")
@TechnicalParameter(key = "medium", label = "介质", type = TechnicalParameter.ParamType.STRING)
private String medium;
@FieldDisplayDefine(value = "氧舱品种")
@TechnicalParameter(key = "oxygenChamber", label = "氧舱品种", type = TechnicalParameter.ParamType.STRING)
private String oxygenChamber;
@FieldDisplayDefine(value = "额定进舱人数")
@TechnicalParameter(key = "ratedEntryCapacity", label = "额定进舱人数", type = TechnicalParameter.ParamType.STRING)
private Integer ratedEntryCapacity;
@FieldDisplayDefine(value = "主体结构")
@TechnicalParameter(key = "chamberMain", label = "主体结构", type = TechnicalParameter.ParamType.STRING)
private String chamberMain;
@FieldDisplayDefine(value = "压力")
@TechnicalParameter(key = "chamberPressure", label = "压力", type = TechnicalParameter.ParamType.STRING)
private String chamberPressure;
@FieldDisplayDefine(value = "温度")
@TechnicalParameter(key = "temperature", label = "温度", type = TechnicalParameter.ParamType.STRING)
private String temperature;
@FieldDisplayDefine(value = "压力介质")
@TechnicalParameter(key = "pressureMedium", label = "压力介质", type = TechnicalParameter.ParamType.STRING)
private String pressureMedium;
@FieldDisplayDefine(value = "人均舱容")
@TechnicalParameter(key = "perCapitaCabinCapacity", label = "人均舱容", type = TechnicalParameter.ParamType.STRING)
private String perCapitaCabinCapacity;
@FieldDisplayDefine(value = "车辆VIN码")
@TechnicalParameter(key = "vin", label = "车辆VIN码", type = TechnicalParameter.ParamType.STRING)
private String vin;
}
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
View file @ 74cfb15f
......@@ -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
View file @ 74cfb15f
......@@ -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
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 @ 74cfb15f
......@@ -69,7 +69,6 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.Collectors;
import static com.alibaba.fastjson.JSON.toJSONString;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl.CONSTRUCTION_TYPE;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl.CONSTRUCTION_TYPE_NAME;
......@@ -132,13 +131,14 @@ public class DataHandlerServiceImpl {
private final EsEquipmentDao esEquipmentDao;
private final IdxBizJgMaintenanceRecordInfoServiceImpl maintenanceRecordInfoService;
private final IdxBizJgMaintenanceRecordInfoServiceImpl maintenanceRecordInfoService;
private static final String ROOT_ORG_CODE = "50";
private final IdxBizJgDesignInfoServiceImpl idxBizJgDesignInfoServiceImpl;
private final StatisticsDataUpdateService statisticsDataUpdateService;
/**
* 安装告知压力管道历史数据修复-详情中的设备列表修改为汇总表格式
*
......@@ -1380,25 +1380,25 @@ public class DataHandlerServiceImpl {
this.updateEsDataQualityScore(d.getRecord(), d.getDataQualityScore());
});
// 数据库更新
if(!refreshDataQualityScores.isEmpty()){
useInfoService.getBaseMapper().updateDataQualityScoreBatch(refreshDataQualityScores, maxVersion + 1);
if (!refreshDataQualityScores.isEmpty()) {
useInfoService.getBaseMapper().updateDataQualityScoreBatch(refreshDataQualityScores, maxVersion + 1);
}
refreshRecords = useInfoService.getBaseMapper().selectUseInfoOfOneVersion(maxVersion);
}
// 2.管道逻辑
List<IdxBizJgProjectContraption> projectContraptionList = projectContraptionService.getBaseMapper().selectList(new LambdaQueryWrapper<IdxBizJgProjectContraption>().isNull(IdxBizJgProjectContraption::getProjectContraptionParentId).select(BaseEntity::getSequenceNbr, IdxBizJgProjectContraption::getUseRegistrationCode));
List<ProjectWaitRefreshDataQualityScore> projectWaitRefreshDataQualityScores = projectContraptionList.stream().map(p->{
List<ProjectWaitRefreshDataQualityScore> projectWaitRefreshDataQualityScores = projectContraptionList.stream().map(p -> {
ProjectWaitRefreshDataQualityScore projectWaitRefreshDataQualityScore = new ProjectWaitRefreshDataQualityScore();
projectWaitRefreshDataQualityScore.setProjectContraptionId(p.getSequenceNbr());
if(StringUtils.isNotEmpty(p.getUseRegistrationCode())){
if (StringUtils.isNotEmpty(p.getUseRegistrationCode())) {
projectWaitRefreshDataQualityScore.setDataQualityScore(1);
} else {
projectWaitRefreshDataQualityScore.setDataQualityScore(3);
}
return projectWaitRefreshDataQualityScore;
return projectWaitRefreshDataQualityScore;
}).collect(Collectors.toList());
if(!projectWaitRefreshDataQualityScores.isEmpty()){
projectContraptionService.getBaseMapper().updateDataQualityScoreBatch(projectWaitRefreshDataQualityScores );
if (!projectWaitRefreshDataQualityScores.isEmpty()) {
projectContraptionService.getBaseMapper().updateDataQualityScoreBatch(projectWaitRefreshDataQualityScores);
}
watch.stop();
log.info("耗时秒：{}", watch.getTotalTimeSeconds());
......@@ -1451,18 +1451,19 @@ public class DataHandlerServiceImpl {
TzBaseEnterpriseInfo::getSuperviseOrgCode,
TzBaseEnterpriseInfo::getSuperviseOrgName
).eq(BaseEntity::getIsDelete, false));
Map<String, TzBaseEnterpriseInfo> useCodeEnterpriseMap = units.stream().collect(Collectors.toMap(TzBaseEnterpriseInfo::getUseCode, Function.identity(),(k1,k2)->k2));
Map<String, TzBaseEnterpriseInfo> useCodeEnterpriseMap = units.stream().collect(Collectors.toMap(TzBaseEnterpriseInfo::getUseCode, Function.identity(), (k1, k2) -> k2));
LambdaQueryWrapper<TzsUserInfo> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(BaseEntity::getIsDelete, false)
.orderByDesc(BaseEntity::getSequenceNbr);
Integer userNum = userInfoMapper.selectCount(wrapper);
int pageSize = 1000;
int totalPage = Math.max(1, (int) Math.ceil((double)userNum / pageSize));
for (int i = 1; i <= totalPage; i++ ){
int totalPage = Math.max(1, (int) Math.ceil((double) userNum / pageSize));
for (int i = 1; i <= totalPage; i++) {
IPage<TzsUserInfo> tzsUserInfoPage = userInfoMapper.selectPage(new Page<>(i, pageSize), wrapper);
List<EsUserInfo> esUserInfos = tzsUserInfoPage.getRecords().stream().map(u->{
List<EsUserInfo> esUserInfos = tzsUserInfoPage.getRecords().stream().map(u -> {
EsUserInfo esUserInfo = new EsUserInfo();
BeanUtil.copyProperties(u, esUserInfo);
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());
esUserInfo.setLicenses(this.buildUserLicenses(u.getSequenceNbr()));
......@@ -1477,7 +1478,7 @@ public class DataHandlerServiceImpl {
private List<EsUserInfo.License> buildUserLicenses(Long sequenceNbr) {
List<TzsUserPermission> permissions = userPermissionMapper.selectList(new LambdaQueryWrapper<TzsUserPermission>().eq(TzsUserPermission::getUserSeq, sequenceNbr));
return permissions.stream().map(p->{
return permissions.stream().map(p -> {
EsUserInfo.License license = new EsUserInfo.License();
BeanUtil.copyProperties(p, license);
return license;
......@@ -1489,16 +1490,22 @@ public class DataHandlerServiceImpl {
StopWatch watch = new StopWatch();
watch.start();
Integer maxVersion = useInfoService.getBaseMapper().selectMaxVersion();
// 1.非管道数据刷数据质量等级
List<String> refreshRecords = useInfoService.getBaseMapper().selectUseInfoOfOneVersionAll(maxVersion);
while (!refreshRecords.isEmpty()) {
List<ESEquipmentInfo> esEquipmentInfos = refreshRecords.parallelStream().map(record->{
ESEquipmentInfo esEquipmentInfo = new ESEquipmentInfo();
Optional<ESEquipmentCategoryDto> categoryDto = esEquipmentCategory.findById(record);
categoryDto.ifPresent(categoryEs -> {
List<ESEquipmentInfo> esEquipmentInfos = refreshRecords.parallelStream().map(record -> {
ESEquipmentInfo esEquipmentInfo = null;
try {
esEquipmentInfo = new ESEquipmentInfo();
Optional<ESEquipmentCategoryDto> categoryDto = esEquipmentCategory.findById(record);
// 兼容243 es 被删除逻辑
ESEquipmentCategoryDto categoryEs = categoryDto.orElseGet(() -> {
Map<String, Object> map = categoryOtherInfoMapper.selectDataById(record);
return JSON.parseObject(toJSONString(map), ESEquipmentCategoryDto.class);
});
BeanUtil.copyProperties(categoryEs, esEquipmentInfo);
IdxBizJgUseInfo useInfo = useInfoService.getOne(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getRecord, record).select(IdxBizJgUseInfo::getRecord, IdxBizJgUseInfo::getCreateDate));
IdxBizJgDesignInfo designInfo = idxBizJgDesignInfoServiceImpl.getOne(new LambdaQueryWrapper<IdxBizJgDesignInfo>()
.eq(IdxBizJgDesignInfo::getRecord,record)
.eq(IdxBizJgDesignInfo::getRecord, record)
.select(IdxBizJgDesignInfo::getRecord, IdxBizJgDesignInfo::getDesignUnitName, IdxBizJgDesignInfo::getDesignUnitCreditCode));
IdxBizJgFactoryInfo factoryInfo = factoryInfoService.getOne(new LambdaQueryWrapper<IdxBizJgFactoryInfo>()
.eq(IdxBizJgFactoryInfo::getRecord, record)
......@@ -1511,14 +1518,21 @@ public class DataHandlerServiceImpl {
esEquipmentInfo.setMAINTAIN_UNIT(lastMaintenanceRecordInfo.getMeUnitCreditCode());
esEquipmentInfo.setMAINTAIN_UNIT_NAME(lastMaintenanceRecordInfo.getMeUnitName());
esEquipmentInfo.setDesignUnitName(designInfo.getDesignUnitName());
esEquipmentInfo.setCreateDate(useInfo.getCreateDate());
esEquipmentInfo.setProduceUnitCreditCode(factoryInfo.getProduceUnitCreditCode());
esEquipmentInfo.setInspections(Collections.singletonList(BeanUtil.copyProperties(inspectionDetectionInfo, ESEquipmentInfo.Inspection.class)));
esEquipmentInfo.setMaintenances(Collections.singletonList(BeanUtil.copyProperties(lastMaintenanceRecordInfo, ESEquipmentInfo.Maintenance.class)));
esEquipmentInfo.setTechParams(this.buildTechParamByEquList(record, categoryEs.getEQU_LIST_CODE()));
});
} catch (Exception e) {
// 异常数据跳过
log.error("设备刷数据处理失败：{}", record, e);
}
return esEquipmentInfo;
}).collect(Collectors.toList());
esEquipmentDao.saveAll(esEquipmentInfos);
esEquipmentInfos.remove(null);
if(!esEquipmentInfos.isEmpty()){
esEquipmentDao.saveAll(esEquipmentInfos);
}
useInfoService.getBaseMapper().updateVersionBatch(refreshRecords, maxVersion + 1);
refreshRecords = useInfoService.getBaseMapper().selectUseInfoOfOneVersionAll(maxVersion);
}
......@@ -1528,6 +1542,6 @@ public class DataHandlerServiceImpl {
}
private List<ESEquipmentInfo.TechParam> buildTechParamByEquList(String record, String equListCode) {
return statisticsDataUpdateService.getTechParams(equListCode, record);
return StringUtils.isNotEmpty(equListCode) ? statisticsDataUpdateService.getTechParams(equListCode, record) : new ArrayList<>();
}
}
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