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

公共服务ip

develop
王兴琳 2 months ago
parent
9b95b7f8e1
commit
3c7b6b48eb
2 changed files with 81 additions and 339 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. 413
      zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java
  2. 7
      zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml

413
zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java
View File

@ -1,7 +1,12 @@
package com.zc.business.domain;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
@ -14,84 +19,119 @@ import org.omg.CORBA.INTERNAL;
* @author ruoyi
* @date 2024-04-19
*/
public class DcPublishManage extends BaseEntity
{
@Data
@NoArgsConstructor
@AllArgsConstructor
public class DcPublishManage extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 主键 */
/**
* 主键
*/
private Long id;
/** 事件编号 */
/**
* 事件编号
*/
//@Excel(name = "事件编号")
private String eventId;
/** 所属机构 */
/**
* 所属机构
*/
//@Excel(name = "所属机构")
private Long deptId;
/** 发布渠道ID */
/**
* 发布渠道ID
*/
//@Excel(name = "发布渠道ID")
private Long publishChannelsId;
/** 标题 */
/**
* 标题
*/
//@Excel(name = "标题")
private String title;
/** 发布渠道：多选用逗号隔开1-手机短信2-微信公众号3-微博4-情报板5-服务网站6-微信小程序 */
@Excel(name = "发布渠道",readConverterExp="1=手机短信,2=微信公众号,3=微博,4=情报板,5=服务网站,6=微信小程序,7=语音广播,8=企业微信")
/**
* 发布渠道：多选用逗号隔开1-手机短信2-微信公众号3-微博4-情报板5-服务网站6-微信小程序
*/
@Excel(name = "发布渠道", readConverterExp = "1=手机短信,2=微信公众号,3=微博,4=情报板,5=服务网站,6=微信小程序,7=语音广播,8=企业微信")
private Integer publishChannels;
/** 发布时间 */
/**
* 发布时间
*/
@Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date publishTime;
//位置
@Excel(name = "位置/设备")
private String position;
/** 事件详情 */
/**
* 事件详情
*/
@Excel(name = "发布内容")
private String contentDetails;
/** 审核状态：0-待审核1-已审核2-未通过 */
/**
* 审核状态：0-待审核1-已审核2-未通过
*/
//@Excel(name = "审核状态： 0-待审核 1-已审核 2-未通过")
private Integer isverify;
/** 发布者 */
/**
* 发布者
*/
@Excel(name = "发布人")
private String publisher;
/** 审核者1 */
/**
* 审核者1
*/
//@Excel(name = "审核者1")
private String auditor1;
/** 审核者1 */
/**
* 审核者1
*/
//@Excel(name = "审核者1")
private String auditor2;
/** 审核时间1 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
/**
* 审核时间1
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
//@Excel(name = "审核时间1", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime1;
/** 审核时间1 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
/**
* 审核时间1
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
//@Excel(name = "审核时间1", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime2;
/** 审核者1意见 */
/**
* 审核者1意见
*/
//@Excel(name = "审核者1意见")
private String auditComment1;
/** 审核者2意见 */
/**
* 审核者2意见
*/
//@Excel(name = "审核者2意见")
private String auditComment2;
/** 发布状态：1-成功2-失败3-草稿 */
@Excel(name = "发布结果",readConverterExp="1=成功,2=失败,3=草稿")
/**
* 发布状态：1-成功2-失败3-草稿
*/
@Excel(name = "发布结果", readConverterExp = "1=成功,2=失败,3=草稿")
private Integer publishStatus;
@ -104,14 +144,18 @@ public class DcPublishManage extends BaseEntity
//@Excel(name = "事件子类", readConverterExp = "1-1=追尾,1-2=侧翻,1-3=撞护栏,1-4=自然,1-5=其他事故,2-1=车辆故障,3-1=主线封闭和限行,3-2=收费站封闭和限行,3-3=立交封闭和限行,3-4=服务区封闭和限行,4-1=道路拥堵,4-2=立交拥堵,4-3=收费站拥堵,4-4=服务区拥堵,5-1=行人,5-2=非机动车,5-3=摩托车,5-4=其他,6-1=烟雾,6-2=倒伏树木,6-3=撒落物,6-4=动物,6-5=其他,7-1=道路养护施工,7-2=收费站养护施工,7-3=服务区养护施工,7-4=枢纽立交匝道养护施工,7-5=地方道路养护施工,7-6=道路工程建设施工,7-7=收费站工程建设施工,7-8=服务区工程建设施工,7-9=枢纽立交匝道工程建设施工,7-10=地方道路工程建设施工,8-1=封闭、暂停营业,8-2=重要设施停用,8-3=服务区其他异常,9-1=摄像机,9-2=护栏,9-3=隔离栅")
private String eventSubclass;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date eventTime;
/** 参数开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
/**
* 参数开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
/** 参数结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
/**
* 参数结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
//参数
private String startStakeMarkValue;
@ -127,309 +171,6 @@ public class DcPublishManage extends BaseEntity
private Integer eventState;
//关联情报板id
private Long logId;
public String getPosition() {
return position;
}
public void setPosition(String position) {
this.position = position;
}
public Long getLogId() {
return logId;
}
public void setLogId(Long logId) {
this.logId = logId;
}
public Integer getEventState() {
return eventState;
}
public void setEventState(Integer eventState) {
this.eventState = eventState;
}
public String getFacilityName() {
return facilityName;
}
public void setFacilityName(String facilityName) {
this.facilityName = facilityName;
}
public String getStartStakeMarkValue() {
return startStakeMarkValue;
}
public void setStartStakeMarkValue(String startStakeMarkValue) {
this.startStakeMarkValue = startStakeMarkValue;
}
public String getEndStakeMarkValue() {
return endStakeMarkValue;
}
public void setEndStakeMarkValue(String endStakeMarkValue) {
this.endStakeMarkValue = endStakeMarkValue;
}
public Integer getStartStakeMark() {
return startStakeMark;
}
public void setStartStakeMark(Integer startStakeMark) {
this.startStakeMark = startStakeMark;
}
public Integer getEndStakeMark() {
return endStakeMark;
}
public void setEndStakeMark(Integer endStakeMark) {
this.endStakeMark = endStakeMark;
}
public String getDirection() {
return direction;
}
public Date getEventTime() {
return eventTime;
}
public void setEventTime(Date eventTime) {
this.eventTime = eventTime;
}
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public void setDirection(String direction) {
this.direction = direction;
}
public String getStakeMark() {
return stakeMark;
}
public void setStakeMark(String stakeMark) {
this.stakeMark = stakeMark;
}
public String getEventType() {
return eventType;
}
public void setEventType(String eventType) {
this.eventType = eventType;
}
public String getEventSubclass() {
return eventSubclass;
}
public void setEventSubclass(String eventSubclass) {
this.eventSubclass = eventSubclass;
}
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setEventId(String eventId)
{
this.eventId = eventId;
}
public String getEventId()
{
return eventId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getDeptId()
{
return deptId;
}
public void setPublishChannelsId(Long publishChannelsId)
{
this.publishChannelsId = publishChannelsId;
}
public Long getPublishChannelsId()
{
return publishChannelsId;
}
public void setTitle(String title)
{
this.title = title;
}
public String getTitle()
{
return title;
}
public void setPublishChannels(Integer publishChannels)
{
this.publishChannels = publishChannels;
}
public Integer getPublishChannels()
{
return publishChannels;
}
public void setIsverify(Integer isverify)
{
this.isverify = isverify;
}
public Integer getIsverify()
{
return isverify;
}
public void setPublisher(String publisher)
{
this.publisher = publisher;
}
public String getPublisher()
{
return publisher;
}
public void setAuditor1(String auditor1)
{
this.auditor1 = auditor1;
}
public String getAuditor1()
{
return auditor1;
}
public void setAuditor2(String auditor2)
{
this.auditor2 = auditor2;
}
public String getAuditor2()
{
return auditor2;
}
public void setAuditTime1(Date auditTime1)
{
this.auditTime1 = auditTime1;
}
public Date getAuditTime1()
{
return auditTime1;
}
public void setAuditTime2(Date auditTime2)
{
this.auditTime2 = auditTime2;
}
public Date getAuditTime2()
{
return auditTime2;
}
public void setAuditComment1(String auditComment1)
{
this.auditComment1 = auditComment1;
}
public String getAuditComment1()
{
return auditComment1;
}
public void setAuditComment2(String auditComment2)
{
this.auditComment2 = auditComment2;
}
public String getAuditComment2()
{
return auditComment2;
}
public void setPublishTime(Date publishTime)
{
this.publishTime = publishTime;
}
public Date getPublishTime()
{
return publishTime;
}
public void setPublishStatus(Integer publishStatus)
{
this.publishStatus = publishStatus;
}
public Integer getPublishStatus()
{
return publishStatus;
}
public void setContentDetails(String contentDetails)
{
this.contentDetails = contentDetails;
}
public String getContentDetails()
{
return contentDetails;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("eventId", getEventId())
.append("deptId", getDeptId())
.append("publishChannelsId", getPublishChannelsId())
.append("title", getTitle())
.append("publishChannels", getPublishChannels())
.append("isverify", getIsverify())
.append("publisher", getPublisher())
.append("auditor1", getAuditor1())
.append("auditor2", getAuditor2())
.append("auditTime1", getAuditTime1())
.append("auditTime2", getAuditTime2())
.append("auditComment1", getAuditComment1())
.append("auditComment2", getAuditComment2())
.append("publishTime", getPublishTime())
.append("publishStatus", getPublishStatus())
.append("contentDetails", getContentDetails())
.append("remark", getRemark())
.append("updateTime", getUpdateTime())
.append("createTime", getCreateTime())
.toString();
}
}
@TableField(exist = false)
private String ip;
}

7
zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zc.business.mapper.DcPublishManageMapper">
<resultMap type="DcPublishManage" id="DcPublishManageResult">
<resultMap type="com.zc.business.domain.DcPublishManage" id="DcPublishManageResult">
<result property="id" column="id" />
<result property="eventId" column="event_id" />
<result property="deptId" column="dept_id" />
@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="facilityName" column="facility_name" />
<result property="eventState" column="event_state" />
<result property="logId" column="log_id" />
<result property="ip" column="oper_ip" />
</resultMap>
@ -343,7 +344,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) AS m ON h.eventType = m.eventType AND pc.publish_channels = m.publish_channels
ORDER BY h.eventType, pc.publish_channels;
</select>
<select id="selectDcPublishManageStatistics" resultType="com.zc.business.domain.DcPublishManage">
<select id="selectDcPublishManageStatistics" parameterType="com.zc.business.domain.DcPublishManage" resultMap="DcPublishManageResult">
select manage.id,
manage.position,
# CASE
@ -351,7 +352,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
# WHEN manage.publish_channels IN (4, 7) THEN log.dc_device_name
# ELSE'未知'
# END AS position,
manage.publisher,manage.publish_channels,manage.publish_status,manage.content_details,publish_time,oper_ip
manage.publisher,manage.publish_channels,manage.publish_status,manage.content_details,publish_time,log.oper_ip as oper_ip
from dc_publish_manage as manage
left join dc_event as event on event.id=manage.event_id
left join dc_oper_log as log on log.id=manage.log_id

Write Preview
Loading…
Cancel
Save