1.压力管道-增加技术参数

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/util/JyjcConstant.java

@@ -8,5 +8,5 @@ public class JyjcConstant {
     /**
      * 技术参数json类型字段
      */
-    public static final String TECH_PARAM_JSON_FIELDS = "safetyAccessoriesAndRelatedDevices, gasCylinderAccessories";
+    public static final String TECH_PARAM_JSON_FIELDS = "safetyAccessoriesAndRelatedDevices,gasCylinderAccessories,pipeInfo";
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/EquipTechParamPipeline.java

@@ -10,7 +10,7 @@ import java.math.BigDecimal;
 
 /**
  * 安全追溯-压力管道
- * 
+ *
  * @author cpp
  * @date 2023-04-06 15:21:22
  */
@@ -19,115 +19,148 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @TableName("idx_biz_jg_tech_params_pipeline")
 public class EquipTechParamPipeline extends AbstractEquipBaseEntity {
-	private static final long serialVersionUID = 1L;
-
-
-
-
-
-	/**
-  	 *  	 * $column.comments
-     *      */
-
-		@TableField(value ="\"INSTANCE_ID\"")
-	private String instanceId;
-	/**
-  	 *  	 * $column.comments
-     *      */
-
-		@TableField(value ="\"STATUS\"")
-	private String status;
-	/**
-  	 *  	 * 工程(装置)名称
-     *      */
-
-		@TableField(value ="\"DEVICE_NAME\"")
-	private String deviceName;
-	/**
-  	 *  	 * 管道类别
-     *      */
-
-		@TableField(value ="\"PIPELINE_CLASS\"")
-	private String pipelineClass;
-	/**
-  	 *  	 * 管道名称（登记单元）
-     *      */
-
-		@TableField(value ="\"PIPE_NAME\"")
-	private String pipeName;
-	/**
-  	 *  	 * 管道编号
-     *      */
-
-		@TableField(value ="\"PIPELINE_NUMBER\"")
-	private String pipelineNumber;
-	/**
-  	 *  	 * 设备级别
-     *      */
-
-		@TableField(value ="\"DEVICE_LEVEL\"")
-	private String deviceLevel;
-	/**
-  	 *  	 * 设计标准
-     *      */
-
-		@TableField(value ="\"DESIGN_STANDARD\"")
-	private String designStandard;
-	/**
-  	 *  	 * 管道图号
-     *      */
-
-		@TableField(value ="\"PIPE_DRAW_NUMBER\"")
-	private String pipeDrawNumber;
-	/**
-  	 *  	 * 公称直径
-     *      */
-
-		@TableField(value ="\"NOMINAL_DIAMETER\"")
-	private BigDecimal nominalDiameter;
-	/**
-  	 *  	 * 公称壁厚
-     *      */
-
-		@TableField(value ="\"WALL_THICKNESS\"")
-	private BigDecimal wallThickness;
-	/**
-  	 *  	 * 管道长度
-     *      */
-
-		@TableField(value ="\"PIPE_LENGTH\"")
-	private BigDecimal pipeLength;
-	/**
-  	 *  	 * 起始位置起点
-     *      */
-
-		@TableField(value ="\"STARTE_POSITION\"")
-	private String startePosition;
-	/**
-  	 *  	 * 压力
-     *      */
-
-		@TableField(value ="\"PRESSURE\"")
-	private BigDecimal pressure;
-	/**
-  	 *  	 * 温度
-     *      */
-
-		@TableField(value ="\"TEMPERATURE\"")
-	private BigDecimal temperature;
-	/**
-  	 *  	 * 介质
-     *      */
-
-		@TableField(value ="\"MEDIUM\"")
-	private String medium;
-	/**
-  	 *  	 * 备注
-     *      */
-
-		@TableField(value ="\"REMARKS\"")
-	private String remarks;
-
-
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * * $column.comments
+     */
+
+    @TableField(value = "\"INSTANCE_ID\"")
+    private String instanceId;
+    /**
+     * * $column.comments
+     */
+
+    @TableField(value = "\"STATUS\"")
+    private String status;
+    /**
+     * * 工程(装置)名称
+     */
+
+    @TableField(value = "\"DEVICE_NAME\"")
+    private String deviceName;
+    /**
+     * * 管道类别
+     */
+
+    @TableField(value = "\"PIPELINE_CLASS\"")
+    private String pipelineClass;
+    /**
+     * * 管道名称（登记单元）
+     */
+
+    @TableField(value = "\"PIPE_NAME\"")
+    private String pipeName;
+    /**
+     * * 管道编号
+     */
+
+    @TableField(value = "\"PIPELINE_NUMBER\"")
+    private String pipelineNumber;
+    /**
+     * * 设备级别
+     */
+
+    @TableField(value = "\"DEVICE_LEVEL\"")
+    private String deviceLevel;
+    /**
+     * * 设计标准
+     */
+
+    @TableField(value = "\"DESIGN_STANDARD\"")
+    private String designStandard;
+    /**
+     * * 管道图号
+     */
+
+    @TableField(value = "\"PIPE_DRAW_NUMBER\"")
+    private String pipeDrawNumber;
+    /**
+     * * 公称直径
+     */
+
+    @TableField(value = "\"NOMINAL_DIAMETER\"")
+    private BigDecimal nominalDiameter;
+    /**
+     * * 公称壁厚
+     */
+
+    @TableField(value = "\"WALL_THICKNESS\"")
+    private BigDecimal wallThickness;
+    /**
+     * * 管道长度
+     */
+
+    @TableField(value = "\"PIPE_LENGTH\"")
+    private BigDecimal pipeLength;
+    /**
+     * * 起始位置起点
+     */
+
+    @TableField(value = "\"STARTE_POSITION\"")
+    private String startePosition;
+    /**
+     * * 设计压力
+     */
+
+    @TableField(value = "\"PRESSURE\"")
+    private String pressure;
+    /**
+     * * 设计温度
+     */
+
+    @TableField(value = "\"TEMPERATURE\"")
+    private String temperature;
+    /**
+     * * 设计介质
+     */
+
+    @TableField(value = "\"MEDIUM\"")
+    private String medium;
+    /**
+     * * 设计备注
+     */
+
+    @TableField(value = "\"REMARKS\"")
+    private String remarks;
+
+    /**
+     * 终点位置
+     */
+    @TableField("\"END_POSITION\"")
+    private String endPosition;
+
+
+    /**
+     * 管道信息
+     */
+    @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-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgTechParamsPipeline.java

@@ -2,12 +2,10 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
 
 /**
  * 安全追溯-压力管道
@@ -21,115 +19,152 @@ import java.util.Date;
 @TableName("idx_biz_jg_tech_params_pipeline")
 public class IdxBizJgTechParamsPipeline extends TzsBaseEntity {
 
-    
-    
 
     /**
      *
      */
-	@TableField("\"RECORD\"")
+    @TableField("\"RECORD\"")
     private String record;
 
     /**
      *
      */
-	@TableField("\"INSTANCE_ID\"")
+    @TableField("\"INSTANCE_ID\"")
     private String instanceId;
 
     /**
      *
      */
-	@TableField("\"STATUS\"")
+    @TableField("\"STATUS\"")
     private String status;
 
     /**
      *
      */
-	@TableField("\"DEVICE_NAME\"")
+    @TableField("\"DEVICE_NAME\"")
     private String deviceName;
 
     /**
      *
      */
-	@TableField("\"PIPELINE_CLASS\"")
+    @TableField("\"PIPELINE_CLASS\"")
     private String pipelineClass;
 
     /**
      *
      */
-	@TableField("\"PIPE_NAME\"")
+    @TableField("\"PIPE_NAME\"")
     private String pipeName;
 
     /**
      *
      */
-	@TableField("\"PIPELINE_NUMBER\"")
+    @TableField("\"PIPELINE_NUMBER\"")
     private String pipelineNumber;
 
     /**
      *
      */
-	@TableField("\"DEVICE_LEVEL\"")
+    @TableField("\"DEVICE_LEVEL\"")
     private String deviceLevel;
 
     /**
      *
      */
-	@TableField("\"DESIGN_STANDARD\"")
+    @TableField("\"DESIGN_STANDARD\"")
     private String designStandard;
 
     /**
      *
      */
-	@TableField("\"PIPE_DRAW_NUMBER\"")
+    @TableField("\"PIPE_DRAW_NUMBER\"")
     private String pipeDrawNumber;
 
     /**
      *
      */
-	@TableField("\"NOMINAL_DIAMETER\"")
+    @TableField("\"NOMINAL_DIAMETER\"")
     private String nominalDiameter;
 
     /**
      *
      */
-	@TableField("\"WALL_THICKNESS\"")
+    @TableField("\"WALL_THICKNESS\"")
     private String wallThickness;
 
     /**
      *
      */
-	@TableField("\"PIPE_LENGTH\"")
+    @TableField("\"PIPE_LENGTH\"")
     private String pipeLength;
 
     /**
      *
      */
-	@TableField("\"STARTE_POSITION\"")
+    @TableField("\"STARTE_POSITION\"")
     private String startePosition;
 
     /**
+     * 终点位置
+     */
+    @TableField("\"END_POSITION\"")
+    private String endPosition;
+
+    /**
      *
      */
-	@TableField("\"PRESSURE\"")
+    @TableField("\"PRESSURE\"")
     private String pressure;
 
     /**
      *
      */
-	@TableField("\"TEMPERATURE\"")
+    @TableField("\"TEMPERATURE\"")
     private String temperature;
 
     /**
      *
      */
-	@TableField("\"MEDIUM\"")
+    @TableField("\"MEDIUM\"")
     private String medium;
 
     /**
      *
      */
-	@TableField("\"REMARKS\"")
+    @TableField("\"REMARKS\"")
     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-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgTechParamsVessel.java

@@ -528,4 +528,22 @@ public class IdxBizJgTechParamsVessel extends TzsBaseEntity {
 	@TableField("\"PER_CAPITA_CABIN_CAPACITY\"")
     private String perCapitaCabinCapacity;
 
+    /**
+     * 气瓶
+     */
+    @TableField(value = "\"GAS_CYLINDER\"")
+    private String gasCylinder;
+
+    /**
+     * 气瓶安全附件
+     */
+    @TableField(value = "\"GAS_CYLINDER_ACCESSORIES\"")
+    private String gasCylinderAccessories;
+
+    /**
+     * 车辆VIN码
+     */
+    @TableField(value = "\"VIN\"")
+    private String vin;
+
 }