From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 150 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index 9b4b853..4074fdb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -1,7 +1,9 @@
package com.panzhihua.service_grid.service.impl;
+import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,19 +12,18 @@
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.helper.AESUtil;
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.ExcelSelectListUtil;
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;
+import com.panzhihua.service_grid.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
@@ -55,7 +56,13 @@
@Resource
private EventGridMemberRelationMapper eventGridMemberRelationMapper;
@Resource
+ private EventSpecialCrowdRecordService eventSpecialCrowdRecordService;
+ @Resource
+ private EventSpecialCrowdRecordMapper eventSpecialCrowdRecordMapper;
+ @Resource
private EventGridDataService eventGridDataService;
+ @Resource
+ private EventResourceMapper eventResourceMapper;
/**
* 分页查找事件
@@ -248,6 +255,16 @@
eventDetailsVO.setCreator(createUser.get("name") == null ? "" : createUser.get("name").toString());
}
+ //当事件为特殊人群上报时，需要查询事件与人口关联关系
+ if(eventDetailsVO.getEventType().equals(6)){
+ List<EventSpecialPopulationDetailsVO> specialPopulationList = eventSpecialCrowdRecordMapper.getSpecialPopulationIds(eventDetailsVO.getId());
+ if(!specialPopulationList.isEmpty()){
+ specialPopulationList.forEach(special -> {
+ special.setAge(IdcardUtil.getAgeByIdCard(special.getIdCard()));
+ });
+ }
+ eventDetailsVO.setPopulationList(specialPopulationList);
+ }
return R.ok(eventDetailsVO);
}
return R.fail("事件不存在");
@@ -268,6 +285,14 @@
if (eventGridDataDO == null) {
return R.fail("网格不存在");
}
+
+ //检查特殊人群上报时参数
+ if(commonEventAddDTO.getEventType().equals(6)){
+ if(commonEventAddDTO.getPopulationIds() == null || commonEventAddDTO.getPopulationIds().size() <= 0){
+ return R.fail("上报人员为空");
+ }
+ }
+
eventDO.setEventCategory(1l);//办件事件
eventDO.setEventStatus(2);//事件状态 2发布
eventDO.setProcessType(1);//网格员处理
@@ -279,6 +304,21 @@
eventDO.setSubmitDate(new Date());
eventDO.setOrderSn(getEventOrderSn(eventDO.getEventType()));
if (eventMapper.insert(eventDO) == 1) {
+
+ //如果是特殊人群，则新增特殊人群与事件关系
+ if(commonEventAddDTO.getEventType().equals(6)){
+ List<EventSpecialCrowdRecordDO> crowdRecordList = new ArrayList<>();
+ commonEventAddDTO.getPopulationIds().forEach(populationId -> {
+ EventSpecialCrowdRecordDO specialCrowdRecordDO = new EventSpecialCrowdRecordDO();
+ specialCrowdRecordDO.setEventId(eventDO.getId());
+ specialCrowdRecordDO.setPopulationId(populationId);
+ specialCrowdRecordDO.setCreateAt(new Date());
+ crowdRecordList.add(specialCrowdRecordDO);
+ });
+ //添加特殊人群上报事件与人口关系
+ eventSpecialCrowdRecordService.saveBatch(crowdRecordList);
+ }
+
//添加音频
if (StringUtils.isNotEmpty(commonEventAddDTO.getAudio())) {
EventResourceDO eventResourceDO = new EventResourceDO();
@@ -339,7 +379,15 @@
if (eventGridDataDO == null) {
return R.fail("网格不存在");
}
+
if (commonEventEditDTO.getId() == null) {
+ //检查特殊人群上报时参数
+ if(commonEventEditDTO.getEventType().equals(6)){
+ if(commonEventEditDTO.getPopulationIds().isEmpty()){
+ return R.fail("上报人员为空");
+ }
+ }
+
EventDO eventDO = new EventDO();
BeanUtils.copyProperties(commonEventEditDTO, eventDO);
eventDO.setGridMemberId(commonEventEditDTO.getUserId());
@@ -353,6 +401,21 @@
eventDO.setGridMemberTelephone(commonEventEditDTO.getPhone());
eventDO.setEventDealStatus(5);
if (eventMapper.insert(eventDO) > 0) {
+
+ //如果是特殊人群，则新增特殊人群与事件关系
+ if(commonEventEditDTO.getEventType().equals(6)){
+ List<EventSpecialCrowdRecordDO> crowdRecordList = new ArrayList<>();
+ commonEventEditDTO.getPopulationIds().forEach(populationId -> {
+ EventSpecialCrowdRecordDO specialCrowdRecordDO = new EventSpecialCrowdRecordDO();
+ specialCrowdRecordDO.setEventId(eventDO.getId());
+ specialCrowdRecordDO.setPopulationId(populationId);
+ specialCrowdRecordDO.setCreateAt(new Date());
+ crowdRecordList.add(specialCrowdRecordDO);
+ });
+ //添加特殊人群上报事件与人口关系
+ eventSpecialCrowdRecordService.saveBatch(crowdRecordList);
+ }
+
//添加音频
if (StringUtils.isNotEmpty(commonEventEditDTO.getAudio())) {
EventResourceDO eventResourceDO = new EventResourceDO();
@@ -2065,11 +2128,90 @@
* @return 事件列表
*/
@Override
- public R getScreenEventList(ScreenEventListDTO eventListDTO){
- if( eventListDTO.getEventType() != null && eventListDTO.getEventType().equals(ScreenEventListDTO.eventType.xc)){
- eventListDTO.setEventCategory(2);
+ public R getScreenEventList(ScreenEventListDTO eventListDTO) {
+ if (eventListDTO.getEventTypes() != null && !eventListDTO.getEventTypes().isEmpty()) {
+ eventListDTO.getEventTypes().forEach(eventType -> {
+ if(eventType.equals(ScreenEventListDTO.eventType.xc)){
+ eventListDTO.setEventCategory(null);
+ }
+ });
+
}
- IPage<EventListVO> eventPageList = this.baseMapper.getScreenEventList(new Page(eventListDTO.getPageNum(),eventListDTO.getPageSize()),eventListDTO);
+ IPage<EventListVO> eventPageList = this.baseMapper.getScreenEventList(new Page(eventListDTO.getPageNum(), eventListDTO.getPageSize()), eventListDTO);
+ if(!eventPageList.getRecords().isEmpty()){
+ eventPageList.getRecords().forEach(event -> {
+ //查询事件关联附件
+ List<EventResourceDO> eventResourceDOList =
+ eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
+ .eq(EventResourceDO::getClassification, 1)
+ .eq(EventResourceDO::getRefId, event.getId())
+ );
+ List<EventResourceVO> picList = new ArrayList<>();
+ List<EventResourceVO> audioList = new ArrayList<>();
+ List<EventResourceVO> videoList = new ArrayList<>();
+ eventResourceDOList.forEach(eventResourceDO -> {
+ switch (eventResourceDO.getType()) {
+ case 1:
+ EventResourceVO picEventResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, picEventResourceVO);
+ picList.add(picEventResourceVO);
+ break;
+ case 2:
+ EventResourceVO audioResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, audioResourceVO);
+ audioList.add(audioResourceVO);
+ break;
+ case 3:
+ EventResourceVO videoResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, videoResourceVO);
+ videoList.add(videoResourceVO);
+ break;
+ }
+ });
+ event.setAudios(audioList);
+ event.setPics(picList);
+ event.setVideos(videoList);
+ });
+ }
return R.ok(eventPageList);
}
+
+ /**
+ * 特殊人群上报-社区人口数据列表
+ * @param specialPopulationDTO 请求参数
+ * @return 社区人口数据列表
+ */
+ @Override
+ public R specialPopulationList(PageEventSpecialPopulationDTO specialPopulationDTO){
+ IPage<EventSpecialPopulationVO> specialPopulationVOIPage = this.baseMapper.specialPopulationList(new Page(specialPopulationDTO.getPageNum(),specialPopulationDTO.getPageSize()),specialPopulationDTO);
+ return R.ok(specialPopulationVOIPage);
+
+ @Override
+ public List<EventDetailsVO> getUnUploadEvent() {
+ List<EventDetailsVO> eventDetailsVOList =new ArrayList<>();
+ List<EventDO> unEventList = baseMapper.selectList(
+ new QueryWrapper<EventDO>()
+ .eq("upload", false)
+ );
+ unEventList.forEach(eventDO -> {
+ eventDetailsVOList.add(eventDetails(eventDO.getId()).getData());
+ });
+ return eventDetailsVOList;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean updateLcUploadFlag(Long id) {
+ EventDO event = baseMapper.selectById(id);
+ event.setUpload(true);
+ baseMapper.updateById(event);
+ EventResourceDO eventResourceDO =new EventResourceDO();
+ eventResourceDO.setUpload(true);
+ int flag = eventResourceMapper.update(eventResourceDO, new QueryWrapper<EventResourceDO>()
+ .eq("ref_id", id));
+ if(flag>0){
+ return true;
+ }
+ return false;
+ }
}
--
Gitblit v1.7.1