diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java index 6aafc7f..e1bbce4 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java @@ -25,21 +25,24 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; /** * 管线编号 */ + @TableField("pipeline_code") private String pipelineCode; /** * 管线名称 */ + @TableField("pipeline_name") private String pipelineName; /** * 管线类型(下拉框) */ + @TableField("pipeline_type") private String pipelineType; @TableField(exist = false) @@ -48,28 +51,34 @@ /*** * 管径(mm) */ + @TableField("pipe_diameter") private String pipeDiameter; /** * 材质 */ + @TableField("material") private String material; /** * 埋设方式 */ + @TableField("bury_mode") private String buryMode; /** * 管线位置 */ + @TableField("pipeline_position") private String pipelinePosition; /** * 建设年代 */ + @TableField("construct_era") private String constructEra; /** * 权属单位(下拉框) */ + @TableField("deptid") private Long deptid; /** @@ -80,40 +89,48 @@ /** * 起始地面高(mm) */ + @TableField("start_ground_height") private Float startGroundHeight; /** * 起始埋深(m) */ + @TableField("start_bury_deep") private Float startBuryDeep; /** * 起始管顶高(mm) */ + @TableField("start_pipecrown_height") private Float startPipecrownHeight; /** * 终止地面高(mm) */ + @TableField("end_ground_height") private Float endGroundHeight; /** * 终止埋深(m) */ + @TableField("end_bury_deep") private Float endBuryDeep; /** * 终止管顶高(mm) */ + @TableField("end_pipecrown_height") private Float endPipecrownHeight; /** * 设计压力(MPa) */ + @TableField("design_pressure") private String designPressure; /** * 瞬时流量(m³) */ + @TableField("instantaneous_flow") private Float instantaneousFlow; /* diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java index 6aafc7f..e1bbce4 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java @@ -25,21 +25,24 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; /** * 管线编号 */ + @TableField("pipeline_code") private String pipelineCode; /** * 管线名称 */ + @TableField("pipeline_name") private String pipelineName; /** * 管线类型(下拉框) */ + @TableField("pipeline_type") private String pipelineType; @TableField(exist = false) @@ -48,28 +51,34 @@ /*** * 管径(mm) */ + @TableField("pipe_diameter") private String pipeDiameter; /** * 材质 */ + @TableField("material") private String material; /** * 埋设方式 */ + @TableField("bury_mode") private String buryMode; /** * 管线位置 */ + @TableField("pipeline_position") private String pipelinePosition; /** * 建设年代 */ + @TableField("construct_era") private String constructEra; /** * 权属单位(下拉框) */ + @TableField("deptid") private Long deptid; /** @@ -80,40 +89,48 @@ /** * 起始地面高(mm) */ + @TableField("start_ground_height") private Float startGroundHeight; /** * 起始埋深(m) */ + @TableField("start_bury_deep") private Float startBuryDeep; /** * 起始管顶高(mm) */ + @TableField("start_pipecrown_height") private Float startPipecrownHeight; /** * 终止地面高(mm) */ + @TableField("end_ground_height") private Float endGroundHeight; /** * 终止埋深(m) */ + @TableField("end_bury_deep") private Float endBuryDeep; /** * 终止管顶高(mm) */ + @TableField("end_pipecrown_height") private Float endPipecrownHeight; /** * 设计压力(MPa) */ + @TableField("design_pressure") private String designPressure; /** * 瞬时流量(m³) */ + @TableField("instantaneous_flow") private Float instantaneousFlow; /* diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index a03aeff..d454b18 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -74,7 +74,7 @@ gunsException.setErrorMessage(errorMsg); throw gunsException; } - return null; + return ResponseData.success(); } @RequestMapping("/delete")