Skip to content

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

1.使用登记单据变更功能

parent 812e2d94
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 240 additions and 1024 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/MultiChangeItemData.java
View file @ 0dac2a0e
...@@ -9,5 +9,5 @@ public class MultiChangeItemData { ...@@ -9,5 +9,5 @@ public class MultiChangeItemData {
String record; String record;
Map<String, Object> data; Map<String, Object> detail;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TechParamsBoilerChangeFieldDto.java
View file @ 0dac2a0e
...@@ -2,93 +2,92 @@ package com.yeejoin.amos.boot.module.jg.api.dto; ...@@ -2,93 +2,92 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine; 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.Group;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* 安全追溯-锅炉 * 安全追溯-锅炉
* *
* @author system_generator * @author system_generator
* @date 2023-08-17 * @date 2023-08-17
*/ */
@EqualsAndHashCode(callSuper = true)
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@Group(value = "tech_params_boiler") @Group(value = "tech_params_boiler")
public class TechParamsBoilerChangeFieldDto extends BaseTechParamsFieldDto { public class TechParamsBoilerChangeFieldDto extends BaseTechParamsFieldDto {
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "设备级别")
private String deviceLevel; private String deviceLevel;
@FieldDisplayDefine(value = "额定蒸发量(热功率)") @FieldDisplayDefine(value = "额定蒸发量（热功率）")
private String ratedEvaporationCapacityThermalPower; private String ratedEvaporationCapacityThermalPower;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "额定工作压力")
private String ratedWorkingPressure; private String ratedWorkingPressure;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "额定工作温度")
private String ratedOperatingTemperature; private String ratedOperatingTemperature;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "设计热效率")
private String designThermalEfficiency; private String designThermalEfficiency;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "给水温度")
private String feedwaterTemperature; private String feedwaterTemperature;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "额定出/回水(油)温度")
private String ratedOutletReturnWaterOilTemperature; private String ratedOutletReturnWaterOilTemperature;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "锅炉本体水（油）容积")
private String waterOilVolumeOfBoilerProper; private String waterOilVolumeOfBoilerProper;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "整装锅炉本体液压试验介质/压力")
private String hydraulicTestMediumPressureOfPackagedBoilerBody; private String hydraulicTestMediumPressureOfPackagedBoilerBody;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "再热器进（出）口温度")
private String inletOutletTemperatureOfReheater; private String inletOutletTemperatureOfReheater;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "再热器进（出）口压力")
private String reheaterInletOutletPressure; private String reheaterInletOutletPressure;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "再热蒸汽流量")
private String reheatSteamFlow; private String reheatSteamFlow;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "有机热载体锅炉气密试验介质/压力")
private String glAirtightTest; private String glAirtightTest;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "燃料（热源）种类")
private String fuelType; private String fuelType;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "受压部件名称")
private String nameOfPressureParts; private String nameOfPressureParts;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "受压部件材料")
private String materialOfPressureParts; private String materialOfPressureParts;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "受压部件壁厚")
private String wallThicknessOfPressureParts; private String wallThicknessOfPressureParts;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "受压部件无损检测方法")
private String nonDestructiveTestingMethodsForPressureParts; private String nonDestructiveTestingMethodsForPressureParts;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "受压部件无损检测比例")
private String proportionOfNdtForPressureParts; private String proportionOfNdtForPressureParts;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "受压部件热处理温度")
private String heatTreatmentTemperatureOfPressureParts; private String heatTreatmentTemperatureOfPressureParts;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "受压部件热处理时间")
private String heatTreatmentTimeOfPressureParts; private String heatTreatmentTimeOfPressureParts;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "受压部件水（耐）压试验介质")
private String hydrostaticTestMedium; private String hydrostaticTestMedium;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "受压部件水（耐）压试验压力")
private String hydrostaticTestPressure; private String hydrostaticTestPressure;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "燃烧方式")
private String combustionMode; private String combustionMode;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TechParamsElevatorChangeFieldDto.java
View file @ 0dac2a0e
...@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.dto; ...@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine; 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.Group;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
...@@ -11,218 +12,68 @@ import lombok.experimental.Accessors; ...@@ -11,218 +12,68 @@ import lombok.experimental.Accessors;
* @author system_generator * @author system_generator
* @date 2023-08-17 * @date 2023-08-17
*/ */
@EqualsAndHashCode(callSuper = true)
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@Group(value = "tech_params_elevator") @Group(value = "tech_params_elevator")
public class TechParamsElevatorChangeFieldDto extends BaseTechParamsFieldDto{ public class TechParamsElevatorChangeFieldDto extends BaseTechParamsFieldDto {
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "额定速度(上行)")
private String ratedSpeedUp; private String ratedSpeedUp;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "额定速度(下行)")
private String ratedSpeedDown; private String ratedSpeedDown;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "额定载重量")
private String ratedLoadCapacity; private String ratedLoadCapacity;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "提升高度")
private String carSize;
@FieldDisplayDefine(value = "设备级别")
private String liftingHeight; private String liftingHeight;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "层数")
private Integer storey; private Integer storey;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "站数")
private Integer stand; private Integer stand;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "门数")
private Integer numberDoors; private Integer numberDoors;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "控制方式")
private String controlMode; private String controlMode;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "油缸数量")
private Integer numberCylinders; private Integer numberCylinders;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "顶升方式")
private String jackingType; private String jackingType;
@FieldDisplayDefine(value = "设备级别")
private String ratedPressure;
@FieldDisplayDefine(value = "设备级别")
private String explosionproofType;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "区域防爆等级")
private String explosionproofGrade; private String explosionproofGrade;
@FieldDisplayDefine(value = "设备级别")
private String explosiveSubstance;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "整机防爆标志")
private String explosionproofSignComplete; private String explosionproofSignComplete;
@FieldDisplayDefine(value = "设备级别")
private String qdzjRatedPower;
@FieldDisplayDefine(value = "设备级别")
private String qdzjRatedSpeed;
@FieldDisplayDefine(value = "设备级别")
private String qdzjReductionRatio;
@FieldDisplayDefine(value = "设备级别")
private String yabzFullloadPressure;
@FieldDisplayDefine(value = "设备级别")
private String xgxlMediaType;
@FieldDisplayDefine(value = "设备级别")
private Integer xgxlMediaNumber;
@FieldDisplayDefine(value = "设备级别")
private String xgxlMediaModel;
@FieldDisplayDefine(value = "设备级别")
private String xgxlMediaSpecification;
@FieldDisplayDefine(value = "设备级别")
private String qdzjModel;
@FieldDisplayDefine(value = "设备级别")
private String qdzjProductNo;
@FieldDisplayDefine(value = "设备级别")
private String qdzjManufacturer;
@FieldDisplayDefine(value = "设备级别")
private String kzgModel;
@FieldDisplayDefine(value = "设备级别")
private String kzgProductNo;
@FieldDisplayDefine(value = "设备级别")
private String kzgManufacturer;
@FieldDisplayDefine(value = "设备级别")
private String xsqModel;
@FieldDisplayDefine(value = "设备级别")
private String xsqProductNo;
@FieldDisplayDefine(value = "设备级别")
private String xsqManufacturer;
@FieldDisplayDefine(value = "设备级别")
private String aqqModel;
@FieldDisplayDefine(value = "设备级别")
private String aqqProductNo;
@FieldDisplayDefine(value = "设备级别")
private String aqqManufacturer;
@FieldDisplayDefine(value = "设备级别")
private String jxhcqModel;
@FieldDisplayDefine(value = "设备级别")
private String jxhcqProductNo;
@FieldDisplayDefine(value = "设备级别")
private String jxhcqManufacturer;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "名义速度")
private String dchcqModel;
@FieldDisplayDefine(value = "设备级别")
private String dchcqProductNo;
@FieldDisplayDefine(value = "设备级别")
private String dchcqManufacturer;
@FieldDisplayDefine(value = "设备级别")
private String cmmszzModel;
@FieldDisplayDefine(value = "设备级别")
private String cmmszzProductNo;
@FieldDisplayDefine(value = "设备级别")
private String cmmszzManufacturer;
@FieldDisplayDefine(value = "设备级别")
private String jmmszzModel;
@FieldDisplayDefine(value = "设备级别")
private String jmmszzProductNo;
@FieldDisplayDefine(value = "设备级别")
private String jmmszzManufacturer;
@FieldDisplayDefine(value = "设备级别")
private String sxcsbhzzModel;
@FieldDisplayDefine(value = "设备级别")
private String sxcsbhzzProductNo;
@FieldDisplayDefine(value = "设备级别")
private String sxcsbhzzManufacturer;
@FieldDisplayDefine(value = "设备级别")
private String jxywydbhzzModel;
@FieldDisplayDefine(value = "设备级别")
private String jxywydbhzzProductNo;
@FieldDisplayDefine(value = "设备级别")
private String jxywydbhzzManufacturer;
@FieldDisplayDefine(value = "设备级别")
private String yybzModel;
@FieldDisplayDefine(value = "设备级别")
private String yybzProductNo;
@FieldDisplayDefine(value = "设备级别")
private String yybzManufacturer;
@FieldDisplayDefine(value = "设备级别")
private String xsqdfModel;
@FieldDisplayDefine(value = "设备级别")
private String xsqdfProductNo;
@FieldDisplayDefine(value = "设备级别")
private String xsqdfManufacturer;
@FieldDisplayDefine(value = "设备级别")
private String nominalSpeed; private String nominalSpeed;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "倾斜角")
private String angleRoll; private String angleRoll;
@FieldDisplayDefine(value = "设备级别")
private String nominalWidth;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "使用区段长度")
private String useSectionLength; private String useSectionLength;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "输送能力")
private String conveyingCapacity; private String conveyingCapacity;
@FieldDisplayDefine(value = "设备级别")
private String workType;
@FieldDisplayDefine(value = "设备级别")
private String workEnvironment;
@FieldDisplayDefine(value = "设备级别")
private String kzgOperationMode;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "轿门位置")
private String doorPosition; private String doorPosition;
@FieldDisplayDefine(value = "设备级别") @FieldDisplayDefine(value = "额定速度")
private String ratedSpeed; private String ratedSpeed;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TechParamsPipelineChangeFieldDto.java
View file @ 0dac2a0e
package com.yeejoin.amos.boot.module.jg.api.dto; package com.yeejoin.amos.boot.module.jg.api.dto;
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.Group;
import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -15,154 +14,51 @@ import lombok.experimental.Accessors; ...@@ -15,154 +14,51 @@ import lombok.experimental.Accessors;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@Group(value = "tech_params_pipeline") @Group(value = "tech_params_pipeline")
public class TechParamsPipelineChangeFieldDto extends BaseTechParamsFieldDto{ public class TechParamsPipelineChangeFieldDto extends BaseTechParamsFieldDto {
/** @FieldDisplayDefine(value = "管道类别")
*
*/
@TableField("\"RECORD\"")
private String record;
/**
*
*/
@TableField("\"INSTANCE_ID\"")
private String instanceId;
/**
*
*/
@TableField("\"STATUS\"")
private String status;
/**
*
*/
@TableField("\"DEVICE_NAME\"")
private String deviceName;
/**
*
*/
@TableField("\"PIPELINE_CLASS\"")
private String pipelineClass; private String pipelineClass;
/**
*
*/
@TableField("\"PIPE_NAME\"")
private String pipeName;
/** @FieldDisplayDefine(value = "管道编号")
*
*/
@TableField("\"PIPELINE_NUMBER\"")
private String pipelineNumber; private String pipelineNumber;
/**
* @FieldDisplayDefine(value = "管道级别")
*/
@TableField("\"DEVICE_LEVEL\"")
private String deviceLevel; private String deviceLevel;
/**
* @FieldDisplayDefine(value = "公称直径")
*/
@TableField("\"DESIGN_STANDARD\"")
private String designStandard;
/**
*
*/
@TableField("\"PIPE_DRAW_NUMBER\"")
private String pipeDrawNumber;
/**
*
*/
@TableField("\"NOMINAL_DIAMETER\"")
private String nominalDiameter; private String nominalDiameter;
/**
* @FieldDisplayDefine(value = "公称壁厚")
*/
@TableField("\"WALL_THICKNESS\"")
private String wallThickness; private String wallThickness;
/**
* @FieldDisplayDefine(value = "管道长度")
*/
@TableField("\"PIPE_LENGTH\"")
private String pipeLength; private String pipeLength;
/**
* @FieldDisplayDefine(value = "起/始位置")
*/
@TableField("\"STARTE_POSITION\"")
private String startePosition; private String startePosition;
/**
* 终点位置
*/
@TableField("\"END_POSITION\"")
private String endPosition;
/** @FieldDisplayDefine(value = "压力")
*
*/
@TableField("\"PRESSURE\"")
private String pressure; private String pressure;
/**
* @FieldDisplayDefine(value = "温度")
*/
@TableField("\"TEMPERATURE\"")
private String temperature; private String temperature;
/**
*
*/
@TableField("\"MEDIUM\"")
private String medium;
/** @FieldDisplayDefine(value = "介质")
* private String medium;
*/
@TableField("\"REMARKS\"")
private String remarks;
/** @FieldDisplayDefine(value = "备注")
* 管道信息 private String remarks;
*/
@TableField(value = "\"PIPE_INFO\"")
private String pipeInfo;
/**
* * 工作压力
*/
@TableField(value = "\"WORK_PRESSURE\"")
private String workPressure;
/**
* * 工作温度
*/
@TableField(value = "\"WORK_TEMPERATURE\"")
private String workTemperature;
/**
* * 工作介质
*/
@TableField(value = "\"WORK_MEDIUM\"")
private String workMedium;
/**
* * 工作备注
*/
@TableField(value = "\"WORK_REMARKS\"")
private String workRemarks;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TechParamsRidesChangeFieldDto.java
View file @ 0dac2a0e
package com.yeejoin.amos.boot.module.jg.api.dto; package com.yeejoin.amos.boot.module.jg.api.dto;
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.Group;
import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
...@@ -12,327 +12,44 @@ import lombok.experimental.Accessors; ...@@ -12,327 +12,44 @@ import lombok.experimental.Accessors;
* @author system_generator * @author system_generator
* @date 2023-08-17 * @date 2023-08-17
*/ */
@EqualsAndHashCode(callSuper = true)
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@Group(value = "tech_params_rides") @Group(value = "tech_params_rides")
public class TechParamsRidesChangeFieldDto extends BaseTechParamsFieldDto{ public class TechParamsRidesChangeFieldDto extends BaseTechParamsFieldDto {
/** @FieldDisplayDefine(value = "轨道高度")
* private String trackHeight;
*/
@TableField("\"RECORD\"")
private String record;
/**
*
*/
@TableField("\"INSTANCE_ID\"")
private String instanceId;
/**
*
*/
@TableField("\"STATUS\"")
private String status;
/**
*
*/
@TableField("\"DESIGN_LIFE\"")
private Integer designLife;
/**
*
*/
@TableField("\"SLIDE_LENGTH\"")
private String slideLength;
/**
*
*/
@TableField("\"SLIDE_HEIGHT\"")
private String slideHeight;
/**
*
*/
@TableField("\"MINIMUM_SLOPE_OF_SLIDE\"")
private String minimumSlopeOfSlide;
/**
*
*/
@TableField("\"AVERAGE_SLOPE_OF_SLIDE\"")
private String averageSlopeOfSlide;
/**
*
*/
@TableField("\"MAXIMUM_SLOPE_OF_THE_SLIDE_WITHOUT_JUMPING\"")
private String maximumSlopeOfTheSlideWithoutJumping;
/**
*
*/
@TableField("\"MINIMUM_RADIUS_OF_CURVATURE_OF_SLIDEWAY\"")
private String minimumRadiusOfCurvatureOfSlideway;
/**
*
*/
@TableField("\"NUMBER_OF_SLIDES\"")
private Integer numberOfSlides;
/**
*
*/
@TableField("\"MAIN_MATERIAL_OF_SLIDE\"")
private String mainMaterialOfSlide;
/**
*
*/
@TableField("\"NUMBER_OF_PULLEYS\"")
private Integer numberOfPulleys;
/**
*
*/
@TableField("\"NUMBER_OF_PASSENGERS\"")
private Integer numberOfPassengers;
/**
*
*/
@TableField("\"ALTITUDE_DIFFERENCE\"")
private String altitudeDifference;
/**
*
*/
@TableField("\"HORIZONTAL_DISTANCE\"")
private String horizontalDistance;
/**
*
*/
@TableField("\"HEIGHT\"")
private String height;
/**
*
*/
@TableField("\"GLIDE_SPEED\"")
private String glideSpeed;
/**
*
*/
@TableField("\"COUNT_OF_PASSENGERS\"")
private Integer countOfPassengers;
/** @FieldDisplayDefine(value = "运行速度")
*
*/
@TableField("\"RUNNING_SPEED\"")
private String runningSpeed; private String runningSpeed;
/** @FieldDisplayDefine(value = "乘坐人数")
* private Integer numberOfPassengers;
*/
@TableField("\"NUMBER_OF_VEHICLES\"")
private Integer numberOfVehicles;
/**
*
*/
@TableField("\"POWER\"")
private String power;
/**
*
*/
@TableField("\"TRACK_HEIGHT\"")
private String trackHeight;
/** @FieldDisplayDefine(value = "滑道长度")
* private String slideLength;
*/
@TableField("\"NUMBER_OF_MEMBERS\"")
private Integer numberOfMembers;
/** @FieldDisplayDefine(value = "运行高度")
*
*/
@TableField("\"OPERATING_HEIGHT\"")
private String operatingHeight; private String operatingHeight;
/** @FieldDisplayDefine(value = "蹦极绳长度")
* private String slideHeight;
*/
@TableField("\"DRIVE_POWER\"")
private String drivePower;
/** @FieldDisplayDefine(value = "回转直径")
*
*/
@TableField("\"ROTARY_DIAMETER\"")
private String rotaryDiameter; private String rotaryDiameter;
/** @FieldDisplayDefine(value = "单边摆角")
*
*/
@TableField("\"RATED_NUMBER_OF_PASSENGERS\"")
private Integer ratedNumberOfPassengers;
/**
*
*/
@TableField("\"NUMBER_OF_PODS\"")
private Integer numberOfPods;
/**
*
*/
@TableField("\"EQUIPMENT_HEIGHT\"")
private String equipmentHeight;
/**
*
*/
@TableField("\"RATED_LINEAR_SPEED\"")
private String ratedLinearSpeed;
/**
*
*/
@TableField("\"ROTARY_TABLE_SPEED\"")
private String rotaryTableSpeed;
/**
*
*/
@TableField("\"UNILATERAL_SWING_ANGLE\"")
private String unilateralSwingAngle; private String unilateralSwingAngle;
/** @FieldDisplayDefine(value = "车辆数")
* private Integer numberOfVehicles;
*/
@TableField("\"NUMBER_OF_CABINS\"")
private Integer numberOfCabins;
/**
*
*/
@TableField("\"MAXIMUM_OPERATING_HEIGHT\"")
private String maximumOperatingHeight;
/**
*
*/
@TableField("\"ROTATION_DIAMETER\"")
private String rotationDiameter;
/**
*
*/
@TableField("\"MAXIMUM_SPEED\"")
private String maximumSpeed;
/** @FieldDisplayDefine(value = "倾角")
*
*/
@TableField("\"DIP\"")
private String dip; private String dip;
/** @FieldDisplayDefine(value = "设备高度")
* private String equipmentHeight;
*/
@TableField("\"SLEWING_SPEED\"")
private String slewingSpeed;
/**
*
*/
@TableField("\"LIFTING_SPEED\"")
private String liftingSpeed;
/**
*
*/
@TableField("\"HEIGHT_DIFFERENCE\"")
private String heightDifference;
/**
*
*/
@TableField("\"MAIN_CABLE_DIAMETER\"")
private String mainCableDiameter;
/**
*
*/
@TableField("\"ANGLE_OF_CHORD\"")
private String angleOfChord;
/**
*
*/
@TableField("\"PASSENGER_NUM\"")
private Integer passengerNum;
/**
*
*/
@TableField("\"BOUNCE_HEIGHT\"")
private String bounceHeight;
/**
*
*/
@TableField("\"MAXIMUM_LOAD\"")
private String maximumLoad;
/**
*
*/
@TableField("\"EQUIPMENT_POWER\"")
private String equipmentPower;
/**
*
*/
@TableField("\"FLOOR_AREA\"")
private String floorArea;
/**
*
*/
@TableField("\"LIFTOFF_ALTITUDE\"")
private String liftoffAltitude;
/**
*
*/
@TableField("\"FIELD_DIAMETER\"")
private String fieldDiameter;
/**
*
*/
@TableField("\"SPHERE_DIAMETER\"")
private String sphereDiameter;
/**
*
*/
@TableField("\"SPHERE_VOLUME\"")
private String sphereVolume;
/**
*
*/
@TableField("\"OPERATOR_NUMBER\"")
private Integer operatorNumber;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TechParamsRopewayChangeFieldDto.java
View file @ 0dac2a0e
package com.yeejoin.amos.boot.module.jg.api.dto; package com.yeejoin.amos.boot.module.jg.api.dto;
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.Group;
import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
...@@ -12,124 +12,49 @@ import lombok.experimental.Accessors; ...@@ -12,124 +12,49 @@ import lombok.experimental.Accessors;
* @author system_generator * @author system_generator
* @date 2023-08-17 * @date 2023-08-17
*/ */
@EqualsAndHashCode(callSuper = true)
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@Group(value = "tech_params_ropeway") @Group(value = "tech_params_ropeway")
public class TechParamsRopewayChangeFieldDto extends BaseTechParamsFieldDto{ public class TechParamsRopewayChangeFieldDto extends BaseTechParamsFieldDto {
@FieldDisplayDefine(value = "平距")
/**
*
*/
@TableField("\"RECORD\"")
private String record;
/**
*
*/
@TableField("\"INSTANCE_ID\"")
private String instanceId;
/**
*
*/
@TableField("\"STATUS\"")
private String status;
/**
*
*/
@TableField("\"HORIZONTAL_DISTANCE\"")
private String horizontalDistance; private String horizontalDistance;
/** @FieldDisplayDefine(value = "支架数目")
*
*/
@TableField("\"SUPPORTS_COUNT\"")
private Integer supportsCount; private Integer supportsCount;
/** @FieldDisplayDefine(value = "斜长")
*
*/
@TableField("\"OBLIQUE_LENGTH\"")
private String obliqueLength; private String obliqueLength;
/** @FieldDisplayDefine(value = "主电机型式")
*
*/
@TableField("\"MAIN_MOTOR_MODEL\"")
private String mainMotorModel; private String mainMotorModel;
/** @FieldDisplayDefine(value = "主电机功率")
*
*/
@TableField("\"MAIN_MOTOR_POWER\"")
private String mainMotorPower; private String mainMotorPower;
/** @FieldDisplayDefine(value = "高差")
*
*/
@TableField("\"ALTITUDE_DIFFERENCE\"")
private String altitudeDifference; private String altitudeDifference;
/** @FieldDisplayDefine(value = "运量")
*
*/
@TableField("\"OIL_PRESSURE_HEAVY_HAMMER\"")
private String oilPressureHeavyHammer;
/**
*
*/
@TableField("\"OIL_PRESSURE_OIL_PRESSURE\"")
private String oilPressureOilPressure;
/**
*
*/
@TableField("\"FREIGHT_VOLUME\"")
private String freightVolume; private String freightVolume;
/** @FieldDisplayDefine(value = "运载索")
*
*/
@TableField("\"CARRIER_LINE\"")
private String carrierLine; private String carrierLine;
/** @FieldDisplayDefine(value = "速度")
*
*/
@TableField("\"SPEED\"")
private String speed; private String speed;
/** @FieldDisplayDefine(value = "承载索")
*
*/
@TableField("\"BEARING_CABLE\"")
private String bearingCable; private String bearingCable;
/** @FieldDisplayDefine(value = "索距")
*
*/
@TableField("\"CABLE_PITCH\"")
private String cablePitch; private String cablePitch;
/** @FieldDisplayDefine(value = "张紧油压（重锤重量）")
* private String oilPressureHeavyHammer;
*/
@TableField("\"NUMBER_AND_TYPE_OF_VEHICLES\"")
private String numberAndTypeOfVehicles;
/** @FieldDisplayDefine(value = "运载工具数量和类型")
* private String numberAndTypeOfVehicles;
*/
@TableField("\"TRACTION_ROPE\"")
private String tractionRope;
/**
*
*/
@TableField("\"BALANCE_CABLE\"")
private String balanceCable;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TechParamsVehicleChangeFieldDto.java
View file @ 0dac2a0e
package com.yeejoin.amos.boot.module.jg.api.dto; package com.yeejoin.amos.boot.module.jg.api.dto;
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.Group;
import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
...@@ -12,293 +12,83 @@ import lombok.experimental.Accessors; ...@@ -12,293 +12,83 @@ import lombok.experimental.Accessors;
* @author system_generator * @author system_generator
* @date 2023-08-17 * @date 2023-08-17
*/ */
@EqualsAndHashCode(callSuper = true)
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@Group(value = "tech_params_vehicle") @Group(value = "tech_params_vehicle")
public class TechParamsVehicleChangeFieldDto extends BaseTechParamsFieldDto{ public class TechParamsVehicleChangeFieldDto extends BaseTechParamsFieldDto {
/** @FieldDisplayDefine(value = "车架编号")
*
*/
@TableField("\"RECORD\"")
private String record;
/**
*
*/
@TableField("\"INSTANCE_ID\"")
private String instanceId;
/**
*
*/
@TableField("\"STATUS\"")
private String status;
/**
*
*/
@TableField("\"FRAME_NO\"")
private String frameNo; private String frameNo;
/** @FieldDisplayDefine(value = "发动机（行走电机）编号")
*
*/
@TableField("\"ENGINE_NO\"")
private String engineNo; private String engineNo;
/** @FieldDisplayDefine(value = "额定起重量")
* private String liftingCapacity;
*/
@TableField("\"POWER_MODE\"")
private String powerMode;
/** @FieldDisplayDefine(value = "传动方式")
*
*/
@TableField("\"TRANSMISSION_MODE\"")
private String transmissionMode; private String transmissionMode;
/** @FieldDisplayDefine(value = "自重")
*
*/
@TableField("\"FRAME_STRUCTURE\"")
private String frameStructure;
/**
*
*/
@TableField("\"DRIVING_MODE\"")
private String drivingMode;
/**
*
*/
@TableField("\"WEIGHT\"")
private String weight; private String weight;
/** @FieldDisplayDefine(value = "动力方式")
* private String powerMode;
*/
@TableField("\"CARRYING_IDLER_MAX_RUNNING_SPEED\"")
private String carryingIdlerMaxRunningSpeed;
/** @FieldDisplayDefine(value = "最大运行速度")
* private String maxRunningSpeed;
*/
@TableField("\"MAX_LIFTING_SPEED\"")
private String maxLiftingSpeed;
/** @FieldDisplayDefine(value = "工作装置空载最大起升高度")
* private String maxLiftingHeight;
*/
@TableField("\"PROTECT_GRADE\"")
private String protectGrade;
/** @FieldDisplayDefine(value = "气体/粉尘组别（防爆）")
*
*/
@TableField("\"GAS_GROUP\"")
private String gasGroup; private String gasGroup;
/** @FieldDisplayDefine(value = "车架结构")
* private String frameStructure;
*/
@TableField("\"TEMPERATURE_GROUP\"")
private String temperatureGroup;
/**
*
*/
@TableField("\"LIFTING_CAPACITY\"")
private String liftingCapacity;
/**
*
*/
@TableField("\"SYSTEM_VOLTAGE\"")
private String systemVoltage;
/**
*
*/
@TableField("\"LOAD_CENTER_DISTANCE\"")
private String loadCenterDistance;
/**
*
*/
@TableField("\"ENGINE_POWER\"")
private String enginePower;
/**
*
*/
@TableField("\"MAX_SPEED\"")
private String maxSpeed;
/**
*
*/
@TableField("\"EXPLOSIONPROOF_PLACE\"")
private String explosionproofPlace;
/**
*
*/
@TableField("\"GANTRY_FORM\"")
private String gantryForm;
/**
*
*/
@TableField("\"MAX_LIFTING_HEIGHT\"")
private String maxLiftingHeight;
/**
*
*/
@TableField("\"FREE_LIFTING_HEIGHT\"")
private String freeLiftingHeight;
/** @FieldDisplayDefine(value = "驾驶方式")
* private String drivingMode;
*/
@TableField("\"PORTAL_ANGLE_FRONT\"")
private String portalAngleFront;
/** @FieldDisplayDefine(value = "空载最大运行速度")
* private String carryingIdlerMaxRunningSpeed;
*/
@TableField("\"PORTAL_ANGLE_BEHIND\"")
private String portalAngleBehind;
/** @FieldDisplayDefine(value = "设备保护等级（防爆）")
* private String protectGrade;
*/
@TableField("\"MAX_LIFTING_SPEED1\"")
private String maxLiftingSpeed1;
/** @FieldDisplayDefine(value = "温度组别（防爆）")
* private String temperatureGroup;
*/
@TableField("\"MAX_LIFTING_SPEED2\"")
private String maxLiftingSpeed2;
/** @FieldDisplayDefine(value = "额定载客人数")
* private Integer passengersNumber;
*/
@TableField("\"MAX_DESCENT_SPEED1\"")
private String maxDescentSpeed1;
/** @FieldDisplayDefine(value = "最大行驶坡度")
* private String maxDrivingSlope;
*/
@TableField("\"MAX_DESCENT_SPEED2\"")
private String maxDescentSpeed2;
/** @FieldDisplayDefine(value = "整车整备质量")
*
*/
@TableField("\"VEHICLE_MASS\"")
private String vehicleMass; private String vehicleMass;
/** @FieldDisplayDefine(value = "轴距")
*
*/
@TableField("\"PASSENGERS_NUMBER\"")
private Integer passengersNumber;
/**
*
*/
@TableField("\"MAX_RUNNING_SPEED\"")
private String maxRunningSpeed;
/**
*
*/
@TableField("\"WHEEL_BASE\"")
private String wheelBase; private String wheelBase;
/** @FieldDisplayDefine(value = "轮距（前）")
*
*/
@TableField("\"TRACK_WIDTH_FRONT\"")
private String trackWidthFront; private String trackWidthFront;
/** @FieldDisplayDefine(value = "轮距（后）")
*
*/
@TableField("\"TRACK_WIDTH_BEHIND\"")
private String trackWidthBehind; private String trackWidthBehind;
/** @FieldDisplayDefine(value = "观光列车车厢数")
*
*/
@TableField("\"CARS_NUMBER\"")
private Integer carsNumber; private Integer carsNumber;
/** @FieldDisplayDefine(value = "观光列车每节车厢座位数")
*
*/
@TableField("\"SEAT_NUMBER\"")
private Integer seatNumber; private Integer seatNumber;
/** @FieldDisplayDefine(value = "观光列车牵引车头座位数")
*
*/
@TableField("\"TRACTOR_SEAT_NUMBER\"")
private Integer tractorSeatNumber; private Integer tractorSeatNumber;
/** @FieldDisplayDefine(value = "空载最大起升速度")
* private String maxLiftingSpeed;
*/
@TableField("\"MAX_DRIVING_SLOPE\"")
private String maxDrivingSlope;
/**
*
*/
@TableField("\"BRAKING_DISTANCE\"")
private String brakingDistance;
/**
*
*/
@TableField("\"OVERALL_LENGTH\"")
private String overallLength;
/**
*
*/
@TableField("\"OVERALL_WIDTH\"")
private String overallWidth;
/**
*
*/
@TableField("\"OVERALL_ALTITUDE\"")
private String overallAltitude;
/**
*
*/
@TableField("\"MIN_GROUND_CLEARANCE\"")
private String minGroundClearance;
/**
*
*/
@TableField("\"MIN_TURNING_RADIUS\"")
private String minTurningRadius;
/**
*
*/
@TableField("\"MAIN_PARTS\"")
private String mainParts;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml
View file @ 0dac2a0e
...@@ -2304,7 +2304,7 @@ ...@@ -2304,7 +2304,7 @@
${tableName} ${tableName}
set set
<foreach collection="columns" item="column" separator=","> <foreach collection="columns" item="column" separator=",">
${column.columnName} = ${column.columnValue} ${column.columnName} = #{column.columnValue}
</foreach> </foreach>
where record = #{record} where record = #{record}
</if> </if>
......
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/BatchDataChangeProcessStrategy.java
View file @ 0dac2a0e
...@@ -49,13 +49,13 @@ public class BatchDataChangeProcessStrategy implements IChangeDataProcessStrateg ...@@ -49,13 +49,13 @@ public class BatchDataChangeProcessStrategy implements IChangeDataProcessStrateg
@Override @Override
public List<ChangeDataDto> handle(Map<String, Object> changeData, String defaultChangeId) { public List<ChangeDataDto> handle(Map<String, Object> changeData, String defaultChangeId) {
JSONObject data = (JSONObject) changeData.get("data"); JSONObject data = (JSONObject) changeData;
JSONArray equips = data.getJSONArray(RequestChangeData.multiDataKey); JSONArray equips = data.getJSONArray(RequestChangeData.multiDataKey);
List<MultiChangeItemData> items = equips.toJavaList(MultiChangeItemData.class); List<MultiChangeItemData> items = equips.toJavaList(MultiChangeItemData.class);
List<ChangeDataDto> allChangeColumns = new ArrayList<>(); List<ChangeDataDto> allChangeColumns = new ArrayList<>();
items.forEach(item -> { items.forEach(item -> {
String record = item.getRecord(); String record = item.getRecord();
Map<String, Object> itemData = item.getData(); Map<String, Object> itemData = item.getDetail();
List<ChangeDataDto> oneEquipChangeColumns = singleDataChangeProcessStrategy.handle(itemData, record); List<ChangeDataDto> oneEquipChangeColumns = singleDataChangeProcessStrategy.handle(itemData, record);
allChangeColumns.addAll(oneEquipChangeColumns); allChangeColumns.addAll(oneEquipChangeColumns);
}); });
...@@ -83,7 +83,7 @@ public class BatchDataChangeProcessStrategy implements IChangeDataProcessStrateg ...@@ -83,7 +83,7 @@ public class BatchDataChangeProcessStrategy implements IChangeDataProcessStrateg
} else { } else {
tableData = jgUseRegistrationMapper.queryForUnitPipelineEquipment(records); tableData = jgUseRegistrationMapper.queryForUnitPipelineEquipment(records);
} }
result.put("table_data", tableData); result.put("tableData", tableData);
return result; return result;
} }
......
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/EquipChangeDataUpdateService.java
View file @ 0dac2a0e
...@@ -2,18 +2,22 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl; ...@@ -2,18 +2,22 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory; import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto; import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.jg.api.dto.*; import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper; import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IBizDataChangeHandleStrategy; import com.yeejoin.amos.boot.module.jg.api.service.IBizDataChangeHandleStrategy;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgDesignInfoMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgDesignInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgFactoryInfoMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgFactoryInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
...@@ -34,12 +38,15 @@ public class EquipChangeDataUpdateService { ...@@ -34,12 +38,15 @@ public class EquipChangeDataUpdateService {
private final CommonMapper commonMapper; private final CommonMapper commonMapper;
public EquipChangeDataUpdateService(ESEquipmentCategory esEquipmentCategory, IdxBizJgDesignInfoMapper idxBizJgDesignInfoMapper, IdxBizJgFactoryInfoMapper jgFactoryInfoMapper, IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper, CommonMapper commonMapper) { private final EquipmentCategoryMapper equipmentCategoryMapper;
public EquipChangeDataUpdateService(ESEquipmentCategory esEquipmentCategory, IdxBizJgDesignInfoMapper idxBizJgDesignInfoMapper, IdxBizJgFactoryInfoMapper jgFactoryInfoMapper, IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper, CommonMapper commonMapper, EquipmentCategoryMapper equipmentCategoryMapper) {
this.esEquipmentCategory = esEquipmentCategory; this.esEquipmentCategory = esEquipmentCategory;
this.idxBizJgDesignInfoMapper = idxBizJgDesignInfoMapper; this.idxBizJgDesignInfoMapper = idxBizJgDesignInfoMapper;
this.jgFactoryInfoMapper = jgFactoryInfoMapper; this.jgFactoryInfoMapper = jgFactoryInfoMapper;
this.idxBizJgRegisterInfoMapper = idxBizJgRegisterInfoMapper; this.idxBizJgRegisterInfoMapper = idxBizJgRegisterInfoMapper;
this.commonMapper = commonMapper; this.commonMapper = commonMapper;
this.equipmentCategoryMapper = equipmentCategoryMapper;
} }
public void updateRegisterChangeData(String record, EquipRegisterChangeDataDto registerChangeDataDto) { public void updateRegisterChangeData(String record, EquipRegisterChangeDataDto registerChangeDataDto) {
...@@ -115,17 +122,28 @@ public class EquipChangeDataUpdateService { ...@@ -115,17 +122,28 @@ public class EquipChangeDataUpdateService {
private void updateRegisterEsData(String record, EquipRegisterChangeDataDto registerChangeDataDto) { private void updateRegisterEsData(String record, EquipRegisterChangeDataDto registerChangeDataDto) {
// es 数据更新 // es 数据更新
Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(record); Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(record);
if (optional.isPresent() && !Objects.equals(registerChangeDataDto.getProductName(), IBizDataChangeHandleStrategy.DEFAULT_VALUE)) { if (optional.isPresent()) {
ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get(); ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
esEquipmentCategoryDto.setPRODUCT_NAME(registerChangeDataDto.getProductName()); esEquipmentCategoryDto.setPRODUCT_NAME(registerChangeDataDto.getProductName());
esEquipmentCategoryDto.setEQU_CODE(registerChangeDataDto.getEquCode());
esEquipmentCategoryDto.setEQU_TYPE(registerChangeDataDto.getEquType());
esEquipmentCategoryDto.setEQU_DEFINE_CODE(registerChangeDataDto.getEquDefine());
if (StringUtils.isEmpty(registerChangeDataDto.getEquDefine())) {
esEquipmentCategoryDto.setEQU_DEFINE(null);
} else {
EquipmentCategory category = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, registerChangeDataDto.getEquDefine()));
if (category != null) {
esEquipmentCategoryDto.setEQU_DEFINE(category.getName());
}
}
esEquipmentCategory.save(esEquipmentCategoryDto); esEquipmentCategory.save(esEquipmentCategoryDto);
} }
} }
public void updateTechParamByRecord(String tableName, String record, List<ChangeDataDto> changeDataDtos) { public void updateTechParamByRecord(String tableName, String record, List<ChangeDataDto> changeDataDtos) {
List<DynamicColumnDto> columns = changeDataDtos.stream().map(c->{ List<DynamicColumnDto> columns = changeDataDtos.stream().map(c -> {
DynamicColumnDto columnDto = new DynamicColumnDto(); DynamicColumnDto columnDto = new DynamicColumnDto();
columnDto.setColumnName(String.format("\"%s\"",StrUtil.toUnderlineCase(c.getColumnKey()).toUpperCase())); columnDto.setColumnName(String.format("\"%s\"", StrUtil.toUnderlineCase(c.getColumnKey()).toUpperCase()));
columnDto.setColumnValue(c.getColumnNewValue()); columnDto.setColumnValue(c.getColumnNewValue());
return columnDto; return columnDto;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
......
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/JgUseRegistrationServiceImpl.java
View file @ 0dac2a0e
...@@ -2298,33 +2298,42 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2298,33 +2298,42 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if (!(FlowStatusEnum.TO_BE_FINISHED.getName().equals(jgUseRegistration.getStatus()) if (!(FlowStatusEnum.TO_BE_FINISHED.getName().equals(jgUseRegistration.getStatus())
|| FlowStatusEnum.TO_BE_DISCARD.getName().equals(jgUseRegistration.getStatus())) || FlowStatusEnum.TO_BE_DISCARD.getName().equals(jgUseRegistration.getStatus()))
|| "1".equals(jgUseRegistration.getRegType())) { || "1".equals(jgUseRegistration.getRegType())) {
// 基本信息 + 制造信息 fillLastEquipDetail(jsonObject, record);
Map<String, Object> detail = this.baseMapper.getDetail(record); }
// 设计信息 }
Map<String, Object> desDetail = this.baseMapper.getDesDetail(record);
if (!ObjectUtils.isEmpty(desDetail)) { public void fillLastEquipDetail(JSONObject jsonObject, String record) {
detail.putAll(desDetail); // 基本信息 + 制造信息 + 设计信息
} fillLastEquipBaseInfo(jsonObject, record);
// 安装信息 // 安装信息
Map<String, Object> installDetail = this.baseMapper.getiInstallDetail(record); Map<String, Object> installDetail = this.baseMapper.getiInstallDetail(record);
// 历史设备登记来的数据没有安装业务信息 从一码通数据拿 // 历史设备登记来的数据没有安装业务信息 从一码通数据拿
if (ValidationUtil.isEmpty(installDetail)) { if (ValidationUtil.isEmpty(installDetail)) {
installDetail = this.baseMapper.getiInstallDetailByIdx(record); installDetail = this.baseMapper.getiInstallDetailByIdx(record);
} }
// 维保信息 // 维保信息
Map<String, Object> maintenanceDetail = this.baseMapper.getMaintenanceDetail(record); Map<String, Object> maintenanceDetail = this.baseMapper.getMaintenanceDetail(record);
// 历史设备登记来的数据没有维保业务信息 从一码通数据拿 // 历史设备登记来的数据没有维保业务信息 从一码通数据拿
if (ValidationUtil.isEmpty(maintenanceDetail)) { if (ValidationUtil.isEmpty(maintenanceDetail)) {
maintenanceDetail = this.baseMapper.getMaintenanceDetailByIdx(record); maintenanceDetail = this.baseMapper.getMaintenanceDetailByIdx(record);
} }
if (!ObjectUtils.isEmpty(maintenanceDetail)) { if (!ObjectUtils.isEmpty(maintenanceDetail)) {
detail.putAll(maintenanceDetail); jsonObject.putAll(maintenanceDetail);
} }
if (!ObjectUtils.isEmpty(installDetail)) { if (!ObjectUtils.isEmpty(installDetail)) {
detail.putAll(installDetail); jsonObject.putAll(installDetail);
} }
jsonObject.putAll(detail); }
public void fillLastEquipBaseInfo(JSONObject jsonObject, String record) {
// 基本信息 + 制造信息
Map<String, Object> detail = this.baseMapper.getDetail(record);
// 设计信息
Map<String, Object> desDetail = this.baseMapper.getDesDetail(record);
if (!ObjectUtils.isEmpty(desDetail)) {
detail.putAll(desDetail);
} }
jsonObject.putAll(detail);
} }
private UseFlagParamDto buildUseFlagParamDto(JgUseRegistration useRegistration, IdxBizJgRegisterInfo registerInfo, IdxBizJgFactoryInfo factoryInfo, Map<String, Object> exportParamsMap) { private UseFlagParamDto buildUseFlagParamDto(JgUseRegistration useRegistration, IdxBizJgRegisterInfo registerInfo, IdxBizJgFactoryInfo factoryInfo, Map<String, Object> exportParamsMap) {
......
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/SingleDataChangeProcessStrategy.java
View file @ 0dac2a0e
...@@ -118,6 +118,16 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate ...@@ -118,6 +118,16 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
jsonFields.add(field.getName()); jsonFields.add(field.getName());
} }
} }
// 技术参数附件
Field[] fields4 = TechParamsLiftingChangeFieldDto.class.getDeclaredFields();
for (Field field : fields4) {
field.setAccessible(true);
FieldDisplayDefine fieldDisplayDefine = field.getAnnotation(FieldDisplayDefine.class);
if (fieldDisplayDefine != null && fieldDisplayDefine.type() == JSON.class) {
jsonFields.add(field.getName());
}
}
} }
public List<ChangeDataDto> handleOne(Map<String, Object> changeData, String record) { public List<ChangeDataDto> handleOne(Map<String, Object> changeData, String record) {
...@@ -126,9 +136,9 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate ...@@ -126,9 +136,9 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
EquipRegisterChangeDataDto registerChangeDataDto = new EquipRegisterChangeDataDto(); EquipRegisterChangeDataDto registerChangeDataDto = new EquipRegisterChangeDataDto();
EquipDesignChangeDataDto equipDesignChangeDataDto = new EquipDesignChangeDataDto(); EquipDesignChangeDataDto equipDesignChangeDataDto = new EquipDesignChangeDataDto();
EquipFactoryChangeDataDto equipFactoryChangeDataDto = new EquipFactoryChangeDataDto(); EquipFactoryChangeDataDto equipFactoryChangeDataDto = new EquipFactoryChangeDataDto();
BeanUtil.copyProperties(JSON.parseObject(JSONObject.toJSONString(changeData)), registerChangeDataDto); BeanUtil.copyProperties(JSON.parse(JSONObject.toJSONString(changeData)), registerChangeDataDto, true);
BeanUtil.copyProperties(JSON.parseObject(JSONObject.toJSONString(changeData)), equipFactoryChangeDataDto); BeanUtil.copyProperties(JSON.parse(JSONObject.toJSONString(changeData)), equipFactoryChangeDataDto, true);
BeanUtil.copyProperties(JSON.parseObject(JSONObject.toJSONString(changeData)), equipDesignChangeDataDto); BeanUtil.copyProperties(JSON.parse(JSONObject.toJSONString(changeData)), equipDesignChangeDataDto, true);
buildChangeFields(record, equipDesignChangeDataDto, equipFactoryChangeDataDto, registerChangeDataDto, allChangeColumns); buildChangeFields(record, equipDesignChangeDataDto, equipFactoryChangeDataDto, registerChangeDataDto, allChangeColumns);
// 设备制造、设计、注册信息业务处理落库 // 设备制造、设计、注册信息业务处理落库
this.dealBizDataForEquip(record, registerChangeDataDto); this.dealBizDataForEquip(record, registerChangeDataDto);
...@@ -393,7 +403,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate ...@@ -393,7 +403,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
case YLRQ: case YLRQ:
// 压力容器 // 压力容器
TechParamsVesselChangeFieldDto newVessel = new TechParamsVesselChangeFieldDto(); TechParamsVesselChangeFieldDto newVessel = new TechParamsVesselChangeFieldDto();
BeanUtil.copyProperties(changeData, newVessel, true); BeanUtil.copyProperties(JSON.parse(JSONObject.toJSONString(changeData)), newVessel, true);
IdxBizJgTechParamsVessel techParamsVessel = iIdxBizJgTechParamsVesselService.getOneData(record); IdxBizJgTechParamsVessel techParamsVessel = iIdxBizJgTechParamsVesselService.getOneData(record);
TechParamsVesselChangeFieldDto oldVessel = BeanUtil.copyProperties(techParamsVessel, TechParamsVesselChangeFieldDto.class); TechParamsVesselChangeFieldDto oldVessel = BeanUtil.copyProperties(techParamsVessel, TechParamsVesselChangeFieldDto.class);
// 字段行转列 // 字段行转列
...@@ -409,7 +419,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate ...@@ -409,7 +419,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
case DT: case DT:
// 电梯 // 电梯
TechParamsElevatorChangeFieldDto newElevator = new TechParamsElevatorChangeFieldDto(); TechParamsElevatorChangeFieldDto newElevator = new TechParamsElevatorChangeFieldDto();
BeanUtil.copyProperties(changeData, newElevator, true); BeanUtil.copyProperties(JSON.parse(JSONObject.toJSONString(changeData)), newElevator, true);
IdxBizJgTechParamsElevator techParamsElevator = iIdxBizJgTechParamsElevatorService.getOneData(record); IdxBizJgTechParamsElevator techParamsElevator = iIdxBizJgTechParamsElevatorService.getOneData(record);
TechParamsElevatorChangeFieldDto oldElevator = BeanUtil.copyProperties(techParamsElevator, TechParamsElevatorChangeFieldDto.class); TechParamsElevatorChangeFieldDto oldElevator = BeanUtil.copyProperties(techParamsElevator, TechParamsElevatorChangeFieldDto.class);
...@@ -426,7 +436,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate ...@@ -426,7 +436,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
case QZJX: case QZJX:
// 起重机械 // 起重机械
TechParamsLiftingChangeFieldDto newLifting = new TechParamsLiftingChangeFieldDto(); TechParamsLiftingChangeFieldDto newLifting = new TechParamsLiftingChangeFieldDto();
BeanUtil.copyProperties(changeData, newLifting, true); BeanUtil.copyProperties(JSON.parse(JSONObject.toJSONString(changeData)), newLifting, true);
IdxBizJgTechParamsLifting techParamsLifting = iIdxBizJgTechParamsLiftingService.getOneData(record); IdxBizJgTechParamsLifting techParamsLifting = iIdxBizJgTechParamsLiftingService.getOneData(record);
// 技术参数对象转换为全部技术参数 ，其他无用字段去掉 // 技术参数对象转换为全部技术参数 ，其他无用字段去掉
...@@ -444,7 +454,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate ...@@ -444,7 +454,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
case CC: case CC:
// 场（厂）内专用机动车辆 // 场（厂）内专用机动车辆
TechParamsVehicleChangeFieldDto newVehicle = new TechParamsVehicleChangeFieldDto(); TechParamsVehicleChangeFieldDto newVehicle = new TechParamsVehicleChangeFieldDto();
BeanUtil.copyProperties(changeData, newVehicle, true); BeanUtil.copyProperties(JSON.parse(JSONObject.toJSONString(changeData)), newVehicle, true);
IdxBizJgTechParamsVehicle techParamsVehicle = iIdxBizJgTechParamsVehicleService.getOneData(record); IdxBizJgTechParamsVehicle techParamsVehicle = iIdxBizJgTechParamsVehicleService.getOneData(record);
TechParamsVehicleChangeFieldDto oldVehicle = BeanUtil.copyProperties(techParamsVehicle, TechParamsVehicleChangeFieldDto.class); TechParamsVehicleChangeFieldDto oldVehicle = BeanUtil.copyProperties(techParamsVehicle, TechParamsVehicleChangeFieldDto.class);
...@@ -461,7 +471,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate ...@@ -461,7 +471,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
case YLSS: case YLSS:
// 大型游乐设施 // 大型游乐设施
TechParamsRidesChangeFieldDto newRides = new TechParamsRidesChangeFieldDto(); TechParamsRidesChangeFieldDto newRides = new TechParamsRidesChangeFieldDto();
BeanUtil.copyProperties(changeData, newRides, true); BeanUtil.copyProperties(JSON.parse(JSONObject.toJSONString(changeData)), newRides, true);
IdxBizJgTechParamsRides techParamsRides = iIdxBizJgTechParamsRidesService.getOneData(record); IdxBizJgTechParamsRides techParamsRides = iIdxBizJgTechParamsRidesService.getOneData(record);
// 技术参数对象转换为全部技术参数 ，其他无用字段去掉 // 技术参数对象转换为全部技术参数 ，其他无用字段去掉
...@@ -479,7 +489,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate ...@@ -479,7 +489,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
case YLGD: case YLGD:
// 压力管道 // 压力管道
TechParamsPipelineChangeFieldDto newPipeline = new TechParamsPipelineChangeFieldDto(); TechParamsPipelineChangeFieldDto newPipeline = new TechParamsPipelineChangeFieldDto();
BeanUtil.copyProperties(changeData, newPipeline, true); BeanUtil.copyProperties(JSON.parse(JSONObject.toJSONString(changeData)), newPipeline, true);
IdxBizJgTechParamsPipeline techParamsPipeline = iIdxBizJgTechParamsPipelineService.getOneData(record); IdxBizJgTechParamsPipeline techParamsPipeline = iIdxBizJgTechParamsPipelineService.getOneData(record);
// 技术参数对象转换为全部技术参数 ，其他无用字段去掉 // 技术参数对象转换为全部技术参数 ，其他无用字段去掉
...@@ -497,7 +507,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate ...@@ -497,7 +507,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
case KYSD: case KYSD:
// 客运索道 // 客运索道
TechParamsRopewayChangeFieldDto newRopeway = new TechParamsRopewayChangeFieldDto(); TechParamsRopewayChangeFieldDto newRopeway = new TechParamsRopewayChangeFieldDto();
BeanUtil.copyProperties(changeData, newRopeway, true); BeanUtil.copyProperties(JSON.parse(JSONObject.toJSONString(changeData)), newRopeway, true);
IdxBizJgTechParamsRopeway techParamsRopeway = iIdxBizJgTechParamsRopewayService.getOneData(record); IdxBizJgTechParamsRopeway techParamsRopeway = iIdxBizJgTechParamsRopewayService.getOneData(record);
// 技术参数对象转换为全部技术参数 ，其他无用字段去掉 // 技术参数对象转换为全部技术参数 ，其他无用字段去掉
...@@ -530,7 +540,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate ...@@ -530,7 +540,7 @@ public class SingleDataChangeProcessStrategy implements IChangeDataProcessStrate
private static TechParamsBoilerChangeFieldDto getTechParamsBoilerChangeField(Map<String, Object> changeData) { private static TechParamsBoilerChangeFieldDto getTechParamsBoilerChangeField(Map<String, Object> changeData) {
TechParamsBoilerChangeFieldDto newBoiler = new TechParamsBoilerChangeFieldDto(); TechParamsBoilerChangeFieldDto newBoiler = new TechParamsBoilerChangeFieldDto();
BeanUtil.copyProperties(changeData, newBoiler, true); BeanUtil.copyProperties(JSON.parse(JSONObject.toJSONString(changeData)), newBoiler, true);
return newBoiler; return newBoiler;
} }
......
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/UseRegisterUpdateService.java
View file @ 0dac2a0e
...@@ -59,16 +59,17 @@ public class UseRegisterUpdateService { ...@@ -59,16 +59,17 @@ public class UseRegisterUpdateService {
jsonObject.put("factoryUseSiteStreet", String.valueOf(Long.valueOf(jsonObject.get("factoryUseSiteStreet").toString()))); jsonObject.put("factoryUseSiteStreet", String.valueOf(Long.valueOf(jsonObject.get("factoryUseSiteStreet").toString())));
} }
if (!"unit".equals(jgUseRegistration.getManageType())) { if (!"unit".equals(jgUseRegistration.getManageType())) {
// 台套逻辑
String record = useRegistrationService.setDefaultRecord(jgUseRegistration, null); String record = useRegistrationService.setDefaultRecord(jgUseRegistration, null);
// 需求：当申请信息由于设备信息错误被驳回及撤回时显示的数据还是旧设备数据，导致该申请单无法使用 // 更新 设计、制造、基本信息json
// 解决方案：设备基本信息、制造信息、设计信息、安装信息、维保信息，已完成时显示历史数据、非完成时显示最新设备数据 useRegistrationService.fillLastEquipBaseInfo(jsonObject, record);
useRegistrationService.fillHistoryDataWithNewEquip(jsonObject, jgUseRegistration, record);
// 补充"车牌号"字段 // 补充"车牌号"字段
LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record); LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record);
IdxBizJgRegisterInfo idxBizJgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper); IdxBizJgRegisterInfo idxBizJgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
jsonObject.put("carNumber", idxBizJgRegisterInfo.getCarNumber()); jsonObject.put("carNumber", idxBizJgRegisterInfo.getCarNumber());
jsonObject.put("regType", jgUseRegistration.getRegType()); jsonObject.put("regType", jgUseRegistration.getRegType());
} else { } else {
// 单位办理逻辑
List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) jsonObject.get("equipmentLists"); List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) jsonObject.get("equipmentLists");
List<String> records = equipmentLists.stream().map(v -> (String) v.get("record")).collect(toList()); List<String> records = equipmentLists.stream().map(v -> (String) v.get("record")).collect(toList());
jsonObject.remove("equipmentLists"); jsonObject.remove("equipmentLists");
......
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