From 8ec2cdc7531c65e245a2131e60c1c27440eb6a3b Mon Sep 17 00:00:00 2001 From: manailin <261030956@qq.com> Date: 星期三, 30 六月 2021 17:54:40 +0800 Subject: [PATCH] [修改]修改注释和修改浪潮那边的接口字段对应关系 --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 174 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 85 insertions(+), 89 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 051eb33..a9870ea 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 @@ -13,7 +13,6 @@ import com.panzhihua.common.model.dtos.EventResourceDTO; 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; @@ -36,10 +35,6 @@ import javax.annotation.Resource; import java.util.*; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; /** * @auther lyq @@ -68,11 +63,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(); @@ -80,14 +75,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(); @@ -95,15 +91,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(); @@ -115,7 +112,7 @@ * @param EventVisitingTasksDeleteDTO * @return 平台用户信息 */ - public R delete(EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO){ + public R delete(EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO) { return R.fail(); } @@ -125,14 +122,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(); @@ -141,7 +138,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")); @@ -150,11 +147,11 @@ } @Override - public R taskList(EventTasksQuery query) throws Exception{ + 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){ + 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())); } } @@ -162,11 +159,11 @@ } @Override - public R appTaskList(EventTasksQuery query) throws Exception{ + public R appTaskList(EventTasksQuery query) throws Exception { - IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.appFindListByPage(new Page(query.getPageNum(),query.getPageSize()),query); - for(EventVisitingTasksVO eventVisitingTasksVO:page.getRecords()){ - if(eventVisitingTasksVO.getNationCode() != null){ + IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.appFindListByPage(new Page(query.getPageNum(), query.getPageSize()), query); + for (EventVisitingTasksVO eventVisitingTasksVO : page.getRecords()) { + if (eventVisitingTasksVO.getNationCode() != null) { eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode())); } } @@ -177,12 +174,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)); @@ -192,10 +189,10 @@ @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)){ + 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()); } @@ -205,14 +202,14 @@ @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.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson())); @@ -224,16 +221,16 @@ @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)){ + 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(); @@ -241,21 +238,20 @@ @Override public List<EventVisitingTasksVO> exportTaskList(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); return page.getRecords(); } - - private void addVisitingTask(Long id, Map<String, Object> gridMap,Long communityId,Long userId) throws Exception{ + 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())); @@ -266,14 +262,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 ?null:map.get("phone").toString()); + 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()); 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); @@ -281,13 +277,13 @@ 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())); + visitingTasksDO.setOutOrLocal(map.get("out_or_local") == null ? null : Integer.valueOf(map.get("out_or_local").toString())); - if(map.get("label") != null){ + if (map.get("label") != null) { List<String> option = getOption(map.get("label").toString()); - if(!CollectionUtils.isEmpty(option)){ + if (!CollectionUtils.isEmpty(option)) { JSONObject json = new JSONObject(); - json.put("option",option); + json.put("option", option); visitingTasksDO.setTableContentJson(json.toJSONString()); } } @@ -297,7 +293,7 @@ private List<String> getOption(String label) { List<String> option = new ArrayList<>(); - if(!Objects.isNull(label)) { + if (!Objects.isNull(label)) { if (label.contains("精神障碍")) { option.add("精神障碍异常1"); option.add("精神障碍异常2"); @@ -329,11 +325,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(); @@ -344,11 +340,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(); @@ -356,22 +352,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(); @@ -381,46 +377,46 @@ @Override public R complete(EventVisitCompleteDTO taskCompleteDTO) { EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(taskCompleteDTO.getId()); - if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){ + if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) { return R.fail("当前状态不可完成走访"); } EventVisitingTasksDO complete = new EventVisitingTasksDO(); - BeanUtils.copyProperties(taskCompleteDTO,complete); - if(taskCompleteDTO.getException().intValue() == 0){ + BeanUtils.copyProperties(taskCompleteDTO, complete); + if (taskCompleteDTO.getException().intValue() == 0) { complete.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode()); - }else{ + } else { complete.setEventStatus(EventTasksStatusEnum.YC.getCode()); } complete.setSubmitDate(DateUtil.parse(taskCompleteDTO.getSubmitDate(), DatePattern.NORM_DATETIME_FORMAT)); JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()); - json.put("check",taskCompleteDTO.getOption()); + json.put("check", taskCompleteDTO.getOption()); complete.setTableContentJson(json.toJSONString()); - if(!StringUtils.isEmpty(taskCompleteDTO.getImgList())){ - taskCompleteDTO.getImgList().forEach(e->{ - createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,1,e); + if (!StringUtils.isEmpty(taskCompleteDTO.getImgList())) { + taskCompleteDTO.getImgList().forEach(e -> { + createResource(eventVisitingTasksDO.getId(), taskCompleteDTO.getUserId(), 2, 1, e); }); } - if(!CollectionUtils.isEmpty(taskCompleteDTO.getVosList())){ - taskCompleteDTO.getVosList().forEach(e->{ - createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,2,e); + if (!CollectionUtils.isEmpty(taskCompleteDTO.getVosList())) { + taskCompleteDTO.getVosList().forEach(e -> { + createResource(eventVisitingTasksDO.getId(), taskCompleteDTO.getUserId(), 2, 2, e); }); } - if(!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())){ - taskCompleteDTO.getVosList().forEach(e->{ - createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,3,e); + if (!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())) { + taskCompleteDTO.getVosList().forEach(e -> { + createResource(eventVisitingTasksDO.getId(), taskCompleteDTO.getUserId(), 2, 3, e); }); } - Map<String,Object> map = eventVisitingTasksMapper.findUserById(taskCompleteDTO.getUserId()); + Map<String, Object> map = eventVisitingTasksMapper.findUserById(taskCompleteDTO.getUserId()); complete.setGridMemberStreet(Long.valueOf(map.get("street_id").toString())); complete.setGridMemberCommunity(Long.valueOf(map.get("community_id").toString())); complete.setGridMember(Long.valueOf(map.get("user_id").toString())); complete.setGridMemberName(map.get("name").toString()); - complete.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString()); + complete.setGridMenberTele(map.get("phone") == null ? "" : map.get("phone").toString()); int rt = eventVisitingTasksMapper.complete(complete); - if(rt > 0){ + if (rt > 0) { return R.ok(); } return R.fail(); @@ -440,13 +436,13 @@ @Override public List<LcEventVisitingTasksListDTO> getUnUploadVisitingTask() { - List<LcEventVisitingTasksListDTO> lcEventVisitingTasksList =new ArrayList<>(); + List<LcEventVisitingTasksListDTO> lcEventVisitingTasksList = new ArrayList<>(10); List<EventVisitingTasksDO> eventVisitingTasksList = baseMapper.selectList( new QueryWrapper<EventVisitingTasksDO>() .eq("lc_upload", false) - .eq("event_status",2) + .eq("event_status", 2) ); - lcEventVisitingTasksList= CopyUtil.beanCopyList(eventVisitingTasksList,LcEventVisitingTasksListDTO.class); + lcEventVisitingTasksList = CopyUtil.beanCopyList(eventVisitingTasksList, LcEventVisitingTasksListDTO.class); lcEventVisitingTasksList.forEach(visitingTasks -> { addVisitingTasksFile(visitingTasks); }); -- Gitblit v1.7.1