Merge remote-tracking branch 'origin/dev_project_branch' into dev_temp

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -12,6 +12,11 @@
     <artifactId>data-aggregator-server</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-mybatis</artifactId>
@@ -47,11 +52,10 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
-        <!--服务调用相关依赖-->
         <dependency>
-            <groupId>com.epmet</groupId>
+            <groupId>io.github.openfeign</groupId>
-            <artifactId>epmet-commons-service-call</artifactId>
+            <artifactId>feign-httpclient</artifactId>
-            <version>0.3.1</version>
+            <version>10.3.0</version>
         </dependency>
         <!--动态数据源-->
         <dependency>

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/DataAggregatorApplication.java → epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/DataAggregatorApplication.java

@@ -1,4 +1,4 @@
-package com.epmet.dataaggre;
+package com.epmet;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovIssueController.java

@@ -1,6 +1,8 @@
 package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -39,8 +41,8 @@ public class GovIssueController {
      * @author zxc
      * @date 2020/12/25 下午2:37
      */
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_HOT_ISSUE_ALL)
     @PostMapping("allissuelist")
-//    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_HOT_ISSUE_ALL)
     public Result<AllIssueResultDTO> allIssueList(@RequestBody AllIssueFormDTO formDTO, @LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(formDTO, AllIssueFormDTO.AllIssueForm.class);
         return new Result<AllIssueResultDTO>().ok(govIssueService.allIssueList(formDTO,tokenDto));

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -118,6 +118,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 		AllProjectResultDTO resultDTO = new AllProjectResultDTO();
 		String agencyId = govOrgService.getAgencyIdByUserId(tokenDto.getUserId());
 		int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+
 		if (StringUtils.isEmpty(agencyId)) {
 			throw new RenException(String.format("获取工作人员组织信息失败,staffId->%s", tokenDto.getUserId()));
 		}
@@ -141,27 +142,31 @@ public class GovProjectServiceImpl implements GovProjectService {
 				project.setCurrentDisposeDept(departmentList);
 
 			});
+			int pageSize =  pageIndex + formDTO.getPageSize();
+			if (pageSize > projectList.size()) {
+				pageSize = projectList.size();
+			}
 			//排序(创建:create 更新:update 部门:department 耗时:date 次数:count)
 			switch (formDTO.getSortType()) {
 				case "create":
 					projectList = projectList.stream().sorted(Comparator.comparing(ProjectInfoDTO::getProjectTime).reversed())
-							.collect(Collectors.toList()).subList(pageIndex, pageIndex + formDTO.getPageSize());
+							.collect(Collectors.toList()).subList(pageIndex, pageSize);
 					break;
 				case "update":
 					projectList = projectList.stream().sorted(Comparator.comparing(ProjectInfoDTO::getUpdateTime).reversed())
-							.collect(Collectors.toList()).subList(pageIndex, pageIndex + formDTO.getPageSize());
+							.collect(Collectors.toList()).subList(pageIndex, pageSize);
 					break;
 				case "department":
 					projectList = projectList.stream().sorted(Comparator.comparing(ProjectInfoDTO::getDepartmentCount).reversed())
-							.collect(Collectors.toList()).subList(pageIndex, pageIndex + formDTO.getPageSize());
+							.collect(Collectors.toList()).subList(pageIndex, pageSize);
 					break;
 				case "date":
 					projectList = projectList.stream().sorted(Comparator.comparing(ProjectInfoDTO::getTimeSpent).reversed())
-							.collect(Collectors.toList()).subList(pageIndex, pageIndex + formDTO.getPageSize());
+							.collect(Collectors.toList()).subList(pageIndex, pageSize);
 					break;
 				case "count":
 					projectList = projectList.stream().sorted(Comparator.comparing(ProjectInfoDTO::getProcessCount).reversed())
-							.collect(Collectors.toList()).subList(pageIndex, pageIndex + formDTO.getPageSize());
+							.collect(Collectors.toList()).subList(pageIndex, pageSize);
 					break;
 				default:
 					break;

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml

@@ -149,4 +149,8 @@ pagehelper:
 dingTalk:
   robot:
     webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
+    secret: @dingTalk.robot.secret@
+
+logging:
+  level:
+    com.epmet.dataaggre: debug