suzhou-jichuang-lanhai
/
SzplatformJava
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

推送接口字段新增

Browse Source
master
dongdingding 2 years ago
parent dff04ba3fc
commit eee5bf8459
5 changed files with 232 additions and 76 deletions
Show Stats Download Patch File Download Diff File

4
ruoyi-admin/src/main/java/com/ruoyi/pt/controller/BEventAccessController.java
Unescape View File

@ -22,7 +22,7 @@ import java.util.List;
*/ */
@Api(tags = "事件接⼊") @Api(tags = "事件接⼊")
@RestController @RestController
@RequestMapping("/event") @RequestMapping("/gateway/event/event/eventData/")
public class BEventAccessController extends BaseController { public class BEventAccessController extends BaseController {
@Autowired @Autowired
private IBEventAccessService bEventAccessService; private IBEventAccessService bEventAccessService;
@ -59,7 +59,7 @@ public class BEventAccessController extends BaseController {
} }
/** /**
* 事件推送接⼝⼊ * 事件推送接⼝
*/ */
@ApiOperation(value = "事件推送接⼝") @ApiOperation(value = "事件推送接⼝")
@PostMapping("/imports") @PostMapping("/imports")

106
ruoyi-admin/src/main/java/com/ruoyi/pt/domain/BEventAccess.java
Unescape View File

@ -37,18 +37,18 @@ public class BEventAccess extends BaseEntity {
private String areaCode; private String areaCode;
/** /**
* 街道编码,12位编码 * 街道编码,15位编码
*/ */
@Excel(name = "街道编码,12位编码") @Excel(name = "街道编码,15位编码")
@ApiModelProperty(value = "街道编码,12位编码") @ApiModelProperty(value = "街道编码,15位编码")
private String streetCode; private String communityCode;
/** /**
* 事件消息来源部⻔名称例如：市应急局 * ⽹格编码,15位编码
*/ */
@Excel(name = "事件消息来源部⻔名称例如：市应急局") @Excel(name = "⽹格编码,15位编码")
@ApiModelProperty(value = "事件消息来源部⻔名称例如：市应急局") @ApiModelProperty(value = "⽹格编码,15位编码")
private String origin; private String gridCode;
/** /**
* 事件消息所属场景编码：该场 * 事件消息所属场景编码：该场
@ -117,9 +117,9 @@ public class BEventAccess extends BaseEntity {
* 处理" 1："处理中" 2："已 * 处理" 1："处理中" 2："已
* 完成" * 完成"
*/ */
@Excel(name = "事件当前处理状态，0 未处理 1：处理中 2：已完成") @Excel(name = "事件案件状态")
@ApiModelProperty(value = "事件当前处理状态，0： 未处理 1： 处理中 2： 已完成") @ApiModelProperty(value = "事件案件状态")
private Long superviseStatus; private String caseStatus;
/** /**
* 事件上报⼈ * 事件上报⼈
@ -172,4 +172,88 @@ public class BEventAccess extends BaseEntity {
private String eventFile; private String eventFile;
/**
* 1、⼀般2、提级3、疑难4、多跨5、逾期6、推诿7、督办，多个逗号分隔
*/
@Excel(name = "1、⼀般2、提级3、疑难4、多跨5、逾期6、推诿7、督办，多个逗号分隔")
@ApiModelProperty(value = "1、⼀般2、提级3、疑难4、多跨5、逾期6、推诿7、督办，多个逗号分隔")
private String eventLabel;
/**
* 案件类型编码
*/
@Excel(name = "案件类型编码")
@ApiModelProperty(value = "案件类型编码")
private String scenceType;
/**
* 案件类型名称
*/
@Excel(name = "案件类型名称")
@ApiModelProperty(value = "案件类型名称")
private String scenceTypename;
/**
* 受理时间
*/
@Excel(name = "受理时间")
@ApiModelProperty(value = "受理时间")
private String acceptanceTime;
/**
* 处置时限
*/
@Excel(name = "处置时限")
@ApiModelProperty(value = "处置时限")
private String dealTimeLimit;
/**
* 拒绝时限
*/
@Excel(name = "拒绝时限")
@ApiModelProperty(value = "拒绝时限")
private String refuseTimeLimit;
/**
* 拒绝时限
*/
@Excel(name = "反馈时间")
@ApiModelProperty(value = "反馈时间")
private String feedbackTime;
/**
* 办结时间
*/
@Excel(name = "办结时间")
@ApiModelProperty(value = "办结时间")
private String completionTime;
/**
* 主办单位
*/
@Excel(name = "主办单位")
@ApiModelProperty(value = "主办单位")
private String mainOrganizer;
/**
* 执法单位
*/
@Excel(name = "执法单位")
@ApiModelProperty(value = "执法单位")
private String enforceLawOrganizer;
/**
* 协办单位
*/
@Excel(name = "协办单位")
@ApiModelProperty(value = "协办单位")
private String coOrganizer;
} }

2
ruoyi-admin/src/main/resources/application.yml
Unescape View File

@ -18,7 +18,7 @@ ruoyi:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口，默认为8080 # 服务器的HTTP端口，默认为8080
port: 9002 port: 9102
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: /api context-path: /api

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
Unescape View File

@ -114,7 +114,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.antMatchers("/login", "/register", "/captchaImage").permitAll() .antMatchers("/login", "/register", "/captchaImage").permitAll()
// 静态资源，可匿名访问 // 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/pt/info/**","/event/**","/eventProgress/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/pt/info/**","/gateway/event/event/eventData/**","/gateway/event/event/eventData/eventProgress/**").permitAll()
// 除上面外的所有请求全部需要鉴权认证 // 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated() .anyRequest().authenticated()
.and() .and()

194
ruoyi-system/src/main/resources/mapper/pt/BEventAccessMapper.xml
Unescape View File

@ -1,75 +1,123 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.pt.mapper.BEventAccessMapper"> <mapper namespace="com.ruoyi.pt.mapper.BEventAccessMapper">
<resultMap type="BEventAccess" id="BEventAccessResult"> <resultMap type="BEventAccess" id="BEventAccessResult">
<result property="id" column="id" /> <result property="id" column="id"/>
<result property="innerEventId" column="inner_event_id" /> <result property="innerEventId" column="inner_event_id"/>
<result property="areaCode" column="area_code" /> <result property="areaCode" column="area_code"/>
<result property="streetCode" column="street_code" /> <result property="communityCode" column="community_code"/>
<result property="origin" column="origin" /> <result property="gridCode" column="grid_code"/>
<result property="scence" column="scence" /> <result property="scence" column="scence"/>
<result property="title" column="title" /> <result property="title" column="title"/>
<result property="content" column="content" /> <result property="content" column="content"/>
<result property="eventTime" column="event_time" /> <result property="eventTime" column="event_time"/>
<result property="eventCoordinate" column="event_coordinate" /> <result property="eventCoordinate" column="event_coordinate"/>
<result property="msgType" column="msg_type" /> <result property="msgType" column="msg_type"/>
<result property="msgTypeName" column="msg_type_name" /> <result property="msgTypeName" column="msg_type_name"/>
<result property="eventUrl" column="event_url" /> <result property="eventUrl" column="event_url"/>
<result property="superviseStatus" column="supervise_status" /> <result property="caseStatus" column="case_status"/>
<result property="eventCreator" column="event_creator" /> <result property="eventCreator" column="event_creator"/>
<result property="eventCreatorTel" column="event_creator_tel" /> <result property="eventCreatorTel" column="event_creator_tel"/>
<result property="eventPlaceName" column="event_place_name" /> <result property="eventPlaceName" column="event_place_name"/>
<result property="eventDuration" column="event_duration" /> <result property="eventDuration" column="event_duration"/>
<result property="executeType" column="execute_type" /> <result property="executeType" column="execute_type"/>
<result property="remindStatus" column="remind_status" /> <result property="remindStatus" column="remind_status"/>
<result property="eventFile" column="event_file" /> <result property="eventFile" column="event_file"/>
<result property="eventLabel" column="event_label"/>
<result property="scenceType" column="scence_type"/>
<result property="scenceTypename" column="scence_typename"/>
<result property="acceptanceTime" column="acceptance_time"/>
<result property="dealTimeLimit" column="deal_time_limit"/>
<result property="refuseTimeLimit" column="refuse_time_limit"/>
<result property="feedbackTime" column="feedback_time"/>
<result property="completionTime" column="completion_time"/>
<result property="mainOrganizer" column="main_organizer"/>
<result property="enforceLawOrganizer" column="enforce_law_organizer"/>
<result property="coOrganizer" column="co_organizer"/>
</resultMap> </resultMap>
<sql id="selectBEventAccessVo"> <sql id="selectBEventAccessVo">
select id, inner_event_id, area_code, street_code, origin, scence, title, content, event_time, event_coordinate, msg_type, msg_type_name, event_url, supervise_status, event_creator, event_creator_tel, event_place_name, event_duration, execute_type, remind_status, event_file from b_event_access select id,
inner_event_id,
area_code,
community_code,
grid_code,
scence,
title,
content,
event_time,
event_coordinate,
msg_type,
msg_type_name,
event_url,
case_status,
event_creator,
event_creator_tel,
event_place_name,
event_duration,
execute_type,
remind_status,
event_file,
event_label,
scence_type,
scence_typename,
acceptance_time,
deal_time_limit,
refuse_time_limit,
feedback_time,
completion_time,
main_organizer,
enforce_law_organizer,
co_organizer
from b_event_access
</sql> </sql>
<select id="selectBEventAccessList" parameterType="BEventAccess" resultMap="BEventAccessResult"> <select id="selectBEventAccessList" parameterType="BEventAccess" resultMap="BEventAccessResult">
<include refid="selectBEventAccessVo"/> <include refid="selectBEventAccessVo"/>
<where> <where>
<if test="innerEventId != null and innerEventId != ''"> and inner_event_id = #{innerEventId}</if> <if test="innerEventId != null and innerEventId != ''">and inner_event_id = #{innerEventId}</if>
<if test="areaCode != null and areaCode != ''"> and area_code = #{areaCode}</if> <if test="areaCode != null and areaCode != ''">and area_code = #{areaCode}</if>
<if test="streetCode != null and streetCode != ''"> and street_code = #{streetCode}</if> <if test="communityCode != null and communityCode != ''">and community_code = #{communityCode}</if>
<if test="origin != null and origin != ''"> and origin = #{origin}</if> <if test="gridCode != null and gridCode != ''">and grid_code = #{gridCode}</if>
<if test="scence != null and scence != ''"> and scence = #{scence}</if> <if test="scence != null and scence != ''">and scence = #{scence}</if>
<if test="title != null and title != ''"> and title = #{title}</if> <if test="title != null and title != ''">and title = #{title}</if>
<if test="content != null and content != ''"> and content = #{content}</if> <if test="content != null and content != ''">and content = #{content}</if>
<if test="eventTime != null and eventTime != ''"> and event_time = #{eventTime}</if> <if test="eventTime != null and eventTime != ''">and event_time = #{eventTime}</if>
<if test="eventCoordinate != null and eventCoordinate != ''"> and event_coordinate = #{eventCoordinate}</if> <if test="eventCoordinate != null and eventCoordinate != ''">and event_coordinate = #{eventCoordinate}</if>
<if test="msgType != null "> and msg_type = #{msgType}</if> <if test="msgType != null ">and msg_type = #{msgType}</if>
<if test="msgTypeName != null and msgTypeName != ''"> and msg_type_name like concat('%', #{msgTypeName}, '%')</if> <if test="msgTypeName != null and msgTypeName != ''">and msg_type_name like concat('%', #{msgTypeName},
<if test="eventUrl != null and eventUrl != ''"> and event_url = #{eventUrl}</if> '%')
<if test="superviseStatus != null "> and supervise_status = #{superviseStatus}</if> </if>
<if test="eventCreator != null and eventCreator != ''"> and event_creator = #{eventCreator}</if> <if test="eventUrl != null and eventUrl != ''">and event_url = #{eventUrl}</if>
<if test="eventCreatorTel != null and eventCreatorTel != ''"> and event_creator_tel = #{eventCreatorTel}</if> <if test="caseStatus != null ">and case_status = #{caseStatus}</if>
<if test="eventPlaceName != null and eventPlaceName != ''"> and event_place_name like concat('%', #{eventPlaceName}, '%')</if> <if test="eventCreator != null and eventCreator != ''">and event_creator = #{eventCreator}</if>
<if test="eventDuration != null "> and event_duration = #{eventDuration}</if> <if test="eventCreatorTel != null and eventCreatorTel != ''">and event_creator_tel = #{eventCreatorTel}
<if test="executeType != null "> and execute_type = #{executeType}</if> </if>
<if test="remindStatus != null "> and remind_status = #{remindStatus}</if> <if test="eventPlaceName != null and eventPlaceName != ''">and event_place_name like concat('%',
<if test="eventFile != null and eventFile != ''"> and event_file = #{eventFile}</if> #{eventPlaceName}, '%')
</if>
<if test="eventDuration != null ">and event_duration = #{eventDuration}</if>
<if test="executeType != null ">and execute_type = #{executeType}</if>
<if test="remindStatus != null ">and remind_status = #{remindStatus}</if>
<if test="eventFile != null and eventFile != ''">and event_file = #{eventFile}</if>
</where> </where>
</select> </select>
<select id="selectBEventAccessById" parameterType="Long" resultMap="BEventAccessResult"> <select id="selectBEventAccessById" parameterType="Long" resultMap="BEventAccessResult">
<include refid="selectBEventAccessVo"/> <include refid="selectBEventAccessVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertBEventAccess" parameterType="BEventAccess" useGeneratedKeys="true" keyProperty="id"> <insert id="insertBEventAccess" parameterType="BEventAccess" useGeneratedKeys="true" keyProperty="id">
insert into b_event_access insert into b_event_access
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="innerEventId != null">inner_event_id,</if> <if test="innerEventId != null">inner_event_id,</if>
<if test="areaCode != null">area_code,</if> <if test="areaCode != null">area_code,</if>
<if test="streetCode != null">street_code,</if> <if test="communityCode != null">community_code,</if>
<if test="origin != null">origin,</if> <if test="gridCode != null">grid_code,</if>
<if test="scence != null">scence,</if> <if test="scence != null">scence,</if>
<if test="title != null">title,</if> <if test="title != null">title,</if>
<if test="content != null">content,</if> <if test="content != null">content,</if>
@ -78,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="msgType != null">msg_type,</if> <if test="msgType != null">msg_type,</if>
<if test="msgTypeName != null">msg_type_name,</if> <if test="msgTypeName != null">msg_type_name,</if>
<if test="eventUrl != null">event_url,</if> <if test="eventUrl != null">event_url,</if>
<if test="superviseStatus != null">supervise_status,</if> <if test="caseStatus != null">case_status,</if>
<if test="eventCreator != null">event_creator,</if> <if test="eventCreator != null">event_creator,</if>
<if test="eventCreatorTel != null">event_creator_tel,</if> <if test="eventCreatorTel != null">event_creator_tel,</if>
<if test="eventPlaceName != null">event_place_name,</if> <if test="eventPlaceName != null">event_place_name,</if>
@ -86,12 +134,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="executeType != null">execute_type,</if> <if test="executeType != null">execute_type,</if>
<if test="remindStatus != null">remind_status,</if> <if test="remindStatus != null">remind_status,</if>
<if test="eventFile != null">event_file,</if> <if test="eventFile != null">event_file,</if>
</trim> <if test="eventLabel != null">event_label,</if>
<if test="scenceType != null">scence_type,</if>
<if test="scenceTypename != null">scence_typename,</if>
<if test="acceptanceTime != null">acceptance_time,</if>
<if test="dealTimeLimit != null">deal_time_limit,</if>
<if test="refuseTimeLimit != null">refuse_time_limit,</if>
<if test="feedbackTime != null">feedback_time,</if>
<if test="completionTime != null">completion_time,</if>
<if test="mainOrganizer != null">main_organizer,</if>
<if test="enforceLawOrganizer != null">enforce_law_organizer,</if>
<if test="coOrganizer != null">co_organizer,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="innerEventId != null">#{innerEventId},</if> <if test="innerEventId != null">#{innerEventId},</if>
<if test="areaCode != null">#{areaCode},</if> <if test="areaCode != null">#{areaCode},</if>
<if test="streetCode != null">#{streetCode},</if> <if test="communityCode != null">#{communityCode},</if>
<if test="origin != null">#{origin},</if> <if test="gridCode != null">#{gridCode},</if>
<if test="scence != null">#{scence},</if> <if test="scence != null">#{scence},</if>
<if test="title != null">#{title},</if> <if test="title != null">#{title},</if>
<if test="content != null">#{content},</if> <if test="content != null">#{content},</if>
@ -100,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="msgType != null">#{msgType},</if> <if test="msgType != null">#{msgType},</if>
<if test="msgTypeName != null">#{msgTypeName},</if> <if test="msgTypeName != null">#{msgTypeName},</if>
<if test="eventUrl != null">#{eventUrl},</if> <if test="eventUrl != null">#{eventUrl},</if>
<if test="superviseStatus != null">#{superviseStatus},</if> <if test="caseStatus != null">#{caseStatus},</if>
<if test="eventCreator != null">#{eventCreator},</if> <if test="eventCreator != null">#{eventCreator},</if>
<if test="eventCreatorTel != null">#{eventCreatorTel},</if> <if test="eventCreatorTel != null">#{eventCreatorTel},</if>
<if test="eventPlaceName != null">#{eventPlaceName},</if> <if test="eventPlaceName != null">#{eventPlaceName},</if>
@ -108,7 +167,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="executeType != null">#{executeType},</if> <if test="executeType != null">#{executeType},</if>
<if test="remindStatus != null">#{remindStatus},</if> <if test="remindStatus != null">#{remindStatus},</if>
<if test="eventFile != null">#{eventFile},</if> <if test="eventFile != null">#{eventFile},</if>
</trim> <if test="eventLabel != null">#{eventLabel},</if>
<if test="scenceType != null">#{scenceType},</if>
<if test="scenceTypename != null">#{scenceTypename},</if>
<if test="acceptanceTime != null">#{acceptanceTime},</if>
<if test="dealTimeLimit != null">#{dealTimeLimit},</if>
<if test="refuseTimeLimit != null">#{refuseTimeLimit},</if>
<if test="feedbackTime != null">#{feedbackTime},</if>
<if test="completionTime != null">#{completionTime},</if>
<if test="mainOrganizer != null">#{mainOrganizer},</if>
<if test="enforceLawOrganizer != null">#{enforceLawOrganizer},</if>
<if test="coOrganizer != null">#{coOrganizer},</if>
</trim>
</insert> </insert>
<update id="updateBEventAccess" parameterType="BEventAccess"> <update id="updateBEventAccess" parameterType="BEventAccess">
@ -116,8 +186,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="innerEventId != null">inner_event_id = #{innerEventId},</if> <if test="innerEventId != null">inner_event_id = #{innerEventId},</if>
<if test="areaCode != null">area_code = #{areaCode},</if> <if test="areaCode != null">area_code = #{areaCode},</if>
<if test="streetCode != null">street_code = #{streetCode},</if> <if test="communityCode != null">community_code = #{communityCode},</if>
<if test="origin != null">origin = #{origin},</if> <if test="gridCode != null">grid_code = #{gridCode},</if>
<if test="scence != null">scence = #{scence},</if> <if test="scence != null">scence = #{scence},</if>
<if test="title != null">title = #{title},</if> <if test="title != null">title = #{title},</if>
<if test="content != null">content = #{content},</if> <if test="content != null">content = #{content},</if>
@ -126,7 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="msgType != null">msg_type = #{msgType},</if> <if test="msgType != null">msg_type = #{msgType},</if>
<if test="msgTypeName != null">msg_type_name = #{msgTypeName},</if> <if test="msgTypeName != null">msg_type_name = #{msgTypeName},</if>
<if test="eventUrl != null">event_url = #{eventUrl},</if> <if test="eventUrl != null">event_url = #{eventUrl},</if>
<if test="superviseStatus != null">supervise_status = #{superviseStatus},</if> <if test="caseStatus != null">case_status = #{caseStatus},</if>
<if test="eventCreator != null">event_creator = #{eventCreator},</if> <if test="eventCreator != null">event_creator = #{eventCreator},</if>
<if test="eventCreatorTel != null">event_creator_tel = #{eventCreatorTel},</if> <if test="eventCreatorTel != null">event_creator_tel = #{eventCreatorTel},</if>
<if test="eventPlaceName != null">event_place_name = #{eventPlaceName},</if> <if test="eventPlaceName != null">event_place_name = #{eventPlaceName},</if>
@ -139,11 +209,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update> </update>
<delete id="deleteBEventAccessById" parameterType="Long"> <delete id="deleteBEventAccessById" parameterType="Long">
delete from b_event_access where id = #{id} delete
from b_event_access
where id = #{id}
</delete> </delete>
<delete id="deleteBEventAccessByIds" parameterType="String"> <delete id="deleteBEventAccessByIds" parameterType="String">
delete from b_event_access where id in delete from b_event_access where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>

Write Preview
Loading…
Cancel
Save