diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/BEventAccessController.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/BEventAccessController.java index 9f8f044..e5c9a77 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/BEventAccessController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/BEventAccessController.java @@ -22,7 +22,7 @@ import java.util.List; */ @Api(tags = "事件接⼊") @RestController -@RequestMapping("/event") +@RequestMapping("/gateway/event/event/eventData/") public class BEventAccessController extends BaseController { @Autowired private IBEventAccessService bEventAccessService; @@ -59,7 +59,7 @@ public class BEventAccessController extends BaseController { } /** - * 事件推送接⼝⼊ + * 事件推送接⼝ */ @ApiOperation(value = "事件推送接⼝") @PostMapping("/imports") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/domain/BEventAccess.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/domain/BEventAccess.java index 8b2bc6a..a050974 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/domain/BEventAccess.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/domain/BEventAccess.java @@ -37,18 +37,18 @@ public class BEventAccess extends BaseEntity { private String areaCode; /** - * 街道编码,12位编码 + * 街道编码,15位编码 */ - @Excel(name = "街道编码,12位编码") - @ApiModelProperty(value = "街道编码,12位编码") - private String streetCode; + @Excel(name = "街道编码,15位编码") + @ApiModelProperty(value = "街道编码,15位编码") + private String communityCode; /** - * 事件消息来源部⻔名称例如:市应急局 + * ⽹格编码,15位编码 */ - @Excel(name = "事件消息来源部⻔名称例如:市应急局") - @ApiModelProperty(value = "事件消息来源部⻔名称例如:市应急局") - private String origin; + @Excel(name = "⽹格编码,15位编码") + @ApiModelProperty(value = "⽹格编码,15位编码") + private String gridCode; /** * 事件消息所属场景编码:该场 @@ -117,9 +117,9 @@ public class BEventAccess extends BaseEntity { * 处理" 1:"处理中" 2:"已 * 完成" */ - @Excel(name = "事件当前处理状态,0 未处理 1:处理中 2:已完成") - @ApiModelProperty(value = "事件当前处理状态,0: 未处理 1: 处理中 2: 已完成") - private Long superviseStatus; + @Excel(name = "事件案件状态") + @ApiModelProperty(value = "事件案件状态") + private String caseStatus; /** * 事件上报⼈ @@ -172,4 +172,88 @@ public class BEventAccess extends BaseEntity { 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; } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 33b53d0..5a62896 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -18,7 +18,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口,默认为8080 - port: 9002 + port: 9102 servlet: # 应用的访问路径 context-path: /api diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index a0f3f44..95c0413 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -114,7 +114,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter .antMatchers("/login", "/register", "/captchaImage").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() .and() diff --git a/ruoyi-system/src/main/resources/mapper/pt/BEventAccessMapper.xml b/ruoyi-system/src/main/resources/mapper/pt/BEventAccessMapper.xml index b126b3c..38d4c7b 100644 --- a/ruoyi-system/src/main/resources/mapper/pt/BEventAccessMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/pt/BEventAccessMapper.xml @@ -1,75 +1,123 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 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 - + - + insert into b_event_access inner_event_id, area_code, - street_code, - origin, + community_code, + grid_code, scence, title, content, @@ -78,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" msg_type, msg_type_name, event_url, - supervise_status, + case_status, event_creator, event_creator_tel, event_place_name, @@ -86,12 +134,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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, + #{innerEventId}, #{areaCode}, - #{streetCode}, - #{origin}, + #{communityCode}, + #{gridCode}, #{scence}, #{title}, #{content}, @@ -100,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{msgType}, #{msgTypeName}, #{eventUrl}, - #{superviseStatus}, + #{caseStatus}, #{eventCreator}, #{eventCreatorTel}, #{eventPlaceName}, @@ -108,7 +167,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{executeType}, #{remindStatus}, #{eventFile}, - + #{eventLabel}, + #{scenceType}, + #{scenceTypename}, + #{acceptanceTime}, + #{dealTimeLimit}, + #{refuseTimeLimit}, + #{feedbackTime}, + #{completionTime}, + #{mainOrganizer}, + #{enforceLawOrganizer}, + #{coOrganizer}, + @@ -116,8 +186,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" inner_event_id = #{innerEventId}, area_code = #{areaCode}, - street_code = #{streetCode}, - origin = #{origin}, + community_code = #{communityCode}, + grid_code = #{gridCode}, scence = #{scence}, title = #{title}, content = #{content}, @@ -126,7 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" msg_type = #{msgType}, msg_type_name = #{msgTypeName}, event_url = #{eventUrl}, - supervise_status = #{superviseStatus}, + case_status = #{caseStatus}, event_creator = #{eventCreator}, event_creator_tel = #{eventCreatorTel}, event_place_name = #{eventPlaceName}, @@ -139,11 +209,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from b_event_access where id = #{id} + delete + from b_event_access + where id = #{id} - delete from b_event_access where id in + delete from b_event_access where id in #{id}