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/dto/result/ActTrendMonthlyResultDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *   公益互助-公益活动次数
+ * @Author sun
+ */
+@Data
+public class ActTrendMonthlyResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 月id :yyyyMM
+     */
+    private String monthId = "";
+
+    /**
+     * 活动数量（本月举行的活动）
+     */
+    private Integer actCount = 0;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/HeartActcounttrendResultDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+import rx.internal.util.LinkedArrayList;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+
+/**
+ *  公益互助-公益活动次数
+ * @Author sun
+ */
+@Data
+public class HeartActcounttrendResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 横坐标 月份集合
+     */
+    private LinkedList<String> xAxis;
+
+    /**
+     * 活动次数 集合
+     */
+    private LinkedList<String> actCountDataList;
+
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/HeartSummaryResultDTO.java

@@ -0,0 +1,43 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  公益互助-各类总数汇总
+ * @Author sun
+ */
+@Data
+public class HeartSummaryResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 日期Id, 数据更新至：yyyyMMdd
+     */
+    private String dateId = "";
+
+    /**
+     * 活动次数
+     */
+    private Integer actCount = 0;
+    /**
+     * 志愿者总数
+     */
+    private Integer volunteerCount = 0;
+    /**
+     * 参与人次
+     */
+    private Integer partiUserCount = 0;
+    /**
+     * 发放积分
+     */
+    private Integer rewardPointCount = 0;
+    /**
+     * 公益时长
+     */
+    private Integer heartTime = 0;
+
+
+}

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

@@ -4,6 +4,8 @@ import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.datareport.service.evaluationindex.screen.KcScreenService;
+import com.epmet.evaluationindex.screen.dto.result.HeartActcounttrendResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.HeartSummaryResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.HomepageSummaryResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -35,6 +37,26 @@ public class KcScreenController {
         return new Result<HomepageSummaryResultDTO>().ok(kcScreenService.homepageSummary(externalAppRequestParam));
     }
 
+    /**
+     *  @param externalAppRequestParam
+     * @Description  公益互助-各类总数汇总
+     * @author sun
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("heart/summary")
+    public Result<HeartSummaryResultDTO> heartSummary(ExternalAppRequestParam externalAppRequestParam){
+        return new Result<HeartSummaryResultDTO>().ok(kcScreenService.heartSummary(externalAppRequestParam));
+    }
 
+    /**
+     *  @param externalAppRequestParam
+     * @Description  公益互助-公益活动次数
+     * @author sun
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("heart/actcounttrend")
+    public Result<HeartActcounttrendResultDTO> heartActcounttrend(ExternalAppRequestParam externalAppRequestParam){
+        return new Result<HeartActcounttrendResultDTO>().ok(kcScreenService.heartActcounttrend(externalAppRequestParam));
+    }
 
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcActTrendMonthlyDao.java

@@ -17,8 +17,11 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.evaluationindex.screen.dto.result.ActTrendMonthlyResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * KC-活动(次数+时长)趋势(先根据customerId+monthId删除)
  *
@@ -28,4 +31,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcActTrendMonthlyDao {
 
+    /**
+     *  @param customerId
+     * @Description  按客户查询最近十二个月数据
+     * @author sun
+     */
+    List<ActTrendMonthlyResultDTO> selectActTrendMonthly(String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcVolunteerHeatRankGridDailyDao.java

@@ -17,6 +17,7 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenkc;
 
+import com.epmet.evaluationindex.screen.dto.result.HeartSummaryResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -28,4 +29,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenKcVolunteerHeatRankGridDailyDao {
 
+    /**
+     *  @param customerId
+     * @Description  公益互助-各类总数汇总
+     * @author sun
+     */
+    HeartSummaryResultDTO selectHeartSummary(String customerId);
 }

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

@@ -1,6 +1,8 @@
 package com.epmet.datareport.service.evaluationindex.screen;
 
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
+import com.epmet.evaluationindex.screen.dto.result.HeartActcounttrendResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.HeartSummaryResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.HomepageSummaryResultDTO;
 
 /**
@@ -18,4 +20,17 @@ public interface KcScreenService {
      */
     HomepageSummaryResultDTO homepageSummary(ExternalAppRequestParam externalAppRequestParam);
 
+    /**
+     *  @param externalAppRequestParam
+     * @Description  公益互助-各类总数汇总
+     * @author sun
+     */
+    HeartSummaryResultDTO heartSummary(ExternalAppRequestParam externalAppRequestParam);
+
+    /**
+     *  @param externalAppRequestParam
+     * @Description  公益互助-公益活动次数
+     * @author sun
+     */
+    HeartActcounttrendResultDTO heartActcounttrend(ExternalAppRequestParam externalAppRequestParam);
 }

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

@@ -3,13 +3,21 @@ package com.epmet.datareport.service.evaluationindex.screen.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.constant.DataSourceConstant;
+import com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcActTrendMonthlyDao;
 import com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcPlatformSummaryDailyDao;
+import com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcVolunteerHeatRankGridDailyDao;
 import com.epmet.datareport.service.evaluationindex.screen.KcScreenService;
 import com.epmet.datareport.utils.DateUtils;
+import com.epmet.evaluationindex.screen.dto.result.ActTrendMonthlyResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.HeartActcounttrendResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.HeartSummaryResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.HomepageSummaryResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * 孔村大屏api
  *
@@ -24,10 +32,14 @@ public class KcScreenServiceImpl implements KcScreenService {
     private DateUtils dateUtils;
     @Autowired
     private ScreenKcPlatformSummaryDailyDao screenKcPlatformSummaryDailyDao;
+    @Autowired
+    private ScreenKcVolunteerHeatRankGridDailyDao screenKcVolunteerHeatRankGridDailyDao;
+    @Autowired
+    private ScreenKcActTrendMonthlyDao screenKcActTrendMonthlyDao;
 
     /**
-     *  @param externalAppRequestParam
-     * @Description  首页-平台各类总数
+     * @param externalAppRequestParam
+     * @Description 首页-平台各类总数
      * @author sun
      */
     @Override
@@ -35,4 +47,37 @@ public class KcScreenServiceImpl implements KcScreenService {
         return screenKcPlatformSummaryDailyDao.selectSummaryDaily(externalAppRequestParam.getCustomerId());
     }
 
+    /**
+     * @param externalAppRequestParam
+     * @Description 公益互助-各类总数汇总
+     * @author sun
+     */
+    @Override
+    public HeartSummaryResultDTO heartSummary(ExternalAppRequestParam externalAppRequestParam) {
+        return screenKcVolunteerHeatRankGridDailyDao.selectHeartSummary(externalAppRequestParam.getCustomerId());
+    }
+
+    /**
+     * @param externalAppRequestParam
+     * @Description 公益互助-公益活动次数
+     * @author sun
+     */
+    @Override
+    public HeartActcounttrendResultDTO heartActcounttrend(ExternalAppRequestParam externalAppRequestParam) {
+        HeartActcounttrendResultDTO resultDTO = new HeartActcounttrendResultDTO();
+        LinkedList<String> xAxis = new LinkedList<>();
+        LinkedList<String> actCountDataList = new LinkedList<>();
+        //1.按客户查询最近十二个月数据
+        List<ActTrendMonthlyResultDTO> list = screenKcActTrendMonthlyDao.selectActTrendMonthly(externalAppRequestParam.getCustomerId());
+        //2.倒序遍历封装数据
+        for (int i = list.size() - 1; i >= 0; i--) {
+            xAxis.add(list.get(i).getMonthId());
+            actCountDataList.add(list.get(i).getActCount().toString());
+        }
+        //3.封装数据并返回
+        resultDTO.setXAxis(xAxis);
+        resultDTO.setActCountDataList(actCountDataList);
+        return resultDTO;
+    }
+
 }

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcActTrendMonthlyDao.xml

@@ -4,5 +4,18 @@
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcActTrendMonthlyDao">
 
 
-
+    <select id="selectActTrendMonthly"
+            resultType="com.epmet.evaluationindex.screen.dto.result.ActTrendMonthlyResultDTO">
+        SELECT
+            month_id AS "monthId",
+            act_count AS "actCount"
+        FROM
+            screen_kc_act_trend_monthly
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        ORDER BY
+            month_id DESC
+        LIMIT 12
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcVolunteerHeatRankGridDailyDao.xml

@@ -4,4 +4,21 @@
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcVolunteerHeatRankGridDailyDao">
 
 
+    <select id="selectHeartSummary" resultType="com.epmet.evaluationindex.screen.dto.result.HeartSummaryResultDTO">
+        SELECT
+            date_id AS "dateId",
+            act_count AS "actCount",
+            volunteer_count AS "volunteerCount",
+            parti_user_count AS "partiUserCount",
+            reward_point_count AS "rewardPointCount",
+            heart_time AS "heartTime"
+        FROM
+            screen_kc_act_summary_daily
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        ORDER BY
+            date_id DESC
+        LIMIT 1
+    </select>
 </mapper>

epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.7__add_kongcun_app.sql

@@ -0,0 +1,9 @@
+INSERT INTO `epmet_common_service`.`external_customer`(`ID`, `CUSTOMER_NAME`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2fe0065f70ca0e23ce4c26fca5f1d933', '大美孔村', 0, 0, 'APP_USER', '2020-09-15 09:00:57', 'APP_USER', '2020-09-15 09:00:57');
+
+
+INSERT INTO `epmet_common_service`.`external_app`(`ID`, `APP_NAME`, `CUSTOMER_ID`, `CUSTOMER_TYPE`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`, `DEL_FLAG`) VALUES ('4733fda58aba5024b776f22f135350df', '孔村数据采集', '2fe0065f70ca0e23ce4c26fca5f1d933', 'external', 0, 'APP_USER', '2020-09-15 09:01:31', 'APP_USER', '2020-09-15 09:01:31', 0);
+INSERT INTO `epmet_common_service`.`external_app`(`ID`, `APP_NAME`, `CUSTOMER_ID`, `CUSTOMER_TYPE`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`, `DEL_FLAG`) VALUES ('5efcfb775125d656f39583b8110a3d7d', '孔村大屏', '2fe0065f70ca0e23ce4c26fca5f1d933', 'external', 0, 'APP_USER', '2020-09-15 09:01:39', 'APP_USER', '2020-09-15 09:01:39', 0);
+
+
+INSERT INTO `epmet_common_service`.`external_app_secret`(`ID`, `APP_ID`, `SECRET`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('362d4fce3311f67edb40b0e5291d37eb', '5efcfb775125d656f39583b8110a3d7d', '657cd46d385a4c2ba6d9355aee24654ac3951deab7e6436e91201561b94969b5', 0, 0, 'APP_USER', '2020-09-15 09:01:39', 'APP_USER', '2020-09-15 09:01:39');
+INSERT INTO `epmet_common_service`.`external_app_secret`(`ID`, `APP_ID`, `SECRET`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('7853487c79dab384b4c681d734d9eb3a', '4733fda58aba5024b776f22f135350df', '61224b4d747f4853b9551fe078b90b2355f72c3256a14bdb8faac4a4d7ed68a0', 0, 0, 'APP_USER', '2020-09-15 09:01:31', 'APP_USER', '2020-09-15 09:01:31');