From c3a5a9ae94e5604160f0ba4ac6148934db84f26b Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期日, 27 六月 2021 15:58:50 +0800
Subject: [PATCH] [新增]走访任务向市平台推送。推送市平台测环境
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 220 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 145 insertions(+), 75 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
index 32a10c3..ce29926 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -1,36 +1,36 @@
package com.panzhihua.service_grid.service.impl;
+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;
import com.panzhihua.common.enums.EventTasksStatusEnum;
-import com.panzhihua.common.model.dtos.grid.EventVisitingTasksAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventVisitingTasksDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.query.visit.EventTasksQuery;
import com.panzhihua.common.model.query.visit.EventVisitListQuery;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.grid.EventDetailsVO;
+import com.panzhihua.common.model.vos.grid.EventResourceVO;
import com.panzhihua.common.model.vos.visit.*;
+import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
-import com.panzhihua.service_grid.dao.*;
-import com.panzhihua.service_grid.model.dos.*;
+import com.panzhihua.service_grid.dao.EventResourceMapper;
+import com.panzhihua.service_grid.dao.EventVisitingTasksMapper;
+import com.panzhihua.service_grid.model.dos.EventResourceDO;
+import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
+import com.panzhihua.service_grid.service.EventResourceService;
import com.panzhihua.service_grid.service.EventVisitingTasksService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -50,18 +50,23 @@
@Resource
private EventResourceMapper eventResourceMapper;
+ @Resource
+ private EventResourceService eventResourceService;
+
@Value("${domain.aesKey:}")
private String aesKey;
+
/**
* 新增重点人群走访记录
+ *
* @param eventVisitingTasksAddDTO
* @return 新增结果
*/
- public R add(EventVisitingTasksAddDTO eventVisitingTasksAddDTO){
+ public R add(EventVisitingTasksAddDTO eventVisitingTasksAddDTO) {
EventVisitingTasksDO eventVisitingTasksDO = new EventVisitingTasksDO();
BeanUtils.copyProperties(eventVisitingTasksAddDTO, eventVisitingTasksDO);
eventVisitingTasksDO.setCreateAt(new Date());
- if(eventVisitingTasksMapper.insert(eventVisitingTasksDO)>0){
+ if (eventVisitingTasksMapper.insert(eventVisitingTasksDO) > 0) {
return R.ok();
}
return R.fail();
@@ -69,14 +74,15 @@
/**
* 修改重点人群走访记录
+ *
* @param eventVisitingTasksEditDTO
* @return 维护结果
*/
- public R edit(EventVisitingTasksEditDTO eventVisitingTasksEditDTO){
+ public R edit(EventVisitingTasksEditDTO eventVisitingTasksEditDTO) {
EventVisitingTasksDO eventVisitingTasksDO = new EventVisitingTasksDO();
BeanUtils.copyProperties(eventVisitingTasksEditDTO, eventVisitingTasksDO);
//eventVisitingTasksDO.setUpdateAt(new Date());
- if(eventVisitingTasksMapper.updateById(eventVisitingTasksDO)>0){
+ if (eventVisitingTasksMapper.updateById(eventVisitingTasksDO) > 0) {
return R.ok();
}
return R.fail();
@@ -84,15 +90,16 @@
/**
* 分页查找重点人群走访记录
+ *
* @param pageEventVisitingTasksDTO
* @return 维护结果
*/
- public R<IPage<EventVisitingTasksVO>> query(PageEventVisitingTasksDTO pageEventVisitingTasksDTO){
- Page page = new Page(1,10);
- if(pageEventVisitingTasksDTO.getPageNum()!=null) {
+ public R<IPage<EventVisitingTasksVO>> query(PageEventVisitingTasksDTO pageEventVisitingTasksDTO) {
+ Page page = new Page(1, 10);
+ if (pageEventVisitingTasksDTO.getPageNum() != null) {
page.setCurrent(pageEventVisitingTasksDTO.getPageNum());
}
- if(pageEventVisitingTasksDTO.getPageSize()!=null) {
+ if (pageEventVisitingTasksDTO.getPageSize() != null) {
page.setSize(pageEventVisitingTasksDTO.getPageSize());
}
return R.ok();
@@ -100,26 +107,28 @@
/**
* 删除重点人群走访记录
+ *
* @param EventVisitingTasksDeleteDTO
* @return 平台用户信息
*/
- public R delete(EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO){
+ public R delete(EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO) {
return R.fail();
}
/**
* 查询重点人群走访记录详细信息
+ *
* @param id 重点人群走访记录 id
* @return 查找结果
*/
- public R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(Long id){
+ public R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(Long id) {
EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
- if(eventVisitingTasksDO!=null) {
+ if (eventVisitingTasksDO != null) {
EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
- eventVisitingTasksDetailsVO.setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,1));
- eventVisitingTasksDetailsVO.setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,2));
- eventVisitingTasksDetailsVO.setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,3));
+ eventVisitingTasksDetailsVO.setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 1));
+ eventVisitingTasksDetailsVO.setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 2));
+ eventVisitingTasksDetailsVO.setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 3));
return R.ok(eventVisitingTasksDetailsVO);
}
return R.fail();
@@ -128,7 +137,7 @@
@Override
public R count(Long communityId) {
- Map<String,Long> countMap = eventVisitingTasksMapper.count(communityId);
+ Map<String, Long> countMap = eventVisitingTasksMapper.count(communityId);
EventVisitCountVO eventVisitCountVO = new EventVisitCountVO();
eventVisitCountVO.setVisit(countMap.get("visit"));
eventVisitCountVO.setVisited(countMap.get("visited"));
@@ -139,7 +148,7 @@
@Override
public R taskList(EventTasksQuery query) {
- IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query);
+ IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(), query.getPageSize()), query);
return R.ok(page);
}
@@ -148,12 +157,12 @@
@Override
public R delete(String ids, Long communityId) {
String[] idarr = ids.split(",");
- for(String id:idarr){
- if(StringUtils.isEmpty(id)){
+ for (String id : idarr) {
+ if (StringUtils.isEmpty(id)) {
continue;
}
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectOne(new QueryWrapper<EventVisitingTasksDO>().eq("id",Long.valueOf(id)).eq("grid_member_community",communityId));
- if(eventVisitingTasksDO == null){
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectOne(new QueryWrapper<EventVisitingTasksDO>().eq("id", Long.valueOf(id)).eq("grid_member_community", communityId));
+ if (eventVisitingTasksDO == null) {
throw new RuntimeException("无权限");
}
eventVisitingTasksMapper.deleteById(Long.valueOf(id));
@@ -163,20 +172,20 @@
@Override
public R visitorList(EventVisitListQuery query) {
- IPage<EventVisitListVO> page = eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(),query.getPageSize()),query);
+ IPage<EventVisitListVO> page = eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(), query.getPageSize()), query);
return R.ok(page);
}
@Override
public R list(EventTasksQuery query) {
- IPage<AppVisitTasksVO> page = eventVisitingTasksMapper.list(new Page(query.getPageNum(),query.getPageSize()),query);
+ IPage<AppVisitTasksVO> page = eventVisitingTasksMapper.list(new Page(query.getPageNum(), query.getPageSize()), query);
return R.ok(page);
}
@Override
public R detail(Long id) throws Exception {
EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
- if(eventVisitingTasksDO!=null) {
+ if (eventVisitingTasksDO != null) {
EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
;
@@ -189,16 +198,16 @@
@Transactional(rollbackFor = Exception.class)
@Override
public R add(String ids, Long communityId, Long userId) {
- Map<String,Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId,6);
- if(CollectionUtils.isEmpty(map)){
+ Map<String, Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId, 6);
+ if (CollectionUtils.isEmpty(map)) {
return R.fail("网格员不存在");
}
String[] id = ids.split(",");
- for(String idstr:id){
- if(StringUtils.isEmpty(idstr)){
+ for (String idstr : id) {
+ if (StringUtils.isEmpty(idstr)) {
continue;
}
- addVisitingTask(Long.valueOf(idstr),map,communityId,userId);
+ addVisitingTask(Long.valueOf(idstr), map, communityId, userId);
}
return R.ok();
@@ -206,22 +215,21 @@
@Override
public List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) {
- IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query);
+ IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(), query.getPageSize()), query);
return page.getRecords();
}
-
- private void addVisitingTask(Long id, Map<String, Object> gridMap,Long communityId,Long userId) {
+ private void addVisitingTask(Long id, Map<String, Object> gridMap, Long communityId, Long userId) {
Integer count = eventVisitingTasksMapper.countNoneComplete(id);
- if(count > 0){
+ if (count > 0) {
return;
}
- Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
- if(CollectionUtils.isEmpty(map)){
- return ;
+ Map<String, Object> map = eventVisitingTasksMapper.findPopulationById(id);
+ if (CollectionUtils.isEmpty(map)) {
+ return;
}
EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
// visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
@@ -232,14 +240,14 @@
visitingTasksDO.setVisiterId(Long.valueOf(map.get("id").toString()));
visitingTasksDO.setVisiterName(map.get("name").toString());
visitingTasksDO.setVisiterSex(Integer.valueOf(map.get("sex").toString()));
- visitingTasksDO.setVisiterTele(map.get("phone") == null?"":map.get("phone").toString());
+ visitingTasksDO.setVisiterTele(map.get("phone") == null ? "" : map.get("phone").toString());
StringBuilder sb = new StringBuilder();
sb.append(map.get("address")).append(map.get("road")).append(map.get("door_no")).append(map.get("floor")).append("栋").append(map.get("unit_no")).append("单元").append(map.get("house_no")).append("号");
visitingTasksDO.setVisiterAddress(sb.toString());
visitingTasksDO.setVisiterType(0);
visitingTasksDO.setActOpara(0);
- if(map.get("lat") != null && map.get("lng") != null){
- visitingTasksDO.setHappentLatLng(map.get("lat")+"-"+map.get("lng"));
+ if (map.get("lat") != null && map.get("lng") != null) {
+ visitingTasksDO.setHappentLatLng(map.get("lat") + "-" + map.get("lng"));
}
visitingTasksDO.setEventStatus(EventTasksStatusEnum.DZF.getCode());
visitingTasksDO.setReporting(0);
@@ -255,11 +263,11 @@
public R cancel(Long id) {
EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
- if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
+ if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) {
return R.fail("当前状态不可撤销");
}
- int rt = eventVisitingTasksMapper.cancel(id,EventTasksStatusEnum.YCX.getCode());
- if(rt > 0){
+ int rt = eventVisitingTasksMapper.cancel(id, EventTasksStatusEnum.YCX.getCode());
+ if (rt > 0) {
return R.ok();
}
return R.fail();
@@ -270,11 +278,11 @@
public R reset(Long id) {
EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
- if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()){
+ if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()) {
return R.fail("当前状态不可恢复");
}
- int rt = eventVisitingTasksMapper.updateEventStatus(id,EventTasksStatusEnum.DZF.getCode());
- if(rt > 0){
+ int rt = eventVisitingTasksMapper.updateEventStatus(id, EventTasksStatusEnum.DZF.getCode());
+ if (rt > 0) {
return R.ok();
}
return R.fail();
@@ -282,22 +290,22 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public synchronized R start(Long id,Long userId) {
+ public synchronized R start(Long id, Long userId) {
EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
- if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
+ if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) {
return R.fail("当前状态不可开始走访");
}
- Map<String,Object> map = eventVisitingTasksMapper.findUserById(userId);
+ Map<String, Object> map = eventVisitingTasksMapper.findUserById(userId);
EventVisitingTasksDO start = new EventVisitingTasksDO();
start.setId(id);
start.setGridMemberStreet(Long.valueOf(map.get("street_id").toString()));
start.setGridMemberCommunity(Long.valueOf(map.get("community_id").toString()));
start.setGridMember(Long.valueOf(map.get("user_id").toString()));
start.setGridMemberName(map.get("name").toString());
- start.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());
+ start.setGridMenberTele(map.get("phone") == null ? "" : map.get("phone").toString());
start.setEventStatus(EventTasksStatusEnum.JXZ.getCode());
int rt = eventVisitingTasksMapper.start(start);
- if(rt > 0){
+ if (rt > 0) {
return R.ok();
}
return R.fail();
@@ -307,38 +315,100 @@
@Override
public R complete(EventVisitCompleteDTO taskCompleteDTO) {
EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(taskCompleteDTO.getId());
- if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.JXZ.getCode()){
+ if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.JXZ.getCode()) {
return R.fail("当前状态不可完成走访");
}
- if(taskCompleteDTO.getException().intValue() == 0){
+ if (taskCompleteDTO.getException().intValue() == 0) {
taskCompleteDTO.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode());
- }else{
+ } else {
taskCompleteDTO.setEventStatus(EventTasksStatusEnum.YC.getCode());
}
- if(!CollectionUtils.isEmpty(taskCompleteDTO.getImgList())){
- taskCompleteDTO.getImgList().forEach(e->{
- createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,1,e);
+ if (!CollectionUtils.isEmpty(taskCompleteDTO.getImgList())) {
+ taskCompleteDTO.getImgList().forEach(e -> {
+ createResource(eventVisitingTasksDO.getId(), eventVisitingTasksDO.getDellUserId(), 2, 1, e);
});
}
- if(!CollectionUtils.isEmpty(taskCompleteDTO.getVosList())){
- taskCompleteDTO.getVosList().forEach(e->{
- createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,2,e);
+ if (!CollectionUtils.isEmpty(taskCompleteDTO.getVosList())) {
+ taskCompleteDTO.getVosList().forEach(e -> {
+ createResource(eventVisitingTasksDO.getId(), eventVisitingTasksDO.getDellUserId(), 2, 2, e);
});
}
- if(!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())){
- taskCompleteDTO.getVosList().forEach(e->{
- createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,3,e);
+ if (!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())) {
+ taskCompleteDTO.getVosList().forEach(e -> {
+ createResource(eventVisitingTasksDO.getId(), eventVisitingTasksDO.getDellUserId(), 2, 3, e);
});
}
int rt = eventVisitingTasksMapper.complete(taskCompleteDTO);
- if(rt > 0){
+ if (rt > 0) {
return R.ok();
}
return R.fail();
}
- private void createResource(Long id, Long dellUserId, int classification, int type,String url) {
+ @Override
+ public List<LcEventVisitingTasksListDTO> getUnUploadVisitingTask() {
+ List<LcEventVisitingTasksListDTO> lcEventVisitingTasksList =new ArrayList<>();
+ List<EventVisitingTasksDO> eventVisitingTasksList = baseMapper.selectList(
+ new QueryWrapper<EventVisitingTasksDO>()
+ .eq("lc_upload", false)
+ .eq("event_status",2)
+ );
+ lcEventVisitingTasksList= CopyUtil.beanCopyList(eventVisitingTasksList,LcEventVisitingTasksListDTO.class);
+ lcEventVisitingTasksList.forEach(visitingTasks -> {
+ addVisitingTasksFile(visitingTasks);
+ });
+ return lcEventVisitingTasksList;
+ }
+
+ private LcEventVisitingTasksListDTO addVisitingTasksFile(LcEventVisitingTasksListDTO visitingTasks) {
+ //查询事件关联附件
+ List<EventResourceDO> eventResourceDOList =
+ eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
+ .eq(EventResourceDO::getClassification, 2)
+ .eq(EventResourceDO::getRefId, visitingTasks.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;
+ }
+ });
+ visitingTasks.setAudios(audioList);
+ visitingTasks.setPics(picList);
+ visitingTasks.setVideos(videoList);
+ return visitingTasks;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean updateLcUploadFlagVisitingTask(Long id) {
+ EventVisitingTasksDO eventVisitingTasksDO = baseMapper.selectById(id);
+ eventVisitingTasksDO.setLcUpload(true);
+ int flag = baseMapper.updateById(eventVisitingTasksDO);
+ if (flag > 0) {
+ return true;
+ }
+ return false;
+ }
+
+ private void createResource(Long id, Long dellUserId, int classification, int type, String url) {
EventResourceDO eventResourceDO = new EventResourceDO();
eventResourceDO.setRefId(id);
eventResourceDO.setClassification(classification);
--
Gitblit v1.7.1