禅道：http://zentao.elinkservice.cn/story-view-670.html

个人档案中上报事件模块相关接口由原来的查询resi_event改为查询ic_event表，市北客户继续沿用之前接口

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -491,4 +491,39 @@ public class IcEventController {
         return new Result();
     }
 
+    /**
+     * @Description  上报事件-回复列表
+     * 模仿gov/project/resieventreply/list接口重新查询新表接口
+     * @author sun
+     */
+    @PostMapping("icevent-list")
+    public Result<List<ReplyListResultDTO>> replyList(@LoginUser TokenDto tokenDto, @RequestBody ReplyListFormDTO formDTO){
+        formDTO.setCurrentUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO, ReplyListFormDTO.ReplyListForm.class);
+        return new Result<List<ReplyListResultDTO>>().ok(icEventService.icEventReplyList(formDTO));
+    }
+
+    /**
+     * 数据分析-个人档案-上报事件列表,根据epmetUserIdList查询
+     * 模仿gov/project/resieventreply/pageuserreported接口重新查询新表接口
+     * @author sun
+     */
+    @PostMapping("icevent-pageuserreported")
+    public Result<PageData<PageUserReportEventResDTO>> pageUserReported(@RequestBody PageUserReportEventFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PageUserReportEventFormDTO.AddUserInternalGroup.class);
+        return new Result<PageData<PageUserReportEventResDTO>>().ok(icEventService.icEventPageUserReported(formDTO));
+    }
+
+    /**
+     * 数字赋能平台-个人档案-事件详情
+     * 模仿gov/project/resieventreply/eventdetail-icdata 接口重新查询新表接口
+     * @author  sun
+     */
+    @PostMapping("icevent-eventdetail-icdata")
+    public Result<EventDetailResultDTO> icEventDetailForIcData(@RequestBody ResiEventDetailFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, ResiEventDetailFormDTO.AddUserInternalGroup.class);
+        return new Result<EventDetailResultDTO>().ok(icEventService.icEventDetailForIcData(formDTO.getResiEventId()));
+    }
+
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java

@@ -4,6 +4,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.IcEventCategoryAnalysisFormDTO;
 import com.epmet.dto.form.IcEventListFormDTO;
 import com.epmet.dto.form.MyReportIcEvFormDTO;
+import com.epmet.dto.form.PageUserReportEventFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcEventEntity;
 import org.apache.ibatis.annotations.MapKey;
@@ -136,4 +137,10 @@ public interface IcEventDao extends BaseDao<IcEventEntity> {
      * @return
      */
     Integer getResiReportEventCount(@Param("reportorIdCard") String reportorIdCard);
+
+    List<ReplyListResultDTO> selectReplyList(@Param("icEventId") String icEventId);
+
+    List<PageUserReportEventResDTO> selectUserReported(PageUserReportEventFormDTO formDTO);
+
+    EventDetailResultDTO selectEventDetail(@Param("icEventId") String icEventId);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java

@@ -241,6 +241,10 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 															 @Param("categoryCode")String categoryCode,
 															 @Param("excludeProjectId") String excludeProjectId,
 															 @Param("epmetUserIds")List<String> epmetUserIds);
+	List<ProjectInfoIcData> selectCommonCategoryIcEventProject(@Param("customerId")String customerId,
+															 @Param("categoryCode")String categoryCode,
+															 @Param("excludeProjectId") String excludeProjectId,
+															 @Param("epmetUserIds")List<String> epmetUserIds);
 
 	/**
 	 * 数据分析-个人档案-话题详情页面的研判分析项目列表

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java

@@ -220,4 +220,10 @@ public interface IcEventService extends BaseService<IcEventEntity> {
      * @Description  工作端事件红点消除
      **/
     void govRedDot(String icEventId);
+
+    List<ReplyListResultDTO> icEventReplyList(ReplyListFormDTO formDTO);
+
+    PageData<PageUserReportEventResDTO> icEventPageUserReported(PageUserReportEventFormDTO formDTO);
+
+    EventDetailResultDTO icEventDetailForIcData(String icEventId);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -22,6 +22,7 @@ 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;
@@ -94,6 +95,11 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     private EpmetMessageOpenFeignClient messageOpenFeignClient;
     @Autowired
     private ProjectSatisfactionDetailService projectSatisfactionDetailService;
+    @Autowired
+    private ProjectDao projectDao;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
 
     public CustomerStaffInfoCacheResult getStaffInfo(String customerId,String staffId){
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, staffId);
@@ -1580,4 +1586,88 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         baseDao.updateById(entity);
     }
 
+    @Override
+    public List<ReplyListResultDTO> icEventReplyList(ReplyListFormDTO formDTO) {
+        List<ReplyListResultDTO> list = baseDao.selectReplyList(formDTO.getResiEventId());
+        list.forEach(dto -> {
+            if (dto.getReplyUserId().equals(formDTO.getCurrentUserId())) {
+                dto.setReplyName("我");
+            }
+        });
+        return list;
+    }
+
+    @Override
+    public PageData<PageUserReportEventResDTO> icEventPageUserReported(PageUserReportEventFormDTO formDTO) {
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) {
+            return new PageData<PageUserReportEventResDTO>(new ArrayList<>(), NumConstant.ZERO);
+        }
+        PageInfo<PageUserReportEventResDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
+                formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserReported(formDTO));
+        return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
+    }
+
+    @Override
+    public EventDetailResultDTO icEventDetailForIcData(String icEventId) {
+        EventDetailResultDTO dto = baseDao.selectEventDetail(icEventId);
+        if (null == dto) {
+            return new EventDetailResultDTO();
+        }
+        //附件按类型分组【图片、语音】
+        List<String> eventImgs = new ArrayList<>();
+        List<FileCommonDTO> 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<String> staffName = govOrgOpenFeignClient.staffName(eventProjectInfo.getUserId());
+            if (!staffName.success()) {
+                throw new RenException("查询工作人员名字失败");
+            }
+            eventProjectInfo.setOperationName(staffName.getData());
+            dto.setProjectInfo(eventProjectInfo);
+        }
+        // 查询报事人名字
+        List<String> userIdList = new ArrayList<>();
+        userIdList.add(dto.getEventUserId());
+        Result<List<UserBaseInfoResultDTO>> 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<String> gridNameResult = govOrgOpenFeignClient.gridName(dto.getGridId());
+        if (!gridNameResult.success()) {
+            throw new RenException("查询所属网格失败");
+        }
+        dto.setGridName(gridNameResult.getData());
+        // 查询报事的org
+        List<String> orgNameList = dto.getOrgNameList();
+        Result<List<String>> orgResult = govOrgOpenFeignClient.selectOrgNameByType(orgNameList);
+        if (!orgResult.success()) {
+            throw new RenException("查询组织名称失败");
+        }
+        List<String> data = orgResult.getData();
+        dto.setEventOrg(data);
+        return dto;
+    }
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -20,6 +20,7 @@ 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;
@@ -937,8 +938,16 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         List<ProjectDataDTO> projectData=new ArrayList<>();
         for(IssueProjectCategoryDictDTO categoryDictDTO:categoryRes.getData()){
             //当前项目分类一致，排除当前项目，相同分类编码
-            List<ProjectInfoIcData> projectList=projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(),
-                    categoryDictDTO.getCategoryCode(),formDTO.getProjectId(),formDTO.getEpmetUserIdList());
+            //2022.6.27  市北客户继续沿用直接接口，其他客户不在查询resi_event表 改查ic_eveent表数据   sun    start
+            List<ProjectInfoIcData> projectList = new ArrayList<>();
+            if (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId())) {
+                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());

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -375,4 +375,90 @@
         where e.ID_CARD = #{reportorIdCard}
           and e.DEL_FLAG = '0'
     </select>
+
+    <select id="selectReplyList" resultType="com.epmet.dto.result.ReplyListResultDTO">
+        SELECT
+            rer.user_show_name as replyName,
+            rer.created_time as replyTime,
+            rer.content as replyContent,
+            rer.from_user_id as replyUserId
+        FROM
+            ic_event_reply rer
+        WHERE
+            rer.del_flag = '0'
+        AND rer.resi_event_id = #{icEventId}
+        ORDER BY
+            rer.created_time DESC
+    </select>
+
+    <select id="selectUserReported" resultType="com.epmet.dto.result.PageUserReportEventResDTO">
+        SELECT
+            re.id AS resiEventId,
+            re.event_content AS eventContent,
+            if(re.operation_type='1', '1', '0') AS shiftProject,
+            if(re.operation_type='1', re.OPERATION_ID, '') AS projectId,
+            re.created_time AS reportTime
+        FROM
+            ic_event re
+        WHERE
+            re.del_flag = '0'
+        AND re.report_user_id = ''
+        ORDER BY re.created_time desc
+    </select>
+
+    <!-- 报事详情 -->
+    <resultMap id="selectEventDetailMap" type="com.epmet.dto.result.EventDetailResultDTO">
+        <result property="isProject" column="isProject"/>
+        <result property="eventTime" column="eventTime"/>
+        <result property="eventContent" column="eventContent"/>
+        <result property="eventAddress" column="eventAddress"/>
+        <result property="isClosed" column="isClosed"/>
+        <result property="isResolve" column="isResolve"/>
+        <result property="isRollback" column="isRollback"/>
+        <result property="projectId" column="projectId"/>
+        <result property="gridId" column="gridId"/>
+        <result property="eventUserId" column="eventUserId"/>
+        <!--<collection property="eventImgs" ofType="java.lang.String">
+            <result column="eventImg"/>
+        </collection>-->
+        <collection property="attachmentList" ofType="com.epmet.dto.result.EventDetailResultDTO$Attachment">
+            <result column="resiEventAttachmentId"/><!-- 附件表ID，如果附件url和type一样会被去重 加上id就可以了 -->
+            <result column="url" property="url"/>
+            <result column="type" property="type"/>
+            <result column="duration" property="duration"/>
+        </collection>
+        <!--<collection property="eventPerson" ofType="java.lang.String">
+            <result column="person"/>
+        </collection>
+        <collection property="eventPersonIds" ofType="java.lang.String">
+            <result column="personUserId"/>
+        </collection>-->
+        <collection property="orgNameList" ofType="java.lang.String">
+            <result column="orgId"/>
+        </collection>
+    </resultMap>
+    <select id="selectEventDetail" resultType="com.epmet.dto.result.EventDetailResultDTO">
+        SELECT
+            IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i:%s'),'') AS eventTime,
+            IFNULL(re.EVENT_CONTENT,'') AS eventContent,
+            IFNULL(re.ADDRESS,'') AS eventAddress,
+            (CASE WHEN re.`STATUS` = 'processing' THEN FALSE WHEN re.`STATUS` = 'closed_case' THEN TRUE ELSE FALSE END) AS isClosed,
+            (IF(IFNULL(re.RESOLVE_STATUS,TRUE) OR '' = re.RESOLVE_STATUS, TRUE, FALSE)) AS isResolve,
+            (CASE WHEN re.READ_FLAG = 1 THEN FALSE ELSE TRUE END) AS isRollback,
+            (CASE WHEN re.operation_type = 1 THEN TRUE ELSE FALSE END) AS isProject,
+            if(re.operation_type='1', re.OPERATION_ID, '') AS projectId,
+            ea.id AS resiEventAttachmentId,
+            ea.ATTACHMENT_URL AS url,
+            ea.ATTACHMENT_TYPE AS type,
+            ea.duration AS duration,
+            re.GRID_ID AS gridId,
+            re.CREATED_BY AS eventUserId,
+            re.AGENCY_ID AS orgId
+        FROM ic_event re
+        LEFT JOIN ic_event_attachment ea ON (ea.IC_EVENT_ID = re.ID AND ea.DEL_FLAG = '0')
+        WHERE re.DEL_FLAG = '0'
+            AND re.ID = #{icEventId}
+        order by ea.sort asc
+    </select>
+
 </mapper>

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -440,6 +440,32 @@
         order by p.CREATED_TIME desc
     </select>
 
+    <select id="selectCommonCategoryIcEventProject" parameterType="map" resultType="com.epmet.dto.result.ProjectInfoIcData">
+        select
+            distinct
+            pc.project_id as projectId,
+            p.title as projectTitle,
+            p.origin_id as resiEventId,
+            p.`status` as projectStatus,
+            '' as issueId,
+            '' as topicId
+        FROM project_category pc
+        INNER JOIN project p ON (pc.project_id = p.id)
+        INNER JOIN ic_event re ON (p.origin_id = re.id)
+        WHERE
+            pc.del_flag = '0'
+        AND p.del_flag = '0'
+        AND re.del_flag = '0'
+        AND pc.customer_id = #{customerId}
+        AND p.origin = 'ic_event'
+        AND pc.project_id != #{excludeProjectId}
+        <foreach collection="epmetUserIds" item="epmetUserId" open="AND(  " separator=" OR " index="index" close=")">
+            re.report_user_id = #{epmetUserId}
+        </foreach>
+        AND pc.category_code like concat(#{categoryCode},'%')
+        ORDER BY p.created_time desc
+    </select>
+
     <!--    数据分析-个人档案-话题详情页面的研判分析项目列表 -->
     <select id="selectCommonCategoryIssueProject" parameterType="map" resultType="com.epmet.dto.result.ProjectInfoIcData">
         SELECT