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

信息发布问题

develop
wangsixiang 11 months ago
parent
43c5fe7a56
commit
f800d2c525
4 changed files with 40 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      zc-business/src/main/java/com/zc/business/domain/DcWarning.java
  2. 19
      zc-business/src/main/java/com/zc/business/mapper/DcPublishManageMapper.java
  3. 5
      zc-business/src/main/java/com/zc/business/service/impl/MsmServiceImpl.java
  4. 4
      zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml

52
zc-business/src/main/java/com/zc/business/domain/DcWarning.java
View File

@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 预警信息对象 dc_warning * 预警信息对象 dc_warning
* *
* @author ruoyi * @author ruoyi
* @date 2024-01-13 * @date 2024-01-13
*/ */
@ -56,14 +56,13 @@ public class DcWarning extends BaseEntity
private Integer warningType; private Integer warningType;
/** 事件子类：1-1 拥堵1-2 缓行 */ /** 事件子类：1-1 拥堵1-2 缓行 */
@Excel(name = "事件子类", readConverterExp ="1-1-拥堵,1-2=缓行,2-1=普通行人,2-2=工作人员,3-1=摩托车,3-2=自行车,3-3=三轮车,4-1=非工程车,4-2=工程车,4-3=主路有车,4-4=匝道有车,4-5=车辆故障（弃用),4-6=交通事故（弃用),4-7=应急车道被占用,4-8=车离开应急车道,4-9=其他,4-10=未知车辆,5-1=倒车/逆行,5-2=压线,5-3=掉头,5-4=超速,5-5=低速,5-6=违规变道,5-7=未保持安全距离,6-1=烟火,6-2=火灾,6-3=障碍物,6-4=抛洒物,7-1=道路施工,8-1=雨,8-2=冰雹,8-3=风,8-4=雾,8-5=高温,8-6=积水,8-7=路面湿滑,8-8=路面结冰,8-9=道路能见度低,8-10=道路团雾,9-1=只碰撞不倾斜,9-2=只倾斜无碰撞,9-3=碰撞后倾斜,10-1=未知,10-2单车事故,10-3=多车事故,11-1=车辆抛锚,11-2=车辆炸胎（有备胎),11-2=车辆炸胎（无备胎),99-1=其它") @Excel(name = "事件子类", readConverterExp ="1-1=拥堵,1-2=缓行,2-1=普通行人,2-2=工作人员,3-1=摩托车,3-2=自行车,3-3=三轮车,4-1=非工程车,4-2=工程车,4-3=主路有车,4-4=匝道有车,4-5=车辆故障（弃用),4-6=交通事故（弃用),4-7=应急车道被占用,4-8=车离开应急车道,4-9=其他,4-10=未知车辆,5-1=倒车/逆行,5-2=压线,5-3=掉头,5-4=超速,5-5=低速,5-6=违规变道,5-7=未保持安全距离,6-1=烟火,6-2=火灾,6-3=障碍物,6-4=抛洒物,7-1=道路施工,8-1=雨,8-2=冰雹,8-3=风,8-4=雾,8-5=高温,8-6=积水,8-7=路面湿滑,8-8=路面结冰,8-9=道路能见度低,8-10=道路团雾,9-1=只碰撞不倾斜,9-2=只倾斜无碰撞,9-3=碰撞后倾斜,10-1=未知,10-2单车事故,10-3=多车事故,11-1=车辆抛锚,11-2=车辆炸胎（有备胎),11-2=车辆炸胎（无备胎),99-1=其它")
private String warningSubclass; private String warningSubclass;
/** 事件解除原因 */ /** 事件解除原因 */
@Excel(name = "事件解除原因")
private String relieveReason; private String relieveReason;
/** 事件解除类型： 1-误报解除2-事件已结束3-无需处理事件4-其它 */ /** 事件解除类型： 1-误报解除2-事件已结束3-无需处理事件4-其它 */
@Excel(name = "信息来源", readConverterExp = "1=误报解除2,2=事件已结束3,3=无需处理事件,4=其它") //@Excel(name = "事件解除类型", readConverterExp = "1=误报解除2,2=事件已结束3,3=无需处理事件,4=其它")
private Integer relieveType; private Integer relieveType;
@ -90,7 +89,6 @@ public class DcWarning extends BaseEntity
private String latitude; private String latitude;
/** 车辆类型 */ /** 车辆类型 */
//@Excel(name = "车辆类型")
private String vehicleType; private String vehicleType;
/** 持续时长 */ /** 持续时长 */
private int duration; private int duration;
@ -302,102 +300,102 @@ public class DcWarning extends BaseEntity
{ {
return stakeMark; return stakeMark;
} }
public void setDirection(String direction) public void setDirection(String direction)
{ {
this.direction = direction; this.direction = direction;
} }
public String getDirection() public String getDirection()
{ {
return direction; return direction;
} }
public void setDeptId(Long deptId) public void setDeptId(Long deptId)
{ {
this.deptId = deptId; this.deptId = deptId;
} }
public Long getDeptId() public Long getDeptId()
{ {
return deptId; return deptId;
} }
public void setWarningState(Integer warningState) public void setWarningState(Integer warningState)
{ {
this.warningState = warningState; this.warningState = warningState;
} }
public Integer getWarningState() public Integer getWarningState()
{ {
return warningState; return warningState;
} }
public void setWarningTime(Date warningTime) public void setWarningTime(Date warningTime)
{ {
this.warningTime = warningTime; this.warningTime = warningTime;
} }
public Date getWarningTime() public Date getWarningTime()
{ {
return warningTime; return warningTime;
} }
public void setUserId(Long userId) public void setUserId(Long userId)
{ {
this.userId = userId; this.userId = userId;
} }
public Long getUserId() public Long getUserId()
{ {
return userId; return userId;
} }
public void setWarningSource(Integer warningSource) public void setWarningSource(Integer warningSource)
{ {
this.warningSource = warningSource; this.warningSource = warningSource;
} }
public Integer getWarningSource() public Integer getWarningSource()
{ {
return warningSource; return warningSource;
} }
public void setWarningLevel(Integer warningLevel) public void setWarningLevel(Integer warningLevel)
{ {
this.warningLevel = warningLevel; this.warningLevel = warningLevel;
} }
public Integer getWarningLevel() public Integer getWarningLevel()
{ {
return warningLevel; return warningLevel;
} }
public void setWarningType(Integer warningType) public void setWarningType(Integer warningType)
{ {
this.warningType = warningType; this.warningType = warningType;
} }
public Integer getWarningType() public Integer getWarningType()
{ {
return warningType; return warningType;
} }
public void setWarningSubclass(String warningSubclass) public void setWarningSubclass(String warningSubclass)
{ {
this.warningSubclass = warningSubclass; this.warningSubclass = warningSubclass;
} }
public String getWarningSubclass() public String getWarningSubclass()
{ {
return warningSubclass; return warningSubclass;
} }
public void setWarningTitle(String warningTitle) public void setWarningTitle(String warningTitle)
{ {
this.warningTitle = warningTitle; this.warningTitle = warningTitle;
} }
public String getWarningTitle() public String getWarningTitle()
{ {
return warningTitle; return warningTitle;
} }
public void setOtherConfig(String otherConfig) public void setOtherConfig(String otherConfig)
{ {
this.otherConfig = otherConfig; this.otherConfig = otherConfig;
} }
public String getOtherConfig() public String getOtherConfig()
{ {
return otherConfig; return otherConfig;
} }

19
zc-business/src/main/java/com/zc/business/mapper/DcPublishManageMapper.java
View File

@ -3,19 +3,20 @@ package com.zc.business.mapper;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import com.zc.business.domain.DcPublishManage; import com.zc.business.domain.DcPublishManage;
import com.zc.business.domain.DcPublishingChannels;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
/** /**
* 信息发布管理记录Mapper接口 * 信息发布管理记录Mapper接口
* *
* @author ruoyi * @author ruoyi
* @date 2024-04-19 * @date 2024-04-19
*/ */
public interface DcPublishManageMapper public interface DcPublishManageMapper
{ {
/** /**
* 查询信息发布管理记录 * 查询信息发布管理记录
* *
* @param id 信息发布管理记录主键 * @param id 信息发布管理记录主键
* @return 信息发布管理记录 * @return 信息发布管理记录
*/ */
@ -23,7 +24,7 @@ public interface DcPublishManageMapper
/** /**
* 查询信息发布管理记录列表 * 查询信息发布管理记录列表
* *
* @param dcPublishManage 信息发布管理记录 * @param dcPublishManage 信息发布管理记录
* @return 信息发布管理记录集合 * @return 信息发布管理记录集合
*/ */
@ -32,7 +33,7 @@ public interface DcPublishManageMapper
List<DcPublishManage> selectEventDcPublishManageList(DcPublishManage dcPublishManage); List<DcPublishManage> selectEventDcPublishManageList(DcPublishManage dcPublishManage);
/** /**
* 新增信息发布管理记录 * 新增信息发布管理记录
* *
* @param dcPublishManage 信息发布管理记录 * @param dcPublishManage 信息发布管理记录
* @return 结果 * @return 结果
*/ */
@ -40,7 +41,7 @@ public interface DcPublishManageMapper
/** /**
* 修改信息发布管理记录 * 修改信息发布管理记录
* *
* @param dcPublishManage 信息发布管理记录 * @param dcPublishManage 信息发布管理记录
* @return 结果 * @return 结果
*/ */
@ -48,7 +49,7 @@ public interface DcPublishManageMapper
/** /**
* 删除信息发布管理记录 * 删除信息发布管理记录
* *
* @param id 信息发布管理记录主键 * @param id 信息发布管理记录主键
* @return 结果 * @return 结果
*/ */
@ -61,7 +62,7 @@ public interface DcPublishManageMapper
int deleteDisPath(String eventId); int deleteDisPath(String eventId);
/** /**
* 批量删除信息发布管理记录 * 批量删除信息发布管理记录
* *
* @param ids 需要删除的数据主键集合 * @param ids 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
@ -69,7 +70,7 @@ public interface DcPublishManageMapper
//查询交通事件类型 //查询交通事件类型
public Integer selectEventType(@Param("eventId")String eventId); public Integer selectEventType(@Param("eventId")String eventId);
//获取发布渠道信息 //获取发布渠道信息
public DcPublishManage selectPublishManage(@Param("dataCategory")Integer dataCategory); public DcPublishingChannels selectPublishManage(@Param("dataCategory")Integer dataCategory);
//查询信息发布列表 //查询信息发布列表
public List<HashMap<String,Object>> selectDcPublishManageListMap(DcPublishManage dcPublishManage); public List<HashMap<String,Object>> selectDcPublishManageListMap(DcPublishManage dcPublishManage);
//统计今日发布渠道分析 //统计今日发布渠道分析

5
zc-business/src/main/java/com/zc/business/service/impl/MsmServiceImpl.java
View File

@ -14,6 +14,7 @@ import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.zc.business.domain.DcEventProcess; import com.zc.business.domain.DcEventProcess;
import com.zc.business.domain.DcPublishManage; import com.zc.business.domain.DcPublishManage;
import com.zc.business.domain.DcPublishingChannels;
import com.zc.business.mapper.DcPublishManageMapper; import com.zc.business.mapper.DcPublishManageMapper;
import com.zc.business.service.IMsmService; import com.zc.business.service.IMsmService;
import com.zc.business.utils.HttpUtil; import com.zc.business.utils.HttpUtil;
@ -220,7 +221,7 @@ public class MsmServiceImpl implements IMsmService {
String eventId = map.get("eventId").toString();//事件id String eventId = map.get("eventId").toString();//事件id
String content = map.get("content").toString();//信息内容 String content = map.get("content").toString();//信息内容
Integer eventType = dcPublishManageMapper.selectEventType(eventId);//事件类型 Integer eventType = dcPublishManageMapper.selectEventType(eventId);//事件类型
DcPublishManage publishManage = dcPublishManageMapper.selectPublishManage(eventType);//渠道信息 DcPublishingChannels publishManage = dcPublishManageMapper.selectPublishManage(eventType);//渠道信息
if (publishManage!=null){ if (publishManage!=null){
dcPublishManage.setPublishChannelsId(publishManage.getId());//渠道id dcPublishManage.setPublishChannelsId(publishManage.getId());//渠道id
} }
@ -276,4 +277,4 @@ public class MsmServiceImpl implements IMsmService {
dcEventProcessService.insertDcEventProcess(dcEventProcess); dcEventProcessService.insertDcEventProcess(dcEventProcess);
return AjaxResult.success(message + weiXin); return AjaxResult.success(message + weiXin);
} }
} }

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

@ -88,8 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectEventType" resultType="java.lang.Integer"> <select id="selectEventType" resultType="java.lang.Integer">
select event_type from dc_event where id=#{eventId} select event_type from dc_event where id=#{eventId}
</select> </select>
<select id="selectPublishManage" resultType="com.zc.business.domain.DcPublishManage"> <select id="selectPublishManage" resultType="com.zc.business.domain.DcPublishingChannels">
select id,publish_channels from dc_publishing_channels where enabled=2 and data_category=#{dataCategory} select id,publish_channels publishChannels from dc_publishing_channels where enabled=2 and data_category=#{dataCategory}
</select> </select>
<select id="selectDcPublishManageListMap" resultType="java.util.HashMap"> <select id="selectDcPublishManageListMap" resultType="java.util.HashMap">
select select

Write Preview
Loading…
Cancel
Save