From 76ed3735c23da4b7ef97b8a0f365facbc14f6903 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期日, 27 六月 2021 16:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 204 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 136 insertions(+), 68 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 ce29926..409a429 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,11 +1,17 @@
package com.panzhihua.service_grid.service.impl;
+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;
import com.panzhihua.common.enums.EventTasksStatusEnum;
+import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
+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;
@@ -30,6 +36,12 @@
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.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -62,11 +74,11 @@
* @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();
@@ -74,15 +86,14 @@
/**
* 修改重点人群走访记录
- *
* @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();
@@ -90,16 +101,15 @@
/**
* 分页查找重点人群走访记录
- *
* @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();
@@ -111,7 +121,7 @@
* @param EventVisitingTasksDeleteDTO
* @return 平台用户信息
*/
- public R delete(EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO) {
+ public R delete(EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO){
return R.fail();
}
@@ -121,14 +131,14 @@
* @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();
@@ -137,7 +147,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"));
@@ -146,10 +156,21 @@
}
@Override
- public R taskList(EventTasksQuery query) {
+ public R taskList(EventTasksQuery query) throws Exception{
- IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(), query.getPageSize()), query);
+ IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query);
+ for(EventVisitingTasksVO eventVisitingTasksVO:page.getRecords()){
+ if(eventVisitingTasksVO.getNationCode() != null){
+ eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
+ }
+ if(eventVisitingTasksVO.getVisiterTele() != null){
+ }
+ eventVisitingTasksVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksVO.getVisiterTele(), aesKey));
+ }
+ page.getRecords().forEach(e->{
+
+ });
return R.ok(page);
}
@@ -157,12 +178,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));
@@ -172,24 +193,24 @@
@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);
- ;
eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(), aesKey));
+ eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
return R.ok(eventVisitingTasksDetailsVO);
}
return R.fail();
@@ -197,39 +218,39 @@
@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)) {
+ public R add(String ids, Long communityId, Long userId) throws Exception {
+ 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();
}
@Override
- public List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) {
- IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(), query.getPageSize()), query);
-
+ public List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) throws Exception {
+ 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) throws Exception{
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()));
@@ -240,14 +261,16 @@
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());
+ if(map.get("phone") != null){
+ visitingTasksDO.setVisiterTele(AESUtil.decrypt128(map.get("phone").toString(),aesKey));
+ }
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,7 +278,47 @@
visitingTasksDO.setUrgent(false);
visitingTasksDO.setUrgentDell(false);
visitingTasksDO.setCreateBy(userId);
+ visitingTasksDO.setOutOrLocal(map.get("out_or_local") == null?null:Integer.valueOf(map.get("out_or_local").toString()));
+
+ if(map.get("label") != null){
+ List<String> option = getOption(map.get("label").toString());
+ if(!CollectionUtils.isEmpty(option)){
+ JSONObject json = new JSONObject();
+ json.put("option",option);
+ visitingTasksDO.setTableContentJson(json.toJSONString());
+ }
+ }
+
eventVisitingTasksMapper.insert(visitingTasksDO);
+ }
+
+ private List<String> getOption(String label) {
+ List<String> option = new ArrayList<>();
+ if(!Objects.isNull(label)) {
+ if (label.contains("精神障碍")) {
+ option.add("精神障碍异常1");
+ option.add("精神障碍异常2");
+ option.add("精神障碍异常3");
+ option.add("精神障碍异常4");
+
+ } else if (label.contains("吸毒")) {
+ option.add("疑似复吸");
+ option.add("失联");
+ option.add("复吸");
+ option.add("空挂户");
+ } else if (label.contains("刑满释放")) {
+ option.add("刑满释放异常1");
+ option.add("刑满释放异常2");
+ option.add("刑满释放异常3");
+ option.add("刑满释放异常4");
+ } else if (label.contains("社区矫正")) {
+ option.add("社区矫正异常1");
+ option.add("社区矫正异常2");
+ option.add("社区矫正异常3");
+ option.add("社区矫正异常4");
+ }
+ }
+ return option;
}
@Transactional(rollbackFor = Exception.class)
@@ -263,11 +326,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();
@@ -278,11 +341,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();
@@ -290,22 +353,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();
@@ -315,32 +378,37 @@
@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);
+ JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
+ json.put("check",taskCompleteDTO.getOption());
+ taskCompleteDTO.setOption(json.toJSONString());
+
+ 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();
--
Gitblit v1.7.1