diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 9042cc9a9c..d66c8277ad 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -491,18 +491,6 @@ public class IcEventController { return new Result(); } - /** - * @Description 上报事件-回复列表 - * 模仿gov/project/resieventreply/list接口重新查询新表接口 - * @author sun - */ - @PostMapping("icevent-list") - public Result> replyList(@LoginUser TokenDto tokenDto, @RequestBody ReplyListFormDTO formDTO){ - formDTO.setCurrentUserId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(formDTO, ReplyListFormDTO.ReplyListForm.class); - return new Result>().ok(icEventService.icEventReplyList(formDTO)); - } - /** * 数据分析-个人档案-上报事件列表,根据epmetUserIdList查询 * 模仿gov/project/resieventreply/pageuserreported接口重新查询新表接口 @@ -514,16 +502,6 @@ public class IcEventController { return new Result>().ok(icEventService.icEventPageUserReported(formDTO)); } - /** - * 数字赋能平台-个人档案-事件详情 - * 模仿gov/project/resieventreply/eventdetail-icdata 接口重新查询新表接口 - * @author sun - */ - @PostMapping("icevent-eventdetail-icdata") - public Result icEventDetailForIcData(@RequestBody ResiEventDetailFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, ResiEventDetailFormDTO.AddUserInternalGroup.class); - return new Result().ok(icEventService.icEventDetailForIcData(formDTO.getResiEventId())); - } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java index 46a391aa69..39675cb5b6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java @@ -138,9 +138,6 @@ public interface IcEventDao extends BaseDao { */ Integer getResiReportEventCount(@Param("reportorIdCard") String reportorIdCard); - List selectReplyList(@Param("icEventId") String icEventId); - List selectUserReported(PageUserReportEventFormDTO formDTO); - EventDetailResultDTO selectEventDetail(@Param("icEventId") String icEventId); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index a8dbce0939..6c5e253e06 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -241,10 +241,6 @@ public interface ProjectDao extends BaseDao { @Param("categoryCode")String categoryCode, @Param("excludeProjectId") String excludeProjectId, @Param("epmetUserIds")List epmetUserIds); - List selectCommonCategoryIcEventProject(@Param("customerId")String customerId, - @Param("categoryCode")String categoryCode, - @Param("excludeProjectId") String excludeProjectId, - @Param("epmetUserIds")List epmetUserIds); /** * 数据分析-个人档案-话题详情页面的研判分析项目列表 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java index f913401117..32c167dfdc 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java @@ -221,9 +221,6 @@ public interface IcEventService extends BaseService { **/ void govRedDot(String icEventId); - List icEventReplyList(ReplyListFormDTO formDTO); - PageData icEventPageUserReported(PageUserReportEventFormDTO formDTO); - EventDetailResultDTO icEventDetailForIcData(String icEventId); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index b70393e187..e23b8ab4aa 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -22,7 +22,6 @@ import com.epmet.commons.tools.scan.result.SyncScanResult; import com.epmet.commons.tools.utils.*; import com.epmet.constant.*; import com.epmet.dao.IcEventDao; -import com.epmet.dao.ProjectDao; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.form.demand.DemandRecId; @@ -95,10 +94,6 @@ public class IcEventServiceImpl extends BaseServiceImpl icEventReplyList(ReplyListFormDTO formDTO) { - List list = baseDao.selectReplyList(formDTO.getResiEventId()); - list.forEach(dto -> { - if (dto.getReplyUserId().equals(formDTO.getCurrentUserId())) { - dto.setReplyName("我"); - } - }); - return list; - } - @Override public PageData icEventPageUserReported(PageUserReportEventFormDTO formDTO) { if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) { @@ -1607,67 +1591,4 @@ public class IcEventServiceImpl extends BaseServiceImpl(pageInfo.getList(), pageInfo.getTotal()); } - @Override - public EventDetailResultDTO icEventDetailForIcData(String icEventId) { - EventDetailResultDTO dto = baseDao.selectEventDetail(icEventId); - if (null == dto) { - return new EventDetailResultDTO(); - } - //附件按类型分组【图片、语音】 - List eventImgs = new ArrayList<>(); - List voiceList = new ArrayList<>(); - dto.getAttachmentList().forEach(file -> { - if ("image".equals(file.getType())) { - eventImgs.add(file.getUrl()); - } else if ("voice".equals(file.getType())) { - FileCommonDTO fl = new FileCommonDTO(); - fl.setUrl(file.getUrl()); - fl.setDuration(file.getDuration()); - voiceList.add(fl); - } - }); - dto.setEventImgs(eventImgs); - dto.setVoiceList(voiceList); - - // 已转项目 - if (dto.getIsProject()) { - // 查询项目信息 - EventProjectInfoDTO eventProjectInfo = projectDao.selectEventProjectInfo(dto.getProjectId()); - // 查询操作人的名字 - Result staffName = govOrgOpenFeignClient.staffName(eventProjectInfo.getUserId()); - if (!staffName.success()) { - throw new RenException("查询工作人员名字失败"); - } - eventProjectInfo.setOperationName(staffName.getData()); - dto.setProjectInfo(eventProjectInfo); - } - // 查询报事人名字 - List userIdList = new ArrayList<>(); - userIdList.add(dto.getEventUserId()); - Result> userResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); - if (!userResult.success() || CollectionUtils.isEmpty(userResult.getData())) { - throw new RenException("查询当前用户信息异常"); - } - userResult.getData().forEach(u -> { - if (u.getUserId().equals(dto.getEventUserId())) { - dto.setEventPeopleName(u.getUserShowName()); - } - }); - // 查询所属网格 - Result gridNameResult = govOrgOpenFeignClient.gridName(dto.getGridId()); - if (!gridNameResult.success()) { - throw new RenException("查询所属网格失败"); - } - dto.setGridName(gridNameResult.getData()); - // 查询报事的org - List orgNameList = dto.getOrgNameList(); - Result> orgResult = govOrgOpenFeignClient.selectOrgNameByType(orgNameList); - if (!orgResult.success()) { - throw new RenException("查询组织名称失败"); - } - List data = orgResult.getData(); - dto.setEventOrg(data); - return dto; - } - } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index c8b7c7d8a8..439794c875 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -20,7 +20,6 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; -import com.epmet.commons.tools.constant.CustomerIdConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.FileCommonDTO; @@ -938,16 +937,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl projectData=new ArrayList<>(); for(IssueProjectCategoryDictDTO categoryDictDTO:categoryRes.getData()){ //当前项目分类一致,排除当前项目,相同分类编码 - //2022.6.27 市北客户继续沿用直接接口,其他客户不在查询resi_event表 改查ic_eveent表数据 sun start - List projectList = new ArrayList<>(); - if (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId())) { - projectList = projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(), + List projectList = projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(), categoryDictDTO.getCategoryCode(), formDTO.getProjectId(), formDTO.getEpmetUserIdList()); - } else { - projectList = projectDao.selectCommonCategoryIcEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(), - categoryDictDTO.getCategoryCode(), formDTO.getProjectId(), formDTO.getEpmetUserIdList()); - } - //2022.6.27 市北客户继续沿用直接接口,其他客户不在查询resi_event表 改查ic_eveent表数据 sun end if(!CollectionUtils.isEmpty(projectList)){ ProjectDataDTO projectDataDTO=new ProjectDataDTO(); projectDataDTO.setFirstCategoryCode(categoryDictDTO.getCategoryCode()); diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index a56e70d41f..7c22c84cbb 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -376,21 +376,6 @@ and e.DEL_FLAG = '0' - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 2bf087f56a..493f8bbf72 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -440,32 +440,6 @@ order by p.CREATED_TIME desc - -