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

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/constant/ScreenConstant.java

@@ -16,4 +16,7 @@ public interface ScreenConstant {
 
     String COMMA = ",";
 
+    String MONTH_ID = "month";
+
+    String YEAR_ID = "year";
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AnNingSubAgencyIndexRankFormDTO.java

@@ -0,0 +1,44 @@
+package com.epmet.evaluationindex.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 5、下级部门指数排行（安宁数据段用） 入参
+ * @Author zhangyong
+ * @DateTime 2020/09/08 9:54
+ */
+@Data
+public class AnNingSubAgencyIndexRankFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -2920561669035794486L;
+
+    public interface SubAgencyIndexRank{}
+
+    /**
+     * 机关ID
+     */
+    @NotBlank(message = "组织id不能为空",groups = {SubAgencyIndexRank.class})
+    private String agencyId;
+
+    /**
+     * 默认查询前几名
+     */
+    @NotNull(message = "默认查询名次不能为空",groups = {SubAgencyIndexRank.class})
+    private Integer topNum;
+
+    /**
+     * asc 正序， desc 降序
+     */
+    @NotNull(message = "排序方式不能为空",groups = {SubAgencyIndexRank.class})
+    private String sort;
+
+    /**
+     * 年度：year 月度：month
+     */
+    @NotNull(message = "年度、月度不能为空",groups = {SubAgencyIndexRank.class})
+    private String type;
+}

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

@@ -7,12 +7,15 @@ import com.epmet.datareport.service.evaluationindex.screen.AgencyService;
 import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.TreeResultDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 组织相关api
  *
@@ -34,7 +37,11 @@ public class AgencyController {
      */
     //@ExternalAppRequestAuth
     @PostMapping("tree")
-    public Result<TreeResultDTO> tree(ExternalAppRequestParam externalAppRequestParam){
+    public Result<TreeResultDTO> tree(HttpServletRequest request, ExternalAppRequestParam externalAppRequestParam){
+        String customerId = request.getHeader("CustomerId");
+        if(StringUtils.isBlank(externalAppRequestParam.getCustomerId())){
+            externalAppRequestParam.setCustomerId(customerId);
+        }
         return new Result<TreeResultDTO>().ok(agencyService.tree(externalAppRequestParam));
     }
 

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

@@ -3,10 +3,7 @@ package com.epmet.datareport.controller.screen;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.IndexService;
-import com.epmet.evaluationindex.screen.dto.form.MonthBarchartFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.MonthPieChartFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.*;
 import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
@@ -84,4 +81,19 @@ public class IndexController {
         return new Result<List<SubAgencyIndexRankResultDTO>>().ok(indexService.subAgencyIndexRank(subAgencyIndexRankFormDTO));
     }
 
+    /**
+     * 5、下级部门指数排行（安宁数据段用）
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @Author zhangyong
+     * @Date 09:38 2020-09-08
+     **/
+    //@ExternalAppRequestAuth
+    @PostMapping("dataclient/subagencyindexrank")
+    public Result<List<SubAgencyIndexRankResultDTO>> anNingSubAgencyIndexRank(@RequestBody AnNingSubAgencyIndexRankFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, AnNingSubAgencyIndexRankFormDTO.SubAgencyIndexRank.class);
+        return new Result<List<SubAgencyIndexRankResultDTO>>().ok(indexService.anNingSubAgencyIndexRank(formDTO));
+    }
+
 }

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

@@ -17,6 +17,7 @@
 
 package com.epmet.datareport.dao.evaluationindex.screen;
 
+import com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResult;
 import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
@@ -58,5 +59,15 @@ public interface ScreenIndexDataMonthlyDao{
      * @date 2020/8/20 10:04 上午
      */
     List<SubAgencyIndexRankResultDTO> selectSubAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO);
-	
-}
+
+    /**
+     * 5、下级部门指数排行（安宁数据段用） - 月(上一个月)
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @Author zhangyong
+     * @Date 09:38 2020-09-08
+     **/
+    List<SubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexMonthlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+
+}

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

@@ -17,10 +17,14 @@
 
 package com.epmet.datareport.dao.evaluationindex.screen;
 
+import com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 指数-指数数据(按年统计)
  *
@@ -37,5 +41,14 @@ public interface ScreenIndexDataYearlyDao{
      * @date 2020/8/19 3:43 下午
      */
     YearAverageIndexResultDTO selectYearAverageIndex(@Param("agencyId")String agencyId);
-	
-}
+
+    /**
+     * 5、下级部门指数排行（安宁数据段用） - 年
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @Author zhangyong
+     * @Date 09:38 2020-09-08
+     **/
+    List<SubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexYearlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+}

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

@@ -1,9 +1,6 @@
 package com.epmet.datareport.service.evaluationindex.screen;
 
-import com.epmet.evaluationindex.screen.dto.form.MonthBarchartFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.MonthPieChartFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.*;
 import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
@@ -51,4 +48,14 @@ public interface IndexService {
      */
     List<SubAgencyIndexRankResultDTO> subAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO);
 
+    /**
+     * 5、下级部门指数排行（安宁数据段用）
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @Author zhangyong
+     * @Date 09:38 2020-09-08
+     **/
+    List<SubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+
 }

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

@@ -12,6 +12,7 @@ import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.AgencyDistributionResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.TreeResultDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -43,13 +44,13 @@ public class AgencyServiceImpl implements AgencyService {
     @Override
     public TreeResultDTO tree(ExternalAppRequestParam externalAppRequestParam) {
         // 1. 查询客户根组织ID
-//        String customerId = externalAppRequestParam.getCustomerId();
+        String customerId = externalAppRequestParam.getCustomerId();
 
 
         // 验签关闭，customerId无法获取，暂时写死
-        String customerId = "b09527201c4409e19d1dbc5e3c3429a1";
-
-
+        if(StringUtils.isBlank(customerId)){
+            customerId = "b09527201c4409e19d1dbc5e3c3429a1";
+        }
         TreeResultDTO rootAgency = screenCustomerAgencyDao.selectRootAgencyId(customerId);
         if (null == rootAgency){
             return new TreeResultDTO();

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

@@ -7,10 +7,8 @@ import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataMonthlyDao
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataYearlyDao;
 import com.epmet.datareport.service.evaluationindex.screen.IndexService;
 import com.epmet.datareport.utils.DateUtils;
-import com.epmet.evaluationindex.screen.dto.form.MonthBarchartFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.MonthPieChartFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.evaluationindex.screen.constant.ScreenConstant;
+import com.epmet.evaluationindex.screen.dto.form.*;
 import com.epmet.evaluationindex.screen.dto.result.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -182,4 +180,17 @@ public class IndexServiceImpl implements IndexService {
         }
         return subAgencyIndexRankResultDTOS;
     }
+
+    @Override
+    public List<SubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO) {
+        List<SubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = new ArrayList<>();
+        if (ScreenConstant.YEAR_ID.equals(formDTO.getType())){
+            // 年 指数排行
+            subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectAnNingSubAgencyIndexYearlyRank(formDTO);
+        } else if (ScreenConstant.MONTH_ID.equals(formDTO.getType())){
+            // 月(上一个月) 指数排行
+            subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectAnNingSubAgencyIndexMonthlyRank(formDTO);
+        }
+        return subAgencyIndexRankResultDTOS;
+    }
 }

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

@@ -60,4 +60,27 @@
         ORDER BY index_total DESC
             LIMIT #{topNum}
     </select>
-</mapper>
+
+    <!-- 下级部门指数排行 安宁 - 月 -->
+    <select id="selectAnNingSubAgencyIndexMonthlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
+        SELECT
+        org_name AS `NAME`,
+        index_total AS totalIndex,
+        govern_ablity AS governAbility,
+        party_dev_ablity AS partyDevAbility,
+        service_ablity AS serviceAbility
+        FROM
+        screen_index_data_monthly
+        WHERE
+        del_flag = '0'
+        AND parent_id = #{agencyId}
+        AND month_id = left(replace(DATE_SUB( CURDATE(),INTERVAL 1 MONTH),'-',''),6)
+        <if test="sort == 'asc'">
+            ORDER BY index_total ASC
+        </if>
+        <if test="sort == 'desc'">
+            ORDER BY index_total DESC
+        </if>
+        LIMIT #{topNum}
+    </select>
+</mapper>

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

@@ -18,4 +18,27 @@
             AND org_id = #{agencyId}
             AND year_id = DATE_FORMAT(NOW(),'%Y')
     </select>
-</mapper>
+
+    <!-- 下级部门指数排行 安宁 - 年 -->
+    <select id="selectAnNingSubAgencyIndexYearlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
+        SELECT
+        org_name AS `NAME`,
+        index_total AS totalIndex,
+        govern_ablity AS governAbility,
+        party_dev_ablity AS partyDevAbility,
+        service_ablity AS serviceAbility
+        FROM
+        screen_index_data_yearly
+        WHERE
+        del_flag = '0'
+        AND parent_id = #{agencyId}
+        AND year_id = YEAR(CURDATE())
+        <if test="sort == 'asc'">
+            ORDER BY index_total ASC
+        </if>
+        <if test="sort == 'desc'">
+            ORDER BY index_total DESC
+        </if>
+        LIMIT #{topNum}
+    </select>
+</mapper>

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

@@ -1,7 +1,5 @@
 package com.epmet;
 
-import com.epmet.commons.tools.enums.EnvEnum;
-import com.epmet.commons.tools.utils.HttpClientManager;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -17,6 +15,5 @@ public class DataStatsApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(DataStatsApplication.class ,args);
-        HttpClientManager.getInstance().sendAlarmMsg(EnvEnum.getCurrentEnv().getName() +" DataStatsApplication started!");
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java

@@ -285,7 +285,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
             minValue = new BigDecimal(String.valueOf(minAndMaxMap.get(minValueKey)));
             //如果最大值超过阈值 则最大值为阈值
             if (new BigDecimal(NumConstant.ONE_NEG).compareTo(index.getThreshold()) != NumConstant.ZERO
-                    && maxValue.compareTo(new BigDecimal(NumConstant.ONE_NEG)) == NumConstant.ONE) {
+                    && maxValue.compareTo(index.getThreshold()) == NumConstant.ONE) {
                 maxValue = index.getThreshold();
             }
             //分值计算器

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml

@@ -39,7 +39,7 @@
     <!--   获取网格内党员的联系群众能力考评分（平均值）  -->
     <select id="selectGridContactMassesAvgValue" parameterType="map" resultType="java.math.BigDecimal">
          SELECT
-            AVG( SCORE ) AS AVG_CONTACT_MASSES_SCORE
+            round(AVG( SCORE ),6) AS AVG_CONTACT_MASSES_SCORE
          FROM
             fact_index_cpc_score m
          WHERE
@@ -55,7 +55,7 @@
     <!-- 获取网格内党员的联系群众能力考评分（平均值）的最大值，最小值   -->
     <select id="selectListGridContactMassesAvgValue" parameterType="com.epmet.dto.indexcal.CalculateCommonFormDTO" resultType="java.math.BigDecimal">
         SELECT
-            AVG( SCORE ) AS AVG_CONTACT_MASSES_SCORE
+            round(AVG( SCORE ),6) AS AVG_CONTACT_MASSES_SCORE
         FROM
             fact_index_cpc_score m
         WHERE
@@ -70,7 +70,7 @@
     <!--  网格内党员的参与议事能力考评分（平均值） 最大值最小值  -->
     <select id="selectListJoinIssueAvgValue" parameterType="com.epmet.dto.indexcal.CalculateCommonFormDTO" resultType="java.math.BigDecimal">
          SELECT
-            AVG( SCORE ) AS AVG_JOIN_ISSUE_SCORE
+            round(AVG( SCORE ),6) AS AVG_JOIN_ISSUE_SCORE
         FROM
             fact_index_cpc_score m
         WHERE
@@ -85,7 +85,7 @@
     <!--    -->
     <select id="selectGridJoinIssueAvgValue" parameterType="map" resultType="java.math.BigDecimal">
         SELECT
-            AVG( SCORE ) AS AVG_CONTACT_MASSES_SCORE
+            round(AVG( SCORE ),6) AS AVG_CONTACT_MASSES_SCORE
          FROM
             fact_index_cpc_score m
          WHERE

epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.4__add_anningejia.sql

@@ -0,0 +1,9 @@
+INSERT INTO `external_customer` ( `ID`, `CUSTOMER_NAME`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME` )
+VALUES
+	( '6c67e54f0ce4ba92a33f503082c92fc9', '安宁e家', 0, 0, 'APP_USER', '2020-09-08 09:11:56', 'APP_USER', '2020-09-08 09:11:56' );
+INSERT INTO `external_app` ( `ID`, `APP_NAME`, `CUSTOMER_ID`, `CUSTOMER_TYPE`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`, `DEL_FLAG` )
+VALUES
+	( 'c67d2bb17112e9aabdf137cb4f8072fe', '安宁e家数据端', '6c67e54f0ce4ba92a33f503082c92fc9', 'external', 0, 'APP_USER', '2020-09-08 09:13:32', 'APP_USER', '2020-09-08 09:13:32', 0 );
+INSERT INTO `external_app_secret` ( `ID`, `APP_ID`, `SECRET`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME` )
+VALUES
+	( '3e7d65039e25570777216cecfadfa304', 'c67d2bb17112e9aabdf137cb4f8072fe', '8c3e52923720460093b59184ffbdcb44a7f9e752991348aba861e8b43e109836', 0, 0, 'APP_USER', '2020-09-08 09:13:32', 'APP_USER', '2020-09-08 09:13:32' );