网格下项目

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -353,4 +353,13 @@ public interface GovIssueOpenFeignClient {
 	@PostMapping(value = "/gov/issue/issueprojectcategorydict/categorylist")
 	Result<List<CategoryListResultDTO>> selectCategoryOneLevelListByCustomerId(@LoginUser TokenDto tokenDto);
 
+	/**
+	 * @Description  查询组织下每个网格的项目数
+	 * @param formDTO
+	 * @author zxc
+	 * @date 2021/12/9 2:59 下午
+	 */
+	@PostMapping(value = "/gov/issue/issue/projectcountbygrid")
+	Result<List<ProjectDistributionAnalysisRightDTO>> getProjectCountByGrid(@RequestBody ProjectDistributionAnalysisFormDTO formDTO);
+
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -287,4 +287,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
     public Result<List<CategoryListResultDTO>> selectCategoryOneLevelListByCustomerId(TokenDto tokenDto) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "selectCategoryOneLevelListByCustomerId", tokenDto);
     }
+
+    @Override
+    public Result<List<ProjectDistributionAnalysisRightDTO>> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getProjectCountByGrid", formDTO);
+    }
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java

@@ -311,5 +311,16 @@ public class IssueController {
         return new Result<List<ResiBuzzLeftPieChartResultDTO>>().ok(issueService.resiBuzzLeftPieChart(formDTO,tokenDto));
     }
 
+    /**
+     * @Description  查询组织下每个网格的项目数
+     * @param formDTO
+     * @author zxc
+     * @date 2021/12/9 2:59 下午
+     */
+    @PostMapping("projectcountbygrid")
+    public Result<List<ProjectDistributionAnalysisRightDTO>> getProjectCountByGrid(@RequestBody ProjectDistributionAnalysisFormDTO formDTO){
+        return new Result<List<ProjectDistributionAnalysisRightDTO>>().ok(issueService.getProjectCountByGrid(formDTO));
+    }
+
 }
 

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java

@@ -254,4 +254,12 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      */
     List<ResiBuzzLeftPieChartResultDTO> resiBuzzLeftPieChart(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("length")Integer length);
 
+    /**
+     * @Description  查询组织下每个网格的项目数
+     * @param orgId
+     * @author zxc
+     * @date 2021/12/9 2:59 下午
+     */
+    List<ProjectDistributionAnalysisRightDTO> getProjectCountByGrid(@Param("orgId")String orgId,@Param("startDate")String startDate,@Param("endDate")String endDate);
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java

@@ -369,4 +369,12 @@ public interface IssueService extends BaseService<IssueEntity> {
      */
     List<ResiBuzzLeftPieChartResultDTO> resiBuzzLeftPieChart(ResiBuzzLeftPieChartFormDTO formDTO,TokenDto tokenDto);
 
+    /**
+     * @Description  查询组织下每个网格的项目数
+     * @param formDTO
+     * @author zxc
+     * @date 2021/12/9 2:59 下午
+     */
+    List<ProjectDistributionAnalysisRightDTO> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO);
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -1638,5 +1638,20 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return result;
     }
 
+    /**
+     * @Description  查询组织下每个网格的项目数
+     * @param formDTO
+     * @author zxc
+     * @date 2021/12/9 2:59 下午
+     */
+    @Override
+    public List<ProjectDistributionAnalysisRightDTO> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) {
+        List<ProjectDistributionAnalysisRightDTO> result = baseDao.getProjectCountByGrid(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate());
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
+        return result;
+    }
+
 
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -639,4 +639,18 @@
             ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50)temp
         GROUP BY categoryCode
     </select>
+
+    <!-- 查询组织下每个网格的项目数 -->
+    <select id="getProjectCountByGrid" resultType="com.epmet.dto.result.ProjectDistributionAnalysisRightDTO">
+        SELECT
+            GRID_ID,
+            COUNT(ID) AS count
+        FROM issue
+        WHERE DEL_FLAG = '0'
+            AND ISSUE_STATUS = 'shift_project'
+            AND ORG_ID = #{orgId}
+            AND DATE_FORMAT(SHIFTED_TIME,'%Y-%m-%d') >= #{startDate}
+            AND DATE_FORMAT(SHIFTED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
+        GROUP BY GRID_ID
+    </select>
 </mapper>

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java

@@ -1,6 +1,7 @@
 package com.epmet.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -23,6 +24,7 @@ public class ProjectDistributionAnalysisRightDTO implements Serializable {
     /**
      * 组织类型，组织：agency，网格：grid
      */
+    @JsonIgnore
     private String orgType;
 
     /**

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,4 +31,11 @@ public class ProjectDistributionAnalysisRightResultDTO implements Serializable {
     private String above;
 
     private List<ProjectDistributionAnalysisRightDTO> list;
+
+    public ProjectDistributionAnalysisRightResultDTO() {
+        this.under = "";
+        this.middle = "";
+        this.above = "";
+        this.list = new ArrayList<>();
+    }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java

@@ -197,4 +197,6 @@ public interface ProjectConstant {
 
 	String ORG_TYPE_GRID = "grid";
 
+	String ORG_LEVEL_COMMUNITY = "community";
+
 }

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

@@ -28,7 +28,9 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
@@ -2845,7 +2847,25 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 */
 	@Override
 	public ProjectDistributionAnalysisRightResultDTO projectDistributionAnalysisRight(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto) {
-		return null;
+		if (StringUtils.isBlank(formDTO.getOrgId())){
+			CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+			if (null == staffInfo){
+				throw new EpmetException("未查询到此工作人员的所属组织信息...");
+			}
+			formDTO.setOrgId(staffInfo.getAgencyId());
+		}
+		AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getOrgId());
+		if (null == agencyInfo){
+			throw new EpmetException(String.format("未查询到此组织信息{%s}",formDTO.getOrgId()));
+		}
+		ProjectDistributionAnalysisRightResultDTO result = new ProjectDistributionAnalysisRightResultDTO();
+		List<ProjectDistributionAnalysisRightDTO> orgList = new ArrayList<>();
+		if (!agencyInfo.getLevel().equals(ProjectConstant.ORG_LEVEL_COMMUNITY)){
+
+		}else {
+
+		}
+		return result;
 	}
 
 	/**