Merge branch 'dev_ic_data' into develop

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,15 +29,15 @@ public class CategoryProjectResultDTO implements Serializable {
         //项目编码[目前没这个功能 默认为空]
         private String projectCode = "";
         //一级分类Code集合
-        private List<String> categoryCodes;
+        private List<String> categoryCodes = new ArrayList<>();
         //一级分类名称集合
-        private List<String> categoryNames;
+        private List<String> categoryNames = new ArrayList<>();
         //来源：议题issue  项目立项:agency 事件:resi_event【控制电机查看时里边三个按钮的显示】
         private String origin;
-        //网格Id[立项项目此值为空]
-        private String gridId;
-        //网格名[立项项目此值为空]
-        private String gridName;
+        //网格Id[上报给组织的事件、直接立项的项目此值为空]
+        private String gridId = "";
+        //网格名[上报给组织的事件、直接立项的项目此值为空]
+        private String gridName = "";
         //状态:待处理 pending，已结案closed
         private String status;
         //标题
@@ -44,7 +45,7 @@ public class CategoryProjectResultDTO implements Serializable {
         //转项目时间
         private String time;
         //小程序居民端话题或事件创建人【立项项目此值为空】
-        private String userId;
+        private String userId = "";
         //分类对应的所有上级,英文逗号隔开【目前分类只有两级，所以这个字段值其实就是一类的id值】
         @JsonIgnore
         private String categoryPids;

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java

@@ -19,7 +19,7 @@ public class ProjectCategoryTotalResultDTO implements Serializable {
     //一级分类名称
     private String categoryName;
     //一级分类颜色
-    private String colour;
+    private String colour = "";
     //分类下项目总数
     private Integer total = 0;
 

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java

@@ -13,7 +13,7 @@ public class ProjectMonthIncrResultDTO implements Serializable {
     private static final long serialVersionUID = 6188316867855643263L;
 
     //横坐标值
-    private Integer value;
+    private Integer value = 0;
     //横坐标
     private String type;
 

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java

@@ -17,13 +17,13 @@ public class ProjectStatusListResultDTO implements Serializable {
     //项目Id
     private String projectId;
     //来源：议题issue  项目立项:agency 事件:resi_event
-    private Integer origin;
+    private String origin;
     //状态:待处理 pending，结案closed
-    private Integer status;
+    private String status;
     //经度
-    private Integer longitude;
+    private String longitude;
     //纬度
-    private Integer dimension;
+    private String dimension;
     //项目标题
     private String title;
 

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

@@ -15,7 +15,6 @@ import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO;
 import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO;
 import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
-import com.epmet.dataaggre.dto.govissue.result.ShiftProjectIssueListResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO;
 import com.epmet.dataaggre.dto.govproject.ProjectDTO;
 import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO;
@@ -31,7 +30,6 @@ import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
 import com.epmet.dataaggre.service.resigroup.ResiGroupService;
 import com.epmet.dto.IcResiUserDTO;
-import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.form.TimestampIntervalFormDTO;
 import com.epmet.dto.form.WorkMinuteFormDTO;
@@ -293,6 +291,9 @@ public class GovProjectServiceImpl implements GovProjectService {
 				result.setPendingRatio(l.getPendingRatio());
 				result.setClosedTotal(l.getClosedTotal());
 				result.setClosedRatio(l.getClosedRatio());
+				//默认较昨日较上个月增长值就是当前日期的数据
+				result.setDateIncr(l.getProjectTotal());
+				result.setMonthIncr(l.getProjectTotal());
 			}
 			if (formDTO.getYeDateId().equals(l.getDateId())) {
 				result.setDateIncr(result.getProjectTotal() - l.getProjectTotal());
@@ -362,19 +363,33 @@ public class GovProjectServiceImpl implements GovProjectService {
 		List<ProjectCategoryTotalResultDTO> list = evaluationIndexService.projectCategoryList(formDTO);
 
 		//3.封装数据并返回
-		categoryList.forEach(ca -> {
+		//有数据的排在前边，没数据的按分类顺序排在后边
+		Map<String, String> map = new HashMap<>();
+		list.forEach(l -> {
 			ProjectCategoryTotalResultDTO dto = new ProjectCategoryTotalResultDTO();
 			dto.setAgencyId(formDTO.getAgencyId());
+			dto.setTotal(l.getTotal());
+			categoryList.forEach(ca -> {
+				if (ca.getCategoryCode().equals(l.getCategoryCode())) {
 					dto.setCategoryCode(ca.getCategoryCode());
 					dto.setCategoryName(ca.getCategoryName());
 					dto.setColour(ca.getColour());
-			list.forEach(l -> {
-				if (ca.getCategoryCode().equals(l.getCategoryCode())) {
-					dto.setTotal(l.getTotal());
 				}
 			});
+			map.put(l.getCategoryCode(), l.getCategoryCode());
 			resultList.add(dto);
 		});
+		categoryList.forEach(ca -> {
+			if (!map.containsKey(ca.getCategoryCode())) {
+				ProjectCategoryTotalResultDTO dto = new ProjectCategoryTotalResultDTO();
+				dto.setAgencyId(formDTO.getAgencyId());
+				dto.setCategoryCode(ca.getCategoryCode());
+				dto.setCategoryName(ca.getCategoryName());
+				dto.setColour(ca.getColour());
+				resultList.add(dto);
+				map.put(ca.getCategoryCode(), ca.getCategoryCode());
+			}
+		});
 
 		return resultList;
 	}
@@ -390,7 +405,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 		formDTO.setToDateId(DateUtils.dateOrmonthId(formDTO.getDateId(), "date", 1));
 		//1.查询客户下分类信息
 		List<IssueProjectCategoryDictDTO> categoryList = govIssueService.categoryList(formDTO.getCustomerId(), null, null);
-		List<String> categoreCodeList = categoryList.stream().map(ca -> formDTO.getCategoryCode().equals(ca.getParentCategoryCode()) ? ca.getCategoryCode() : "").collect(Collectors.toList());
+		List<String> categoreCodeList = categoryList.stream().filter(ca -> ca.getParentCategoryCode().equals(formDTO.getCategoryCode())).map(m -> m.getCategoryCode()).collect(Collectors.toList());
 		formDTO.setCategoreCodeList(categoreCodeList);
 
 		//2.查询组织及下级截止某一天的某个一级分类下的项目列表
@@ -423,18 +438,22 @@ public class GovProjectServiceImpl implements GovProjectService {
 				}
 			});
 			//项目涉及分类信息【一个项目涉及多个一级分类】
+			//一级分类Id
 			List<String> caId = new ArrayList<>();
-			List<String> caCode = new ArrayList<>();
 			list.forEach(ca -> {
 				if (ca.getProjectId().equals(re.getProjectId())) {
 					caId.add(ca.getCategoryPids());
-					caCode.add(ca.getCategoryCode());
 				}
 			});
+			//一级分类名称、code集合
 			List<String> caName = new ArrayList<>();
-			categoryList.forEach(ca -> caId.stream().filter(li -> ca.getId().equals(li)).forEach(s -> caName.add(ca.getCategoryName())));
-			re.setCategoryCodes(caCode);
+			List<String> caCode = new ArrayList<>();
+			categoryList.forEach(ca -> caId.stream().filter(li -> ca.getId().equals(li)).forEach(s -> {
+				caName.add(ca.getCategoryName());
+				caCode.add(ca.getCategoryCode());
+			}));
 			re.setCategoryNames(caName);
+			re.setCategoryCodes(caCode);
 			//项目来源话题、事件的创建人信息
 			eventUser.forEach(ev -> {
 				if (re.getProjectId().equals(ev.getProjectId())) {
@@ -459,6 +478,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 	@Override
 	public ProjectAnalysisResultDTO projectAnalysis(ProjectAnalysisFormDTO formDTO) {
 		ProjectAnalysisResultDTO resultDTO = new ProjectAnalysisResultDTO();
+		resultDTO.setUserId(formDTO.getUserId());
 		//1.查询userId的身份证号在小程序用户中存在的多个userId值
 		List<UserBaseInfoDTO> userList = epmetUserService.getUserBaseList(formDTO.getUserId());
 		List<String> userIds = userList.stream().map(UserBaseInfoDTO::getUserId).collect(Collectors.toList());

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml

@@ -193,6 +193,7 @@
             `level` = '1'
         AND org_id = #{agencyId}
         AND date_id = #{dateId}
+        ORDER BY project_total DESC
     </select>
 
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -158,11 +158,11 @@
 
     <select id="getProjectStatusList" resultType="com.epmet.dataaggre.dto.govproject.result.ProjectStatusListResultDTO">
         SELECT
-            agency_id "agencyId",
-            id "projectId",
-            origin "origin",
-            `status` "status",
-            locate_longitude "longitude",
+            agency_id agencyId,
+            id projectId,
+            origin origin,
+            `status` status,
+            locate_longitude longitude,
             locate_dimension dimension,
             title title
         FROM
@@ -180,7 +180,7 @@
             p.agency_id agencyId,
             p.id projectId,
             p.origin origin,
-            pc.grid_id gridId,
+            IFNULL(pc.grid_id, '') gridId,
             p.`status` status,
             p.title title,
             p.created_time time
@@ -203,7 +203,7 @@
     <select id="getCategoryList" resultType="com.epmet.dataaggre.dto.govproject.result.CategoryProjectResultDTO$Project">
         SELECT
             project_id projectId,
-            category_pids categoryPids, <!-- 目前分类只有两级，所以这个字段值其实就是一类的id值 -->
+            substring_index(category_pids, ',', 1) categoryPids, <!-- 目前分类只有两级，所以这个字段值其实就是一类的id值，后续上报上来的数据会存在多个 -->
             category_code categoryCode
         FROM
             project_category

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java

@@ -27,6 +27,14 @@ public class CategoryListResultDTO implements Serializable {
 
     private Integer count;
 
+    /**
+     * 颜色
+     */
+    private String colour;
+
+    /**
+     * 1级分类长度
+     */
     private Integer codeLength;
 
     public CategoryListResultDTO() {
@@ -34,5 +42,6 @@ public class CategoryListResultDTO implements Serializable {
         this.categoryName = "";
         this.count = NumConstant.ZERO;
         this.codeLength = NumConstant.ZERO;
+        this.colour = "";
     }
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -33,4 +34,11 @@ public class ResiBuzzLeftPieChartResultDTO implements Serializable {
      * 颜色
      */
     private String colour;
+
+    public ResiBuzzLeftPieChartResultDTO() {
+        this.count = NumConstant.ZERO;
+        this.categoryCode = "";
+        this.categoryName = "";
+        this.colour = "";
+    }
 }

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

@@ -252,7 +252,7 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      * @author zxc
      * @date 2021/12/9 10:57 上午
      */
-    List<ResiBuzzLeftPieChartResultDTO> resiBuzzLeftPieChart(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("length")Integer length);
+    List<ResiBuzzLeftPieChartResultDTO> resiBuzzLeftPieChart(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("length")Integer length,@Param("customerId")String customerId);
 
     /**
      * @Description  查询组织下每个网格的项目数

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

@@ -1631,7 +1631,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             formDTO.setOrgType(IssueConstant.ISSUE_AGENCY);
         }
         Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId());
-        List<ResiBuzzLeftPieChartResultDTO> result = baseDao.resiBuzzLeftPieChart(formDTO.getOrgId(), formDTO.getOrgType(), length);
+        List<ResiBuzzLeftPieChartResultDTO> result = baseDao.resiBuzzLeftPieChart(formDTO.getOrgId(), formDTO.getOrgType(), length, tokenDto.getCustomerId());
         if(CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }

epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql

@@ -0,0 +1,88 @@
+alter table issue_project_category_dict add column `COLOUR` VARCHAR(20) COMMENT '颜色' AFTER `SORT`;
+
+
+
+UPDATE issue_project_category_dict
+SET colour = '#ffba00'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '市场监管';
+
+UPDATE issue_project_category_dict
+SET colour = '#ffd074'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '卫生计生监督执法';
+
+UPDATE issue_project_category_dict
+SET colour = '#42cd05'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '建设管理';
+
+UPDATE issue_project_category_dict
+SET colour = '#16d783'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '文化执法';
+
+UPDATE issue_project_category_dict
+SET colour = '#00e5ed'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '民政';
+
+UPDATE issue_project_category_dict
+SET colour = '#0091ed'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '其他';
+
+UPDATE issue_project_category_dict
+SET colour = '#1b51ff'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '城市管理';
+
+UPDATE issue_project_category_dict
+SET colour = '#1641cc'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '公安交通管理';
+
+UPDATE issue_project_category_dict
+SET colour = '#2a00ff'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '消防安全';
+
+UPDATE issue_project_category_dict
+SET colour = '#7800ff'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '创卫复审类';
+
+UPDATE issue_project_category_dict
+SET colour = '#c600ff'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '环境保护';
+
+UPDATE issue_project_category_dict
+SET colour = '#ff00d2'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '安全监管';
+
+UPDATE issue_project_category_dict
+SET colour = '#ff2a00'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '社会治安综治';
+
+UPDATE issue_project_category_dict
+SET colour = '#ff7800'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '食品药品监管';
+

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

@@ -620,15 +620,16 @@
 
     <!-- 查询居民热议左侧饼图 -->
     <select id="resiBuzzLeftPieChart" resultType="com.epmet.dto.result.ResiBuzzLeftPieChartResultDTO">
-        SELECT COUNT(issueId) AS count,categoryCode,categoryName FROM
+        SELECT COUNT(issueId) AS count,categoryCode,categoryName,colour FROM
             (SELECT
                 i.ID AS issueId,
                 IFNULL(LEFT(ic.CATEGORY_CODE,#{length}),'') AS categoryCode,
-                IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName
+                IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName,
+                IFNULL(cd.colour,'#0091ed') AS colour
             FROM issue i
             LEFT JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0')
             LEFT JOIN issue_category ic ON (ic.ISSUE_ID = i.ID AND ic.DEL_FLAG = '0' AND ic.CUSTOMER_ID = i.CUSTOMER_ID)
-            LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = ic.CATEGORY_CODE AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.CUSTOMER_ID)
+            LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = LEFT(ic.CATEGORY_CODE,#{length}) AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.CUSTOMER_ID)
             WHERE i.DEL_FLAG = '0'
                 <if test='orgType == "grid" '>
                     AND i.GRID_ID = #{orgId}

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

@@ -250,7 +250,8 @@
         SELECT
             CATEGORY_CODE,
             CATEGORY_NAME,
-            LENGTH(CATEGORY_CODE) AS codeLength
+            LENGTH(CATEGORY_CODE) AS codeLength,
+            IFNULL(colour,'') AS colour
         FROM issue_project_category_dict
         WHERE DEL_FLAG = 0
           AND CUSTOMER_ID = #{customerId}

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

@@ -256,4 +256,15 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 															 @Param("categoryCode")String categoryCode,
 															 @Param("excludeProjectId") String excludeProjectId,
 															 @Param("epmetUserIds")List<String> epmetUserIds);
+
+	/**
+	 * @Description  查询组织下的项目数
+	 * @param orgIds
+	 * @param startDate
+	 * @param endDate
+	 * @author zxc
+	 * @date 2021/12/10 10:31 上午
+	 */
+	List<ProjectDistributionAnalysisRightDTO> selectProjectCountByOrg(@Param("orgIds")List<String> orgIds,@Param("startDate")String startDate,@Param("endDate")String endDate);
+
 }

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

@@ -2916,7 +2916,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		ProjectDistributionAnalysisRightResultDTO result = new ProjectDistributionAnalysisRightResultDTO();
 		List<ProjectDistributionAnalysisRightDTO> orgList = new ArrayList<>();
 		if (!agencyInfo.getLevel().equals(ProjectConstant.ORG_LEVEL_COMMUNITY)){
-
+			Result<List<String>> sonAgencyIdResult = govOrgOpenFeignClient.getSonAgencyId(formDTO.getOrgId());
+			if (!sonAgencyIdResult.success()){
+				throw new EpmetException(String.format("查询组织{%s}的下级组织失败...",formDTO.getOrgId()));
+			}
+			List<String> agencyIds = sonAgencyIdResult.getData();
+			if (CollectionUtils.isNotEmpty(agencyIds)){
+				orgList = baseDao.selectProjectCountByOrg(agencyIds,formDTO.getStartDate(),formDTO.getEndDate());
+			}
 		}else {
 			Result<List<ProjectDistributionAnalysisRightDTO>> projectCountByGrid = govIssueOpenFeignClient.getProjectCountByGrid(formDTO);
 			if (!projectCountByGrid.success()){
@@ -2926,6 +2933,21 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				orgList = projectCountByGrid.getData();
 			}
 		}
+		if (CollectionUtils.isNotEmpty(orgList)){
+			result.setList(orgList);
+		}
+		List<Integer> allCount = orgList.stream().map(m -> m.getCount()).collect(Collectors.toList());
+		Integer max = Collections.max(allCount);
+		Integer min = Collections.min(allCount);
+		if (orgList.size() == NumConstant.ONE || max.compareTo(min) == NumConstant.ZERO){
+			result.setUnder(orgList.get(NumConstant.ZERO).getCount().toString());
+			return result;
+		}
+		Integer minRange = min + ((max - min) / NumConstant.THREE);
+		Integer maxRange = min + ((max - min) * NumConstant.TWO / NumConstant.THREE);
+		result.setUnder(minRange.toString().concat("以下"));
+		result.setMiddle(minRange.toString().concat("-").concat(maxRange.toString()));
+		result.setAbove(maxRange.toString().concat("以上"));
 		return result;
 	}
 

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

@@ -469,4 +469,18 @@
         ORDER BY
             p.CREATED_TIME DESC
     </select>
+
+    <!-- 查询组织下的项目数 -->
+    <select id="selectProjectCountByOrg" resultType="com.epmet.dto.result.ProjectDistributionAnalysisRightDTO">
+        <foreach collection="orgIds" item="orgId" separator=" UNION ALL ">
+            SELECT
+                #{orgId} AS orgId,
+                COUNT(ID) AS count
+            FROM project
+            WHERE DEL_FLAG = '0'
+                AND ORG_ID_PATH LIKE CONCAT('%',#{orgId})
+                AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') >= #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
+        </foreach>
+    </select>
 </mapper>