From c86d53bc6be26eb67165b991fdc0311378f53c64 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 23 六月 2021 16:57:13 +0800
Subject: [PATCH] bug修改以及app接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 5 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 42cd8e3..b9547e3 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,5 +1,6 @@
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;
@@ -11,6 +12,7 @@
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;
@@ -21,10 +23,7 @@
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;
@@ -56,6 +55,10 @@
private EventGridDataMapper eventGridDataMapper;
@Resource
private EventGridMemberRelationMapper eventGridMemberRelationMapper;
+ @Resource
+ private EventSpecialCrowdRecordService eventSpecialCrowdRecordService;
+ @Resource
+ private EventSpecialCrowdRecordMapper eventSpecialCrowdRecordMapper;
@Resource
private EventGridDataService eventGridDataService;
@Resource
@@ -252,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("事件不存在");
@@ -272,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);//网格员处理
@@ -283,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();
@@ -343,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());
@@ -357,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();
@@ -2070,7 +2129,7 @@
*/
@Override
public R getScreenEventList(ScreenEventListDTO eventListDTO) {
- if (!eventListDTO.getEventTypes().isEmpty()) {
+ if (eventListDTO.getEventTypes() != null && !eventListDTO.getEventTypes().isEmpty()) {
eventListDTO.getEventTypes().forEach(eventType -> {
if(eventType.equals(ScreenEventListDTO.eventType.xc)){
eventListDTO.setEventCategory(null);
@@ -2117,6 +2176,22 @@
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);
+ if(!specialPopulationVOIPage.getRecords().isEmpty()){
+ specialPopulationVOIPage.getRecords().forEach(specialPopulation -> {
+ specialPopulation.setAge(IdcardUtil.getAgeByIdCard(specialPopulation.getIdCard()));
+ });
+ }
+ return R.ok(specialPopulationVOIPage);
+ }
+
@Override
public List<EventDetailsVO> getUnUploadEvent() {
List<EventDetailsVO> eventDetailsVOList =new ArrayList<>();
--
Gitblit v1.7.1