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

情报发布日志接口修改

develop
lau572 1 year ago
parent
1bc2303b4b
commit
4508c3fb5e
2 changed files with 46 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
  2. 31
      zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml

29
zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
View File

@ -34,6 +34,16 @@ public class DcBoardReleaseLog extends BaseEntity
@ApiModelProperty(value="设备名称")
private String deviceName;
/** 桩号 */
@Excel(name = "桩号")
@ApiModelProperty(value="桩号")
private String stakeMarkId;
/** 方向1-上行,2-中,3-下行 */
@Excel(name = "方向1-上行,2-中,3-下行")
@ApiModelProperty(value="方向1-上行,2-中,3-下行")
private String direction;
/** 发布内容 */
@Excel(name = "发布内容")
@ApiModelProperty(value="发布内容")
@ -107,7 +117,24 @@ public class DcBoardReleaseLog extends BaseEntity
{
return deviceName;
}
public void setReleaseContent(String releaseContent)
public String getStakeMarkId() {
return stakeMarkId;
}
public void setStakeMarkId(String stakeMarkId) {
this.stakeMarkId = stakeMarkId;
}
public String getDirection() {
return direction;
}
public void setDirection(String direction) {
this.direction = direction;
}
public void setReleaseContent(String releaseContent)
{
this.releaseContent = releaseContent;
}

31
zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml
View File

@ -17,32 +17,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="releaseUserId" column="release_user_id" />
<result property="platform" column="platform" />
<result property="releaseIp" column="release_ip" />
<result property="stakeMarkId" column="stake_mark_id" />
<result property="direction" column="direction" />
</resultMap>
<sql id="selectDcBoardReleaseLogVo">
select id, device_id, device_name, release_content, release_status, release_time, release_dept_name, release_dept_id, release_user_name, release_user_id, platform,release_ip from dc_board_release_log
select t1.id, t1.device_id, t2.device_name,t2.stake_mark_id, t2.direction,t1.release_content, t1.release_status,
t1.release_time,t1.release_dept_name,t1.release_dept_id,t1.release_user_name,t1.release_user_id,t1.platform,release_ip
from dc_board_release_log t1
left join dc_device t2 on t1.device_id = t2.iot_device_id
</sql>
<select id="selectDcBoardReleaseLogList" parameterType="DcBoardReleaseLog" resultMap="DcBoardReleaseLogResult">
<include refid="selectDcBoardReleaseLogVo"/>
<where>
<if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
<if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
<if test="releaseContent != null and releaseContent != ''"> and release_content = #{releaseContent}</if>
<if test="releaseStatus != null and releaseStatus != ''"> and release_status = #{releaseStatus}</if>
<if test="releaseTime != null "> and release_time = #{releaseTime}</if>
<if test="releaseDeptName != null and releaseDeptName != ''"> and release_dept_name like concat('%', #{releaseDeptName}, '%')</if>
<if test="releaseDeptId != null and releaseDeptId != ''"> and release_dept_id = #{releaseDeptId}</if>
<if test="releaseUserName != null and releaseUserName != ''"> and release_user_name like concat('%', #{releaseUserName}, '%')</if>
<if test="releaseUserId != null and releaseUserId != ''"> and release_user_id = #{releaseUserId}</if>
<if test="releaseIp != null and releaseIp != ''"> and release_ip = #{releaseIp}</if>
<if test="platform != null and platform != ''"> and platform = #{platform}</if>
<if test="deviceId != null and deviceId != ''"> and t1.device_id = #{deviceId}</if>
<if test="deviceName != null and deviceName != ''"> and t2.device_name like concat('%', #{deviceName}, '%')</if>
<if test="releaseContent != null and releaseContent != ''"> and t1.release_content = #{releaseContent}</if>
<if test="releaseStatus != null and releaseStatus != ''"> and t1.release_status = #{releaseStatus}</if>
<if test="releaseTime != null "> and t1.release_time = #{releaseTime}</if>
<if test="releaseDeptName != null and releaseDeptName != ''"> and t1.release_dept_name like concat('%', #{releaseDeptName}, '%')</if>
<if test="releaseDeptId != null and releaseDeptId != ''"> and t1.release_dept_id = #{releaseDeptId}</if>
<if test="releaseUserName != null and releaseUserName != ''"> and t1.release_user_name like concat('%', #{releaseUserName}, '%')</if>
<if test="releaseUserId != null and releaseUserId != ''"> and t1.release_user_id = #{releaseUserId}</if>
<if test="releaseIp != null and releaseIp != ''"> and t1.release_ip = #{releaseIp}</if>
<if test="platform != null and platform != ''"> and t1.platform = #{platform}</if>
</where>
</select>
<select id="selectDcBoardReleaseLogById" parameterType="Long" resultMap="DcBoardReleaseLogResult">
<include refid="selectDcBoardReleaseLogVo"/>
where id = #{id}
where t1.id = #{id}
</select>
<insert id="insertDcBoardReleaseLog" parameterType="DcBoardReleaseLog" useGeneratedKeys="true" keyProperty="id">

Write Preview
Loading…
Cancel
Save