mengff
/
jihe-dc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

新增字段 施工建设事件表(location,localRoadName,endStakeMark)

develop
王兴琳 1 year ago
parent
2114c1b1f6
commit
38642337f2
2 changed files with 90 additions and 54 deletions
Split View
  1. 127
      zc-business/src/main/java/com/zc/business/domain/DcEventConstruction.java
  2. 17
      zc-business/src/main/resources/mapper/business/DcEventConstructionMapper.xml

127
zc-business/src/main/java/com/zc/business/domain/DcEventConstruction.java
View File

@ -1,21 +1,19 @@
package com.zc.business.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 施工建设事件
"施工分类"为事件“事件子类”对象 dc_event_construction
*
* <p>
* "施工分类"为事件“事件子类”对象 dc_event_construction
*
* @author ruoyi
* @date 2024-01-12
*/
@ -23,81 +21,104 @@ import com.ruoyi.common.core.domain.BaseEntity;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class DcEventConstruction extends BaseEntity
{
public class DcEventConstruction extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("事件编号")
@ApiModelProperty("事件编号")
/** 事件编号 */
private String id;
/** 管制方式：
1-封闭
2-不封闭 */
@ApiModelProperty("管制方式")
/**
* 管制方式：
* 1-封闭
* 2-不封闭
*/
@ApiModelProperty("管制方式")
private Long controlMode;
/** 地点类型：
1-单点
2-多点 */
@ApiModelProperty("地点类型：1-单点2-多点")
/**
* 地点类型：
* 1-单点
* 2-多点
*/
@ApiModelProperty("地点类型：1-单点2-多点")
private Long locationType;
/** 特殊地点描述 */
/**
* 特殊地点描述
*/
@Excel(name = "特殊地点描述")
@ApiModelProperty("特殊地点描述")
private String specialPlaceDescription;
/** 专项施工：
1-专项工程施工
2-改扩建专项工程施工
3-桥梁专项工程施工
4-其他专项工程施工 */
@ApiModelProperty(" 专项施工：1-专项工程施工2-改扩建专项工程施工3-桥梁专项工程施工\4-其他专项工程施工 ")
/**
* 专项施工：
* 1-专项工程施工
* 2-改扩建专项工程施工
* 3-桥梁专项工程施工
* 4-其他专项工程施工
*/
@ApiModelProperty(" 专项施工：1-专项工程施工2-改扩建专项工程施工3-桥梁专项工程施工\4-其他专项工程施工 ")
private Long specialConstruction;
/** 其他施工名称 */
/**
* 其他施工名称
*/
@Excel(name = "其他施工名称")
@ApiModelProperty("其他施工名称")
private String otherConstructionName;
/** 施工措施：
0-无
1-并道行驶
2-临时保通
3-借路侧服务区通行 */
@ApiModelProperty("施工措施 0-无1-并道行驶2-临时保通3-借路侧服务区通行")
/**
* 施工措施：
* 0-无
* 1-并道行驶
* 2-临时保通
* 3-借路侧服务区通行
*/
@ApiModelProperty("施工措施 0-无1-并道行驶2-临时保通3-借路侧服务区通行")
private Long constructionMeasurement;
/** 字段名称对应：
互通立交
收费站
服务区
*/
@ApiModelProperty("字段名称对应：互通立交 收费站 服务区")
/**
* 字段名称对应：
* 互通立交
* 收费站
* 服务区
*/
@ApiModelProperty("字段名称对应：互通立交 收费站 服务区")
private Long facilityId;
/** 出入口（收费站/服务区）：
1-出口
2-入口 */
/**
* 出入口（收费站/服务区）：
* 1-出口
* 2-入口
*/
@ApiModelProperty(" 出入口（收费站/服务区）：1-出口 2-入口 ")
@Excel(name = "出入口", readConverterExp = "收=费站/服务区")
private Long exitsInlets;
/** 占用车道
*/
@ApiModelProperty("占用车道")
/**
* 占用车道
*/
@ApiModelProperty("占用车道")
private String laneOccupancy;
/** 通行情况：
1-通行正常
2-通行受阻 */
@ApiModelProperty("通行情况：1-通行正常 2-通行受阻")
/**
* 通行情况：
* 1-通行正常
* 2-通行受阻
*/
@ApiModelProperty("通行情况：1-通行正常 2-通行受阻")
private Long trafficCondition;
@ApiModelProperty("匝道")
private Long rampId;
@ApiModelProperty("施工方式")
private Long constructionMethod;
@ApiModelProperty("匝道")
private Long rampId;
@ApiModelProperty("施工方式")
private Long constructionMethod;
@ApiModelProperty("地方道路名称")
private String localRoadName;
@ApiModelProperty("结束桩号")
private String endStakeMark;
@ApiModelProperty("地点")
private String location;
@ApiModelProperty("事件信息实体")
//事件信息表

17
zc-business/src/main/resources/mapper/business/DcEventConstructionMapper.xml
View File

@ -16,6 +16,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="exitsInlets" column="exits_inlets" />
<result property="laneOccupancy" column="lane_occupancy" />
<result property="trafficCondition" column="traffic_condition" />
<result property="endStakeMark" column="end_stake_mark" />
<result property="localRoadName" column="local_road_name" />
<result property="location" column="location" />
<result property="dcFacility.facilityName" column="facility_name" />
<result property="dcFacility.facilityType" column="facility_type" />
@ -26,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDcEventConstructionVo">
select id, control_mode, location_type, special_place_description, special_construction, other_construction_name, construction_measurement, facility_id, exits_inlets, lane_occupancy, traffic_condition from dc_event_construction
select location,local_road_name,end_stake_mark,id, control_mode, location_type, special_place_description, special_construction, other_construction_name, construction_measurement, facility_id, exits_inlets, lane_occupancy, traffic_condition from dc_event_construction
</sql>
<sql id="selectDcEventConstructionVoById">
SELECT
@ -41,6 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dc_event_construction.exits_inlets as exits_inlets,
dc_event_construction.lane_occupancy as lane_occupancy,
dc_event_construction.traffic_condition as traffic_condition,
dc_event_construction.local_road_name as local_road_name,
dc_event_construction.end_stake_mark as end_stake_mark,
dc_event_construction.location as location,
dc_facility.other_config as other_config,
dc_facility.remark as remark,
dc_facility.stake_mark as stake_mark,
@ -86,6 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="exitsInlets != null">exits_inlets,</if>
<if test="laneOccupancy != null">lane_occupancy,</if>
<if test="trafficCondition != null">traffic_condition,</if>
<if test="endStakeMark != null">end_stake_mark,</if>
<if test="localRoadName != null">local_road_name,</if>
<if test="location != null">location,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -99,6 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="exitsInlets != null">#{exitsInlets},</if>
<if test="laneOccupancy != null">#{laneOccupancy},</if>
<if test="trafficCondition != null">#{trafficCondition},</if>
<if test="endStakeMark != null">#{endStakeMark},</if>
<if test="localRoadName != null">#{localRoadName},</if>
<if test="location != null">#{location},</if>
</trim>
</insert>
@ -115,6 +127,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="exitsInlets != null">exits_inlets = #{exitsInlets},</if>
<if test="laneOccupancy != null">lane_occupancy = #{laneOccupancy},</if>
<if test="trafficCondition != null">traffic_condition = #{trafficCondition},</if>
<if test="endStakeMark != null">end_stake_mark = #{endStakeMark},</if>
<if test="localRoadName != null">local_road_name = #{localRoadName},</if>
<if test="location != null">location = #{location},</if>
</trim>
where id = #{id}
</update>

Write Preview
Loading…
Cancel
Save