Skip to content

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

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

parents ee66048c 9b9059f8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 721 additions and 238 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotation/TechnicalParameter.java
View file @ af9aa706
...@@ -12,8 +12,16 @@ public @interface TechnicalParameter { ...@@ -12,8 +12,16 @@ public @interface TechnicalParameter {
ParamType type(); ParamType type();
/**
* cb_data_dictionary表的type
* @return 字典code
*/
String dictCode() default "";
String unit() default "";
enum ParamType { enum ParamType {
STRING, INTEGER, FLOAT, BIG_DECIMAL, BOOLEAN 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/BoilerTechParamsDefine.java
View file @ af9aa706
...@@ -14,7 +14,7 @@ import lombok.Data; ...@@ -14,7 +14,7 @@ import lombok.Data;
@Group("1000") @Group("1000")
public class BoilerTechParamsDefine implements ITechParamDefine { public class BoilerTechParamsDefine implements ITechParamDefine {
@TechnicalParameter(key = "deviceLevel", label = "设备级别", type = TechnicalParameter.ParamType.STRING) @TechnicalParameter(key = "deviceLevel", label = "设备级别", type = TechnicalParameter.ParamType.STRING, dictCode = "GLJB")
private String deviceLevel; private String deviceLevel;
...@@ -22,7 +22,7 @@ public class BoilerTechParamsDefine implements ITechParamDefine { ...@@ -22,7 +22,7 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
private String ratedEvaporationCapacityThermalPower; private String ratedEvaporationCapacityThermalPower;
@TechnicalParameter(key = "ratedWorkingPressure", label = "额定工作压力", type = TechnicalParameter.ParamType.BIG_DECIMAL) @TechnicalParameter(key = "ratedWorkingPressure", label = "额定工作压力", type = TechnicalParameter.ParamType.STRING)
private String ratedWorkingPressure; private String ratedWorkingPressure;
...@@ -66,11 +66,11 @@ public class BoilerTechParamsDefine implements ITechParamDefine { ...@@ -66,11 +66,11 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
private String glAirtightTest; private String glAirtightTest;
@TechnicalParameter(key = "fuelType", label = "燃料（热源）种类", type = TechnicalParameter.ParamType.STRING) @TechnicalParameter(key = "fuelType", label = "燃料（热源）种类", type = TechnicalParameter.ParamType.STRING, dictCode = "GLZL")
private String fuelType; private String fuelType;
@TechnicalParameter(key = "nameOfPressureParts", label = "受压部件名称", type = TechnicalParameter.ParamType.STRING) @TechnicalParameter(key = "nameOfPressureParts", label = "受压部件名称", type = TechnicalParameter.ParamType.STRING, dictCode = "GLBJMC")
private String nameOfPressureParts; private String nameOfPressureParts;
...@@ -82,7 +82,7 @@ public class BoilerTechParamsDefine implements ITechParamDefine { ...@@ -82,7 +82,7 @@ public class BoilerTechParamsDefine implements ITechParamDefine {
private String wallThicknessOfPressureParts; private String wallThicknessOfPressureParts;
@TechnicalParameter(key = "nonDestructiveTestingMethodsForPressureParts", label = "受压部件无损检测方法", type = TechnicalParameter.ParamType.STRING) @TechnicalParameter(key = "nonDestructiveTestingMethodsForPressureParts", label = "受压部件无损检测方法", type = TechnicalParameter.ParamType.STRING, dictCode = "GLWSJCFF")
private String nonDestructiveTestingMethodsForPressureParts; private String nonDestructiveTestingMethodsForPressureParts;
......
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 @ af9aa706
package com.yeejoin.amos.boot.module.common.api.dto; 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; import lombok.Data;
/** /**
...@@ -10,70 +11,81 @@ import lombok.Data; ...@@ -10,70 +11,81 @@ import lombok.Data;
* @date 2023-08-17 * @date 2023-08-17
*/ */
@Data @Data
@Group("3000")
public class ElevatorTechParamDefine implements ITechParamDefine { public class ElevatorTechParamDefine implements ITechParamDefine {
@FieldDisplayDefine(value = "额定速度(上行)")
@TechnicalParameter(key = "ratedSpeedUp", label = "额定速度(上行)", type = TechnicalParameter.ParamType.STRING)
private String ratedSpeedUp; private String ratedSpeedUp;
@FieldDisplayDefine(value = "额定速度(下行)")
@TechnicalParameter(key = "ratedSpeedDown", label = "额定速度(下行)", type = TechnicalParameter.ParamType.STRING)
private String ratedSpeedDown; private String ratedSpeedDown;
@FieldDisplayDefine(value = "额定载重量")
@TechnicalParameter(key = "ratedLoadCapacity", label = "额定载重量", type = TechnicalParameter.ParamType.STRING)
private String ratedLoadCapacity; private String ratedLoadCapacity;
@FieldDisplayDefine(value = "提升高度")
@TechnicalParameter(key = "liftingHeight", label = "提升高度", type = TechnicalParameter.ParamType.STRING)
private String liftingHeight; 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; private Integer stand;
@FieldDisplayDefine(value = "门数")
@TechnicalParameter(key = "numberDoors", label = "门数", type = TechnicalParameter.ParamType.STRING)
private Integer numberDoors; private Integer numberDoors;
@FieldDisplayDefine(value = "控制方式", dictCode = "KZFS")
@TechnicalParameter(key = "controlMode", label = "控制方式", type = TechnicalParameter.ParamType.STRING, dictCode = "DSXS")
private String controlMode; private String controlMode;
@FieldDisplayDefine(value = "油缸数量")
@TechnicalParameter(key = "numberCylinders", label = "油缸数量", type = TechnicalParameter.ParamType.STRING)
private Integer numberCylinders; private Integer numberCylinders;
@FieldDisplayDefine(value = "顶升方式", dictCode = "DSXS")
@TechnicalParameter(key = "jackingType", label = "顶升方式", type = TechnicalParameter.ParamType.STRING, dictCode = "DSXS")
private String jackingType; private String jackingType;
@FieldDisplayDefine(value = "区域防爆等级", dictCode = "FBDJ") @TechnicalParameter(key = "explosionproofGrade", label = "区域防爆等级", type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
private String explosionproofGrade; private String explosionproofGrade;
@FieldDisplayDefine(value = "整机防爆标志") @TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", type = TechnicalParameter.ParamType.STRING)
private String explosionproofSignComplete; private String explosionproofSignComplete;
@FieldDisplayDefine(value = "名义速度") @TechnicalParameter(key = "nominalSpeed", label = "名义速度", type = TechnicalParameter.ParamType.STRING)
private String nominalSpeed; 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; private String angleRoll;
@FieldDisplayDefine(value = "使用区段长度") @TechnicalParameter(key = "useSectionLength", label = "使用区段长度", type = TechnicalParameter.ParamType.STRING)
private String useSectionLength; private String useSectionLength;
@FieldDisplayDefine(value = "输送能力") @TechnicalParameter(key = "conveyingCapacity", label = "输送能力", type = TechnicalParameter.ParamType.STRING)
private String conveyingCapacity; private String conveyingCapacity;
@FieldDisplayDefine(value = "轿门位置") @TechnicalParameter(key = "doorPosition", label = "轿门位置", type = TechnicalParameter.ParamType.STRING)
private String doorPosition; private String doorPosition;
@FieldDisplayDefine(value = "额定速度") @TechnicalParameter(key = "ratedSpeed", label = "额定速度", type = TechnicalParameter.ParamType.STRING)
private String ratedSpeed; 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 @ af9aa706
package com.yeejoin.amos.boot.module.common.api.dto; package com.yeejoin.amos.boot.module.common.api.dto;
import com.alibaba.fastjson.JSON; import com.yeejoin.amos.boot.biz.common.annotation.Group;
import com.baomidou.mybatisplus.annotation.TableField; import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
import lombok.Data; import lombok.Data;
/** /**
...@@ -12,102 +11,129 @@ import lombok.Data; ...@@ -12,102 +11,129 @@ import lombok.Data;
* @date 2023-08-17 * @date 2023-08-17
*/ */
@Data @Data
@Group("4000")
public class LiftingTechParamDefine implements ITechParamDefine { public class LiftingTechParamDefine implements ITechParamDefine {
@FieldDisplayDefine(value = "额定起重量") @TechnicalParameter(key = "ratedLiftingCapacity", label = "额定起重量", type = TechnicalParameter.ParamType.STRING)
private String ratedLiftingCapacity; private String ratedLiftingCapacity;
@FieldDisplayDefine(value = "最大起重量")
@TableField("MAX_LIFTING_CAPACITY") @TechnicalParameter(key = "maxLiftingCapacity", label = "最大起重量", type = TechnicalParameter.ParamType.STRING)
private String maxLiftingCapacity; private String maxLiftingCapacity;
@FieldDisplayDefine(value = "最大起重力矩")
@TableField("MAX_LIFTING_TORQUE") @TechnicalParameter(key = "maxLiftingTorque", label = "最大起重力矩", type = TechnicalParameter.ParamType.STRING)
private String maxLiftingTorque; private String maxLiftingTorque;
@FieldDisplayDefine(value = "跨度（工作幅度）")
@TechnicalParameter(key = "spanWorkingRange", label = "跨度（工作幅度）", type = TechnicalParameter.ParamType.STRING)
private String spanWorkingRange; private String spanWorkingRange;
@FieldDisplayDefine(value = "起升速度")
@TechnicalParameter(key = "liftingSpeed", label = "起升速度", type = TechnicalParameter.ParamType.STRING)
private String liftingSpeed; private String liftingSpeed;
@FieldDisplayDefine(value = "起升高度")
@TechnicalParameter(key = "liftingHeight", label = "起升高度", type = TechnicalParameter.ParamType.STRING)
private String liftingHeight; private String liftingHeight;
@FieldDisplayDefine(value = "工作级别", dictCode = "GZJB")
@TechnicalParameter(key = "workLevel", label = "工作级别", type = TechnicalParameter.ParamType.STRING, dictCode = "GZJB")
private String workLevel; private String workLevel;
@FieldDisplayDefine(value = "额定起重力矩")
@TechnicalParameter(key = "ratedLiftingTorque", label = "额定起重力矩", type = TechnicalParameter.ParamType.STRING)
private String ratedLiftingTorque; private String ratedLiftingTorque;
@FieldDisplayDefine(value = "层数/泊位数")
@TechnicalParameter(key = "numberStorey", label = "层数/泊位数", type = TechnicalParameter.ParamType.STRING)
private Integer numberStorey; private Integer numberStorey;
@FieldDisplayDefine(value = "运行速度")
@TechnicalParameter(key = "runningSpeed", label = "运行速度", type = TechnicalParameter.ParamType.STRING)
private String runningSpeed; private String runningSpeed;
@FieldDisplayDefine(value = "大车运行速度")
@TechnicalParameter(key = "bigcarRunSpeed", label = "大车运行速度", type = TechnicalParameter.ParamType.STRING)
private String bigcarRunSpeed; private String bigcarRunSpeed;
@FieldDisplayDefine(value = "小车运行速度")
@TechnicalParameter(key = "smallcarrunSpeed", label = "小车运行速度", type = TechnicalParameter.ParamType.STRING)
private String smallcarrunSpeed; private String smallcarrunSpeed;
@FieldDisplayDefine(value = "额定成员数")
@TechnicalParameter(key = "ratedMembers", label = "额定成员数", type = TechnicalParameter.ParamType.STRING)
private Integer ratedMembers; private Integer ratedMembers;
@FieldDisplayDefine(value = "额定提升速度")
@TechnicalParameter(key = "ratedLiftingSpeed", label = "额定提升速度", type = TechnicalParameter.ParamType.STRING)
private String ratedLiftingSpeed; private String ratedLiftingSpeed;
@FieldDisplayDefine(value = "自由端高度")
@TechnicalParameter(key = "heightFreeEnd", label = "自由端高度", type = TechnicalParameter.ParamType.STRING)
private String heightFreeEnd; private String heightFreeEnd;
@FieldDisplayDefine(value = "吊笼工作行程")
@TechnicalParameter(key = "workStrokeCage", label = "吊笼工作行程", type = TechnicalParameter.ParamType.STRING)
private String workStrokeCage; private String workStrokeCage;
@FieldDisplayDefine(value = "存容量")
@TechnicalParameter(key = "storageCapacity", label = "存容量", type = TechnicalParameter.ParamType.INTEGER)
private Integer storageCapacity; private Integer storageCapacity;
@FieldDisplayDefine(value = "额定升降速度")
@TechnicalParameter(key = "ratedLiftSpeed", label = "额定升降速度", type = TechnicalParameter.ParamType.STRING)
private String ratedLiftSpeed; private String ratedLiftSpeed;
@FieldDisplayDefine(value = "额定横移速度")
@TechnicalParameter(key = "ratedTraverseSpeed", label = "额定横移速度", type = TechnicalParameter.ParamType.STRING)
private String ratedTraverseSpeed; private String ratedTraverseSpeed;
@FieldDisplayDefine(value = "单车最大进(出)车时间")
@TableField("BICYCLE_MAX_EXIT_TIME") @TechnicalParameter(key = "bicycleMaxExitTime", label = "单车最大进(出)车时间", type = TechnicalParameter.ParamType.STRING)
private String bicycleMaxExitTime; private String bicycleMaxExitTime;
@FieldDisplayDefine(value = "单车最大进车时间")
@TechnicalParameter(key = "bicycleMaxComeTime", label = "单车最大进车时间", type = TechnicalParameter.ParamType.STRING)
private String bicycleMaxComeTime; private String bicycleMaxComeTime;
@FieldDisplayDefine(value = "区域防爆等级", dictCode = "FBDJ")
@TechnicalParameter(key = "explosionProofGrade", label = "区域防爆等级", type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
private String explosionProofGrade; private String explosionProofGrade;
@FieldDisplayDefine(value = "悬臂长度")
@TechnicalParameter(key = "cantileverLength", label = "悬臂长度", type = TechnicalParameter.ParamType.STRING)
private String cantileverLength; private String cantileverLength;
@FieldDisplayDefine(value = "变幅速度") @TechnicalParameter(key = "derrickingSpeed", label = "变幅速度", type = TechnicalParameter.ParamType.STRING)
private String derrickingSpeed; private String derrickingSpeed;
@FieldDisplayDefine(value = "吊笼数量")
@TechnicalParameter(key = "hangingCagesNumber", label = "吊笼数量", type = TechnicalParameter.ParamType.STRING)
private String hangingCagesNumber; private String hangingCagesNumber;
@FieldDisplayDefine(value = "燃爆物质")
@TechnicalParameter(key = "explosiveSubstance", label = "燃爆物质", type = TechnicalParameter.ParamType.STRING)
private String explosiveSubstance; private String explosiveSubstance;
@FieldDisplayDefine(value = "整机防爆标志", type = JSON.class)
@TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", type = TechnicalParameter.ParamType.STRING)
private String explosionproofSignComplete; 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; private String parkingVehicleHeight;
@FieldDisplayDefine(value = "适停车辆尺寸宽")
@TechnicalParameter(key = "parkingVehicleWeight", label = "适停车辆尺寸宽", type = TechnicalParameter.ParamType.STRING)
private String parkingVehicleWeight; private String parkingVehicleWeight;
@FieldDisplayDefine(value = "适停车辆尺寸长")
@TechnicalParameter(key = "parkingVehicleLength", label = "适停车辆尺寸长", type = TechnicalParameter.ParamType.STRING)
private String parkingVehicleLength; 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 @ af9aa706
package com.yeejoin.amos.boot.module.common.api.dto; 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; import lombok.Data;
/** /**
...@@ -10,59 +11,59 @@ import lombok.Data; ...@@ -10,59 +11,59 @@ import lombok.Data;
* @date 2023-08-17 * @date 2023-08-17
*/ */
@Data @Data
@Group("8000")
public class PipelineTechParamDefine implements ITechParamDefine { public class PipelineTechParamDefine implements ITechParamDefine {
@FieldDisplayDefine(value = "唯一标识", isExist = false) @TechnicalParameter(key = "pipeName", label = "管道名称（登记单元）", type = TechnicalParameter.ParamType.STRING)
private String record;
@FieldDisplayDefine(value = "管道名称（登记单元）")
private String pipeName; private String pipeName;
@FieldDisplayDefine(value = "管道编号") @TechnicalParameter(key = "pipelineNumber", label = "管道编号", type = TechnicalParameter.ParamType.STRING)
private String pipelineNumber; private String pipelineNumber;
@FieldDisplayDefine(value = "管道级别", typeHandler = "pieLineLevelTypeHandler") @TechnicalParameter(key = "deviceLevel", label = "管道级别", type = TechnicalParameter.ParamType.STRING)
private String deviceLevel; private String deviceLevel;
@FieldDisplayDefine(value = "公称直径") @TechnicalParameter(key = "nominalDiameter", label = "公称直径", type = TechnicalParameter.ParamType.STRING)
private String nominalDiameter; private String nominalDiameter;
@FieldDisplayDefine(value = "公称壁厚") @TechnicalParameter(key = "wallThickness", label = "公称壁厚", type = TechnicalParameter.ParamType.STRING)
private String wallThickness; private String wallThickness;
@FieldDisplayDefine(value = "管道长度") @TechnicalParameter(key = "pipeLength", label = "管道长度", type = TechnicalParameter.ParamType.FLOAT)
private Double pipeLength; private Double pipeLength;
@FieldDisplayDefine(value = "设计压力") @TechnicalParameter(key = "pressure", label = "设计压力", type = TechnicalParameter.ParamType.STRING)
private String pressure; private String pressure;
@FieldDisplayDefine(value = "设计温度") @TechnicalParameter(key = "temperature", label = "设计温度", type = TechnicalParameter.ParamType.STRING)
private String temperature; private String temperature;
@FieldDisplayDefine(value = "设计介质") @TechnicalParameter(key = "medium", label = "设计介质", type = TechnicalParameter.ParamType.STRING)
private String medium; private String medium;
@FieldDisplayDefine(value = "工作压力")
@TechnicalParameter(key = "workPressure", label = "工作压力", type = TechnicalParameter.ParamType.STRING)
private String workPressure; private String workPressure;
@FieldDisplayDefine(value = "工作温度")
@TechnicalParameter(key = "workTemperature", label = "工作温度", type = TechnicalParameter.ParamType.STRING)
private String workTemperature; private String workTemperature;
@FieldDisplayDefine(value = "工作介质") @TechnicalParameter(key = "workMedium", label = "工作介质", type = TechnicalParameter.ParamType.STRING)
private String workMedium; private String workMedium;
@FieldDisplayDefine(value = "备注")
@TechnicalParameter(key = "remarks", label = "备注", type = TechnicalParameter.ParamType.STRING)
private String remarks; 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 @ af9aa706
package com.yeejoin.amos.boot.module.common.api.dto; 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; import lombok.Data;
/** /**
...@@ -10,40 +11,51 @@ import lombok.Data; ...@@ -10,40 +11,51 @@ import lombok.Data;
* @date 2023-08-17 * @date 2023-08-17
*/ */
@Data @Data
@Group("6000")
public class RidesTechParamDefine implements ITechParamDefine { public class RidesTechParamDefine implements ITechParamDefine {
@FieldDisplayDefine(value = "轨道高度")
@TechnicalParameter(key = "trackHeight", label = "轨道高度", type = TechnicalParameter.ParamType.STRING)
private String trackHeight; private String trackHeight;
@FieldDisplayDefine(value = "运行速度")
@TechnicalParameter(key = "runningSpeed", label = "运行速度", type = TechnicalParameter.ParamType.STRING)
private String runningSpeed; private String runningSpeed;
@FieldDisplayDefine(value = "乘坐人数")
@TechnicalParameter(key = "numberOfPassengers", label = "乘坐人数", type = TechnicalParameter.ParamType.STRING)
private Integer numberOfPassengers; private Integer numberOfPassengers;
@FieldDisplayDefine(value = "滑道长度")
@TechnicalParameter(key = "slideLength", label = "滑道长度", type = TechnicalParameter.ParamType.STRING)
private String slideLength; private String slideLength;
@FieldDisplayDefine(value = "运行高度")
@TechnicalParameter(key = "operatingHeight", label = "运行高度", type = TechnicalParameter.ParamType.STRING)
private String operatingHeight; private String operatingHeight;
@FieldDisplayDefine(value = "蹦极绳长度")
@TechnicalParameter(key = "slideHeight", label = "蹦极绳长度", type = TechnicalParameter.ParamType.STRING)
private String slideHeight; private String slideHeight;
@FieldDisplayDefine(value = "回转直径")
@TechnicalParameter(key = "rotaryDiameter", label = "回转直径", type = TechnicalParameter.ParamType.STRING)
private String rotaryDiameter; private String rotaryDiameter;
@FieldDisplayDefine(value = "单边摆角")
@TechnicalParameter(key = "unilateralSwingAngle", label = "单边摆角", type = TechnicalParameter.ParamType.STRING)
private String unilateralSwingAngle; private String unilateralSwingAngle;
@FieldDisplayDefine(value = "车辆数")
@TechnicalParameter(key = "numberOfVehicles", label = "车辆数", type = TechnicalParameter.ParamType.INTEGER)
private Integer numberOfVehicles; private Integer numberOfVehicles;
@FieldDisplayDefine(value = "倾角")
@TechnicalParameter(key = "dip", label = "倾角", type = TechnicalParameter.ParamType.STRING)
private String dip; 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 @ af9aa706
package com.yeejoin.amos.boot.module.common.api.dto; 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; import lombok.Data;
/** /**
...@@ -10,45 +11,56 @@ import lombok.Data; ...@@ -10,45 +11,56 @@ import lombok.Data;
* @date 2023-08-17 * @date 2023-08-17
*/ */
@Data @Data
@Group("9000")
public class RopewayTechParamDefine implements ITechParamDefine { public class RopewayTechParamDefine implements ITechParamDefine {
@FieldDisplayDefine(value = "平距") @TechnicalParameter(key = "horizontalDistance", label = "平距", type = TechnicalParameter.ParamType.STRING)
private String horizontalDistance; private String horizontalDistance;
@FieldDisplayDefine(value = "支架数目")
@TechnicalParameter(key = "supportsCount", label = "支架数目", type = TechnicalParameter.ParamType.INTEGER)
private Integer supportsCount; private Integer supportsCount;
@FieldDisplayDefine(value = "斜长")
@TechnicalParameter(key = "obliqueLength", label = "斜长", type = TechnicalParameter.ParamType.STRING)
private String obliqueLength; private String obliqueLength;
@FieldDisplayDefine(value = "主电机型式")
@TechnicalParameter(key = "mainMotorModel", label = "主电机型式", type = TechnicalParameter.ParamType.STRING)
private String mainMotorModel; private String mainMotorModel;
@FieldDisplayDefine(value = "主电机功率")
@TechnicalParameter(key = "mainMotorPower", label = "主电机功率", type = TechnicalParameter.ParamType.STRING)
private String mainMotorPower; private String mainMotorPower;
@FieldDisplayDefine(value = "高差")
@TechnicalParameter(key = "altitudeDifference", label = "高差", type = TechnicalParameter.ParamType.STRING)
private String altitudeDifference; private String altitudeDifference;
@FieldDisplayDefine(value = "运量")
@TechnicalParameter(key = "freightVolume", label = "运量", type = TechnicalParameter.ParamType.STRING)
private String freightVolume; private String freightVolume;
@FieldDisplayDefine(value = "运载索", dictCode = "YZS") @TechnicalParameter(key = "carrierLine", label = "运载索", type = TechnicalParameter.ParamType.STRING, dictCode = "YZS")
private String carrierLine; private String carrierLine;
@FieldDisplayDefine(value = "速度")
@TechnicalParameter(key = "speed", label = "速度", type = TechnicalParameter.ParamType.STRING)
private String speed; private String speed;
@FieldDisplayDefine(value = "承载索") @TechnicalParameter(key = "bearingCable", label = "承载索", type = TechnicalParameter.ParamType.STRING)
private String bearingCable; private String bearingCable;
@FieldDisplayDefine(value = "索距")
@TechnicalParameter(key = "cablePitch", label = "索距", type = TechnicalParameter.ParamType.STRING)
private String cablePitch; private String cablePitch;
@FieldDisplayDefine(value = "张紧油压（重锤重量）")
@TechnicalParameter(key = "oilPressureHeavyHammer", label = "张紧油压（重锤重量）", type = TechnicalParameter.ParamType.STRING)
private String oilPressureHeavyHammer; private String oilPressureHeavyHammer;
@FieldDisplayDefine(value = "运载工具数量和类型")
@TechnicalParameter(key = "numberAndTypeOfVehicles", label = "运载工具数量和类型", type = TechnicalParameter.ParamType.STRING)
private String numberAndTypeOfVehicles; 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/TechParamItem.java
View file @ af9aa706
...@@ -31,6 +31,14 @@ public class TechParamItem { ...@@ -31,6 +31,14 @@ public class TechParamItem {
* 数字类型专用：最大小数位数 * 数字类型专用：最大小数位数
*/ */
private Integer maxPrecision; private Integer maxPrecision;
/**
* 枚举字典编码
*/
private String dictCode;
/**
* 单位
*/
private String unit;
......
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 @ af9aa706
package com.yeejoin.amos.boot.module.common.api.dto; 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; import lombok.Data;
/** /**
...@@ -10,79 +11,102 @@ import lombok.Data; ...@@ -10,79 +11,102 @@ import lombok.Data;
* @date 2023-08-17 * @date 2023-08-17
*/ */
@Data @Data
@Group("5000")
public class VehicleTechParamDefine implements ITechParamDefine { public class VehicleTechParamDefine implements ITechParamDefine {
@FieldDisplayDefine(value = "车架编号") @TechnicalParameter(key = "frameNo", label = "车架编号", type = TechnicalParameter.ParamType.STRING)
private String frameNo; private String frameNo;
@FieldDisplayDefine(value = "发动机（行走电机）编号")
@TechnicalParameter(key = "engineNo", label = "发动机（行走电机）编号", type = TechnicalParameter.ParamType.STRING)
private String engineNo; private String engineNo;
@FieldDisplayDefine(value = "额定起重量")
@TechnicalParameter(key = "liftingCapacity", label = "额定起重量", type = TechnicalParameter.ParamType.STRING)
private String liftingCapacity; private String liftingCapacity;
@FieldDisplayDefine(value = "传动方式")
@TechnicalParameter(key = "transmissionMode", label = "传动方式", type = TechnicalParameter.ParamType.STRING)
private String transmissionMode; private String transmissionMode;
@FieldDisplayDefine(value = "自重")
@TechnicalParameter(key = "weight", label = "自重", type = TechnicalParameter.ParamType.STRING)
private String weight; private String weight;
@FieldDisplayDefine(value = "动力方式") @TechnicalParameter(key = "powerMode", label = "动力方式", type = TechnicalParameter.ParamType.STRING)
private String powerMode; private String powerMode;
@FieldDisplayDefine(value = "最大运行速度")
@TechnicalParameter(key = "maxRunningSpeed", label = "最大运行速度", type = TechnicalParameter.ParamType.STRING)
private String maxRunningSpeed; private String maxRunningSpeed;
@FieldDisplayDefine(value = "工作装置空载最大起升高度")
@TechnicalParameter(key = "maxLiftingHeight", label = "工作装置空载最大起升高度", type = TechnicalParameter.ParamType.STRING)
private String maxLiftingHeight; private String maxLiftingHeight;
@FieldDisplayDefine(value = "气体/粉尘组别（防爆）")
@TechnicalParameter(key = "gasGroup", label = "气体/粉尘组别（防爆）", type = TechnicalParameter.ParamType.STRING)
private String gasGroup; private String gasGroup;
@FieldDisplayDefine(value = "车架结构")
@TechnicalParameter(key = "frameStructure", label = "车架结构", type = TechnicalParameter.ParamType.STRING)
private String frameStructure; private String frameStructure;
@FieldDisplayDefine(value = "驾驶方式")
@TechnicalParameter(key = "drivingMode", label = "驾驶方式", type = TechnicalParameter.ParamType.STRING)
private String drivingMode; private String drivingMode;
@FieldDisplayDefine(value = "空载最大运行速度")
@TechnicalParameter(key = "carryingIdlerMaxRunningSpeed", label = "空载最大运行速度", type = TechnicalParameter.ParamType.STRING)
private String carryingIdlerMaxRunningSpeed; private String carryingIdlerMaxRunningSpeed;
@FieldDisplayDefine(value = "设备保护等级（防爆）", dictCode = "FBDJ")
@TechnicalParameter(key = "protectGrade", label = "设备保护等级（防爆）", type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
private String protectGrade; private String protectGrade;
@FieldDisplayDefine(value = "温度组别（防爆）")
@TechnicalParameter(key = "temperatureGroup", label = "温度组别（防爆）", type = TechnicalParameter.ParamType.STRING)
private String temperatureGroup; private String temperatureGroup;
@FieldDisplayDefine(value = "额定载客人数")
@TechnicalParameter(key = "passengersNumber", label = "额定载客人数", type = TechnicalParameter.ParamType.INTEGER)
private Integer passengersNumber; private Integer passengersNumber;
@FieldDisplayDefine(value = "最大行驶坡度")
@TechnicalParameter(key = "maxDrivingSlope", label = "最大行驶坡度", type = TechnicalParameter.ParamType.STRING)
private String maxDrivingSlope; private String maxDrivingSlope;
@FieldDisplayDefine(value = "整车整备质量")
@TechnicalParameter(key = "vehicleMass", label = "整车整备质量", type = TechnicalParameter.ParamType.STRING)
private String vehicleMass; private String vehicleMass;
@FieldDisplayDefine(value = "轴距")
@TechnicalParameter(key = "wheelBase", label = "轴距", type = TechnicalParameter.ParamType.STRING)
private String wheelBase; private String wheelBase;
@FieldDisplayDefine(value = "轮距（前）")
@TechnicalParameter(key = "trackWidthFront", label = "轮距（前）", type = TechnicalParameter.ParamType.STRING)
private String trackWidthFront; private String trackWidthFront;
@FieldDisplayDefine(value = "轮距（后）")
@TechnicalParameter(key = "trackWidthBehind", label = "轮距（后）", type = TechnicalParameter.ParamType.STRING)
private String trackWidthBehind; private String trackWidthBehind;
@FieldDisplayDefine(value = "观光列车车厢数")
@TechnicalParameter(key = "carsNumber", label = "观光列车车厢数", type = TechnicalParameter.ParamType.INTEGER)
private Integer carsNumber; private Integer carsNumber;
@FieldDisplayDefine(value = "观光列车每节车厢座位数")
@TechnicalParameter(key = "seatNumber", label = "观光列车每节车厢座位数", type = TechnicalParameter.ParamType.INTEGER)
private Integer seatNumber; private Integer seatNumber;
@FieldDisplayDefine(value = "观光列车牵引车头座位数")
@TechnicalParameter(key = "tractorSeatNumber", label = "观光列车牵引车头座位数", type = TechnicalParameter.ParamType.INTEGER)
private Integer tractorSeatNumber; private Integer tractorSeatNumber;
@FieldDisplayDefine(value = "空载最大起升速度")
@TechnicalParameter(key = "maxLiftingSpeed", label = "空载最大起升速度", type = TechnicalParameter.ParamType.STRING)
private String maxLiftingSpeed; 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
View file @ af9aa706
...@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter; ...@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
import com.yeejoin.amos.boot.module.common.api.dto.TechParamItem; import com.yeejoin.amos.boot.module.common.api.dto.TechParamItem;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.annotations.DateFormat; import org.springframework.data.elasticsearch.annotations.DateFormat;
import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Document;
...@@ -18,12 +19,11 @@ import java.util.Date; ...@@ -18,12 +19,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* @Author cpp * 设备
* @Description
* @Date 2023/6/5
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@Slf4j
@Document(indexName = "idx_biz_equipment_info") @Document(indexName = "idx_biz_equipment_info")
public class ESEquipmentInfo { public class ESEquipmentInfo {
...@@ -188,13 +188,13 @@ public class ESEquipmentInfo { ...@@ -188,13 +188,13 @@ public class ESEquipmentInfo {
private String PRODUCE_UNIT_NAME; private String PRODUCE_UNIT_NAME;
/** /**
* 使用单位统一信用代码 * 安改维单位统一信用代码
*/ */
@Field(type = FieldType.Keyword) @Field(type = FieldType.Keyword)
private String USC_UNIT_CREDIT_CODE; private String USC_UNIT_CREDIT_CODE;
/** /**
* 使用单位统名称 * 安改维单位统名称
*/ */
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String USC_UNIT_NAME; private String USC_UNIT_NAME;
...@@ -205,6 +205,13 @@ public class ESEquipmentInfo { ...@@ -205,6 +205,13 @@ public class ESEquipmentInfo {
@Field(type = FieldType.Date, format = DateFormat.date) @Field(type = FieldType.Date, format = DateFormat.date)
private Date USC_DATE; private Date USC_DATE;
/**
*
*创建日期
*/
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second)
private Date createDate;
/** /**
* 产品名称 * 产品名称
...@@ -304,9 +311,15 @@ public class ESEquipmentInfo { ...@@ -304,9 +311,15 @@ public class ESEquipmentInfo {
@Field(type = FieldType.Integer, name = "DATA_QUALITY_SCORE") @Field(type = FieldType.Integer, name = "DATA_QUALITY_SCORE")
private Integer dataQualityScore; private Integer dataQualityScore;
/**
* 设计单位统一信用代码
*/
@Field(type = FieldType.Keyword) @Field(type = FieldType.Keyword)
private String designUnitCreditCode; private String designUnitCreditCode;
/**
* 设计单位名称
*/
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String designUnitName; private String designUnitName;
...@@ -407,7 +420,7 @@ public class ESEquipmentInfo { ...@@ -407,7 +420,7 @@ public class ESEquipmentInfo {
break; break;
} }
} catch (Exception e) { } catch (Exception e) {
this.strValue = "CONV_ERROR:" + value; log.error("CONV_ERROR", e);
} }
} }
...@@ -537,7 +550,7 @@ public class ESEquipmentInfo { ...@@ -537,7 +550,7 @@ public class ESEquipmentInfo {
* 维保合同结束日期 * 维保合同结束日期
*/ */
@Field(type = FieldType.Date, format = DateFormat.date) @Field(type = FieldType.Date, format = DateFormat.date)
private String informEnd; private Date informEnd;
/** /**
* 维保负责人姓名 * 维保负责人姓名
*/ */
......
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/EsBaseEnterpriseInfo.java
View file @ af9aa706
...@@ -10,6 +10,9 @@ import org.springframework.data.elasticsearch.annotations.FieldType; ...@@ -10,6 +10,9 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
/**
* 企业
*/
@Data @Data
@Document(indexName = "idx_biz_enterprise_info") @Document(indexName = "idx_biz_enterprise_info")
public class EsBaseEnterpriseInfo { public class EsBaseEnterpriseInfo {
......
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/EsUserInfo.java
View file @ af9aa706
...@@ -10,6 +10,9 @@ import org.springframework.data.elasticsearch.annotations.FieldType; ...@@ -10,6 +10,9 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
/**
* 人员
*/
@Data @Data
@Document(indexName = "idx_biz_user_info") @Document(indexName = "idx_biz_user_info")
public class EsUserInfo { public class EsUserInfo {
...@@ -120,6 +123,12 @@ public class EsUserInfo { ...@@ -120,6 +123,12 @@ public class EsUserInfo {
private String unitCode; private String unitCode;
/** /**
* 人员所属企业单位类型
*/
@Field(type = FieldType.Keyword)
private String unitType;
/**
* 头像 * 头像
*/ */
@Field(type = FieldType.Keyword) @Field(type = FieldType.Keyword)
......
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 @ af9aa706
...@@ -39,6 +39,8 @@ public class TechParamUtil { ...@@ -39,6 +39,8 @@ public class TechParamUtil {
techParamItem.setParamLabel(technicalParameter.label()); techParamItem.setParamLabel(technicalParameter.label());
techParamItem.setEquListCode(equListCode); techParamItem.setEquListCode(equListCode);
techParamItem.setParamType(technicalParameter.type()); techParamItem.setParamType(technicalParameter.type());
techParamItem.setDictCode(technicalParameter.dictCode());
techParamItem.setUnit(technicalParameter.unit());
techParamItems.add(techParamItem); techParamItems.add(techParamItem);
} }
} }
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java
View file @ af9aa706
...@@ -675,7 +675,7 @@ public class CommonController extends BaseController { ...@@ -675,7 +675,7 @@ public class CommonController extends BaseController {
public ResponseModel<Object> permissionTreeV2(@RequestParam String menuAgent, public ResponseModel<Object> permissionTreeV2(@RequestParam String menuAgent,
@RequestParam String permissionType, @RequestParam String permissionType,
@RequestParam(required = false) String path, @RequestParam(required = false) String path,
@RequestBody JSONArray params) { @RequestParam JSONArray params) {
return ResponseHelper.buildResponse(commonService.getPermissionTreeWithCompanyV2(menuAgent, permissionType, path, getSelectedOrgInfo().getCompany(), params)); return ResponseHelper.buildResponse(commonService.getPermissionTreeWithCompanyV2(menuAgent, permissionType, path, getSelectedOrgInfo().getCompany(), params));
} }
......
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 @ af9aa706
...@@ -229,6 +229,7 @@ public class DataHandlerController extends BaseController { ...@@ -229,6 +229,7 @@ public class DataHandlerController extends BaseController {
return ResponseHelper.buildResponse(dataHandlerService.initDataQualityScore()); return ResponseHelper.buildResponse(dataHandlerService.initDataQualityScore());
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "初始化综合搜索数据-企业", notes = "初始化综合搜索数据-企业") @ApiOperation(httpMethod = "PUT", value = "初始化综合搜索数据-企业", notes = "初始化综合搜索数据-企业")
@PutMapping(value = "/company/initStatistData2Es") @PutMapping(value = "/company/initStatistData2Es")
...@@ -236,6 +237,7 @@ public class DataHandlerController extends BaseController { ...@@ -236,6 +237,7 @@ public class DataHandlerController extends BaseController {
return ResponseHelper.buildResponse(dataHandlerService.initCompanyStatistData2Es()); return ResponseHelper.buildResponse(dataHandlerService.initCompanyStatistData2Es());
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "初始化综合搜索数据-人员", notes = "初始化综合搜索数据-人员") @ApiOperation(httpMethod = "PUT", value = "初始化综合搜索数据-人员", notes = "初始化综合搜索数据-人员")
@PutMapping(value = "/user/initStatistData2Es") @PutMapping(value = "/user/initStatistData2Es")
...@@ -243,6 +245,7 @@ public class DataHandlerController extends BaseController { ...@@ -243,6 +245,7 @@ public class DataHandlerController extends BaseController {
return ResponseHelper.buildResponse(dataHandlerService.initUserStatistData2Es()); return ResponseHelper.buildResponse(dataHandlerService.initUserStatistData2Es());
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "初始化综合搜索数据-设备", notes = "初始化综合搜索数据-设备") @ApiOperation(httpMethod = "PUT", value = "初始化综合搜索数据-设备", notes = "初始化综合搜索数据-设备")
@PutMapping(value = "/equip/initStatistData2Es") @PutMapping(value = "/equip/initStatistData2Es")
...@@ -250,6 +253,4 @@ public class DataHandlerController extends BaseController { ...@@ -250,6 +253,4 @@ public class DataHandlerController extends BaseController {
return ResponseHelper.buildResponse(dataHandlerService.initEquipStatistData2Es()); return ResponseHelper.buildResponse(dataHandlerService.initEquipStatistData2Es());
} }
} }
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java
View file @ af9aa706
...@@ -799,7 +799,8 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR ...@@ -799,7 +799,8 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
inspectionDetectionInfo.setRecDate(new Date()); inspectionDetectionInfo.setRecDate(new Date());
inspectionDetectionInfo.setSafetyLevel(Objects.toString(entryData.getOrDefault("safetyLevel", ""))); inspectionDetectionInfo.setSafetyLevel(Objects.toString(entryData.getOrDefault("safetyLevel", "")));
inspectionDetectionInfo.setRecUserId(RequestContext.getExeUserId()); inspectionDetectionInfo.setRecUserId(RequestContext.getExeUserId());
inspectionDetectionInfo.setInspectReportNo(Objects.toString(resSeq)); inspectionDetectionInfo.setInspectReportNo(Objects.toString(entryData.getOrDefault("inspectReportNo", "")));
inspectionDetectionInfo.setResultSeq(Objects.toString(resSeq));
idxBizJgInspectionDetectionInfoMapper.insert(inspectionDetectionInfo); idxBizJgInspectionDetectionInfoMapper.insert(inspectionDetectionInfo);
// 保存检验历史表用于详情回显 // 保存检验历史表用于详情回显
...@@ -923,7 +924,8 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR ...@@ -923,7 +924,8 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
inspectionDetectionInfo.setRecDate(new Date()); inspectionDetectionInfo.setRecDate(new Date());
inspectionDetectionInfo.setSafetyLevel(Objects.toString(entryData.getOrDefault("safetyLevel", ""))); inspectionDetectionInfo.setSafetyLevel(Objects.toString(entryData.getOrDefault("safetyLevel", "")));
inspectionDetectionInfo.setRecUserId(RequestContext.getExeUserId()); inspectionDetectionInfo.setRecUserId(RequestContext.getExeUserId());
inspectionDetectionInfo.setInspectReportNo(Objects.toString(sequenceNbr)); inspectionDetectionInfo.setInspectReportNo(Objects.toString(entryData.getOrDefault("inspectReportNo", "")));
inspectionDetectionInfo.setResultSeq(Objects.toString(sequenceNbr));
inspectionDetectionInfo.setSequenceNbr(Objects.toString(sequenceNbr)); inspectionDetectionInfo.setSequenceNbr(Objects.toString(sequenceNbr));
idxBizJgInspectionDetectionInfoMapper.updateById(inspectionDetectionInfo); idxBizJgInspectionDetectionInfoMapper.updateById(inspectionDetectionInfo);
...@@ -962,7 +964,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR ...@@ -962,7 +964,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
// 删除结果表 // 删除结果表
this.baseMapper.deleteById(resultSeq); this.baseMapper.deleteById(resultSeq);
// 删除检验信息表 // 删除检验信息表
idxBizJgInspectionDetectionInfoMapper.delete(new LambdaQueryWrapper<IdxBizJgInspectionDetectionInfo>().eq(IdxBizJgInspectionDetectionInfo::getInspectReportNo, resultSeq.toString())); idxBizJgInspectionDetectionInfoMapper.delete(new LambdaQueryWrapper<IdxBizJgInspectionDetectionInfo>().eq(IdxBizJgInspectionDetectionInfo::getResultSeq, resultSeq.toString()));
// 删除附件表 // 删除附件表
attachmentService.getBaseMapper().delete(new LambdaQueryWrapper<JyjcInspectionResultAttachment>().eq(JyjcInspectionResultAttachment::getResultSeq,resultSeq.toString())); attachmentService.getBaseMapper().delete(new LambdaQueryWrapper<JyjcInspectionResultAttachment>().eq(JyjcInspectionResultAttachment::getResultSeq,resultSeq.toString()));
// 删除历史表 // 删除历史表
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/TzsCustomFilterContentDto.java
View file @ af9aa706
package com.yeejoin.amos.boot.module.statistics.api.dto; package com.yeejoin.amos.boot.module.statistics.api.dto;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; import java.util.Date;
/** /**
...@@ -15,10 +16,10 @@ import java.util.Date; ...@@ -15,10 +16,10 @@ import java.util.Date;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="TzsCustomFilterContentDto", description="用户保存的自定义筛选内容表") @ApiModel(value = "TzsCustomFilterContentDto", description = "用户保存的自定义筛选内容表")
public class TzsCustomFilterContentDto extends BaseDto { public class TzsCustomFilterContentDto extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "所属业务（综合统计分析：zhtjfx）") @ApiModelProperty(value = "所属业务（综合统计分析：zhtjfx）")
...@@ -34,7 +35,7 @@ public class TzsCustomFilterContentDto extends BaseDto { ...@@ -34,7 +35,7 @@ public class TzsCustomFilterContentDto extends BaseDto {
private String filterName; private String filterName;
@ApiModelProperty(value = "筛选条件内容") @ApiModelProperty(value = "筛选条件内容")
private String filterContent; private Object filterContent;
@ApiModelProperty(value = "创建人ID") @ApiModelProperty(value = "创建人ID")
private String createUserId; private String createUserId;
...@@ -43,6 +44,6 @@ public class TzsCustomFilterContentDto extends BaseDto { ...@@ -43,6 +44,6 @@ public class TzsCustomFilterContentDto extends BaseDto {
private Date createTime; private Date createTime;
@ApiModelProperty(value = "筛选条件类型") @ApiModelProperty(value = "筛选条件类型")
private Date filterType; private String filterType;
} }
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/entity/TzsCustomFilterContent.java
View file @ af9aa706
...@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; ...@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/** /**
...@@ -50,7 +51,7 @@ public class TzsCustomFilterContent extends BaseEntity { ...@@ -50,7 +51,7 @@ public class TzsCustomFilterContent extends BaseEntity {
* 筛选条件内容 * 筛选条件内容
*/ */
@TableField("filter_content") @TableField("filter_content")
private String filterContent; private Object filterContent;
/** /**
* 创建人ID * 创建人ID
...@@ -68,6 +69,6 @@ public class TzsCustomFilterContent extends BaseEntity { ...@@ -68,6 +69,6 @@ public class TzsCustomFilterContent extends BaseEntity {
* 筛选条件类型 * 筛选条件类型
*/ */
@TableField("filter_type") @TableField("filter_type")
private Date filterType; private String filterType;
} }
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/AdvanceSearchEnum.java 0 → 100644
View file @ af9aa706
package com.yeejoin.amos.boot.module.statistics.api.enums;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
import lombok.AllArgsConstructor;
import lombok.Getter;
@AllArgsConstructor
@Getter
public enum AdvanceSearchEnum {
/**
* 高级搜索枚举
*/
USE_ORG_CODE("使用登记证编号", "USE_ORG_CODE", TechnicalParameter.ParamType.STRING,""),
EQU_LIST("设备种类", "EQU_LIST",null,""),
EQU_CATEGORY("设备类别", "EQU_CATEGORY",null,""),
EQU_DEFINE("设备品种", "EQU_DEFINE",null,""),
PRODUCT_NAME("设备名称", "PRODUCT_NAME", TechnicalParameter.ParamType.STRING,""),
TECH_PARAM("技术参数", "techParam", null,""),
PARAM_RANGE("参数范围", "paramRange", TechnicalParameter.ParamType.STRING,""),
NEXT_INSPECT_DATE("检验有效期", "nextInspectDate", TechnicalParameter.ParamType.DATE,""),
EQU_STATE("检验有效期", "EQU_STATE", null,""),
// SUPERVISORY_CODE("赋码状态", "", null,""),
// SUPERVISORY_CODE("设备等级", "", null,""),
// SUPERVISORY_CODE("使用年限", "", null,""),
UNIT_TYPE("所属单位类型", "unitType", null,""),
USC_UNIT_NAME("所属单位名称", "USC_UNIT_NAME", TechnicalParameter.ParamType.STRING,""),
PRODUCE_UNIT_NAME("制造单位名称", "PRODUCE_UNIT_NAME", TechnicalParameter.ParamType.STRING,""),
DESIGN_UNIT_NAME("设计单位名称", "DESIGN_UNIT_NAME", TechnicalParameter.ParamType.STRING,""),
ME_UNIT_NAME("维保单位名称", "ME_UNIT_NAME", TechnicalParameter.ParamType.STRING,""),
AZUSC_UNIT_NAME("安装单位名称", "USC_UNIT_NAME", TechnicalParameter.ParamType.STRING,""),
CODE96333("96333识别码", "CODE96333", TechnicalParameter.ParamType.STRING,""),
SUPERVISORY_CODE("监管码", "SUPERVISORY_CODE", TechnicalParameter.ParamType.STRING,""),
EQU_TYPE("设备型号", "EQU_TYPE", TechnicalParameter.ParamType.STRING,""),
PRODUCE_DATE("制造日期", "PRODUCE_DATE", TechnicalParameter.ParamType.DATE,""),
// PRODUCE_DATE("是否进口", "PRODUCE_DATE", TechnicalParameter.ParamType.DATE,""),
USE_PLACE_CODE("使用地点", "USE_PLACE_CODE", TechnicalParameter.ParamType.STRING,""),
USE_PLACE("使用场所", "USE_PLACE", null,""),
;
private String name;
private String code;
private TechnicalParameter.ParamType paramType;
private String url;
public static JSONArray getAll(){
JSONArray jsonArray = new JSONArray();
for (AdvanceSearchEnum item : values()) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("name", item.name);
jsonObject.put("code", item.code);
jsonObject.put("paramType", item.paramType);
jsonObject.put("isMulti", false);
if(TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)){
jsonObject.put("type","inputNumber");
}else if(TechnicalParameter.ParamType.STRING.equals(item.paramType)){
jsonObject.put("type","input");
}else if(TechnicalParameter.ParamType.DATE.equals(item.paramType)){
jsonObject.put("type","date");
}else {
jsonObject.put("type","select");
}
jsonObject.put("conditions",ConditionEnum.getByCode(item.paramType));
jsonObject.put("url", item.url);
jsonArray.add(jsonObject);
}
return jsonArray;
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/ConditionEnum.java 0 → 100644
View file @ af9aa706
package com.yeejoin.amos.boot.module.statistics.api.enums;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.HashMap;
import java.util.Map;
@AllArgsConstructor
@Getter
public enum ConditionEnum {
/**
* 类型枚举
*/
stringEq("等于", "eq", TechnicalParameter.ParamType.STRING),
like("匹配", "like", TechnicalParameter.ParamType.STRING),
notLike("不匹配", "notLike", TechnicalParameter.ParamType.STRING),
numberEq("等于", "eq", TechnicalParameter.ParamType.BIG_DECIMAL),
numberGt("大于", "gt", TechnicalParameter.ParamType.BIG_DECIMAL),
numberLt("小于", "lt", TechnicalParameter.ParamType.BIG_DECIMAL),
numberGe("大于等于", "ge", TechnicalParameter.ParamType.BIG_DECIMAL),
numberLe("小于等于", "le", TechnicalParameter.ParamType.BIG_DECIMAL),
dateEq("等于", "eq", TechnicalParameter.ParamType.DATE),
dateGt("大于", "gt", TechnicalParameter.ParamType.DATE),
dateLt("小于", "lt", TechnicalParameter.ParamType.DATE),
dateGe("大于等于", "ge", TechnicalParameter.ParamType.DATE),
dateLe("小于等于", "le", TechnicalParameter.ParamType.DATE),
in("包含","in", null),
notin("不包含","notin", null),
;
private String name;
private String code;
private TechnicalParameter.ParamType paramType;
public static JSONArray getByCode(TechnicalParameter.ParamType paramType) {
JSONArray jsonArray = new JSONArray();
for (ConditionEnum value : values()) {
if (value.paramType == paramType) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("label", value.name);
jsonObject.put("value", value.code);
jsonArray.add(jsonObject);
}
}
return jsonArray;
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/TzsCustomFilterMapper.java
View file @ af9aa706
package com.yeejoin.amos.boot.module.statistics.api.mapper; package com.yeejoin.amos.boot.module.statistics.api.mapper;
import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilter;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilter;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/** /**
* 自定义筛选字段基础数据表 Mapper 接口 * 自定义筛选字段基础数据表 Mapper 接口
...@@ -11,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -11,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/ */
public interface TzsCustomFilterMapper extends BaseMapper<TzsCustomFilter> { public interface TzsCustomFilterMapper extends BaseMapper<TzsCustomFilter> {
@MapKey("key")
List<Map<String, Object>> selectEquipmentCategoryByParentId(@Param("parentId") String parentId);
} }
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/TzsCustomFilterMapper.xml
View file @ af9aa706
...@@ -2,4 +2,12 @@ ...@@ -2,4 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterMapper"> <mapper namespace="com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterMapper">
<select id="selectEquipmentCategoryByParentId" resultType="java.util.Map">
select
id as key,
code as value,
name as label
from tz_equipment_category
where parent_id = #{parentId}
</select>
</mapper> </mapper>
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ComprehensiveStatisticalAnalysisController.java 0 → 100644
View file @ af9aa706
package com.yeejoin.amos.boot.module.statistcs.biz.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.ComprehensiveStatisticalAnalysisServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.List;
import java.util.Map;
/**
* 综合统计分析API
*
* @author system_generator
* @date 2025-06-24
*/
@RestController
@Api(tags = "综合统计分析API")
@RequestMapping(value = "/comprehensiveStatisticalAnalysis")
public class ComprehensiveStatisticalAnalysisController extends BaseController {
@Autowired
private ComprehensiveStatisticalAnalysisServiceImpl comprehensiveStatisticalAnalysisServiceImpl;
/**
* 查询设备分类
*
* @param category
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/select/equipmentCategory")
@ApiOperation(httpMethod = "POST", value = "查询设备分类", notes = "查询设备分类")
public ResponseModel<List<Map<String, Object>>> queryEquipmentCategory(@RequestBody JSONObject category) {
String key = category.getString("key") == null ? null : category.getString("key");
return ResponseHelper.buildResponse(comprehensiveStatisticalAnalysisServiceImpl.queryEquipmentCategory(key));
}
/**
* @param jsonObject
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/select/queryEquipmentSearchData")
@ApiOperation(httpMethod = "POST", value = "查询设备查询条件", notes = "查询设备查询条件")
public ResponseModel<JSONObject> queryEquipmentSearchData(@RequestBody JSONObject jsonObject){
return ResponseHelper.buildResponse(comprehensiveStatisticalAnalysisServiceImpl.queryEquipmentSearchData(jsonObject.getString("value")));
}
/**
* @param
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/select/queryAdvancedSearch")
@ApiOperation(httpMethod = "GET", value = "查询高级筛选", notes = "查询高级筛选")
public ResponseModel<JSONArray> query(){
return ResponseHelper.buildResponse(comprehensiveStatisticalAnalysisServiceImpl.queryAdvancedSearch());
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/TzsCustomFilterContentController.java
View file @ af9aa706
package com.yeejoin.amos.boot.module.statistcs.biz.controller; package com.yeejoin.amos.boot.module.statistcs.biz.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.statistcs.biz.service.ITzsCustomFilterContentService; import com.yeejoin.amos.boot.module.statistcs.biz.service.ITzsCustomFilterContentService;
import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.TzsCustomFilterContentServiceImpl; import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.TzsCustomFilterContentServiceImpl;
import com.yeejoin.amos.boot.module.statistics.api.dto.TzsCustomFilterContentDto; import com.yeejoin.amos.boot.module.statistics.api.dto.TzsCustomFilterContentDto;
import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilterContent;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -31,8 +31,8 @@ public class TzsCustomFilterContentController extends BaseController { ...@@ -31,8 +31,8 @@ public class TzsCustomFilterContentController extends BaseController {
@Autowired @Autowired
TzsCustomFilterContentServiceImpl tzsCustomFilterContentServiceImpl; TzsCustomFilterContentServiceImpl tzsCustomFilterContentServiceImpl;
@Autowired @Autowired
ITzsCustomFilterContentService tzsCustomFilterContentService; ITzsCustomFilterContentService tzsCustomFilterContentService;
/** /**
* 新增用户保存的自定义筛选内容表 * 新增用户保存的自定义筛选内容表
...@@ -40,28 +40,28 @@ public class TzsCustomFilterContentController extends BaseController { ...@@ -40,28 +40,28 @@ public class TzsCustomFilterContentController extends BaseController {
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增用户保存的自定义筛选内容表", notes = "新增用户保存的自定义筛选内容表") @ApiOperation(httpMethod = "POST", value = "新增用户保存的自定义筛选内容表", notes = "新增用户保存的自定义筛选内容表")
public ResponseModel<TzsCustomFilterContentDto> save(@RequestBody TzsCustomFilterContentDto model) { public ResponseModel<TzsCustomFilterContentDto> save(@RequestBody TzsCustomFilterContentDto model) {
model = tzsCustomFilterContentServiceImpl.createWithModel(model); model = tzsCustomFilterContentService.save(model, getSelectedOrgInfo().getCompany());
return ResponseHelper.buildResponse(model); return ResponseHelper.buildResponse(model);
} }
/** /**
* 根据sequenceNbr更新 * 根据sequenceNbr更新
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}") @PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新用户保存的自定义筛选内容表", notes = "根据sequenceNbr更新用户保存的自定义筛选内容表") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新用户保存的自定义筛选内容表", notes = "根据sequenceNbr更新用户保存的自定义筛选内容表")
public ResponseModel<TzsCustomFilterContentDto> updateBySequenceNbrTzsCustomFilterContent(@RequestBody TzsCustomFilterContentDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<TzsCustomFilterContentDto> updateBySequenceNbrTzsCustomFilterContent(@RequestBody TzsCustomFilterContentDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(tzsCustomFilterContentServiceImpl.updateWithModel(model)); return ResponseHelper.buildResponse(tzsCustomFilterContentServiceImpl.updateWithModel(model));
} }
/** /**
* 根据sequenceNbr删除 * 根据sequenceNbr删除
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
...@@ -70,50 +70,23 @@ public class TzsCustomFilterContentController extends BaseController { ...@@ -70,50 +70,23 @@ public class TzsCustomFilterContentController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}") @DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除用户保存的自定义筛选内容表", notes = "根据sequenceNbr删除用户保存的自定义筛选内容表") @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除用户保存的自定义筛选内容表", notes = "根据sequenceNbr删除用户保存的自定义筛选内容表")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){ public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(tzsCustomFilterContentServiceImpl.removeById(sequenceNbr)); return ResponseHelper.buildResponse(tzsCustomFilterContentServiceImpl.removeById(sequenceNbr));
} }
/** /**
* 根据sequenceNbr查询 * 根据filterType查询
* *
* @param sequenceNbr 主键 * @param filterType 筛选类型
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/selectList")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个用户保存的自定义筛选内容表", notes = "根据sequenceNbr查询单个用户保存的自定义筛选内容表") @ApiOperation(httpMethod = "GET", value = "根据filterType查询单个用户保存的自定义筛选内容表", notes = "根据filterType查询单个用户保存的自定义筛选内容表")
public ResponseModel<TzsCustomFilterContentDto> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<List<TzsCustomFilterContent>> queryByFilterType(@RequestParam(value = "filterType") String filterType) {
return ResponseHelper.buildResponse(tzsCustomFilterContentServiceImpl.queryBySeq(sequenceNbr)); return ResponseHelper.buildResponse(tzsCustomFilterContentServiceImpl.queryByFilterType(filterType));
} }
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "用户保存的自定义筛选内容表分页查询", notes = "用户保存的自定义筛选内容表分页查询")
public ResponseModel<Page<TzsCustomFilterContentDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<TzsCustomFilterContentDto> page = new Page<TzsCustomFilterContentDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(tzsCustomFilterContentService.queryForTzsCustomFilterContentPage(page));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "用户保存的自定义筛选内容表列表全部数据查询", notes = "用户保存的自定义筛选内容表列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<TzsCustomFilterContentDto>> selectForList() {
return ResponseHelper.buildResponse(tzsCustomFilterContentService.queryForTzsCustomFilterContentList());
}
} }
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/ITzsCustomFilterContentService.java
View file @ af9aa706
package com.yeejoin.amos.boot.module.statistcs.biz.service; package com.yeejoin.amos.boot.module.statistcs.biz.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.module.statistics.api.dto.TzsCustomFilterContentDto; import com.yeejoin.amos.boot.module.statistics.api.dto.TzsCustomFilterContentDto;
import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilterContent;
import java.util.List; import java.util.List;
...@@ -13,13 +14,8 @@ import java.util.List; ...@@ -13,13 +14,8 @@ import java.util.List;
* @date 2025-06-24 * @date 2025-06-24
*/ */
public interface ITzsCustomFilterContentService { public interface ITzsCustomFilterContentService {
/**
* 分页查询
*/
Page<TzsCustomFilterContentDto> queryForTzsCustomFilterContentPage(Page<TzsCustomFilterContentDto> page);
/** TzsCustomFilterContentDto save(TzsCustomFilterContentDto model, CompanyBo company);
* 列表查询 示例
*/ List<TzsCustomFilterContent> queryByFilterType(String filterType);
List<TzsCustomFilterContentDto> queryForTzsCustomFilterContentList();
} }
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 0 → 100644
View file @ af9aa706
package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.module.common.api.dto.TechParamItem;
import com.yeejoin.amos.boot.module.common.biz.utils.TechParamUtil;
import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
import com.yeejoin.amos.boot.module.statistics.api.enums.AdvanceSearchEnum;
import com.yeejoin.amos.boot.module.statistics.api.enums.ConditionEnum;
import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterMapper;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.DictionarieModel;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 综合统计分析服务实现类
*
* @author system_generator
* @date 2025-06-24
*/
@Service
public class ComprehensiveStatisticalAnalysisServiceImpl {
@Value("classpath:/json/equipCategory.json")
private Resource equipCategory;
@Autowired
private TzsCustomFilterMapper tzsCustomFilterMapper;
@Autowired
private DataDictionaryServiceImpl dataDictionaryService;
public List<Map<String, Object>> queryEquipmentCategory(String key) {
List<Map<String, Object>> list;
Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(equipCategory);
if (key == null) {
list = resourceJson.get(EquipmentClassifityEnum.ZHTJFX.getCode());
} else {
list = tzsCustomFilterMapper.selectEquipmentCategoryByParentId(key);
}
return list;
}
public JSONObject queryEquipmentSearchData(String value) {
List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(value);
ArrayList<JSONObject> list = new ArrayList<>();
for(int i= 0;i< paramMetaList.size();i++){
JSONObject object = new JSONObject();
object.put("key",paramMetaList.get(i).getParamKey());
object.put("value",paramMetaList.get(i).getParamKey());
object.put("label",paramMetaList.get(i).getParamLabel());
object.put("unit",paramMetaList.get(i).getUnit());
JSONObject skillConfig = new JSONObject();
skillConfig.put("conditions",getConditionList(paramMetaList.get(i).getParamType(),paramMetaList.get(i).getDictCode()));
if(!ValidationUtil.isEmpty(paramMetaList.get(i).getDictCode())){
skillConfig.put("type","select");
skillConfig.put("data",getData(paramMetaList.get(i).getDictCode()));
}else if(TechnicalParameter.ParamType.BIG_DECIMAL.equals(paramMetaList.get(i).getParamType())){
skillConfig.put("type","inputNumber");
}else if(TechnicalParameter.ParamType.STRING.equals(paramMetaList.get(i).getParamType())){
skillConfig.put("type","input");
}else if(TechnicalParameter.ParamType.DATE.equals(paramMetaList.get(i).getParamType())){
skillConfig.put("type","date");
}
skillConfig.put("isMulti",false);
object.put("skillConfig",skillConfig);
list.add(object);
}
JSONObject result = new JSONObject();
result.put("techParam",list);
return result;
}
private JSONArray getData(String dictCode) {
JSONArray jsonArray = new JSONArray();
//根据dictCode查询数据字典
List<DataDictionary> dictionaries = dataDictionaryService.getByType(dictCode);
for (DataDictionary dictionary : dictionaries) {
JSONObject object = new JSONObject();
object.put("label", dictionary.getName());
object.put("value", dictionary.getCode());
jsonArray.add(object);
}
return jsonArray;
}
private JSONArray getConditionList(TechnicalParameter.ParamType value,String dictCode) {
return ConditionEnum.getByCode(ValidationUtil.isEmpty(dictCode) ? value : null);
}
public JSONArray queryAdvancedSearch() {
JSONArray all = AdvanceSearchEnum.getAll();
return all;
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/TzsCustomFilterContentServiceImpl.java
View file @ af9aa706
package com.yeejoin.amos.boot.module.statistcs.biz.service.impl; package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilterContent; import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterContentMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.module.statistcs.biz.service.ITzsCustomFilterContentService; import com.yeejoin.amos.boot.module.statistcs.biz.service.ITzsCustomFilterContentService;
import com.yeejoin.amos.boot.module.statistics.api.dto.TzsCustomFilterContentDto; import com.yeejoin.amos.boot.module.statistics.api.dto.TzsCustomFilterContentDto;
import org.typroject.tyboot.core.rdbms.service.BaseService; import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilterContent;
import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterContentMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -16,18 +21,23 @@ import java.util.List; ...@@ -16,18 +21,23 @@ import java.util.List;
* @date 2025-06-24 * @date 2025-06-24
*/ */
@Service @Service
public class TzsCustomFilterContentServiceImpl extends BaseService<TzsCustomFilterContentDto,TzsCustomFilterContent,TzsCustomFilterContentMapper> implements ITzsCustomFilterContentService { public class TzsCustomFilterContentServiceImpl extends BaseService<TzsCustomFilterContentDto, TzsCustomFilterContent, TzsCustomFilterContentMapper> implements ITzsCustomFilterContentService {
/**
* 分页查询 @Override
*/ public TzsCustomFilterContentDto save(TzsCustomFilterContentDto model, CompanyBo company) {
public Page<TzsCustomFilterContentDto> queryForTzsCustomFilterContentPage(Page<TzsCustomFilterContentDto> page) { model.setOrgCode(company.getOrgCode());
return this.queryForPage(page, null, false); model.setOrgName(company.getCompanyName());
model.setCreateUserId(RequestContext.getExeUserId());
model.setFilterContent(JSONObject.toJSONString(model.getFilterContent()));
model.setCreateTime(new Date());
return this.createWithModel(model);
} }
/** @Override
* 列表查询 示例 public List<TzsCustomFilterContent> queryByFilterType(String filterType) {
*/ LambdaQueryWrapper<TzsCustomFilterContent> queryWrapper = new LambdaQueryWrapper<>();
public List<TzsCustomFilterContentDto> queryForTzsCustomFilterContentList() { queryWrapper.eq(TzsCustomFilterContent::getFilterType, filterType);
return this.queryForList("" , false); queryWrapper.eq(TzsCustomFilterContent::getCreateUserId, RequestContext.getExeUserId());
return this.lambdaQuery().getBaseMapper().selectList(queryWrapper);
} }
} }
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equipCategory.json
View file @ af9aa706
...@@ -390,5 +390,48 @@ ...@@ -390,5 +390,48 @@
"sum": "0", "sum": "0",
"type": "elevator" "type": "elevator"
} }
],
"__statistical__": "综合统计分析筛选项使用",
"statistical": [
{
"key": "26",
"label": "电梯",
"value": "3000"
},
{
"key": "41",
"label": "起重机械",
"value": "4000"
},
{
"key": "1",
"label": "锅炉",
"value": "1000"
},
{
"key": "7",
"label": "压力容器",
"value": "2000"
},
{
"key": "133",
"label": "压力管道",
"value": "8000"
},
{
"key": "80",
"label": "大型游乐设施",
"value": "6000"
},
{
"key": "144",
"label": "客运索道",
"value": "9000"
},
{
"key": "76",
"label": "场（厂）内专用机动车辆",
"value": "5000"
}
] ]
} }
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgInspectionDetectionInfo.java
View file @ af9aa706
...@@ -134,4 +134,10 @@ public class IdxBizJgInspectionDetectionInfo extends TzsBaseEntity implements IB ...@@ -134,4 +134,10 @@ public class IdxBizJgInspectionDetectionInfo extends TzsBaseEntity implements IB
*/ */
@TableField(value ="\"INSPECT_STAFF_CODE\"") @TableField(value ="\"INSPECT_STAFF_CODE\"")
private String inspectStaffCode; private String inspectStaffCode;
/**
* 检验结果表seq，用于关联使用单位录入的检验结果记录
*/
@TableField(value ="\"RESULT_SEQ\"")
private String resultSeq;
} }
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/EquipmentClassifityEnum.java
View file @ af9aa706
...@@ -24,6 +24,8 @@ public enum EquipmentClassifityEnum { ...@@ -24,6 +24,8 @@ public enum EquipmentClassifityEnum {
KYSD("客运索道", "9000"), KYSD("客运索道", "9000"),
//树类型 //树类型
ZHTJFX("综合统计分析","statistical"),
//设备认领状态 //设备认领状态
SBRLZT("设备认领状态", "rlzt"), SBRLZT("设备认领状态", "rlzt"),
BDLS("八大类树", "eightCategory"), BDLS("八大类树", "eightCategory"),
......
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