springcloud_k8s_panzhihuazhihuishequ/common/pom.xml
@@ -14,12 +14,6 @@ <packaging>jar</packaging> <dependencies> <dependency> <groupId>cn.hutool</groupId> <artifactId>hutool-core</artifactId> <version>4.0.7</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java
New file @@ -0,0 +1,59 @@ package com.panzhihua.common.model.dtos.community.bigscreen.event; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; @Data @ApiModel("大屏事件列表请求参数") public class ScreenEventListDTO { @ApiModelProperty(value = "分页每页数量",example = "10") private Long pageSize = 10L; @ApiModelProperty(value = "分页当前记录数",example = "1") private Long pageNum = 1L; @ApiModelProperty(value = "社区id", example = "2", required = true) @NotNull(message = "社区id不能为空") private Long communityId; @ApiModelProperty(value="查询开始时间") private String startTime; @ApiModelProperty(value="查询结束时间") private String endTime; @ApiModelProperty(value="网格id") private Long gridId; @ApiModelProperty(value="事件类型（1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 8宣传教育）") private Integer eventType; @ApiModelProperty(value="事件分类(1、办件事件2、宣传事件3、阅读事件)",hidden = true) private Integer eventCategory = 1; @ApiModelProperty(value="事件处理状态(1待处理、2待验证、3已上报、4已解决、5草稿箱、6已撤销、7已失效 8 已发布)") private Integer eventDealStatus; @ApiModelProperty("是否紧急") private Boolean urgent; @ApiModelProperty("是否重大") private Boolean major; /** * 事件类型（1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 8宣传教育） */ public interface eventType{ int za = 1; int gg = 2; int md = 3; int bwd = 4; int tf = 5; int ts = 6; int xc = 8; } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventListVO.java
New file @@ -0,0 +1,68 @@ package com.panzhihua.common.model.vos.community.screen.event; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.panzhihua.common.model.vos.grid.EventResourceVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; import java.util.List; @Data @ApiModel("事件列表返回参数") public class EventListVO { @ApiModelProperty("事件id") @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty("发布人昵称") private String userName; @ApiModelProperty("发布人id") private Long gridMemberId; @ApiModelProperty("发布人头像") private String imageUrl; @ApiModelProperty("事件上报时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("事件描述") private String eventDes; @ApiModelProperty("危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）") private String dangerLevel; @ApiModelProperty("是否紧急") private Boolean urgent; @ApiModelProperty("是否重大") private Boolean major; @ApiModelProperty("事件发生地点") private String happenAddress; @ApiModelProperty("事件发生地点备注") private String happentAddress; @ApiModelProperty("事件发生经纬度（长在前短在后）") private String happentLatLng; @ApiModelProperty("事件分类1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报") private Integer eventType; @ApiModelProperty("事件分类（1、办件事件2、宣传事件3、阅读事件）") private Integer eventCategory; @ApiModelProperty("事件处理状态(1待处理、2待验证、3已上报、4已解决、5草稿箱、6已撤销、7已失效 8 已发布)") private Integer eventDealStatus; @ApiModelProperty("事件发生地点") private String propagandaType; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventNewStatisticsVO.java
@@ -65,4 +65,7 @@ @ApiModelProperty(value = "图片") private List<EventResourceVO> pics; @ApiModelProperty(value = "事件处理流转记录") private List<EventTransferRecordVO> transferRecordList; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java
New file @@ -0,0 +1,18 @@ package com.panzhihua.common.model.vos.community.screen.event; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data @ApiModel("大屏事件播报流转记录返回参数") public class EventTransferRecordVO { @ApiModelProperty("事件处理时间") private Date processDate; @ApiModelProperty("事件处理结果") private Date processResult; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -9,6 +9,7 @@ import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO; import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO; import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg; import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO; import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO; import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO; import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -1,5 +1,6 @@ package com.panzhihua.common.service.grid; import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO; import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.vos.*; import com.panzhihua.common.model.vos.grid.*; @@ -892,4 +893,12 @@ */ @PostMapping("/eventgridmemberwarnlog/judge") R timedTaskGridMember(); /** * 事件大屏查询事件列表 * @param eventListDTO 请求参数 * @return 事件列表 */ @PostMapping("/screen/event/list") R getScreenEventList(@RequestBody ScreenEventListDTO eventListDTO); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -1,12 +1,15 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO; import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO; import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO; import com.panzhihua.common.model.vos.community.screen.event.EventListVO; import com.panzhihua.common.model.vos.community.screen.event.EventStatisticsVO; import com.panzhihua.common.model.vos.community.screen.index.IndexStatisticsVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.grid.GridService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -22,6 +25,8 @@ @Resource private CommunityService communityService; @Resource private GridService gridService; @ApiOperation(value = "大屏测试接口") @GetMapping("/test/noToken") @@ -73,4 +78,13 @@ } return communityService.getScreenGirds(communityId); } @ApiOperation(value = "事件大屏事件列表接口@lyq",response = EventListVO.class) @PostMapping("/civil/list/noToken") public R eventList(@RequestBody ScreenEventListDTO eventListDTO) { if(eventListDTO.getCommunityId() == null){ return R.fail("参数错误"); } return gridService.getScreenEventList(eventListDTO); } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java
@@ -145,8 +145,10 @@ @ApiOperation(value = "实有人口-下载模板") @GetMapping("/export") public R exportPopulation() { //获取登陆用户 LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); //获取登陆用户绑定社区id Long communityId = this.getLoginUserInfo().getCommunityId(); Long communityId = loginUserInfo.getCommunityId(); //生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址 String ftpUrl = "/mnt/data/web/excel/"; String name = "实有人口导入模板.xlsx"; @@ -219,56 +221,47 @@ List<String> head2 = new ArrayList<String>(); head2.add("民族"); List<String> head3 = new ArrayList<String>(); head3.add("政治面貌(中共党员/中共预备党员/共青团员/民革党员/台盟盟员/群众)"); head3.add("政治面貌(群众/中共党员/共青团员)"); List<String> head4 = new ArrayList<String>(); head4.add("是否租住(是/否)"); List<String> head5 = new ArrayList<String>(); head5.add("与户主关系（户主/本人/配偶/夫/妻/子/女/孙女/孙子/兄弟姐妹/父母/其他）"); head5.add("与户主关系（户主/配偶/子女/孙女/父母/其他）"); List<String> head6 = new ArrayList<String>(); head6.add("*街/路/巷(必填)"); List<String> head7 = new ArrayList<String>(); head7.add("*小区号（必填，政府对于每个小区都有特定编号）"); List<String> head8 = new ArrayList<String>(); head8.add("*楼排号（必填）"); List<String> head9 = new ArrayList<String>(); head9.add("*单元号（必填）"); List<String> head10 = new ArrayList<String>(); head10.add("*户室（必填，四位数表示。前两位楼层，后两位户号）"); head10.add("*单元号（必填）"); List<String> head11 = new ArrayList<String>(); head11.add("建筑用途"); head11.add("*户室（必填，四位数表示。前两位楼层，后两位户号）"); List<String> head12 = new ArrayList<String>(); head12.add("房屋面积"); head12.add("联系方式"); List<String> head13 = new ArrayList<String>(); head13.add("房屋状态(自住/租住/其他)"); head13.add("籍贯"); List<String> head14 = new ArrayList<String>(); head14.add("房屋用途(住宅/公寓/宿舍/仓库/其他）"); head14.add("文化程度（小学/初中/高中/中专/大专/本科/硕士/博士/其他）"); List<String> head15 = new ArrayList<String>(); head15.add("管控状态(常规/关注/管控)"); head15.add("婚姻状况(未婚/已婚/离异/丧偶/分居/其他)"); List<String> head16 = new ArrayList<String>(); head16.add("联系方式"); head16.add("健康状况"); List<String> head17 = new ArrayList<String>(); head17.add("籍贯"); head17.add("工作单位"); List<String> head18 = new ArrayList<String>(); head18.add("文化程度(小学/初中/高中/中专/大专/本科/硕士/博士/其他)"); head18.add("备注"); List<String> head19 = new ArrayList<String>(); head19.add("婚姻状况(未婚/已婚/初婚/再婚/复婚/丧偶/离婚/分居/其他)"); head19.add("户口所在地"); List<String> head20 = new ArrayList<String>(); head20.add("健康状况"); head20.add("本地外地(本地/外地)"); List<String> head21 = new ArrayList<String>(); head21.add("工作单位"); head21.add("房屋状态(自住/租住/其他)"); List<String> head22 = new ArrayList<String>(); head22.add("本地外地(本地/外地)"); head22.add("房屋用途(住宅/公寓/宿舍/仓库/其他）"); List<String> head23 = new ArrayList<String>(); head23.add("户口所在地"); head23.add("管控状态(常规/关注/管控)"); List<String> head24 = new ArrayList<String>(); head24.add("备注"); List<String> head25 = new ArrayList<String>(); head25.add("证件照（人面像）照片"); List<String> head26 = new ArrayList<String>(); head26.add("证件照（国徽面）照片"); List<String> head27 = new ArrayList<String>(); head27.add("户口本照片"); head24.add("是否为居住地(是/否)"); list.add(head0); @@ -280,7 +273,6 @@ list.add(head6); list.add(head7); list.add(head8); list.add(head9); list.add(head10); list.add(head11); list.add(head12); @@ -296,9 +288,6 @@ list.add(head22); list.add(head23); list.add(head24); list.add(head25); list.add(head26); list.add(head27); return list; } @@ -309,29 +298,25 @@ data.add("汉族"); data.add("群众"); data.add("是"); data.add("本人"); data.add("户主"); data.add("樱花街"); data.add("115"); data.add("15栋"); data.add("1"); data.add("1单元"); data.add("1001"); data.add(""); data.add(""); data.add(""); data.add(""); data.add(""); data.add("13768548521"); data.add("中国"); data.add("硕士"); data.add("未婚"); data.add(""); data.add("阿里巴巴"); data.add("本地"); data.add(""); data.add("四川成都"); data.add(""); data.add(""); data.add(""); data.add(""); data.add("本地"); data.add("自住"); data.add("公寓"); data.add("常规"); data.add("否"); return data; }
@@ -827,4 +827,7 @@ " e.id = #{eventId}") EventNewStatisticsVO getEventScreenEventDetail(@Param("eventId") Long eventId); @Select("select process_date,process_result from event_transfer_record where event_id = #{eventId}") List<EventTransferRecordVO> getEventScreenEventTransList(@Param("eventId") Long eventId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -993,6 +993,10 @@ newStatisticsVO.setAudios(audioList); newStatisticsVO.setPics(picList); newStatisticsVO.setVideos(videoList); //查询事件流转记录 List<EventTransferRecordVO> transferRecordList = this.baseMapper.getEventScreenEventTransList(newStatisticsVO.getId()); newStatisticsVO.setTransferRecordList(transferRecordList); } statisticsVO.setNewStatisticsVO(newStatisticsVO); @@ -1318,6 +1322,10 @@ statisticsVO.setAudios(audioList); statisticsVO.setPics(picList); statisticsVO.setVideos(videoList); //查询事件流转记录 List<EventTransferRecordVO> transferRecordList = this.baseMapper.getEventScreenEventTransList(eventDetailDTO.getEventId()); statisticsVO.setTransferRecordList(transferRecordList); } } return R.ok(statisticsVO); springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java
New file @@ -0,0 +1,37 @@ package com.panzhihua.service_grid.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_grid.service.EventService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; /** * @ClasssName BigScreenApi * @Description 网格大屏/事件 * @Author lyq * @Date 2021/6/18 * @Version 1.0 **/ @Slf4j @RestController @RequestMapping("/screen/") public class BigScreenApi extends BaseController { @Resource private EventService eventService; /** * 事件大屏查询事件列表 * @param eventListDTO 请求参数 * @return 事件列表 */ @PostMapping("/event/list") public R eventList(@RequestBody ScreenEventListDTO eventListDTO) { return eventService.getScreenEventList(eventListDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO; import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.vos.community.screen.event.EventListVO; import com.panzhihua.common.model.vos.grid.*; import com.panzhihua.service_grid.model.dos.EventDO; import org.apache.ibatis.annotations.Mapper; @@ -98,4 +100,12 @@ * @return */ Map<String, Object> getUserBaseInfo(@Param("gridMemberId")Long gridMemberId); /** * 事件大屏查询事件列表 * @param eventListDTO 请求参数 * @return 事件列表 */ IPage<EventListVO> getScreenEventList(Page page, @Param("eventListDTO") ScreenEventListDTO eventListDTO); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO; import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; @@ -240,4 +241,11 @@ * @return */ R reportDirect(CommonEventDirectReportDTO commonEventDirectReportDTO); /** * 事件大屏查询事件列表 * @param eventListDTO 请求参数 * @return 事件列表 */ R getScreenEventList(ScreenEventListDTO eventListDTO); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -8,15 +8,18 @@ import com.panzhihua.common.enums.EventType; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO; import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO; import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.screen.event.EventListVO; import com.panzhihua.common.model.vos.grid.*; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.utlis.LngLatUtils; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_grid.dao.*; import com.panzhihua.service_grid.model.dos.*; import com.panzhihua.service_grid.service.EventGridDataService; import com.panzhihua.service_grid.service.EventResourceService; import com.panzhihua.service_grid.service.EventService; import com.panzhihua.service_grid.service.EventTransferRecordService; @@ -51,6 +54,8 @@ private EventGridDataMapper eventGridDataMapper; @Resource private EventGridMemberRelationMapper eventGridMemberRelationMapper; @Resource private EventGridDataService eventGridDataService; /** * 分页查找事件 @@ -2053,4 +2058,18 @@ return R.fail(); } /** * 事件大屏查询事件列表 * @param eventListDTO 请求参数 * @return 事件列表 */ @Override public R getScreenEventList(ScreenEventListDTO eventListDTO){ if( eventListDTO.getEventType() != null && eventListDTO.getEventType().equals(ScreenEventListDTO.eventType.xc)){ eventListDTO.setEventCategory(2); } IPage<EventListVO> eventPageList = this.baseMapper.getScreenEventList(new Page(eventListDTO.getPageNum(),eventListDTO.getPageSize()),eventListDTO); return R.ok(eventPageList); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -879,4 +879,69 @@ <select id="getUserBaseInfo" parameterType="java.lang.Long" resultType="java.util.Map"> select name,image_url from sys_user where user_id = #{gridMemberId} </select> <select id="getScreenEventList" parameterType="com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO" resultType="com.panzhihua.common.model.vos.community.screen.event.EventListVO"> SELECT e.id, e.grid_member_id, su.image_url, su.nick_name AS userName, e.create_at, e.urgent, e.danger_level, e.major, e.event_des, e.event_category, e.event_type, e.propaganda_type, e.happen_address, e.happent_lat_lng, e.happent_address, egd.grid_name FROM `event` AS e LEFT JOIN sys_user AS su ON su.user_id = e.grid_member_id LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id <where> and event_status = 2 <if test='eventListDTO.communityId != null'> and egd.grid_community_id = #{eventListDTO.communityId} </if> <if test='eventListDTO.startTime != null and eventListDTO.startTime != ""'> and e.create_at <![CDATA[>=]]> #{eventListDTO.startTime} </if> <if test='eventListDTO.endTime != null and eventListDTO.endTime != ""'> and e.create_at <![CDATA[<=]]> #{eventListDTO.endTime} </if> <if test='eventListDTO.gridId != null'> and e.grid_id = #{eventListDTO.gridId} </if> <if test='eventListDTO.eventCategory != null'> and e.event_category = #{eventListDTO.eventCategory} </if> <if test='eventListDTO.eventType != null'> and e.event_type = #{eventListDTO.eventType} </if> <if test='eventListDTO.eventDealStatus != null'> and e.event_deal_status = #{eventListDTO.eventDealStatus} </if> <if test='eventListDTO.urgent != null and eventListDTO.urgent != ""'> and e.urgent = #{eventListDTO.urgent} </if> <if test='eventListDTO.major != null and eventListDTO.major != ""'> and e.major = #{eventListDTO.major} </if> </where> order by e.create_at desc </select> </mapper>
