From 95fda41de3f8c229cedafab091f5dbe33eeac7fc Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期一, 28 六月 2021 15:19:00 +0800
Subject: [PATCH] 修改
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 221 insertions(+), 10 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 f87f7fb..a7be958 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,8 @@
package com.panzhihua.service_grid.service.impl;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+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,20 +14,20 @@
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.model.vos.screen.*;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.DateUtils;
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;
@@ -57,9 +60,17 @@
@Resource
private EventGridMemberRelationMapper eventGridMemberRelationMapper;
@Resource
+ private EventSpecialCrowdRecordService eventSpecialCrowdRecordService;
+ @Resource
+ private EventSpecialCrowdRecordMapper eventSpecialCrowdRecordMapper;
+ @Resource
private EventGridDataService eventGridDataService;
@Resource
private EventResourceMapper eventResourceMapper;
+
+ private final String moth_format_str = "yyyy-MM";
+
+ private final String[] monthStr = new String[]{"一","二","三","四","五","六","七","八","九","十","十一","十二"};
/**
* 分页查找事件
@@ -159,6 +170,7 @@
EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
if (eventGridDataDO != null) {
eventDetailsVO.setGridName(eventGridDataDO.getGridName());
+ eventDetailsVO.setCommunityId(eventGridDataDO.getGridCommunityId());
}
//查询事件关联附件
@@ -252,6 +264,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 +294,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 +313,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 +388,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 +410,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();
@@ -2069,19 +2137,77 @@
* @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);
+ 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);
+ 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);
+ 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<>();
List<EventDO> unEventList = baseMapper.selectList(
new QueryWrapper<EventDO>()
.eq("upload", false)
+ .eq("event_process_status", 2)
);
unEventList.forEach(eventDO -> {
eventDetailsVOList.add(eventDetails(eventDO.getId()).getData());
@@ -2104,4 +2230,89 @@
}
return false;
}
+
+ public R eventWork(Long communityId){
+ EventWorkScreenVO workScreenVO = new EventWorkScreenVO();
+ String date = DateUtils.getDateFormatString(new Date(),moth_format_str);
+ Map<String,Long> countMap = this.eventMapper.countByCommunityId(communityId,date);
+ if(!countMap.isEmpty()){
+ workScreenVO.setResolvedNum(countMap.get("resolvedNum")== null ? 0L : Long.valueOf(countMap.get("resolvedNum").toString()));
+ workScreenVO.setPendingNum(countMap.get("pendingNum")== null ? 0L : Long.valueOf(countMap.get("pendingNum").toString()));
+ workScreenVO.setPropagandaNum(countMap.get("propagandaNum")== null ? 0L : Long.valueOf(countMap.get("propagandaNum").toString()));
+ workScreenVO.setCurrentNum(countMap.get("currentNum")== null ? 0L : Long.valueOf(countMap.get("currentNum").toString()));
+ }
+
+ //计算处理时间消耗的时间
+ DateScreenVO countAvg = this.eventMapper.countByAvgCommunityId(communityId);
+ if(countAvg != null){
+ int second = (int) (countAvg.getStartTime().getTime() - countAvg.getEndTime().getTime())/1000;
+ if(second > 0){
+ second = second/workScreenVO.getResolvedNum().intValue();
+ workScreenVO.setAvgCost(second);
+ }
+ }
+ //查询最新事件轮播列表
+ List<EventDetailWorkVO> eventList = this.eventMapper.getWorkScreenEventList(communityId);
+ if(!eventList.isEmpty()){
+ workScreenVO.setEventList(eventList);
+ }
+
+ //统计近半年数据
+ List<EventWorkVO> list = new ArrayList<>();
+ for(EventWorkVO eventWorkVO: listHalfYearByDyn()){
+ EventWorkVO result = this.eventMapper.countByTime(eventWorkVO.getStart(),eventWorkVO.getEnd(),communityId);
+ result.setMonth(eventWorkVO.getMonth());
+ list.add(result);
+ }
+ workScreenVO.setList(list);
+
+ //查询完成事件统计
+ EventTypeWorkVO complete = this.eventMapper.getComplete(communityId);
+ if(complete != null){
+ workScreenVO.setComplete(complete);
+ }
+ //查询未完成事件统计
+ EventTypeWorkVO noComplete = this.eventMapper.getNoComplete(communityId);
+ if(complete != null){
+ workScreenVO.setNoComplete(noComplete);
+ }
+ return R.ok(workScreenVO);
+ }
+
+ private List<EventWorkVO> listHalfYearByDyn() {
+ List<EventWorkVO> dateList = new ArrayList<>();
+ Date now = new Date();
+ for(int i= 6;i>=1;i--){
+ Date date = DateUtils.getDateM(now,-i);
+ DateTime endDay = DateUtil.endOfMonth(date);
+
+ int m = DateUtil.month(endDay);
+// if(m == 0){
+// m = 11;
+// }
+// m--;
+ int day = DateUtil.dayOfMonth(endDay);
+ int half = day/2;
+ String month = DateUtil.format(date,moth_format_str);
+ EventWorkVO eventWorkVO = new EventWorkVO();
+ eventWorkVO.setMonth(monthStr[m]+"月上旬");
+ eventWorkVO.setStart(month+ "-01 00:00:00");
+ eventWorkVO.setEnd(month+ "-"+half+" 23:59:58");
+ dateList.add(eventWorkVO);
+ EventWorkVO eventWorkVO1 = new EventWorkVO();
+ eventWorkVO1.setMonth(monthStr[m]+"月下旬");
+ eventWorkVO1.setStart(month+ "-"+half+" 23:59:58");
+ eventWorkVO1.setEnd(DateUtils.getDateFormatString(endDay,"yyyy-MM-dd HH:mm:ss"));
+ dateList.add(eventWorkVO1);
+ }
+ return dateList;
+
+ }
+
+ public static void main(String[] args) {
+ EventServiceImpl service = new EventServiceImpl();
+ List<EventWorkVO> list = service.listHalfYearByDyn();
+ System.out.println(list);
+ }
+
}
--
Gitblit v1.7.1