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

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

@@ -0,0 +1,30 @@
+package com.epmet.datareport.controller.screen;
+
+import com.epmet.datareport.service.evaluationindex.screen.KcScreenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 孔村大屏api
+ *
+ * @author zhangyong
+ * @date 2020/9/10 10:21
+ */
+@RestController
+@RequestMapping("kcscreen")
+public class KcScreenController {
+
+    @Autowired
+    private KcScreenService kcScreenService;
+
+
+//    @ExternalAppRequestAuth
+//    @PostMapping("homepage/summary")
+//    public Result<YearAverageIndexResultDTO> yearAverageIndex(){
+////        ValidatorUtils.validateEntity(yearAverageIndexFormDTO, YearAverageIndexFormDTO.YearAverageIndex.class);
+////        return new Result<YearAverageIndexResultDTO>().ok(indexService.yearAverageIndex(yearAverageIndexFormDTO));
+//    }
+
+    // @RequestBody
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-活动各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcActSummaryDailyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-活动(次数+时长)趋势(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcActTrendMonthlyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-小组详情(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcGroupDetailGridDailyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-小组分析各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcGroupSummaryGridDailyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-议题分析(各类总数)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcIssueSummaryGridDailyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-议题参与趋势(每天上报当前月)customerId+monthId先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcIssueTrendGridMonthlyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-新闻-按类别统计(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsCategoryAnalysisDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-热点新闻排行-(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsRankDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-新闻-各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsSummaryDailyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-新闻参与趋势-(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsTrendMonthlyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-平台各汇总值(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcPlatformSummaryDailyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-项目按分类统计上报总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcProjectCategoryGridDailyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-项目满意度分析(customerId+monthId先删除记录，再插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcProjectSatisGridMonthlyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-项目分析(各类总数先根据customerId+dateId删除，后插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcProjectSummaryGridDailyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-话题参与趋势(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcTopicTrendGridMonthlyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-用户公益时长排名(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcUserHeatRankGridDailyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-用户分析(先根据customerId+dateId删除，后插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcUserSummaryDailyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-用户趋势分析(根据monthId+customerId先删后增)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcUserTrendGridMonthlyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-志愿者公益时长排名(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcVolunteerHeatRankGridDailyDao {
+
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-志愿者汇总(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcVolunteerSummaryDailyDao {
+
+}

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

@@ -0,0 +1,12 @@
+package com.epmet.datareport.service.evaluationindex.screen;
+
+/**
+ * 孔村大屏api
+ *
+ * @author zhangyong
+ * @date 2020/9/10 10:21
+ */
+public interface KcScreenService {
+
+
+}

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

@@ -0,0 +1,24 @@
+package com.epmet.datareport.service.evaluationindex.screen.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.datareport.service.evaluationindex.screen.KcScreenService;
+import com.epmet.datareport.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 孔村大屏api
+ *
+ * @author zhangyong
+ * @date 2020/9/10 10:21
+ */
+@Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
+public class KcScreenServiceImpl implements KcScreenService {
+
+    @Autowired
+    private DateUtils dateUtils;
+
+
+}

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcActSummaryDailyDao">
+
+
+</mapper>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcActTrendMonthlyDao">
+
+
+
+</mapper>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcGroupDetailGridDailyDao">
+
+
+</mapper>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcGroupSummaryGridDailyDao">
+
+
+</mapper>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcIssueSummaryGridDailyDao">
+
+
+</mapper>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcIssueTrendGridMonthlyDao">
+
+
+
+</mapper>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcNewsCategoryAnalysisDao">
+
+</mapper>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcNewsRankDao">
+
+
+
+</mapper>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcNewsSummaryDailyDao">
+
+
+
+</mapper>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcNewsTrendMonthlyDao">
+
+
+
+</mapper>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcPlatformSummaryDailyDao">
+
+
+</mapper>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcProjectCategoryGridDailyDao">
+
+
+</mapper>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcProjectSatisGridMonthlyDao">
+
+
+
+</mapper>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcProjectSummaryGridDailyDao">
+
+</mapper>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcTopicTrendGridMonthlyDao">
+
+
+
+</mapper>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcUserHeatRankGridDailyDao">
+
+
+</mapper>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcUserSummaryDailyDao">
+
+
+
+</mapper>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcUserTrendGridMonthlyDao">
+
+
+
+</mapper>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcVolunteerHeatRankGridDailyDao">
+
+
+</mapper>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screenkc.ScreenKcVolunteerSummaryDailyDao">
+
+
+</mapper>

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IndexCalConstant.java

@@ -1,14 +1,25 @@
 package com.epmet.constant;
 
 /**
- * 描述一下
+ * 指标计算 常量类
  *
  * @author yinzuomei@elink-cn.com
  * @date 2020/8/27 15:20
  */
 public interface IndexCalConstant {
 
-    Integer PAGE_SIZE = 10;
+    /**
+     * 批量插入 最大数据量
+     */
+    Integer INSERT_SIZE= 100;
+    /**
+     * 批量删除 一次删除50
+     */
+    Integer DELETE_SIZE=1000;
+    /**
+     * 分批计算，一次计算 10条
+     */
+    Integer PAGE_SIZE = 1000;
 
     String GRID_ID="GRID_ID";
 
@@ -35,11 +46,27 @@ public interface IndexCalConstant {
 
     String COMMUNITY_RELATE = "shequxiangguan";
 
+    /**
+     * 网格相关:党建能力
+     */
+    String GRID_DJ_ALL_PARENT_INDEX_CODE="wanggexiangguan:dangjiannengli";
+    /**
+     * 网格相关:治理能力
+     */
+    String GRID_ZL_ALL_PARENT_INDEX_CODE="wanggexiangguan:zhilinengli";
+    /**
+     * 网格相关:服务能力
+     */
+    String GRID_FW_ALL_PARENT_INDEX_CODE="wanggexiangguan:fuwunengli";
+    /**
+     * 区直部门:治理能力
+     */
+    String DEPT_ZL_ALL_PARENT_INDEX_CODE="quzhibumen:zhilinengli";
 
 
 
     // 测试插入数据用
-    String customerId="b09527201c4409e19d1dbc5e3c3429a1";
+    String customerId="epmettest";
     //社区S1-C1
      String SHE_QU_S1_C1="S1-C1";
     //社区S1-C2

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyCalResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.indexcal;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/9 5:52 下午
+ */
+@Data
+public class AgencyCalResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2482954776048082386L;
+
+    private List<AgencyScoreDTO> oneTwoLevel;
+
+    private List<AgencyScoreDTO> fiveLevel;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/CommunityCalResultDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.indexcal;
+
+import com.epmet.dto.screen.FactIndexCommunityScoreDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/10 9:19 上午
+ */
+@Data
+public class CommunityCalResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2482954776048082386L;
+
+    private List<FactIndexCommunityScoreDTO> oneLevel;
+
+    private List<FactIndexCommunityScoreDTO> fiveLevel;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcActSummaryFormDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 7、公益互助-活动各类总数
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcActSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 活动总数
+     */
+    private Integer actCount;
+
+    /**
+     * 志愿者总数
+     */
+    private Integer volunteerCount;
+
+    /**
+     * 参与人次
+     */
+    private Integer partiUserCount;
+
+    /**
+     * 发放积分
+     */
+    private Integer rewardPointCount;
+
+    /**
+     * 公益时长单位分钟
+     */
+    private Integer heartTime;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcActTrendFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 8、公益互助-活动次数趋势
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcActTrendFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 活动数量（本月举行的活动）
+     */
+    private Integer actCount;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcCategorySummaryFormDTO.java

@@ -0,0 +1,52 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 11、项目分析-按分类统计
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcCategorySummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 类别id
+     */
+    private String categoryId;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 项目数量
+     */
+    private Integer projectCount;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupDetailFormDTO.java

@@ -0,0 +1,67 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 18、邻里党群-小组详情
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcGroupDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 小组id
+     */
+    private String groupId;
+
+    /**
+     * 群名称
+     */
+    private String groupName;
+
+    /**
+     * 群主名称
+     */
+    private String groupLeader;
+
+    /**
+     * 群成员数
+     */
+    private Integer memberCount;
+
+    /**
+     * 话题总数
+     */
+    private Integer topicCount;
+
+    /**
+     * 转为议题的话题数
+     */
+    private Integer shifitIssueCount;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupSummaryFormDTO.java

@@ -0,0 +1,62 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 17、邻里党群-各类总数汇总
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcGroupSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 社群总数
+     */
+    private Integer groupCount;
+
+    /**
+     * 群成员总数
+     */
+    private Integer memberCount;
+
+    /**
+     * 话题数量
+     */
+    private Integer topicCount;
+
+    /**
+     * 话题参与量
+     */
+    private Integer partiCount;
+
+    /**
+     * 话题转议题总数
+     */
+    private Integer shiftIssueCount;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupTopicTrendFormDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 19、邻里党群-话题参与趋势
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcGroupTopicTrendFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 话题数量(所在月新增话题数)
+     */
+    private Integer topicCount;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcHomePageFormDTO.java

@@ -0,0 +1,77 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 1、首页-平台各类总数上报 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcHomePageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格总数
+     */
+    private Integer gridCount;
+
+    /**
+     * 已开通网格总数
+     */
+    private Integer openedGridCount;
+
+    /**
+     * 议题总数
+     */
+    private Integer issueCount;
+
+    /**
+     * 项目总数
+     */
+    private Integer projectCount;
+
+    /**
+     * 用户总数
+     */
+    private Integer userCount;
+
+    /**
+     * 党员用户
+     */
+    private Integer partyUserCount;
+
+    /**
+     * 社群总数
+     */
+    private Integer groupCount;
+
+    /**
+     * 话题总数
+     */
+    private Integer topicCount;
+
+    /**
+     * 新闻数量
+     */
+    private Integer newsCount;
+
+    /**
+     * 阅读数量
+     */
+    private Integer readCount;
+
+    /**
+     * 公益活动数量
+     */
+    private Integer actCount;
+
+    /**
+     * 志愿者总数
+     */
+    private Integer vounteerCount;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcIssueSummaryFormDTO.java

@@ -0,0 +1,92 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 2、议题分析-各类总数
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcIssueSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 上报总数
+     */
+    private Integer reportCount;
+
+    /**
+     * 议题总数
+     */
+    private Integer issueCount;
+
+    /**
+     * 待审核数
+     */
+    private Integer pendingCount;
+
+    /**
+     * 已驳回数
+     */
+    private Integer rejectedCount;
+
+    /**
+     * 处理中数
+     */
+    private Integer processingCount;
+
+    /**
+     * 已关闭数
+     */
+    private Integer closedCount;
+
+    /**
+     * 议题浏览数
+     */
+    private Integer issueViewCount;
+
+    /**
+     * 表态数
+     */
+    private Integer voteCount;
+
+    /**
+     * 审核通过数 ？为了算议题效率
+     */
+    private Integer passedCount;
+
+    /**
+     * 转化成项目数 ？为了算议题效率
+     */
+    private Integer shiftToProjectCount;
+
+    /**
+     * 平均审核时间单位分钟  ？
+     */
+    private Integer avgAuditTime;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcIssueTrendFormDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 3、议题分析-参与趋势
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcIssueTrendFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 议题上报数（本月内上报的议题数量）
+     */
+    private Integer reportCount;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsCategoryAnalysisFormDTO.java

@@ -0,0 +1,47 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 16、党建声音-新闻按类别统计
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcNewsCategoryAnalysisFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 类别id
+     */
+    private String categoryId;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 新闻的数量
+     */
+    private Integer newsCount;
+
+    /**
+     * 阅读的数量
+     */
+    private Integer readCount;
+
+    /**
+     * 点赞的数量
+     */
+    private Integer likeCount;
+
+    /**
+     * 点踩的数量
+     */
+    private Integer disLikeCount;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsHotRankFormDTO.java

@@ -0,0 +1,32 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 15、党建声音-热度新闻排行
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcNewsHotRankFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 新闻id
+     */
+    private String newsId;
+
+    /**
+     * 新闻标题
+     */
+    private String newsTitle;
+
+    /**
+     * 新闻热点值
+     */
+    private Integer hotCount;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsSummaryFormDTO.java

@@ -0,0 +1,37 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 13、党建声音-新闻各类总数汇总
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcNewsSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 文章总数
+     */
+    private Integer newsCount;
+
+    /**
+     * 阅读量
+     */
+    private Integer readCount;
+
+    /**
+     * 点赞量
+     */
+    private Integer likeCount;
+
+    /**
+     * 评论量
+     */
+    private Integer commentCount;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsTrendFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 14、党建声音-新闻阅读参与趋势
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcNewsTrendFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 阅读数量
+     */
+    private Integer readCount;
+
+    /**
+     * 参与数量
+     */
+    private Integer partiCount;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcProjectSatisanalysisFormDTO.java

@@ -0,0 +1,52 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 12、项目分析-满意度分析
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcProjectSatisanalysisFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 非常满意项目总数
+     */
+    private Integer greatSatis;
+
+    /**
+     * 满意项目总数
+     */
+    private Integer goodSatis;
+
+    /**
+     * 不满意的项目总数
+     */
+    private Integer disSatis;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcProjectSummaryFormDTO.java

@@ -0,0 +1,77 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 10、项目分析-各类总数
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcProjectSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 项目总数
+     */
+    private Integer projectCount;
+
+    /**
+     * 处理中数
+     */
+    private Integer processingCount;
+
+    /**
+     * 已关闭数
+     */
+    private Integer closedCount;
+
+    /**
+     * 流转次数
+     */
+    private Integer moveCount;
+
+    /**
+     * 已结案数量
+     */
+    private Integer closedCaseCount;
+
+    /**
+     * 项目浏览数
+     */
+    private Integer projectViewCount;
+
+    /**
+     * 表态数
+     */
+    private Integer voteCount;
+
+    /**
+     * 平均结案时间 单位分钟 ？
+     */
+    private Integer avgClosedCaseTime;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcUserHeartRankFormDTO.java

@@ -0,0 +1,47 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 6、用户分析-用户趋势
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcUserHeartRankFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 本月内新增用户数量
+     */
+    private Integer regUserCount;
+
+    /**
+     * 本月内新增党员数量
+     */
+    private Integer partyUserCount;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcUserSummaryFormDTO.java

@@ -0,0 +1,93 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 4、用户分析-各类总数
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcUserSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 浏览用户（首页的用户总数，原型上首页是叫注册用户）
+     */
+    private Integer visitorCount;
+
+    /**
+     * 注册用户=居民数量
+     */
+    private Integer regUserCount;
+
+    /**
+     * 党员用户
+     */
+    private Integer partyUserCount;
+
+    /**
+     * 小于20岁的党员总人数
+     */
+    private Integer ageLevel1;
+
+    /**
+     * 20-30岁的党员总人数
+     */
+    private Integer ageLevel2;
+
+    /**
+     * 31-40岁的党员总人数
+     */
+    private Integer ageLevel3;
+
+    /**
+     * 41-50岁的党员总人数
+     */
+    private Integer ageLevel4;
+
+    /**
+     * 51-60岁的党员总人数
+     */
+    private Integer ageLevel5;
+
+    /**
+     * 60+岁的党员总人数
+     */
+    private Integer ageLevel6;
+
+    /**
+     * 党员中男性总人数
+     */
+    private Integer malePartyUserCount;
+
+    /**
+     * 党员中女性总人数
+     */
+    private Integer femalePartyUserCount;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcVolunteerHeartRankFormDTO.java

@@ -0,0 +1,52 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 5、公益互助-志愿者公益时长排名
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcVolunteerHeartRankFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 用户姓名
+     */
+    private String userName;
+
+    /**
+     * 爱心时长 单位分钟
+     */
+    private Integer heartTime;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcVolunteerSummaryFormDTO.java

@@ -0,0 +1,77 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 9、公益互助-志愿者画像
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcVolunteerSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 小于20岁的志愿者总人数
+     */
+    private Integer ageLevel1;
+
+    /**
+     * 20-30岁的志愿者总人数
+     */
+    private Integer ageLevel2;
+
+    /**
+     * 31-40岁的志愿者总人数
+     */
+    private Integer ageLevel3;
+
+    /**
+     * 41-50岁的志愿者总人数
+     */
+    private Integer ageLevel4;
+
+    /**
+     * 51-60岁的志愿者总人数
+     */
+    private Integer ageLevel5;
+
+    /**
+     * 60+岁的志愿者总人数
+     */
+    private Integer ageLevel6;
+
+    /**
+     * 志愿者中男性总人数
+     */
+    private Integer maleCount;
+
+    /**
+     * 志愿者中女性总人数
+     */
+    private Integer femaleCount;
+}

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml

@@ -9,10 +9,10 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx512m -jar ./app.jar"
     restart: "unless-stopped"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 300M
+          memory: 600M

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

@@ -161,12 +161,12 @@ public class DemoController {
 
     @PostMapping("testcal")
     public Result testCal(){
-        CalculateCommonFormDTO formDTO=new CalculateCommonFormDTO("b09527201c4409e19d1dbc5e3c3429a1","202008");
+        CalculateCommonFormDTO formDTO=new CalculateCommonFormDTO("epmettest","202008");
 //        //查询总记录数
 //        List<GridScoreDTO> gridScoreDTOList=gridScoreDao.selectList(formDTO);
 //        return new Result<List<GridScoreDTO>>().ok(gridScoreDTOList);
-        gridCorreLationService.calculateGridCorreLation(formDTO);
-//        deptScoreService.calculateDeptCorreLation(formDTO);
+//        gridCorreLationService.calculateGridCorreLation(formDTO);
+        deptScoreService.calculateDeptCorreLation(formDTO);
         return new Result();
     }
     @DataSource(DataSourceConstant.EVALUATION_INDEX)

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

@@ -1,5 +1,14 @@
 package com.epmet.controller;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.screencoll.ScreenCollFormDTO;
+import com.epmet.dto.screencoll.form.*;
+import com.epmet.service.evaluationindex.screen.KcScreenCollService;
+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;
 
@@ -12,4 +21,368 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("kcscreencoll")
 public class KcScreenCollController {
+
+    @Autowired
+    private KcScreenCollService kcScreenCollService;
+
+    /**
+     * 1、首页-平台各类总数上报
+     *      当isFirst为true时，后台先按照customerId+dateId，清空数据，再插入。
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_platform_summary_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("homepage/platformsummary")
+    public Result platFormSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcHomePageFormDTO> formDTO) {
+        kcScreenCollService.insertPlatFormSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 2、议题分析-各类总数
+     *      当isFirst为true时，后台先按照customerId+dateId，清空数据，再插入。
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_issue_summary_grid_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("issue/summary")
+    public Result issueSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcIssueSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertIssueSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 3、议题分析-参与趋势
+     *      当isFirst为true时，customerId+monthId先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:  screen_kc_issue_trend_grid_monthly
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("issue/trend")
+    public Result issueTrend(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcIssueTrendFormDTO> formDTO) {
+        kcScreenCollService.insertIssueTrend(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 4、用户分析-各类总数
+     *      当isFirst为true时根据customerId+dateId删除，后插入
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_user_summary_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("user/summary")
+    public Result userSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcUserSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertUserSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 5、公益互助-志愿者公益时长排名
+     *      当isFirst为true时, 根据customerId清空当前客户下所有用户的信息，再插入
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_volunteer_heat_rank_grid_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("volunteer/heartrank")
+    public Result volunteerHeartRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcVolunteerHeartRankFormDTO> formDTO) {
+        kcScreenCollService.insertVolunteerHeartRank(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 6、用户分析-用户趋势
+     *      当isFirst为true时,根据monthId+customerId先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_user_trend_grid_monthly
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("user/userheartrank")
+    public Result userHeartRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcUserHeartRankFormDTO> formDTO) {
+        kcScreenCollService.insertUserHeartRank(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 7、公益互助-活动各类总数
+     *      当isFirst为true时,根据customerId+dateId先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_act_summary_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("act/summary")
+    public Result actSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcActSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertActSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 8、公益互助-活动次数趋势
+     *      当isFirst为true时,根据customerId+monthId先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_act_trend_monthly
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("act/trend")
+    public Result actTrend(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcActTrendFormDTO> formDTO) {
+        kcScreenCollService.insertActTrend(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 9、公益互助-志愿者画像
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_volunteer_summary_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("act/volunteersummary")
+    public Result volunteerSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcVolunteerSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertVolunteerSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 10、项目分析-各类总数
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_project_summary_grid_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("project/summary")
+    public Result projectSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcProjectSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertProjectSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 11、项目分析-按分类统计
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_project_category_grid_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("project/categorysummary")
+    public Result categorySummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcCategorySummaryFormDTO> formDTO) {
+        kcScreenCollService.insertCategorySummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 12、项目分析-满意度分析
+     *      当isFirst为true时,根据 customerId+monthId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_project_satis_grid_monthly
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("project/satisanalysis")
+    public Result projectSatisanalysis(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcProjectSatisanalysisFormDTO> formDTO) {
+        kcScreenCollService.insertProjectSatisanalysis(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 13、党建声音-新闻各类总数汇总
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_news_summary_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("news/summary")
+    public Result newsSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcNewsSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertNewsSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 14、党建声音-新闻阅读参与趋势
+     *      当isFirst为true时,根据 customerId+monthId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_news_trend_monthly
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("news/trend")
+    public Result newsTrend(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcNewsTrendFormDTO> formDTO) {
+        kcScreenCollService.insertNewsTrend(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 15、党建声音-热度新闻排行
+     *      当isFirst为true时,根据 customerId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_news_rank
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("news/hotrank")
+    public Result newsHotRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcNewsHotRankFormDTO> formDTO) {
+        kcScreenCollService.insertNewsHotRank(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 16、党建声音-新闻按类别统计
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_news_category_analysis
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("news/categoryanalysis")
+    public Result newsCategoryAnalysis(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcNewsCategoryAnalysisFormDTO> formDTO) {
+        kcScreenCollService.insertNewsCategoryAnalysis(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 17、邻里党群-各类总数汇总
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_group_summary_grid_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("group/summary")
+    public Result groupSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcGroupSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertGroupSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 18、邻里党群-小组详情
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_group_detail_grid_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("group/detail")
+    public Result groupDetail(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcGroupDetailFormDTO> formDTO) {
+        kcScreenCollService.insertGroupDetail(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 19、邻里党群-话题参与趋势
+     *      当isFirst为true时,根据 customerId+monthId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_topic_trend_grid_monthly
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("group/topictrend")
+    public Result groupTopicTrend(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcGroupTopicTrendFormDTO> formDTO) {
+        kcScreenCollService.insertGroupTopicTrend(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java

@@ -51,7 +51,7 @@ public interface AgencyScoreDao extends BaseDao<AgencyScoreEntity> {
      * @author zxc
      * @date 2020/9/2 15:47
      */
-    void deleteOldRecord(@Param("customerId") String customerId, @Param("monthId")String monthId, @Param("dataType")String dataType);
+    Integer deleteOldRecord(@Param("customerId") String customerId, @Param("monthId")String monthId, @Param("dataType")String dataType,@Param("delNum")Integer delNum);
 
     /**
      * @Description  查询【fact_index_agency_score】相关信息

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencySubScoreDao.java

@@ -46,62 +46,10 @@ public interface AgencySubScoreDao extends BaseDao<AgencyScoreEntity> {
     /**
      * @param customerId
      * @param monthId
-     * @param indexCode
      * @Description 删除旧记录
      * @author zxc
      * @date 2020/9/2 15:47
      */
-    void deleteOldRecord(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode, @Param("dataType") String dataType);
+    Integer deleteOldRecord(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("dataType") String dataType,@Param("delNum")Integer delNum);
 
-    /**
-     * @param customerId
-     * @param monthId
-     * @Description 查询【fact_index_agency_score】相关信息
-     * @author zxc
-     * @date 2020/9/1 9:41 上午
-     */
-    List<AgencyScoreDTO> selectAgencyScoreInfo(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("dataType") String dataType);
-
-    /**
-     * @param customerId
-     * @param monthId
-     * @Description 区下级街道得分平均值
-     * @author zxc
-     * @date 2020/8/31 1:51 下午
-     */
-    List<SubAgencyScoreAvgResultDTO> selectAgencyScoreAvg(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode, @Param("dataType") String dataType);
-
-
-    /**
-     * 根据入参查询  区/街道相关分数表 记录
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<com.epmet.dto.indexcal.AgencyScoreDTO>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<AgencyScoreDTO> selectListAgencyScore(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-    /**
-     * 批量插入区/街道相关分数表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertAgencyScoreData(@Param("list") List<AgencyScoreEntity> list, @Param("customerId") String customerId);
-
-    /**
-     * 根据入参查询  区/街道相关分数表id
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<java.lang.String>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<String> selectListAgencyId(@Param("customerId") String customerId, @Param("monthId") String monthId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunityScoreDao.java

@@ -50,7 +50,7 @@ public interface CommunityScoreDao extends BaseDao<FactIndexCommunityScoreEntity
      * @author zxc
      * @date 2020/9/1 9:03 上午
      */
-    void deleteOldRecord(@Param("customerId") String customerId,@Param("monthId")String monthId);
+    Integer deleteOldRecord(@Param("customerId") String customerId,@Param("monthId")String monthId,@Param("delNum")Integer delNum);
 
     /**
      * @Description  查询社区相关信息

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunitySubScoreDao.java

@@ -50,56 +50,6 @@ public interface CommunitySubScoreDao extends BaseDao<FactIndexCommunityScoreEnt
      * @author zxc
      * @date 2020/9/1 9:03 上午
      */
-    void deleteOldRecord(@Param("customerId") String customerId, @Param("monthId") String monthId);
+    Integer deleteOldRecord(@Param("customerId") String customerId, @Param("monthId") String monthId,@Param("delNum")Integer delNum);
 
-    /**
-     * @param customerId
-     * @param monthId
-     * @Description 查询社区相关信息
-     * @author zxc
-     * @date 2020/9/1 9:41 上午
-     */
-    List<FactIndexCommunityScoreDTO> selectCommunityInfo(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-    /**
-     * 根据入参查询  查询社区相关信息
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<com.epmet.dto.screen.FactIndexCommunityScoreDTO>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<FactIndexCommunityScoreDTO> selectListCommunityScore(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-    /**
-     * @param customerId
-     * @param monthId
-     * @Description 街道下级所有社区得分平均值
-     * @author zxc
-     * @date 2020/8/31 1:51 下午
-     */
-    List<SubCommunityAvgResultDTO> selectSubCommAvgScore(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode);
-
-    /**
-     * 批量插入 社区相关分数表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertCommunityScoreData(@Param("list") List<FactIndexCommunityScoreEntity> list, @Param("customerId") String customerId);
-
-    /**
-     * 根据入参查询  查询社区id
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<java.util.String>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<String> selectListCommunityId(@Param("customerId") String customerId, @Param("monthId") String monthId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcScoreDao.java

@@ -78,7 +78,7 @@ public interface CpcScoreDao extends BaseDao<CpcScoreEntity> {
      **/
     BigDecimal selectGridJoinIssueAvgValue(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("gridId") String gridId);
 
-    int deleteByMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode);
+    int deleteByMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode, @Param("deleteSize") Integer deleteSize, @Param("isTotal") String isTotal);
 
     List<CpcScoreEntity> getPartScore(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("allParentCode") String allParentCode);
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcSubScoreDao.java

@@ -79,7 +79,7 @@ public interface CpcSubScoreDao extends BaseDao<CpcScoreEntity> {
      **/
     BigDecimal selectGridJoinIssueAvgValue(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("gridId") String gridId);
 
-    int deleteByMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("allParentCode") String allParentCode);
+    int deleteByMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("allParentCode") String allParentCode, @Param("deleteSize") Integer deleteSize);
 
     List<CpcScoreEntity> getPartScore(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("allParentCode") String allParentCode);
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java

@@ -45,17 +45,6 @@ public interface DeptScoreDao extends BaseDao<DeptScoreEntity> {
      **/
     List<DeptScoreDTO> selectListDeptScore(@Param("customerId")String customerId, @Param("monthId")String monthId);
 
-    /**
-     * 批量插入 区直部门分值表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertDeptScoreData(@Param("list") List<DeptScoreEntity> list, @Param("customerId")String customerId);
-
     /**
      * 根据入参查询 区直部门分值表id
      * @param customerId
@@ -79,12 +68,25 @@ public interface DeptScoreDao extends BaseDao<DeptScoreEntity> {
 
     /**
      * @return int
-     * @param customerId
-     * @param monthId
-     * @param deptId
+     * @param customerId 客户id
+     * @param monthId  月id
+     * @param indexCode 不必填
+     * @param  deleteSize
      * @author yinzuomei
-     * @description
+     * @description 根据客户id+monthId,删除这个月某个指标所有的数据  一次至多删除50条
      * @Date 2020/9/7 14:30
      **/
-    int deleteByDeptIdAndMonthId(@Param("customerId") String customerId, @Param("monthId")String monthId,@Param("deptId") String deptId);
+    int deleteByDeptIdAndMonthId(@Param("customerId") String customerId,
+                                 @Param("monthId")String monthId,
+                                 @Param("indexCode") String indexCode,
+                                 @Param("deleteSize") int deleteSize);
+
+    /**
+     * @return int
+     * @param deptScoreEntityList
+     * @author yinzuomei
+     * @description 批量插入计算结果
+     * @Date 2020/9/10 10:40
+     **/
+    int insertBatchEntity(@Param("list") List<DeptScoreEntity> deptScoreEntityList);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptSubScoreDao.java

@@ -18,12 +18,11 @@
 package com.epmet.dao.evaluationindex.indexcal;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.indexcal.DeptScoreDTO;
-import com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO;
-import com.epmet.entity.evaluationindex.indexcal.DeptScoreEntity;
+import com.epmet.entity.evaluationindex.indexcal.DeptSubScoreEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import javax.annotation.security.PermitAll;
 import java.util.List;
 
 /**
@@ -33,60 +32,29 @@ import java.util.List;
  * @since v1.0.0 2020-09-02
  */
 @Mapper
-public interface DeptSubScoreDao extends BaseDao<DeptScoreEntity> {
+public interface DeptSubScoreDao extends BaseDao<DeptSubScoreEntity> {
 
     /**
-     * 根据入参查询 区直部门分值表 记录
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<com.epmet.dto.indexcal.DeptScoreDTO>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<DeptScoreDTO> selectListDeptScore(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-    /**
-     * 批量插入 区直部门分值表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertDeptScoreData(@Param("list") List<DeptScoreEntity> list, @Param("customerId") String customerId);
-
-    /**
-     * 根据入参查询 区直部门分值表id
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.lang.String
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
+     * @param insertDeptSubList
+     * @return int
+     * @author yinzuomei
+     * @description 批量插入计算结果 五级指标分数值
+     * @Date 2020/9/10 10:39
      **/
-    List<String> selectListDeptId(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-
-    /**
-     * @param customerId
-     * @param monthId
-     * @param indexCode
-     * @Description 所有直属部门治理能力平均值
-     * @author zxc
-     * @date 2020/9/4 10:53 上午
-     */
-    List<SubAgencyScoreAvgResultDTO> selectGovernDeptScoreAvg(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode);
+    int insertBatchEntity(@Param("list") List<DeptSubScoreEntity> insertDeptSubList);
 
     /**
      * @param customerId
      * @param monthId
-     * @param deptId
+     * @param allParentIndexCode
+     * @param deleteSize         一次至多删除XX条记录
      * @return int
      * @author yinzuomei
-     * @description
-     * @Date 2020/9/7 14:30
+     * @description 批量删除
+     * @Date 2020/9/10 12:28
      **/
-    int deleteByDeptIdAndMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("deptId") String deptId);
+    int deleteByDeptIdAndMonthId(@Param("customerId") String customerId,
+                                 @Param("monthId") String monthId,
+                                 @Param("allParentIndexCode") String allParentIndexCode,
+                                 @Param("deleteSize") int deleteSize);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java

@@ -40,7 +40,7 @@ public interface GridScoreDao extends BaseDao<GridScoreEntity> {
      * @param customerId
      * @param monthId
      * @param indexCode
-     * @param isTotal 1：总分；0不是
+     * @param deleteNum
      * @return int
      * @author yinzuomei
      * @description
@@ -49,7 +49,7 @@ public interface GridScoreDao extends BaseDao<GridScoreEntity> {
     int deleteByCusAndMonthId(@Param("customerId") String customerId,
                               @Param("monthId") String monthId,
                               @Param("indexCode") String indexCode,
-                              @Param("isTotal") String isTotal);
+                              @Param("deleteNum") int deleteNum);
 
     /**
      * @return int
@@ -58,7 +58,7 @@ public interface GridScoreDao extends BaseDao<GridScoreEntity> {
      * @description
      * @Date 2020/8/31 14:01
      **/
-    int insertBatches(List<GridScoreEntity> gridScoreEntityList);
+    int insertBatches(@Param("list")List<GridScoreEntity> gridScoreEntityList);
 
     /**
      * @return java.util.List<com.epmet.dto.indexcal.GridScoreDTO>
@@ -98,15 +98,5 @@ public interface GridScoreDao extends BaseDao<GridScoreEntity> {
      **/
     List<String> selectListGridId(@Param("customerId")String customerId, @Param("monthId")String monthId);
 
-    /**
-     * 批量插入 网格相关分值表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertGridScoreData(@Param("list") List<FactIndexGridScoreDTO> list,@Param("customerId")String customerId);
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridSubScoreDao.java

@@ -18,11 +18,7 @@
 package com.epmet.dao.evaluationindex.indexcal;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.indexcal.CalculateCommonFormDTO;
-import com.epmet.dto.indexcal.GridScoreDTO;
-import com.epmet.dto.screen.FactIndexGridScoreDTO;
-import com.epmet.dto.screen.result.SubGridAvgResultDTO;
-import com.epmet.entity.evaluationindex.indexcal.GridScoreEntity;
+import com.epmet.entity.evaluationindex.indexcal.GridSubScoreEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,80 +31,28 @@ import java.util.List;
  * @since v1.0.0 2020-08-31
  */
 @Mapper
-public interface GridSubScoreDao extends BaseDao<GridScoreEntity> {
+public interface GridSubScoreDao extends BaseDao<GridSubScoreEntity> {
     /**
-     * @param customerId
-     * @param monthId
-     * @param indexCode
-     * @param isTotal    1：总分；0不是
-     * @return int
-     * @author yinzuomei
-     * @description
-     * @Date 2020/8/31 14:00
-     **/
-    int deleteByCusAndMonthId(@Param("customerId") String customerId,
-                              @Param("monthId") String monthId,
-                              @Param("indexCode") String indexCode,
-                              @Param("isTotal") String isTotal);
-
-    /**
-     * @param gridScoreEntityList
+     * @param gridSubScoreEntityList
      * @return int
      * @author yinzuomei
      * @description
      * @Date 2020/8/31 14:01
      **/
-    int insertBatches(List<GridScoreEntity> gridScoreEntityList);
-
-    /**
-     * @param formDTO
-     * @return java.util.List<com.epmet.dto.indexcal.GridScoreDTO>
-     * @author yinzuomei
-     * @description
-     * @Date 2020/8/31 16:42
-     **/
-    List<GridScoreDTO> selectList(CalculateCommonFormDTO formDTO);
+    int insertBatches(@Param("list") List<GridSubScoreEntity> gridSubScoreEntityList);
 
     /**
      * @param customerId
      * @param monthId
-     * @Description 下属所有网格的平均值
-     * @author zxc
-     * @date 2020/8/28 3:20 下午
-     */
-    List<SubGridAvgResultDTO> selectSubGridAvgScore(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode);
-
-    /**
-     * 根据入参查询  网格相关分值记录
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<com.epmet.dto.screen.FactIndexGridScoreDTO>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<FactIndexGridScoreDTO> selectListGridScore(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-    /**
-     * 根据入参查询  网格id
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<java.util.String>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<String> selectListGridId(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-    /**
-     * 批量插入 网格相关分值表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
+     * @param allParentIndexCode
+     * @param deleteSize         一次至多删除XX条记录
+     * @return int
+     * @author yinzuomei
+     * @description 批量删除
+     * @Date 2020/9/10 13:36
      **/
-    void batchInsertGridScoreData(@Param("list") List<FactIndexGridScoreDTO> list, @Param("customerId") String customerId);
-
+    int deleteByDeptIdAndMonthId(@Param("customerId") String customerId,
+                                 @Param("monthId") String monthId,
+                                 @Param("allParentIndexCode") String allParentIndexCode,
+                                 @Param("deleteSize") Integer deleteSize);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcActSummaryDailyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcActSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcActSummaryDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-活动各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcActSummaryDailyDao extends BaseDao<ScreenKcActSummaryDailyEntity> {
+
+    /**
+     * 根据customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteActSummary(@Param("customerId") String customerId,
+                             @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertActSummary(@Param("list") List<KcActSummaryFormDTO> list, @Param("customerId")String customerId,
+                               @Param("dateId")String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcActTrendMonthlyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcActTrendFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcActTrendMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-活动(次数+时长)趋势(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcActTrendMonthlyDao extends BaseDao<ScreenKcActTrendMonthlyEntity> {
+
+    /**
+     * 按照customerId+monthId，清空数据
+     *
+     * @param customerId
+     * @param monthId    例:202008
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteActTrend(@Param("customerId") String customerId,
+                           @Param("monthId") String monthId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param monthId    例:202008
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertActTrend (@Param("list") List<KcActTrendFormDTO> list, @Param("customerId")String customerId,
+                              @Param("monthId")String monthId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcGroupDetailGridDailyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcGroupDetailFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcGroupDetailGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-小组详情(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcGroupDetailGridDailyDao extends BaseDao<ScreenKcGroupDetailGridDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteGroupDetailGrid(@Param("customerId") String customerId,
+                                  @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertGroupDetailGrid(@Param("list") List<KcGroupDetailFormDTO> list, @Param("customerId")String customerId,
+                                    @Param("dateId")String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcGroupSummaryGridDailyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcGroupSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcGroupSummaryGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-小组分析各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcGroupSummaryGridDailyDao extends BaseDao<ScreenKcGroupSummaryGridDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteGroupSummaryGrid(@Param("customerId") String customerId,
+                                   @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertGroupSummaryGrid(@Param("list") List<KcGroupSummaryFormDTO> list, @Param("customerId")String customerId,
+                                     @Param("dateId")String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcIssueSummaryGridDailyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcIssueSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcIssueSummaryGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-议题分析(各类总数)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcIssueSummaryGridDailyDao extends BaseDao<ScreenKcIssueSummaryGridDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.util.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteIssueSummaryGrid(@Param("customerId") String customerId,
+                                   @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertIssueSummaryGrid(@Param("list") List<KcIssueSummaryFormDTO> list, @Param("customerId")String customerId,
+                                     @Param("dateId")String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcIssueTrendFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcIssueTrendGridMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-议题参与趋势(每天上报当前月)customerId+monthId先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcIssueTrendGridMonthlyDao extends BaseDao<ScreenKcIssueTrendGridMonthlyEntity> {
+
+    /**
+     * 按照customerId+monthId，清空数据
+     *
+     * @param customerId
+     * @param monthId   例：202008
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteIssueTrendGrid(@Param("customerId") String customerId,
+                                  @Param("monthId") String monthId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param monthId    例：202008
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertIssueTrendGrid(@Param("list") List<KcIssueTrendFormDTO> list, @Param("customerId")String customerId,
+                                   @Param("monthId")String monthId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsCategoryAnalysisDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcNewsCategoryAnalysisFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcNewsCategoryAnalysisEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-新闻-按类别统计(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsCategoryAnalysisDao extends BaseDao<ScreenKcNewsCategoryAnalysisEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteNewsCategoryAnalysis(@Param("customerId") String customerId,
+                                       @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertNewsCategoryAnalysis(@Param("list") List<KcNewsCategoryAnalysisFormDTO> list, @Param("customerId")String customerId,
+                                         @Param("dateId")String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsRankDao.java

@@ -0,0 +1,59 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcNewsHotRankFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcNewsRankEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-热点新闻排行-(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsRankDao extends BaseDao<ScreenKcNewsRankEntity> {
+
+    /**
+     * 按照customerId，清空数据
+     *
+     * @param customerId
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteNewsRank(@Param("customerId") String customerId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertNewsRank(@Param("list") List<KcNewsHotRankFormDTO> list, @Param("customerId")String customerId,
+                             @Param("dateId")String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsSummaryDailyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcNewsSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcNewsSummaryDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-新闻-各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsSummaryDailyDao extends BaseDao<ScreenKcNewsSummaryDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteNewsSummary(@Param("customerId") String customerId,
+                              @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertNewsSummary(@Param("list") List<KcNewsSummaryFormDTO> list, @Param("customerId")String customerId,
+                                @Param("dateId")String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcNewsTrendFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcNewsTrendMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-新闻参与趋势-(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsTrendMonthlyDao extends BaseDao<ScreenKcNewsTrendMonthlyEntity> {
+
+    /**
+     * 按照customerId+monthId，清空数据
+     *
+     * @param customerId
+     * @param monthId    例:202008
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteNewsTrend(@Param("customerId") String customerId,
+                            @Param("monthId") String monthId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param monthId    例:202008
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertNewsTrend(@Param("list") List<KcNewsTrendFormDTO> list, @Param("customerId")String customerId,
+                              @Param("monthId")String monthId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcPlatformSummaryDailyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcHomePageFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcPlatformSummaryDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-平台各汇总值(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcPlatformSummaryDailyDao extends BaseDao<ScreenKcPlatformSummaryDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.util.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deletePlatFormSummary(@Param("customerId") String customerId,
+                                  @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertPlatFormSummary(@Param("list") List<KcHomePageFormDTO> list, @Param("customerId")String customerId,
+                                    @Param("dateId")String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectCategoryGridDailyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcCategorySummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcProjectCategoryGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-项目按分类统计上报总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcProjectCategoryGridDailyDao extends BaseDao<ScreenKcProjectCategoryGridDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteCategoryGrid(@Param("customerId") String customerId,
+                               @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertCategoryGrid(@Param("list") List<KcCategorySummaryFormDTO> list, @Param("customerId")String customerId,
+                                 @Param("dateId")String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcProjectSatisanalysisFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcProjectSatisGridMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-项目满意度分析(customerId+monthId先删除记录，再插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcProjectSatisGridMonthlyDao extends BaseDao<ScreenKcProjectSatisGridMonthlyEntity> {
+
+    /**
+     * 按照customerId+monthId，清空数据
+     *
+     * @param customerId
+     * @param monthId    例: 202008
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteProjectSatisGrid(@Param("customerId") String customerId,
+                                   @Param("monthId") String monthId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param monthId    例: 202008
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertProjectSatisGrid(@Param("list") List<KcProjectSatisanalysisFormDTO> list, @Param("customerId")String customerId,
+                                     @Param("monthId")String monthId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectSummaryGridDailyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcProjectSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcProjectSummaryGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-项目分析(各类总数先根据customerId+dateId删除，后插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcProjectSummaryGridDailyDao extends BaseDao<ScreenKcProjectSummaryGridDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteProjectSummary(@Param("customerId") String customerId,
+                                 @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertProjectSummary(@Param("list") List<KcProjectSummaryFormDTO> list, @Param("customerId")String customerId,
+                                   @Param("dateId")String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyDao.java

@@ -0,0 +1,62 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcGroupTopicTrendFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcTopicTrendGridMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-话题参与趋势(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcTopicTrendGridMonthlyDao extends BaseDao<ScreenKcTopicTrendGridMonthlyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param monthId    例：202008
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteTopicTrendGrid(@Param("customerId") String customerId,
+                                 @Param("monthId") String monthId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param monthId    例：202008
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertTopicTrendGrid(@Param("list") List<KcGroupTopicTrendFormDTO> list, @Param("customerId")String customerId,
+                                   @Param("monthId")String monthId);
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserHeatRankGridDailyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.screen.ScreenKcUserHeatRankGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-用户公益时长排名(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcUserHeatRankGridDailyDao extends BaseDao<ScreenKcUserHeatRankGridDailyEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserSummaryDailyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcUserSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcUserSummaryDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-用户分析(先根据customerId+dateId删除，后插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcUserSummaryDailyDao extends BaseDao<ScreenKcUserSummaryDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteUserSummary(@Param("customerId") String customerId,
+                              @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertUserSummary(@Param("list") List<KcUserSummaryFormDTO> list, @Param("customerId")String customerId,
+                                @Param("dateId")String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcUserHeartRankFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcUserTrendGridMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-用户趋势分析(根据monthId+customerId先删后增)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcUserTrendGridMonthlyDao extends BaseDao<ScreenKcUserTrendGridMonthlyEntity> {
+
+    /**
+     * 根据monthId+customerId先删后增
+     *
+     * @param customerId
+     * @param monthId       例:202008
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteUserTrendGrid(@Param("customerId") String customerId,
+                                @Param("monthId") String monthId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param monthId       例:202008
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertUserTrendGrid(@Param("list") List<KcUserHeartRankFormDTO> list, @Param("customerId")String customerId,
+                                  @Param("monthId")String monthId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyDao.java

@@ -0,0 +1,59 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcVolunteerHeartRankFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcVolunteerHeatRankGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-志愿者公益时长排名(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcVolunteerHeatRankGridDailyDao extends BaseDao<ScreenKcVolunteerHeatRankGridDailyEntity> {
+
+    /**
+     * 按照customerId，清空数据
+     *
+     * @param customerId
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteVolunteerHeatRankGrid(@Param("customerId") String customerId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertVolunteerHeatRankGrid(@Param("list") List<KcVolunteerHeartRankFormDTO> list, @Param("customerId")String customerId,
+                                          @Param("dateId")String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcVolunteerSummaryDailyDao.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcVolunteerSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcVolunteerSummaryDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-志愿者汇总(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcVolunteerSummaryDailyDao extends BaseDao<ScreenKcVolunteerSummaryDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteVolunteerSummary(@Param("customerId") String customerId,
+                                  @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertVolunteerSummary(@Param("list") List<KcVolunteerSummaryFormDTO> list, @Param("customerId")String customerId,
+                                     @Param("dateId")String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/AgencySubScoreEntity.java

@@ -32,7 +32,7 @@ import java.math.BigDecimal;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("fact_index_sub_agency_score")
+@TableName("fact_index_agency_sub_score")
 public class AgencySubScoreEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/CpcSubScoreEntity.java

@@ -32,7 +32,7 @@ import java.math.BigDecimal;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("fact_index_sub_cpc_score")
+@TableName("fact_index_cpc_sub_score")
 public class CpcSubScoreEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;