Merge remote-tracking branch 'origin/dev_resi_event' into develop

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ResiEventDTO.java

@@ -0,0 +1,85 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.project;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 居民报事表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@Data
+public class ResiEventDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
+	/**
+	 * 事件id
+	 */
+	private String resiEventId;
+
+	/**
+	 * 报给？：
+	 网格：grid；
+	 社区：community；
+	 乡（镇、街道）级:street；
+	 区县级: district；
+	 市级: city；
+	 省级:province。
+	 */
+	private String orgType;
+
+	/**
+	 * 报给的组织或者网格id
+	 */
+	private String orgId;
+
+	/**
+	 * org_id的上级组织id，org_id是跟组织，此列为0
+	 */
+	private String orgPid;
+
+	/**
+	 * org_id的所有上级组织id，org_id是跟组织，此列为0
+	 */
+	private String orgPids;
+
+	/**
+	 * 含义：已读read，未读：un_read；组织下的工作人员从待处理=>处理中，点击查看详情前更新为已读；
+	 */
+	private String orgRead;
+
+	/**
+	 * (1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：人大代表回复or报事人回复or工作人员回复、立项、办结更新为1；
+	 */
+	private Boolean redDot;
+
+	private String projectId;
+
+	private String createdBy;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java

@@ -81,4 +81,5 @@ public interface ProjectConstant {
      * 项目来源于 工作端立项
      */
     String PROJECT_ORIGIN_AGENCY="agency";
+    String PROJECT_ORIGIN_EVENT="resi_event";
 }

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

@@ -19,10 +19,7 @@ package com.epmet.dao.project;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ProjectDTO;
-import com.epmet.dto.project.ProjectAgencyDTO;
+import com.epmet.dto.project.*;
-import com.epmet.dto.project.ProjectCategoryDTO;
-import com.epmet.dto.project.ProjectGridDTO;
-import com.epmet.dto.project.ProjectPointDTO;
 import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
 import com.epmet.entity.project.ProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -194,4 +191,11 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
     List<String> selectClosedProjectIds(@Param("customerId")String customerId,
                                         @Param("origin")String origin,
                                         @Param("projectStatus")String projectStatus);
+
+    /**
+     * 获取已转项目事件事件
+     * @param customerId
+     * @return
+     */
+    List<ResiEventDTO> getEventList(@Param("customerId")String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java

@@ -206,24 +206,54 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgency
 			Map<String, OrgStatisticsResultDTO> projectResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
 					dateId,	ProjectConstant.RESOLVED,
 					OrgTypeConstant.AGENCY);
+			Map<String, OrgStatisticsResultDTO> eventProjectResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
+					dateId,	ProjectConstant.RESOLVED,
+					ProjectConstant.PROJECT_ORIGIN_EVENT);
 			if (!projectResolvedTotal.isEmpty()) {
 				agencyGovernDailyList.forEach(item -> {
 					OrgStatisticsResultDTO dto = projectResolvedTotal.get(item.getAgencyId());
+					int sum = item.getApprovalProjectResolvedCount();
+					if (null != dto) {
+						sum = sum + dto.getSum();
+					}
+					item.setApprovalProjectResolvedCount(sum);
+				});
+			}
+			if (!eventProjectResolvedTotal.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = eventProjectResolvedTotal.get(item.getAgencyId());
+					int sum = item.getApprovalProjectResolvedCount();
 					if (null != dto) {
-						item.setApprovalProjectResolvedCount(dto.getSum());
+						sum = sum + dto.getSum();
 					}
+					item.setApprovalProjectResolvedCount(sum);
 				});
 			}
 			// 当前组织内：来源于议题的项目：结案无需解决数
 			Map<String, OrgStatisticsResultDTO> projectUnResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
 					dateId,	ProjectConstant.UNRESOLVED,
 					OrgTypeConstant.AGENCY);
+			Map<String, OrgStatisticsResultDTO> eventProjectUnResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
+					dateId,	ProjectConstant.UNRESOLVED,
+					ProjectConstant.PROJECT_ORIGIN_EVENT);
 			if (!projectUnResolvedTotal.isEmpty()) {
 				agencyGovernDailyList.forEach(item -> {
 					OrgStatisticsResultDTO dto = projectUnResolvedTotal.get(item.getAgencyId());
+					int sum = item.getApprovalProjectUnResolvedCount();
+					if (null != dto) {
+						sum = sum + dto.getSum();
+					}
+					item.setApprovalProjectUnResolvedCount(sum);
+				});
+			}
+			if (!eventProjectUnResolvedTotal.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = eventProjectUnResolvedTotal.get(item.getAgencyId());
+					int sum = item.getApprovalProjectUnResolvedCount();
 					if (null != dto) {
-						item.setApprovalProjectUnResolvedCount(dto.getSum());
+						sum = sum + dto.getSum();
 					}
+					item.setApprovalProjectUnResolvedCount(sum);
 				});
 			}
 		}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java

@@ -108,6 +108,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
         Map<String,Integer>  issueProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_ISSUE,DimObjectStatusConstant.UNRESOLVED);
         Map<String,Integer>  approvalProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.RESOLVED);
         Map<String,Integer>  approvalProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.UNRESOLVED);
+        Map<String,Integer>  eventProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_EVENT,DimObjectStatusConstant.RESOLVED);
+        Map<String,Integer>  eventProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_EVENT,DimObjectStatusConstant.UNRESOLVED);
         Map<String, Integer> inGroupTopicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ZERO_STR);
         Map<String, Integer> inGroupTopicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ZERO_STR);
         Map<String, GovernGridClosedTotalCommonDTO> dtoMap=getGovernGridClosedTotalCommonDTOMap(customerId,gridIds);
@@ -142,14 +144,24 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                 insertEntity.setIssueProjectUnResolvedCount(issueProjectUnResolvedMap.get(insertEntity.getGridId()));
             }
             //7、当前网格内：项目立项，结案已解决数；默认为0，
+            int resolveCount = 0;
             if(approvalProjectResolvedMap.containsKey(insertEntity.getGridId())){
-                insertEntity.setApprovalProjectResolvedCount(approvalProjectResolvedMap.get(insertEntity.getGridId()));
+                resolveCount = resolveCount + approvalProjectResolvedMap.get(insertEntity.getGridId());
             }
+            if(eventProjectResolvedMap.containsKey(insertEntity.getGridId())){
+                resolveCount = resolveCount + eventProjectResolvedMap.get(insertEntity.getGridId());
+
+            }
+            insertEntity.setApprovalProjectResolvedCount(resolveCount);
             // 8、当前网格内：项目立项，结案无需解决数；默认为0，
+            int unResolveCount = 0;
             if(approvalProjectUnResolvedMap.containsKey(insertEntity.getGridId())){
-                insertEntity.setApprovalProjectUnResolvedCount(approvalProjectUnResolvedMap.get(insertEntity.getGridId()));
+                unResolveCount = resolveCount + approvalProjectUnResolvedMap.get(insertEntity.getGridId());
             }
-
+            if(eventProjectUnResolvedMap.containsKey(insertEntity.getGridId())){
+                unResolveCount = resolveCount + eventProjectUnResolvedMap.get(insertEntity.getGridId());
+            }
+            insertEntity.setApprovalProjectUnResolvedCount(unResolveCount);
             // 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
             // 9、当前网格内，未出小组即未转议题的：话题关闭已解决数
             if(inGroupTopicResolvedMap.containsKey(insertEntity.getGridId())){
@@ -318,7 +330,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                             // 12、来源于议题的项目，未出网格（在网格内流转的）结案并且无需解决的项目数
                             fromIssueUnResolvedInGridCount += 1;
                         }
-                    } else if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(governProjectInfoDTO.getOrigin())) {
+                    } else if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(governProjectInfoDTO.getOrigin()) || ProjectConstant.PROJECT_ORIGIN_EVENT.equals(governProjectInfoDTO.getOrigin())) {
                         if (ProjectConstant.RESOLVED.equals(governProjectInfoDTO.getIsResolved())) {
                             // 13、来源于项目立项的项目，未出网格（在网格内流转的）结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0
                             fromAgencyResolvedInGridCount += 1;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java

@@ -16,6 +16,7 @@ import com.epmet.dto.issue.IssueDTO;
 import com.epmet.dto.party.PartyMemberDTO;
 import com.epmet.dto.project.FinishOrgDTO;
 import com.epmet.dto.project.ProcessInfoDTO;
+import com.epmet.dto.project.ResiEventDTO;
 import com.epmet.dto.project.result.ProjectOrgPeriodResultDTO;
 import com.epmet.dto.result.WorkDayResultDTO;
 import com.epmet.dto.topic.ResiTopicDTO;
@@ -41,10 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -128,6 +126,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 		List<ProjectDTO> projectList = projectService.getProjectInfo(customerId, dateString);
 		factOriginProjectMainDailyService.deleteByDate(customerId, dateString);
 		if (!CollectionUtils.isEmpty(projectList)) {
+			Map<String, ResiEventDTO> projectEventMap = projectService.getEventList(customerId);
 			//提取议题ID
 			List<String> issueIds =
 					projectList.stream().filter(item -> ProjectConstant.ISSUE.equals(item.getOrigin())).map(ProjectDTO::getOriginId).collect(Collectors.toList());
@@ -154,11 +153,6 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 				entity.setMonthId(dimId.getMonthId());
 				entity.setWeekId(dimId.getWeekId());
 				entity.setDateId(dimId.getDateId());
-				if (ProjectConstant.ISSUE.equals(project.getOrigin())) {
-					entity.setIssueId(project.getOriginId());
-				} else {
-					entity.setIssueId("");
-				}
 				entity.setProjectStatus(project.getStatus());
 				entity.setIsResolved(project.getClosedStatus());
 				entity.setCreatedTime(project.getCreatedTime());
@@ -168,6 +162,20 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 				entity.setTopicId("");
 				entity.setTopicCreatorId("");
 				entity.setGridId("");
+				if (ProjectConstant.ISSUE.equals(project.getOrigin())) {
+					entity.setIssueId(project.getOriginId());
+				} else if (ProjectConstant.PROJECT_ORIGIN_EVENT.equals(project.getOrigin())){
+					entity.setIssueId("");
+					ResiEventDTO eventDTO = projectEventMap.get(project.getId());
+					if (null != eventDTO) {
+						if (ProjectConstant.PUBLISHER_TYPE_GRID.equals(eventDTO.getOrgType())) {
+							entity.setGridId(eventDTO.getOrgId());
+							entity.setTopicCreatorId(eventDTO.getCreatedBy());
+						}
+					}
+				} else {
+					entity.setIssueId("");
+				}
 				String[] pIds = project.getOrgIdPath().split(StrConstant.COLON);
 				if (pIds.length > 1) {
 					entity.setPid(pIds[pIds.length - 2]);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java

@@ -270,7 +270,7 @@ public class StatsIssueServiceImpl implements StatsIssueService {
 		//已结案项目统计
 		List<ProjectGridDTO> closedProjectTotalList = projectService.getGridClosedProjectTotal(customerId, dateString);
 		//已结案项目增量
-		List<ProjectGridDTO> closedProjectIncList = projectService.getGridClosedProjectTotal(customerId, dateString);
+		List<ProjectGridDTO> closedProjectIncList = projectService.getGridClosedProjectInc(customerId, dateString);
 
 		Map<String, Long> resolveMap= new HashMap<>();
 		Map<String, Long> unResolveMap = new HashMap<>();

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java

@@ -22,6 +22,7 @@ import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.project.ProjectAgencyDTO;
 import com.epmet.dto.project.ProjectGridDTO;
+import com.epmet.dto.project.ResiEventDTO;
 import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.project.ProjectEntity;
@@ -191,4 +192,11 @@ public interface ProjectService extends BaseService<ProjectEntity> {
      * @return
      */
     List<String> selectClosedProjectIds(String customerId,String origin ,String projectStatus);
+
+    /**
+     * 获取事件信息
+     * @param customerId
+     * @return
+     */
+    Map<String, ResiEventDTO> getEventList(String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@@ -23,10 +23,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.project.ProjectDao;
 import com.epmet.dto.ProjectDTO;
-import com.epmet.dto.project.ProjectAgencyDTO;
+import com.epmet.dto.project.*;
-import com.epmet.dto.project.ProjectCategoryDTO;
-import com.epmet.dto.project.ProjectGridDTO;
-import com.epmet.dto.project.ProjectPointDTO;
 import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.project.ProjectEntity;
@@ -37,6 +34,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -239,5 +237,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return baseDao.selectClosedProjectIds(customerId,origin,projectStatus);
 	}
 
+    @Override
+    public Map<String, ResiEventDTO> getEventList(String customerId) {
+        List<ResiEventDTO> list = baseDao.getEventList(customerId);
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(list)) {
+        	return Collections.emptyMap();
+		}
+        return list.stream().collect(Collectors.toMap(ResiEventDTO::getProjectId, Function.identity()));
+    }
+
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml

@@ -707,7 +707,8 @@
             ) a ON fm.GRID_ID = a.orgId
         WHERE
             PROJECT_STATUS = 'closed'
-          AND ORIGIN = "issue"
+          AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event')
+          AND GRID_ID != ''
           AND CUSTOMER_ID = #{customerId}
          AND DATE_ID <= #{dateId}
         GROUP BY

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

@@ -55,7 +55,7 @@
         FROM project
         WHERE
             DEL_FLAG = '0'
-          AND ORIGIN = 'issue'
+          AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event')
           AND STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
           AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') <![CDATA[ <= ]]> #{date}
@@ -69,7 +69,7 @@
         FROM project
         WHERE
             DEL_FLAG = '0'
-          AND ORIGIN = 'issue'
+          AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event')
           AND STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
           AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') = #{date}
@@ -220,4 +220,19 @@
                 AND p.ORIGIN =#{origin}
             </if>
     </select>
+
+    <select id="getEventList" resultType="com.epmet.dto.project.ResiEventDTO">
+        select  rero.RESI_EVENT_ID,
+                rero.ORG_TYPE,
+                rero.ORG_ID,
+                rero.ORG_PID,
+                rero.ORG_PIDS,
+                re.PROJECT_ID.CREATED_BY,
+                re.PROJECT_ID
+        from resi_event_report_org rero
+        inner join  resi_event re on rero.RESI_EVENT_ID = re.id and re.SHIFT_PROJECT = 1 and  re.DEL_FLAG = '0'
+        where rero.del_flag = '0'
+        and rero.CUSTOMER_ID = #{customerId}
+
+    </select>
 </mapper>

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

@@ -41,7 +41,6 @@ import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
-import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.service.ResiEventService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -114,17 +113,25 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     @Override
     public void updateViewTime(UpdateViewTimeFormDTO formDTO) {
         ResiEventEntity eventEntity=baseDao.selectById(formDTO.getEventId());
-        if(null!=eventEntity){
+        if (null == eventEntity) {
+            throw new RenException(String.format("没有找到事件记录,eventId:%s",formDTO.getEventId()));
+        }
+        if(formDTO.getUserId().equals(eventEntity.getReportUserId())){
+            log.warn("报事人查看详情不需要调用此接口");
+            return;
+        }
+        // 这个事件已经被查看了
         eventEntity.setReadFlag(true);
         baseDao.updateById(eventEntity);
-        }
         // 居民端：resi_user；工作端：staff
         if(EventConstant.RESI_USER.equals(formDTO.getViewType())){
+            //被@的人置为已读
             resiEventMentionDao.updateReadFlag(formDTO.getEventId(),formDTO.getUserId());
         }else if(EventConstant.STAFF.equals(formDTO.getViewType())){
+            // 当前组织置为已读
             resiEventReportOrgDao.updateReadFlag(formDTO.getEventId(),formDTO.getOrgId(),formDTO.getUserId());
         }
-        // 插入查看日志
+        // 插入首次查看日志
         List<ResiEventOperationLogEntity> logEntityList = resiEventOperationLogDao.selectByUserAction(formDTO.getEventId(), formDTO.getUserId(), ResiEventAction.READ_FIRST.getCode());
         if (CollectionUtils.isEmpty(logEntityList)) {
             ResiEventOperationLogEntity publishLog=new ResiEventOperationLogEntity();