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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -628,4 +628,12 @@ public class RedisKeys {
 		return rootPrefix.concat("resi:").concat("export").concat(":template:changed").concat(customerId);
 	}
 
+	/**
+	 * desc:临时方案
+	 * @param userId
+	 * @return
+	 */
+	public static String getOrgTreeCacheKey(String userId) {
+		return rootPrefix.concat("ic:temp:orgtree").concat("userId");
+	}
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java

@@ -97,4 +97,17 @@ public class GrassRootsGovernController {
         return new  Result<List<GovernCapacityRankResultDTO>>().ok(grassRootsGovernService.governCapacityRank(param));
     }
 
+    /**
+     * @Description 治理能力榜单查询 screen_govern_rank_data
+     * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321627
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.08.20 17:46
+     **/
+    @PostMapping("governcapacityrank-origin")
+    public Result<List<GovernCapacityRankResultDTO>> governCapacityRankOrigin(@RequestBody AgencyAndNumFormDTO param){
+        ValidatorUtils.validateEntity(param,AgencyFormDTO.CommonAgencyIdGroup.class);
+        return new  Result<List<GovernCapacityRankResultDTO>>().ok(grassRootsGovernService.governCapacityRankOrigin(param));
+    }
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenGovernRankDataDao.java

@@ -50,4 +50,7 @@ public interface ScreenGovernRankDataDao{
      * @date 2021/2/26 上午9:22
      */
     List<GovernCapacityResultDTO> selectGovernCapacityRatioNew(@Param("monthId") String monthId,@Param("orgIds") List<String> orgIds);
+
+    List<GovernCapacityResultDTO> selectGovernCapacityRatioBak(@Param("monthId") String monthId,@Param("agencyId") String agencyId);
+    List<GovernCapacityResultDTO> selectGovernCapacityRatioNewBak(@Param("monthId") String monthId,@Param("orgIds") List<String> orgIds);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/GrassRootsGovernService.java

@@ -65,6 +65,12 @@ public interface GrassRootsGovernService {
     **/
     List<GovernCapacityRankResultDTO> governCapacityRank(AgencyAndNumFormDTO param);
 
+    /**
+     * 治理能力榜单查询 screen_govern_rank_data
+     * @param param
+     * @return
+     */
+    List<GovernCapacityRankResultDTO> governCapacityRankOrigin(AgencyAndNumFormDTO param);
     /**
      * @Description 6、公众参与-柱状折线图
      * @NEI   https://nei.netease.com/interface/detail/req/?pid=57068&id=322434

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java

@@ -295,6 +295,62 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         return result;
     }
 
+    /**
+     * 治理能力榜单查询 screen_govern_rank_data
+     * @param param
+     * @return
+     */
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
+    @Override
+    public List<GovernCapacityRankResultDTO> governCapacityRankOrigin(AgencyAndNumFormDTO param) {
+        List<GovernCapacityResultDTO> orderList = new ArrayList<>();
+        if (null == param.getTopNum() || NumConstant.ZERO == param.getTopNum()) {
+            param.setTopNum(NumConstant.TEN);
+        }
+        String monthId = dateUtils.getCurrentMonthId();
+
+        if (StringUtils.isNotEmpty(param.getAreaCode())){
+            List<String> nextAgencyIds = screenCustomerAgencyService.getNextAgencyIds(param.getAreaCode(), param.getAgencyId());
+            if (CollectionUtils.isEmpty(nextAgencyIds)){
+                return new ArrayList<>();
+            }
+            PageHelper.startPage(NumConstant.ONE,param.getTopNum());
+            orderList = screenGovernRankDataDao.selectGovernCapacityRatioNewBak(monthId,nextAgencyIds);
+            int time = NumConstant.TWELVE;
+            while(CollectionUtils.isEmpty(orderList) && time > NumConstant.ONE){
+                time--;
+                monthId = dateUtils.getPreviousMonthIdByDest(null, monthId);
+                PageHelper.startPage(NumConstant.ONE,param.getTopNum());
+                orderList = screenGovernRankDataDao.selectGovernCapacityRatioNewBak(monthId,nextAgencyIds);
+            }
+        }else {
+            PageHelper.startPage(NumConstant.ONE,param.getTopNum());
+            orderList = screenGovernRankDataDao.selectGovernCapacityRatioBak(monthId, param.getAgencyId());
+            int time = NumConstant.TWELVE;
+            while (CollectionUtils.isEmpty(orderList) && time > NumConstant.ONE) {
+                time++;
+                monthId = dateUtils.getPreviousMonthIdByDest(null, monthId);
+                PageHelper.startPage(NumConstant.ONE, param.getTopNum());
+                orderList = screenGovernRankDataDao.selectGovernCapacityRatioBak(monthId, param.getAgencyId());
+            }
+        }
+        if(null == orderList || orderList.isEmpty()) {
+            return new ArrayList<>();
+        }
+        List<GovernCapacityRankResultDTO> result = new LinkedList<>();
+        orderList.forEach(o -> {
+            GovernCapacityRankResultDTO rank = new GovernCapacityRankResultDTO();
+            rank.setAgencyName(o.getAgencyName());
+            rank.setGovernRatio(convertPercentStr(o.getGovernRatio(),NumConstant.ONE));
+            rank.setResolvedRatio(convertPercentStr(o.getResolvedRatio(),NumConstant.ONE));
+            rank.setResponseRatio(convertPercentStr(o.getResponseRatio(),NumConstant.ONE));
+            rank.setSatisfactionRatio(convertPercentStr(o.getSatisfactionRatio(),NumConstant.ONE));
+            rank.setParentAgencyName(o.getParentAgencyName());
+            rank.setMonthId(o.getMonthId());
+            result.add(rank);
+        });
+        return result;
+    }
     /**
      * @Description 6、公众参与-柱状折线图
      * @NEI   https://nei.netease.com/interface/detail/req/?pid=57068&id=322434

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml

@@ -82,4 +82,82 @@
         RESPONSE_RATIO DESC
     </select>
 
+    <!-- 查询政府治理能力各项指标 -->
+    <select id="selectGovernCapacityRatioBak" resultType="com.epmet.evaluationindex.screen.dto.result.GovernCapacityResultDTO">
+       SELECT
+            rankData.org_id as orgId,
+            rankData.ORG_NAME AS agencyName,
+            rankData.RESPONSE_RATIO,
+            rankData.RESOLVED_RATIO,
+            rankData.GOVERN_RATIO,
+            rankData.SATISFACTION_RATIO,
+            agency.AGENCY_NAME AS parentAgencyName
+        FROM
+            screen_govern_rank_data rankData
+        LEFT JOIN
+            screen_customer_agency agency
+            ON rankData.PARENT_ID = agency.AGENCY_ID AND agency.DEL_FLAG = '0' AND agency.AGENCY_ID = #{agencyId}
+        WHERE
+            rankData.DEL_FLAG = '0'
+            AND rankData.PARENT_ID = #{agencyId}
+            AND rankData.MONTH_ID = #{monthId}
+        ORDER BY
+            rankData.RESPONSE_RATIO DESC
+    </select>
+
+    <!--  基层治理-治理能力榜单 多客户版，调用此sql -->
+    <select id="selectGovernCapacityRatioNewBak" resultType="com.epmet.evaluationindex.screen.dto.result.GovernCapacityResultDTO">
+        (SELECT
+            agency.agency_id as orgId,
+            agency.AGENCY_NAME AS agencyName,
+            IFNULL(rankData.RESPONSE_RATIO,0) AS RESPONSE_RATIO,
+            IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO,
+            IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO,
+            IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO,
+            pa.AGENCY_NAME AS parentAgencyName,
+            rankData.MONTH_ID as monthId
+        FROM screen_customer_agency agency
+        left join screen_customer_agency pa
+        on(agency.PARENT_AREA_CODE=pa.AREA_CODE
+            and pa.DEL_FLAG='0')
+        left join screen_govern_rank_data rankData
+            ON (agency.AGENCY_ID =rankData.org_id
+            AND rankData.DEL_FLAG = '0'
+            and rankData.org_type='agency')
+        WHERE
+            agency.DEL_FLAG = '0'
+            AND agency.agency_id in
+            <foreach collection="orgIds" item="orgId" open="(" close=")" separator=",">
+                #{orgId}
+            </foreach>
+            AND rankData.MONTH_ID =#{monthId}
+        )
+        union
+        (
+        SELECT
+            grid.grid_id as orgId,
+            grid.GRID_NAME AS agencyName,
+            IFNULL(rankData.RESPONSE_RATIO,0) AS RESPONSE_RATIO,
+            IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO,
+            IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO,
+            IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO,
+            ca.agency_name AS parentAgencyName,
+            rankData.MONTH_ID as monthId
+        FROM screen_customer_grid grid
+        left join screen_customer_agency ca
+            on (ca.agency_id = grid.parent_agency_id)
+        left join screen_govern_rank_data_daily rankData
+            ON (grid.grid_id=rankData.org_id
+            AND grid.DEL_FLAG = 0
+            and rankData.org_type='grid')
+            WHERE grid.DEL_FLAG = '0'
+            AND grid.GRID_ID in
+            <foreach collection="orgIds" item="orgId" open="(" close=")" separator=",">
+                #{orgId}
+            </foreach>
+            AND rankData.MONTH_ID =#{monthId}
+            )
+        ORDER BY
+        RESPONSE_RATIO DESC
+    </select>
 </mapper>

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

@@ -37,10 +37,13 @@ public class ResiBuzzLeftPieChartResultDTO implements Serializable {
      */
     private String color;
 
+    @JsonIgnore
+    private String issueId;
+
     public ResiBuzzLeftPieChartResultDTO() {
         this.count = NumConstant.ZERO;
         this.categoryCode = "";
         this.categoryName = "";
-        this.color = "#0091ed";
+        this.color = "";
     }
 }

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

@@ -262,6 +262,9 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      */
     List<ResiBuzzLeftPieChartResultDTO> resiBuzzLeftPieChartByIssueIds(@Param("length")Integer length,@Param("issueIds")List<String> issueIds);
 
+    List<ResiBuzzLeftPieChartResultDTO> resiBuzzIssueCategoryByIssueIds(@Param("length")Integer length,@Param("issueIds")List<String> issueIds);
+    List<ResiBuzzLeftPieChartResultDTO> resiBuzzIssueCategoryNameByIssueIds(List<ResiBuzzLeftPieChartResultDTO> categories,@Param("customerId")String customerId);
+
     /**
      * @Description  查询前50名的议题ID
      * @param orgId

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

@@ -1667,13 +1667,37 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         if(CollectionUtils.isEmpty(issueIds)){
             return new ArrayList<>();
         }
-        List<ResiBuzzLeftPieChartResultDTO> result = baseDao.resiBuzzLeftPieChartByIssueIds(length, issueIds);
+        List<ResiBuzzLeftPieChartResultDTO> categories = baseDao.resiBuzzIssueCategoryByIssueIds(length, issueIds);
+        List<ResiBuzzLeftPieChartResultDTO> pieChat = getPieChat(issueIds);
+        Iterator<ResiBuzzLeftPieChartResultDTO> list = pieChat.iterator();
+        while (list.hasNext()){
+            ResiBuzzLeftPieChartResultDTO next = list.next();
+            for (ResiBuzzLeftPieChartResultDTO category : categories) {
+                if (next.getIssueId().equals(category.getIssueId())){
+                    list.remove();
+                    continue;
+                }
+            }
+        }
+        categories.addAll(pieChat);
+//        List<ResiBuzzLeftPieChartResultDTO> result = baseDao.resiBuzzLeftPieChartByIssueIds(length, issueIds);
+        List<ResiBuzzLeftPieChartResultDTO> result = baseDao.resiBuzzIssueCategoryNameByIssueIds(categories, tokenDto.getCustomerId());
         if (CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }
         return result;
     }
 
+    public List<ResiBuzzLeftPieChartResultDTO> getPieChat(List<String> issueIds){
+        List<ResiBuzzLeftPieChartResultDTO> resultDTOS = new ArrayList<>();
+        issueIds.forEach(i -> {
+            ResiBuzzLeftPieChartResultDTO dto = new ResiBuzzLeftPieChartResultDTO();
+            dto.setIssueId(i);
+            resultDTOS.add(dto);
+        });
+        return resultDTOS;
+    }
+
     /**
      * @Description  查询组织下每个网格的项目数
      * @param formDTO

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

@@ -617,25 +617,25 @@
 
     <!-- 查询居民热议左侧饼图 -->
     <select id="resiBuzzLeftPieChart" resultType="com.epmet.dto.result.ResiBuzzLeftPieChartResultDTO">
-        SELECT COUNT(issueId) AS count,categoryCode,categoryName,color FROM
-            (SELECT
-                i.ID AS issueId,
-                IFNULL(LEFT(ic.CATEGORY_CODE,#{length}),'') AS categoryCode,
-                IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName,
-                IFNULL(cd.color,'#0091ed') AS color
-            FROM issue i
-            INNER 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 = 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}
-                </if>
-                <if test='orgType == "agency" '>
-                    AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
-                </if>
-            ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50)temp
-        GROUP BY categoryName
+
+        SELECT COUNT(t2.issueId) AS count,cd.CATEGORY_CODE,IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName, IFNULL(cd.COLOR,'#0091ed') AS color FROM
+        (SELECT t1.issueId AS issueId,IFNULL(LEFT(ic.CATEGORY_CODE,#{length}),'') AS categoryCode FROM
+        (SELECT
+        i.ID AS issueId
+        FROM issue i
+        INNER JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0')
+        WHERE i.DEL_FLAG = '0'
+        <if test='orgType == "grid" '>
+            AND i.GRID_ID = #{orgId}
+        </if>
+        <if test='orgType == "agency" '>
+            AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+        </if>
+        ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50)t1
+        LEFT JOIN issue_category ic ON (t1.issueId = ic.ISSUE_ID AND ic.DEL_FLAG = '0')
+        GROUP BY t1.issueId,categoryCode)t2
+        LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = t2.categoryCode AND cd.CUSTOMER_ID = #{customerId} AND cd.DEL_FLAG = '0' )
+        GROUP BY cd.CATEGORY_NAME
     </select>
 
     <!-- 查询组织下每个网格的项目数 -->
@@ -696,11 +696,38 @@
             IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName,
             IFNULL(cd.color,'#0091ed') AS color
         FROM issue_category ic
-        INNER 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)
+        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)
             AND ic.ISSUE_ID IN (
                 <foreach collection="issueIds" item="issueId" separator=",">
                     #{issueId}
                 </foreach>
-                ) GROUP BY categoryName
+                ) GROUP BY categoryCode
+    </select>
+    <select id="resiBuzzIssueCategoryByIssueIds"
+            resultType="com.epmet.dto.result.ResiBuzzLeftPieChartResultDTO">
+        SELECT
+               ISSUE_ID ,
+               IFNULL(LEFT(CATEGORY_CODE,2),'') AS categoryCode
+        FROM issue_category
+        WHERE DEL_FLAG = '0'
+          AND ISSUE_ID IN(
+        <foreach collection="issueIds" item="issueId" separator=",">
+            #{issueId}
+        </foreach>
+            )
+        GROUP BY issue_id,categoryCode
+    </select>
+    <select id="resiBuzzIssueCategoryNameByIssueIds"
+            resultType="com.epmet.dto.result.ResiBuzzLeftPieChartResultDTO">
+        select count(t2.issueId) as count , t2.categoryCode,t2.categoryName,t2.color from
+        (<foreach collection="categories" item="c" separator="UNION ALL">
+            select
+                t1.issueId as issueId,
+                cd.CATEGORY_CODE as categoryCode,
+                IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName,
+                IFNULL(cd.COLOR,'#0091ed') AS color
+            from (select #{c.issueId} as issueId,#{c.categoryCode} as categoryCode) t1
+            LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = t1.categoryCode AND cd.CUSTOMER_ID = #{customerId} AND cd.DEL_FLAG = '0' )
+        </foreach>)t2
     </select>
 </mapper>

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

@@ -20,6 +20,8 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -53,6 +55,8 @@ import java.util.Set;
 @RestController
 @RequestMapping("customeragency")
 public class CustomerAgencyController {
+    @Autowired
+    private RedisUtils redisUtils;
 
     @Autowired
     private CustomerAgencyService customerAgencyService;
@@ -366,7 +370,17 @@ public class CustomerAgencyController {
      */
     @PostMapping("agencygridtree")
     public Result<AgencyTreeResultDTO> getOrgTreeData(@LoginUser TokenDto tokenDTO) {
-        return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId()));
+        //tokenDTO.setUserId("dffe71e021a61b900f9025f4f07f6955");
+        String orgTreeCacheKey = RedisKeys.getOrgTreeCacheKey(tokenDTO.getUserId());
+        Object o = redisUtils.get(orgTreeCacheKey);
+        AgencyTreeResultDTO result = null;
+        if (o == null){
+            result = customerAgencyService.getOrgTreeData(tokenDTO.getUserId());
+            redisUtils.set(orgTreeCacheKey,result,RedisUtils.MINUTE_THIRTY_EXPIRE);
+        }else {
+            result = (AgencyTreeResultDTO) o;
+        }
+        return new Result<AgencyTreeResultDTO>().ok(result);
     }
 
     /**