From b1e9f850ffa9406c7df90d9cb9fd6dc0b7446202 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期四, 24 六月 2021 18:30:24 +0800
Subject: [PATCH] 联调修改
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 838950e..cc7c6f1 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
@@ -6,6 +6,7 @@
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;
@@ -27,6 +28,11 @@
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.*;
/**
@@ -131,10 +137,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);
+ 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);
}
@@ -182,7 +199,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public R add(String ids, Long communityId, Long userId) {
+ 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("网格员不存在");
@@ -199,15 +216,14 @@
}
@Override
- public List<EventVisitingTasksVO> exportTaskList(EventTasksQuery 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){
@@ -226,7 +242,9 @@
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());
--
Gitblit v1.7.1