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/EventVisitingTasksServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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 b01bcf4..051eb33 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
@@ -17,7 +17,6 @@
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;
@@ -158,9 +157,6 @@
if(eventVisitingTasksVO.getNationCode() != null){
eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
}
- if(eventVisitingTasksVO.getVisiterTele() != null){
- eventVisitingTasksVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksVO.getVisiterTele(), aesKey));
- }
}
return R.ok(page);
}
@@ -172,9 +168,6 @@
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));
}
}
return R.ok(page);
@@ -200,6 +193,13 @@
@Override
public R visitorList(EventVisitListQuery query) {
IPage<EventVisitListVO> page = eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(),query.getPageSize()),query);
+ page.getRecords().stream().forEach(e->{
+ List<EventVisitingTasksDO> list = eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id",e.getId()).orderByDesc("id"));
+ if(!CollectionUtils.isEmpty(list)){
+ e.setCreateAt(list.get(0).getCreateAt());
+ e.setEventStatus(list.get(0).getEventStatus());
+ }
+ });
return R.ok(page);
}
@@ -215,7 +215,6 @@
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);
}
@@ -267,9 +266,7 @@
visitingTasksDO.setVisiterId(Long.valueOf(map.get("id").toString()));
visitingTasksDO.setVisiterName(map.get("name").toString());
visitingTasksDO.setVisiterSex(Integer.valueOf(map.get("sex").toString()));
- if(map.get("phone") != null){
- visitingTasksDO.setVisiterTele(AESUtil.decrypt128(map.get("phone").toString(),aesKey));
- }
+ visitingTasksDO.setVisiterTele(map.get("phone") == null ?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());
--
Gitblit v1.7.1