From c64da5152d32c366eecfb20b3fdc023be1d27681 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 14 七月 2021 15:26:19 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 153 ++++++++++++++++++++++++++++++++------------------
1 files changed, 98 insertions(+), 55 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..16880f7 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
@@ -11,13 +11,13 @@
import com.panzhihua.common.enums.EventTasksStatusEnum;
import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
import com.panzhihua.common.model.dtos.EventResourceDTO;
+import com.panzhihua.common.model.dtos.IdDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
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;
@@ -158,9 +158,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);
}
@@ -173,33 +170,48 @@
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);
}
@Transactional
@Override
- public R delete(String ids, Long communityId) {
- String[] idarr = ids.split(",");
- for(String id:idarr){
- if(StringUtils.isEmpty(id)){
- continue;
+ public R delete(IdDTO idDTO, Long communityId) {
+ String[] ids = idDTO.getId().split(",");
+ for(String id:ids){
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(id));
+ if(eventVisitingTasksDO != null){
+ if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
+ return R.fail("您选择的走访任务中有已解决的不可删除");
+ }
+ eventVisitingTasksMapper.deleteById(id);
}
- 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));
}
return R.ok();
+ }
+
+ private String toDelete(Long id) {
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ if(eventVisitingTasksDO == null){
+ return "["+id+"]数据不存在;";
+ }
+ if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
+ return "["+eventVisitingTasksDO.getVisiterName()+"]状态不可删除;";
+ }
+ eventVisitingTasksMapper.deleteById(id);
+ return null;
}
@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").last("limit 0,1"));
+ if(!CollectionUtils.isEmpty(list)){
+ e.setCreateAt(list.get(0).getCreateAt());
+ e.setEventStatus(list.get(0).getEventStatus());
+ }
+ });
return R.ok(page);
}
@@ -215,8 +227,21 @@
if(eventVisitingTasksDO!=null) {
EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
- eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(), aesKey));
+ if(StringUtils.isNotEmpty(eventVisitingTasksDO.getVisiterTele())){
+ eventVisitingTasksDetailsVO.setVisiterPhone(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
+ eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
+ }
+ JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
+ if(jsonObject != null && jsonObject.get("check") != null){
+ eventVisitingTasksDetailsVO.setOption(jsonObject.get("check").toString());
+ }
+
+ //查询资源文件
+ 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();
@@ -224,19 +249,27 @@
@Transactional(rollbackFor = Exception.class)
@Override
- 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(",");
+ public R add(IdDTO idDTO, Long communityId, Long userId) throws Exception {
+
+// Map<String,Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId,6);
+// if(CollectionUtils.isEmpty(map)){
+// return R.fail("网格员不存在");
+// }
+
+ StringBuilder rt = new StringBuilder();
+ String[] id = idDTO.getId().split(",");
for(String idstr:id){
if(StringUtils.isEmpty(idstr)){
continue;
}
- addVisitingTask(Long.valueOf(idstr),map,communityId,userId);
+ String error = addVisitingTask(Long.valueOf(idstr),idDTO.getGridId(),userId);
+ if(!StringUtils.isEmpty(error)){
+ rt.append(error);
+ }
}
-
+ if(!StringUtils.isEmpty(rt)){
+ return R.fail("部分新增失败"+rt.toString());
+ }
return R.ok();
}
@@ -246,19 +279,19 @@
return page.getRecords();
}
+ private String addVisitingTask(Long id, Long gridId,Long userId) throws Exception{
-
- private void addVisitingTask(Long id, Map<String, Object> gridMap,Long communityId,Long userId) throws Exception{
+ Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
+ if(CollectionUtils.isEmpty(map)){
+ return "被访问人ID["+id+"]不存在;";
+ }
Integer count = eventVisitingTasksMapper.countNoneComplete(id);
if(count > 0){
- return;
- }
- Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
- if(CollectionUtils.isEmpty(map)){
- return ;
+ return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
}
EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
+ visitingTasksDO.setGridId(gridId);
// visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
// visitingTasksDO.setGridMemberCommunity(communityId);
// visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));
@@ -267,9 +300,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());
@@ -296,6 +327,7 @@
}
eventVisitingTasksMapper.insert(visitingTasksDO);
+ return null;
}
private List<String> getOption(String label) {
@@ -329,13 +361,13 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public R cancel(Long id) {
+ public R cancel(IdDTO idDTO) {
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
return R.fail("当前状态不可撤销");
}
- int rt = eventVisitingTasksMapper.cancel(id,EventTasksStatusEnum.YCX.getCode());
+ int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),5);
if(rt > 0){
return R.ok();
}
@@ -344,13 +376,13 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public R reset(Long id) {
+ public R reset(IdDTO idDTO) {
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
- if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()){
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
+ if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != 5){
return R.fail("当前状态不可恢复");
}
- int rt = eventVisitingTasksMapper.updateEventStatus(id,EventTasksStatusEnum.DZF.getCode());
+ int rt = eventVisitingTasksMapper.updateEventStatus(eventVisitingTasksDO.getId(),EventTasksStatusEnum.DZF.getCode());
if(rt > 0){
return R.ok();
}
@@ -372,7 +404,7 @@
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.setEventStatus(EventTasksStatusEnum.JXZ.getCode());
+ start.setEventStatus(EventTasksStatusEnum.YJJ.getCode());
int rt = eventVisitingTasksMapper.start(start);
if(rt > 0){
return R.ok();
@@ -387,17 +419,29 @@
if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
return R.fail("当前状态不可完成走访");
}
+
+ //查询当前人员是否是(精神障碍,吸毒,刑满释放,社区矫正),如果是这四种状态，option参数为必填参数
+ String label = this.baseMapper.getPopulationLabel(eventVisitingTasksDO.getVisiterId());
+ if(StringUtils.isNotEmpty(label)){
+ if(label.contains("精神障碍") || label.contains("吸毒") || label.contains("刑满释放") || label.contains("社区矫正")){
+ if(StringUtils.isNotEmpty(taskCompleteDTO.getOption())){
+ return R.fail("请选择异常状态");
+ }
+ }
+ }
+
EventVisitingTasksDO complete = new EventVisitingTasksDO();
BeanUtils.copyProperties(taskCompleteDTO,complete);
- if(taskCompleteDTO.getException().intValue() == 0){
- complete.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode());
- }else{
- complete.setEventStatus(EventTasksStatusEnum.YC.getCode());
- }
+ complete.setEventStatus(EventTasksStatusEnum.YJJ.getCode());
+
complete.setSubmitDate(DateUtil.parse(taskCompleteDTO.getSubmitDate(), DatePattern.NORM_DATETIME_FORMAT));
- JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
- json.put("check",taskCompleteDTO.getOption());
- complete.setTableContentJson(json.toJSONString());
+ if(StringUtils.isNotEmpty(eventVisitingTasksDO.getTableContentJson())){
+ JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
+ if(StringUtils.isNotEmpty(taskCompleteDTO.getOption())){
+ json.put("check",taskCompleteDTO.getOption());
+ }
+ complete.setTableContentJson(json.toJSONString());
+ }
if(!StringUtils.isEmpty(taskCompleteDTO.getImgList())){
taskCompleteDTO.getImgList().forEach(e->{
@@ -410,7 +454,7 @@
});
}
if(!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())){
- taskCompleteDTO.getVosList().forEach(e->{
+ taskCompleteDTO.getVideoList().forEach(e->{
createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,3,e);
});
}
@@ -422,7 +466,7 @@
complete.setGridMemberName(map.get("name").toString());
complete.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());
- int rt = eventVisitingTasksMapper.complete(complete);
+ int rt = eventVisitingTasksMapper.updateById(complete);
if(rt > 0){
return R.ok();
}
@@ -502,6 +546,5 @@
}
return false;
}
-
}
--
Gitblit v1.7.1