Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_hotfix

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -1111,6 +1111,7 @@ public class DemoController {
         }else {
             screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId,dateId);
             screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId,dateId);
+            result.add(dateId);
             redisUtils.hSet(RedisKeys.getBackDoorbizExcuteResult("gridandorgdailynew"),customerId,result,3*24*60*60L);
         }
         long end = System.currentTimeMillis();

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java

@@ -7,6 +7,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.stats.DimCustomerService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,6 +24,7 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2020/9/15 11:06
  */
+@Slf4j
 @RestController
 @RequestMapping("factorigin")
 public class FactOriginExtractController {
@@ -95,6 +97,7 @@ public class FactOriginExtractController {
 
     @PostMapping("project")
     public Result projectData(@RequestBody ExtractOriginFormDTO extractOriginFormDTO) {
+        long start = System.currentTimeMillis();
         if (StringUtils.isNotBlank(extractOriginFormDTO.getCustomerId())) {
             List<String> daysBetween;
             if (StringUtils.isBlank(extractOriginFormDTO.getDateId())) {
@@ -115,6 +118,7 @@ public class FactOriginExtractController {
                 projectExtractService.saveOriginProjectDaily(dto);
             });
         }
+        log.info("projectData end,cost:{}",System.currentTimeMillis() - start);
         return new Result();
     }
 

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

@@ -200,7 +200,8 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
      * 获取已转项目事件事件
      *
      * @param customerId
+     * @param projectId
      * @return
      */
-    List<ResiEventDTO> getEventList(@Param("customerId") String customerId);
+    List<ResiEventDTO> getEventList(@Param("customerId") String customerId, @Param("projectId") String projectId);
 }

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

@@ -128,7 +128,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 		List<ProjectDTO> projectList = projectService.getProjectInfo(customerId, dateString, projectId);
 		factOriginProjectMainDailyService.deleteByDate(customerId, dateString,projectId);
 		if (!CollectionUtils.isEmpty(projectList)) {
-			Map<String, ResiEventDTO> projectEventMap = projectService.getEventList(customerId);
+			Map<String, ResiEventDTO> projectEventMap = projectService.getEventList(customerId, projectId);
 			//提取议题ID
 			List<String> issueIds =
 					projectList.stream().filter(item -> ProjectConstant.ISSUE.equals(item.getOrigin())).map(ProjectDTO::getOriginId).collect(Collectors.toList());
@@ -231,7 +231,9 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 		}
 
 		//满意度
+		long start = System.currentTimeMillis();
 		List<FactOriginProjectMainDailyEntity> satisfaction =  projectService.getProjectSatisfaction(customerId, projectId);
+		log.info("saveOriginProjectDaily 满意度 cost:{}",System.currentTimeMillis()-start);
 		if (CollectionUtils.isNotEmpty(satisfaction)) {
 			factOriginProjectMainDailyService.updateBatchById(satisfaction);
 		}
@@ -239,7 +241,9 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 		final List<FactOriginProjectMainDailyEntity> mainList = list;
 		List<FactOriginProjectLogDailyEntity> logList = new ArrayList<>();
 		//节点发起人 部门流转退回结案
+		start = System.currentTimeMillis();
 		List<ProcessInfoDTO> processList = projectProcessService.getProcessListByCustomer(customerId, dateString, projectId);
+		log.info("saveOriginProjectDaily 节点发起人 部门流转退回结案 cost:{}",System.currentTimeMillis()-start);
 		if (!CollectionUtils.isEmpty(processList)) {
 			logList = processList.stream().map(process -> {
 				//获取日期相关维度
@@ -291,7 +295,9 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 			}).collect(Collectors.toList());
 		}
 		//节点发起人 响应
+		start = System.currentTimeMillis();
 		List<ProcessInfoDTO> responseList = projectProcessService.getResponseProcessList(customerId, dateString, projectId);
+		log.info("saveOriginProjectDaily 节点发起人 响应 cost:{}",System.currentTimeMillis()-start);
 		if (!CollectionUtils.isEmpty(responseList)) {
 			logList.addAll(responseList.stream().map(process -> {
 				//获取日期相关维度
@@ -337,8 +343,9 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 		}
 
 		//项目评论人
+		start = System.currentTimeMillis();
 		List<ProcessInfoDTO> satisfactionRecordList = projectProcessService.getSatisfactionRecord(customerId, dateString, projectId);
-
+		log.info("saveOriginProjectDaily 项目评论人 cost:{}",System.currentTimeMillis()-start);
 		satisfactionRecordList.forEach(log -> mainList.stream().filter(project -> log.getProjectId().equals(project.getId())).forEach(main -> {
 			//进行满意度评价的居民的所属机关的父机机关信息
 			log.setPid(main.getPid());
@@ -367,7 +374,9 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 
 
 		//节点接收人
+		start = System.currentTimeMillis();
 		List<ProcessInfoDTO> processStaffList = projectProcessService.getProcessStaffByCustomer(customerId, dateString, projectId);
+		log.info("saveOriginProjectDaily 节点接收人 cost:{}",System.currentTimeMillis()-start);
 		logList.addAll(processStaffList.stream().map(process -> {
 			//获取日期相关维度
 			DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(process.getCreatedTime());

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

@@ -202,5 +202,5 @@ public interface ProjectService extends BaseService<ProjectEntity> {
      * @param projectId
      * @return
      */
-    Map<String, ResiEventDTO> getEventList(String customerId);
+    Map<String, ResiEventDTO> getEventList(String customerId, String projectId);
 }

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

@@ -243,8 +243,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	}
 
     @Override
-    public Map<String, ResiEventDTO> getEventList(String customerId) {
-        List<ResiEventDTO> list = baseDao.getEventList(customerId);
+    public Map<String, ResiEventDTO> getEventList(String customerId, String projectId) {
+        List<ResiEventDTO> list = baseDao.getEventList(customerId, projectId);
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(list)) {
         	return Collections.emptyMap();
 		}

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

@@ -259,6 +259,9 @@
         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'
+        <if test="projectId != null and projectId != ''">
+            AND re.PROJECT_ID = #{projectId}
+        </if>
         and rero.CUSTOMER_ID = #{customerId}
 
     </select>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java

@@ -265,15 +265,13 @@ public class IcUserDemandRecController {
      * @throws Exception
      */
     @PostMapping("analysis-export")
-    public Result analysisExport(HttpServletResponse response,@LoginUser TokenDto tokenDto, @RequestBody PageListAnalysisFormDTO formDTO)throws Exception {
+    public void analysisExport(HttpServletResponse response,@LoginUser TokenDto tokenDto, @RequestBody PageListAnalysisFormDTO formDTO)throws Exception {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setPageFlag(false);
         PageData<DemandRecResultDTO> res=icUserDemandRecService.pageListAnalysis(formDTO);
         if (!CollectionUtils.isEmpty(res.getList())) {
             ExcelUtils.exportExcelToTarget(response, null, res.getList(), DemandRecExcelResultDTO.class);
-            return new Result();
         }
-        return new Result();
     }
 
     /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -365,8 +365,8 @@ public class CustomerAgencyController {
      * @Date 2021/9/8 15:20
      */
     @PostMapping("agencygridtree")
-    public Result<AgencyTreeResultDTO> getOrgTreeData(/*@LoginUser*/ TokenDto tokenDTO) {
-        tokenDTO.setUserId("dffe71e021a61b900f9025f4f07f6955");
+    public Result<AgencyTreeResultDTO> getOrgTreeData(@LoginUser TokenDto tokenDTO) {
+        //tokenDTO.setUserId("dffe71e021a61b900f9025f4f07f6955");
         return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId()));
     }