Merge remote-tracking branch 'origin/dev_data_stats' into dev

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java

@@ -117,5 +117,5 @@ public interface ServiceConstant {
     /**
      * 数据统计
      */
-    String DATA_STATISTICAL = "data_statistical";
+    String DATA_STATISTICAL = "data-statistical-server";
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/voice/ArticleGridPublishedSummaryDTO.java

@@ -44,6 +44,11 @@ public class ArticleGridPublishedSummaryDTO implements Serializable {
 	 * 发布文章总数
 	 */
 	private Integer articleTotalCount;
+
+	/**
+	 * 今日发布文章数
+	 */
+	private Integer publishedCount;
 	/**
 	 * 状态为发布中的文章总数
 	 */

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -0,0 +1,131 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * desc:  数据统计 对外feign client
+ *
+ * @return:
+ * @date: 2020/6/22 17:39
+ * @author: jianjun liu
+ */
+@FeignClient(name = ServiceConstant.DATA_STATISTICAL, fallback = DataStatisticalOpenFeignClientFallBack.class)
+public interface DataStatisticalOpenFeignClient {
+
+ /**
+  * desc:  【日】统计文章总数及在线文章总数 包含 机关 部门 网格
+  *
+  * @date: 2020/6/22 9:09
+  * @author: jianjun liu
+  */
+ @PostMapping(value = "data/stats/statspublicity/articleSummaryDailyStatsjob")
+ Result articleSummaryDailyStatsjob();
+
+ /**
+  * desc:  定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格
+  *
+  * @return:
+  * @date: 2020/6/22 9:09
+  * @author: jianjun liu
+  */
+ @PostMapping(value = "data/stats/statspublicity/tagUsedDailyStatsjob")
+ Result tagUsedDailyStatsjob();
+
+ /**
+  * desc:  【月】 统计发表文章最多的分类 包含 机关 部门 网格
+  *
+  * @date: 2020/6/22 9:09
+  * @author: jianjun liu
+  */
+ @PostMapping(value = "data/stats/statspublicity/tagUsedMonthlyStatsjob")
+ Result tagUsedMonthlyStatsjob();
+
+ /**
+  * desc:  【季，年】 统计发表文章最多的分类 包含 机关 部门 网格
+  *
+  * @date: 2020/6/22 9:09
+  * @author: jianjun liu
+  */
+ @PostMapping(value = "data/stats/statspublicity/tagUsedQuarterlyStatsjob")
+ Result tagUsedQuarterlyStatsjob();
+
+ /**
+  * desc:  【日】 统计阅读最多的标签 包含 机关 网格
+  *
+  * @date: 2020/6/22 9:09
+  * @author: jianjun liu
+  */
+ @PostMapping(value = "data/stats/statspublicity/tagViewedDailyStatsjob")
+ Result tagViewedDailyStatsjob();
+
+ /**
+  * desc: 【月】 统计阅读最多的标签 包含 机关 网格
+  *
+  * @date: 2020/6/22 9:09
+  * @author: jianjun liu
+  */
+ @PostMapping(value = "data/stats/statspublicity/tagViewedMonthlyStatsjob")
+ Result tagViewedMonthlyStatsjob();
+
+ /**
+  * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格
+  *
+  * @date: 2020/6/22 9:09
+  * @author: jianjun liu
+  */
+ @PostMapping(value = "data/stats/statspublicity/tagViewedQuarterlyStatsjob")
+ Result tagViewedQuarterlyStatsjob();
+
+ /**
+  * @Description  统计 “网格小组”， dim：【网格-日】
+  * @param
+  * @author zxc
+  */
+ @PostMapping("/data/stats/statsgroup/groupgriddaily")
+ Result groupGridDaily();
+
+ /**
+  * @Description  统计 “网格小组”， dim：【机关-日】
+  * @param
+  * @author zxc
+  */
+ @PostMapping("/data/stats/statsgroup/groupagencydaily")
+ Result groupAgencyDaily();
+
+ /**
+  * @Description  统计 “网格小组”， dim：【机关-月】
+  * @param
+  * @author zxc
+  */
+ @PostMapping("/data/stats/statsgroup/groupagencymonthly")
+ Result groupAgencyMonthly();
+
+ /**
+  * 议题统计
+  * @author zhaoqifeng
+  * @date 2020/6/23 14:34
+  * @param
+  * @return com.epmet.commons.tools.utils.Result
+  */
+ @PostMapping("/data/stats/statsissue/issuestats")
+ Result agencyGridIssueStats();
+
+ /**
+  * @Description 数据统计-项目-机关日月统计
+  * @Author sun
+  */
+ @PostMapping("/data/stats/statsproject/agencyprojectstats")
+ Result agencyProjectStats();
+
+ /**
+  * @Description 数据统计-项目-网格日月统计
+  * @Author sun
+  */
+ @PostMapping("/data/stats/statsproject/gridprojectstats")
+ Result gridProjectStats();
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -0,0 +1,135 @@
+package com.epmet.feign.impl;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * desc:
+ *
+ * @return:
+ * @date: 2020/6/22 9:38
+ * @author: jianjun liu
+ * email:liujianjun@git.elinkit.com.cn
+ */
+@Component
+public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOpenFeignClient {
+
+    /**
+     * desc:  【日】统计文章总数及在线文章总数 包含 机关 部门 网格
+     *
+     * @date: 2020/6/22 9:09
+     * @author: jianjun liu
+     */
+    @Override
+    public Result articleSummaryDailyStatsjob() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "articleSummaryDailyStatsjob");
+    }
+
+    /**
+     * desc:  定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格
+     *
+     * @return:
+     * @date: 2020/6/22 9:09
+     * @author: jianjun liu
+     */
+    @Override
+    public Result tagUsedDailyStatsjob() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "tagUsedDailyStatsjob");
+    }
+
+    /**
+     * desc:  【月】 统计发表文章最多的分类 包含 机关 部门 网格
+     *
+     * @date: 2020/6/22 9:09
+     * @author: jianjun liu
+     */
+    @Override
+    public Result tagUsedMonthlyStatsjob() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "tagUsedMonthlyStatsjob");
+    }
+
+    /**
+     * desc:  【季，年】 统计发表文章最多的分类 包含 机关 部门 网格
+     *
+     * @date: 2020/6/22 9:09
+     * @author: jianjun liu
+     */
+    @Override
+    public Result tagUsedQuarterlyStatsjob() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "tagUsedQuarterlyStatsjob");
+    }
+
+    /**
+     * desc:  【日】 统计阅读最多的标签 包含 机关 网格
+     *
+     * @date: 2020/6/22 9:09
+     * @author: jianjun liu
+     */
+    @Override
+    public Result tagViewedDailyStatsjob() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "tagViewedDailyStatsjob");
+    }
+
+    /**
+     * desc: 【月】 统计阅读最多的标签 包含 机关 网格
+     *
+     * @date: 2020/6/22 9:09
+     * @author: jianjun liu
+     */
+    @Override
+    public Result tagViewedMonthlyStatsjob() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "tagViewedMonthlyStatsjob");
+    }
+
+    /**
+     * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格
+     *
+     * @date: 2020/6/22 9:09
+     * @author: jianjun liu
+     */
+    @Override
+    public Result tagViewedQuarterlyStatsjob() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "tagViewedQuarterlyStatsjob");
+    }
+
+    @Override
+    public Result groupGridDaily() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "groupGridDaily");
+    }
+
+    @Override
+    public Result groupAgencyDaily() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "groupAgencyDaily");
+    }
+
+    @Override
+    public Result groupAgencyMonthly() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "groupAgencyMonthly");
+    }
+
+    @Override
+    public Result agencyGridIssueStats() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "agencyGridIssueStats");
+    }
+
+    /**
+     * @Description 数据统计-项目-机关日月统计
+     * @Author sun
+     */
+    @Override
+    public Result agencyProjectStats() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "agencyProjectStats");
+    }
+
+    /**
+     * @Description 数据统计-项目-网格日月统计
+     * @Author sun
+     */
+    @Override
+    public Result gridProjectStats() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "gridProjectStats");
+    }
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java

@@ -23,7 +23,6 @@ import com.epmet.entity.voice.ArticleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,15 +42,14 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
 	 * @param publisherType
 	 * @return
 	 */
-	List<ArticleGridPublishedSummaryDTO> getAllPublishedCount(@Param("customerId") String customerId, @Param("publishDate") Date publishDate, @Param("publisherType") String publisherType);
+	List<ArticleGridPublishedSummaryDTO> getAllPublishedCount(@Param("customerId") String customerId, @Param("publishDate") String publishDate, @Param("publisherType") String publisherType);
 
 	/**
 	 * desc:根据客户Id 和发布时间 获取文章数据
 	 *
 	 * @param customerId
 	 * @param publishDate
-	 * @param publisherType
 	 * @return
 	 */
-	List<ArticleEntity> getPublishedArticleByDay(@Param("customerId") String customerId, @Param("publishDate") Date publishDate, @Param("publisherType") String publisherType);
+	List<ArticleEntity> getPublishedArticleByDay(@Param("customerId") String customerId, @Param("publishDate") String publishDate);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleOperateRecordDao.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.voice;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.voice.ArticleOperateRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章操作记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Mapper
+public interface ArticleOperateRecordDao extends BaseDao<ArticleOperateRecordEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedAgencyDailyEntity.java

@@ -55,6 +55,11 @@ public class FactArticlePublishedAgencyDailyEntity extends BaseEpmetEntity {
      */
 	private Integer articleTotalCount;
 
+	/**
+	 * 今日发布文章数
+	 */
+	private Integer publishedCount;
+
     /**
      * 当前发文数量 当前未下线的文章数量
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedDepartmentDailyEntity.java

@@ -55,6 +55,11 @@ public class FactArticlePublishedDepartmentDailyEntity extends BaseEpmetEntity {
      */
 	private Integer articleTotalCount;
 
+	/**
+	 * 今日发布文章数
+	 */
+	private Integer publishedCount;
+
     /**
      * 当前发文数量 当前未下线的文章数量
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedGridDailyEntity.java

@@ -55,6 +55,11 @@ public class FactArticlePublishedGridDailyEntity extends BaseEpmetEntity {
      */
 	private Integer articleTotalCount;
 
+	/**
+	 * 今日发布文章数
+	 */
+	private Integer publishedCount;
+
     /**
      * 当前发文数量 当前未下线的文章数量
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/voice/ArticleOperateRecordEntity.java

@@ -0,0 +1,76 @@
+/**
+ * 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.entity.voice;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 文章操作记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("article_operate_record")
+public class ArticleOperateRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 文章ID
+     */
+	private String articleId;
+
+    /**
+     * 网格ID，下线文章时，多个以英文:隔开
+     */
+	private String gridIds;
+
+    /**
+     * 执行人 xx街道-xx中心-姓名
+     */
+	private String opUser;
+
+    /**
+     * 操作内容 操作内容，eg：重新编辑文章；
+     */
+	private String content;
+
+    /**
+     * 操作类型 发布文章：publish；取消文章置顶：canceltop；设置置顶：settop；下线文章：offline；修改文章发布范围：updatepublishrange
+     */
+	private String opType;
+
+    /**
+     * 操作时间
+     */
+	private Date opTime;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java

@@ -104,7 +104,7 @@ public class StatsDimServiceImpl implements StatsDimService {
             lastExecRecord = lastExecRecordService.createLastExecRecord(StatsSubject.DIM_AGENCY);
         }
 
-        Date statsEndTime = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN_YYYYMMDD);
+        Date statsEndTime = new Date();
         Date statsStartTime = null;
         if (lastExecRecord.getExecTime() != null) {
             statsStartTime = DateUtils.integrate(lastExecRecord.getExecTime(), DateUtils.DATE_PATTERN_YYYYMMDD);
@@ -126,7 +126,7 @@ public class StatsDimServiceImpl implements StatsDimService {
             lastExecRecord = lastExecRecordService.createLastExecRecord(StatsSubject.DIM_CUSTOMER);
         }
 
-        Date statsEndTime = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN_YYYYMMDD);
+        Date statsEndTime = new Date();
         Date statsStartTime = null;
         if (lastExecRecord.getExecTime() != null) {
             statsStartTime = DateUtils.integrate(lastExecRecord.getExecTime(), DateUtils.DATE_PATTERN_YYYYMMDD);
@@ -145,7 +145,7 @@ public class StatsDimServiceImpl implements StatsDimService {
             lastExecRecord = lastExecRecordService.createLastExecRecord(StatsSubject.DIM_DEPARTMENT);
         }
 
-        Date statsEndTime = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN_YYYYMMDD);
+        Date statsEndTime = new Date();
         Date statsStartTime = null;
         if (lastExecRecord.getExecTime() != null) {
             statsStartTime = DateUtils.integrate(lastExecRecord.getExecTime(), DateUtils.DATE_PATTERN_YYYYMMDD);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java

@@ -14,6 +14,7 @@ import com.epmet.entity.voice.ArticleEntity;
 import com.epmet.entity.voice.ArticleTagsEntity;
 import com.epmet.service.StatsPublicityService;
 import com.epmet.service.stats.*;
+import com.epmet.service.voice.ArticleOperateRecordService;
 import com.epmet.service.voice.ArticleService;
 import com.epmet.service.voice.ArticleTagsService;
 import com.epmet.service.voice.ArticleVisitRecordService;
@@ -55,6 +56,8 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 	@Autowired
 	private ArticleVisitRecordService articleVisitRecordService;
 	@Autowired
+	private ArticleOperateRecordService articleOperateRecordService;
+	@Autowired
 	private FactArticlePublishedGridDailyService factArticlePublishedGridDailyService;
 	@Autowired
 	private FactArticlePublishedDepartmentDailyService factArticlePublishedDepartmentDailyService;
@@ -107,27 +110,26 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 	public Boolean articleSummaryDailyStatsjob(Date statsDate) {
 		//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
 		if (statsDate == null) {
-			//当天的凌晨时间 即为今天之前的数据
-			statsDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN);
+			//查询的是昨天及以前的数据
+			statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, -1), DateUtils.DATE_PATTERN);
 		} else {
-			statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN);
+			statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
 		}
 		DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
 		int pageNo = 1;
 		int pageSize = 100;
 		List<String> customerIdList = null;
+		String statsDateStr = DateUtils.format(statsDate);
 		do {
 			customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
 			if (!CollectionUtils.isEmpty(customerIdList)) {
 				for (String customerId : customerIdList) {
-					Date finalStatsDate = statsDate;
-
 					try {
 						//key:所在机关Id
 						Map<String, ArticleGridPublishedSummaryDTO> agencySummaryMap = new HashMap<>();
-						statsPublishedGridDaily(finalStatsDate, dimIdBean, customerId, agencySummaryMap);
-						statsPublishedDepartmentDaily(finalStatsDate, dimIdBean, customerId, agencySummaryMap);
-						statsPublishedAgencyDaily(finalStatsDate, dimIdBean, customerId, agencySummaryMap);
+						statsPublishedGridDaily(statsDateStr, dimIdBean, customerId, agencySummaryMap);
+						statsPublishedDepartmentDaily(statsDateStr, dimIdBean, customerId, agencySummaryMap);
+						statsPublishedAgencyDaily(statsDateStr, dimIdBean, customerId, agencySummaryMap);
 					} catch (Exception e) {
 						log.error("articlePublishedCountDayStats exception", e);
 					}
@@ -157,10 +159,10 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 			if (!CollectionUtils.isEmpty(customerIdList)) {
 				for (String customerId : customerIdList) {
 					Date finalStatsDate = statsDate;
-					executorService.submit(() -> {
+					//executorService.submit(() -> {
 						//统计
 						statsTagUsedDaily(finalStatsDate, dimIdBean, customerId);
-					});
+					//});
 				}
 			}
 		} while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize);
@@ -334,7 +336,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		return true;
 	}
 
-	private void statsPublishedDepartmentDaily(Date statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId, Map<String, ArticleGridPublishedSummaryDTO> agencySummaryMap) {
+	private void statsPublishedDepartmentDaily(String statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId, Map<String, ArticleGridPublishedSummaryDTO> agencySummaryMap) {
 		//获取所有客户
 		List<DimDepartmentEntity> departmentDTOList = dimDepartmentService.getDepartmentListByCustomerId(customerId);
 		if (CollectionUtils.isEmpty(departmentDTOList)) {
@@ -345,7 +347,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 			//转换为 需要插入的Entity
 			Map<String, FactArticlePublishedDepartmentDailyEntity> departmentDailyEntityMap = convertDepartmentDailyEntity(departmentDTOList, dimIdBean);
 			//获取当天的业务数据
-			List<ArticleGridPublishedSummaryDTO> publishedArticleCount = articleService.getAllDepartmentPublishedCount(customerId, DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN));
+			List<ArticleGridPublishedSummaryDTO> publishedArticleCount = articleService.getAllDepartmentPublishedCount(customerId, statsDate);
 
 			if (!CollectionUtils.isEmpty(publishedArticleCount)) {
 				for (ArticleGridPublishedSummaryDTO summaryDTO : publishedArticleCount) {
@@ -356,6 +358,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 					}
 					gridDailyEntities.setArticleTotalCount(summaryDTO.getArticleTotalCount());
 					gridDailyEntities.setArticlePublishedCount(summaryDTO.getArticlePublishedCount());
+					gridDailyEntities.setPublishedCount(summaryDTO.getPublishedCount());
 					//同一个机关下数据累加
 					buildAgencySummaryData(agencySummaryMap, summaryDTO);
 				}
@@ -381,10 +384,12 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 			summary.setPublisherId(summaryDTO.getPublisherId());
 			summary.setArticleTotalCount(summaryDTO.getArticleTotalCount());
 			summary.setArticlePublishedCount(summaryDTO.getArticlePublishedCount());
+			summary.setPublishedCount(summaryDTO.getPublishedCount());
 			result.put(summaryDTO.getPublisherId(), summaryDTO);
 		} else {
 			publishedSummaryDTO.setArticlePublishedCount(publishedSummaryDTO.getArticlePublishedCount() + summaryDTO.getArticlePublishedCount());
 			publishedSummaryDTO.setArticleTotalCount(publishedSummaryDTO.getArticleTotalCount() + summaryDTO.getArticlePublishedCount());
+			publishedSummaryDTO.setPublishedCount(publishedSummaryDTO.getPublishedCount() + summaryDTO.getPublishedCount());
 		}
 	}
 
@@ -396,7 +401,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 	 * @param customerId
 	 * @param agencySummaryMap
 	 */
-	private void statsPublishedGridDaily(Date statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId, Map<String, ArticleGridPublishedSummaryDTO> agencySummaryMap) {
+	private void statsPublishedGridDaily(String statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId, Map<String, ArticleGridPublishedSummaryDTO> agencySummaryMap) {
 		//获取所有网格
 		List<DimGridEntity> gridDTOList = dimGridService.getGridListByCustomerId(customerId);
 		if (CollectionUtils.isEmpty(gridDTOList)) {
@@ -404,29 +409,34 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 			return;
 		}
 		executorService.submit(() -> {
-			//转换为 需要插入的Entity
-			Map<String, FactArticlePublishedGridDailyEntity> gridDailyEntityMap = convertGridDailyEntity(gridDTOList, dimIdBean);
-			//获取当天的业务数据
-			List<ArticleGridPublishedSummaryDTO> publishedArticleCount = articleService.getAllGridPublishedCount(customerId, statsDate);
-			if (!CollectionUtils.isEmpty(publishedArticleCount)) {
-				for (ArticleGridPublishedSummaryDTO summaryDTO : publishedArticleCount) {
-					FactArticlePublishedGridDailyEntity gridDailyEntity = gridDailyEntityMap.get(summaryDTO.getGridId());
-					if (gridDailyEntity == null) {
-						log.error("publicitySummary getAllGridPublishedCount gridId:{} not exist in dimGrid", summaryDTO.getGridId());
-						continue;
+			try {
+				//转换为 需要插入的Entity
+				Map<String, FactArticlePublishedGridDailyEntity> gridDailyEntityMap = convertGridDailyEntity(gridDTOList, dimIdBean);
+				//获取当天的业务数据
+				List<ArticleGridPublishedSummaryDTO> publishedArticleCount = articleService.getAllGridPublishedCount(customerId, statsDate);
+				if (!CollectionUtils.isEmpty(publishedArticleCount)) {
+					for (ArticleGridPublishedSummaryDTO summaryDTO : publishedArticleCount) {
+						FactArticlePublishedGridDailyEntity gridDailyEntity = gridDailyEntityMap.get(summaryDTO.getPublisherId());
+						if (gridDailyEntity == null) {
+							log.error("publicitySummary getAllGridPublishedCount gridId:{} not exist in dimGrid", summaryDTO.getGridId());
+							continue;
+						}
+						gridDailyEntity.setArticleTotalCount(summaryDTO.getArticleTotalCount());
+						gridDailyEntity.setArticlePublishedCount(summaryDTO.getArticlePublishedCount());
+						gridDailyEntity.setPublishedCount(summaryDTO.getPublishedCount());
+						//同一个机关下数据累加
+						buildAgencySummaryData(agencySummaryMap, summaryDTO);
 					}
-					gridDailyEntity.setArticleTotalCount(summaryDTO.getArticleTotalCount());
-					gridDailyEntity.setArticlePublishedCount(summaryDTO.getArticlePublishedCount());
-					//同一个机关下数据累加
-					buildAgencySummaryData(agencySummaryMap, summaryDTO);
 				}
+				boolean b = factArticlePublishedGridDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), gridDailyEntityMap.values());
+			} catch (Exception e) {
+				log.error("statsPublishedGridDaily exception customerId:{},statsDate:{}", customerId, statsDate);
 			}
-			boolean b = factArticlePublishedGridDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), gridDailyEntityMap.values());
 		});
 
 	}
 
-	private void statsPublishedAgencyDaily(Date statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId, Map<String, ArticleGridPublishedSummaryDTO> agencySummaryMap) {
+	private void statsPublishedAgencyDaily(String statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId, Map<String, ArticleGridPublishedSummaryDTO> agencySummaryMap) {
 		//获取所有机关
 		List<DimAgencyEntity> agencyDTOList = dimAgencyService.getAgencyListByCustomerId(customerId);
 		if (CollectionUtils.isEmpty(agencyDTOList)) {
@@ -434,6 +444,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 			return;
 		}
 		executorService.submit(() -> {
+		try {
 			//转换为 需要插入的Entity
 			Map<String, FactArticlePublishedAgencyDailyEntity> agencyDailyEntityMap = convertAgencyDailyEntity(agencyDTOList, dimIdBean);
 			//获取当天的业务数据
@@ -449,6 +460,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 					}
 					gridDailyEntities.setArticleTotalCount(summaryDTO.getArticleTotalCount());
 					gridDailyEntities.setArticlePublishedCount(summaryDTO.getArticlePublishedCount());
+					gridDailyEntities.setPublishedCount(summaryDTO.getPublishedCount());
 					haveDataAgencyDailyMap.put(summaryDTO.getAgencyId(), gridDailyEntities);
 					//同一个机关下数据累加
 					//buildAgencySummaryData(agencySummaryMap, summaryDTO);
@@ -459,6 +471,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 					selfDaily.setAgencyId(summaryDTO.getAgencyId().concat(DimAgencyConstant.TYPE_SELF_ID_SUFFIX));
 					selfDaily.setArticleTotalCount(summaryDTO.getArticleTotalCount());
 					selfDaily.setArticlePublishedCount(summaryDTO.getArticlePublishedCount());
+					selfDaily.setPublishedCount(summaryDTO.getPublishedCount());
 					haveDataAgencyDailySelfMap.put(selfDaily.getAgencyId(), selfDaily);
 				}
 			}
@@ -479,7 +492,12 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 			if (!CollectionUtils.isEmpty(haveDataAgencyDailySelfMap)) {
 				agencyDailyEntityMap.putAll(haveDataAgencyDailySelfMap);
 			}
+			log.debug("statsPublishedAgencyDaily insert:{}",JSON.toJSONString(agencyDailyEntityMap.values()));
 			boolean b = factArticlePublishedAgencyDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), agencyDailyEntityMap.values());
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.error("statsPublishedAgencyDaily exception,customer:{}",customerId);
+		}
 		});
 
 	}
@@ -492,77 +510,85 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 	 * @param customerId
 	 */
 	private void statsTagUsedDaily(Date statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId) {
-		//1.业务数据来源 发布时间为统计时间的
-		// 因为一个客户的发布文章数在同一天不会特别的多，所以以客户为单位查询今天发布的所有带有标签的文章  根据发布单位类型进行拆分
-		//  1.1查出今天所有的文章标签 根据网格Id
-		//  1.2
-		//获取所有网格
-		List<DimAgencyEntity> agencyDTOList = dimAgencyService.getAgencyListByCustomerId(customerId);
-		if (CollectionUtils.isEmpty(agencyDTOList)) {
-			log.warn("publicitySummary getAgencyListByCustomerId return empty,customerId:{}", customerId);
-			return;
-		}
-		//转换为 需要插入的Entity
-		Map<String, DimAgencyEntity> dimAgencyEntityMap = agencyDTOList.stream().collect(Collectors.toMap(DimAgencyEntity::getId, o -> o));
-		//转换为 需要插入的Entity key gridId_tagId
-		Map<String, FactTagUsedGridDailyEntity> tagUsedGridDailyMap = new HashMap<>();
-		Map<String, FactTagUsedDepartmentDailyEntity> tagUsedDeptDailyMap = new HashMap<>();
-		Map<String, FactTagUsedAgencyDailyEntity> tagUsedAgencyDailyMap = new HashMap<>();
-		Map<String, FactTagUsedAgencyDailyEntity> tagUsedAgencyDailySelfMap = new HashMap<>();
-		//获取当天的业务数据
-		//1获取文章及机关id,网格Id
-		List<ArticleEntity> publishedArticleList = articleService.getPublishedArticleByPublishTime(customerId, statsDate);
-		if (CollectionUtils.isEmpty(publishedArticleList)) {
-			return;
-		}
-		//KEY 文章Id
-		Map<String, ArticleEntity> articleMap = publishedArticleList.stream().collect(Collectors.toMap(ArticleEntity::getId, o -> o));
-		Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
-		Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN);
-		//2 获取文章标签
-		List<ArticleTagsEntity> articleTagsList = articleTagsService.getArticleTagsByCreateTime(customerId, startTime, endTime);
-		if (CollectionUtils.isEmpty(articleTagsList)) {
-			log.error("publicitySummary getArticleTagsByCreateTime customerId:{} have not articleTags,publishedArticleList:{}", customerId, JSON.toJSONString(publishedArticleList));
-			return;
-		}
-		//tagId
-		for (ArticleTagsEntity tagEntity : articleTagsList) {
-			ArticleEntity articleEntity = articleMap.get(tagEntity.getArticleId());
-			if (articleEntity == null) {
-				log.error("publicitySummary articleMap articleId:{} ", tagEntity.getArticleId());
+		try {
+			//1.业务数据来源 发布时间为统计时间的
+			// 因为一个客户的发布文章数在同一天不会特别的多，所以以客户为单位查询今天发布的所有带有标签的文章  根据发布单位类型进行拆分
+			//  1.1查出今天所有的文章标签 根据网格Id
+			//  1.2
+			//获取所有网格
+			List<DimAgencyEntity> agencyDTOList = dimAgencyService.getAgencyListByCustomerId(customerId);
+			if (CollectionUtils.isEmpty(agencyDTOList)) {
+				log.warn("publicitySummary getAgencyListByCustomerId return empty,customerId:{}", customerId);
 				return;
 			}
-			DimAgencyEntity dimAgencyEntity = dimAgencyEntityMap.get(articleEntity.getOrgId());
-			convertTagUsedAgencyDailyEntity(dimAgencyEntity.getPid(), tagUsedAgencyDailyMap, articleEntity, tagEntity, dimIdBean);
-			switch (articleEntity.getPublisherType()) {
-				case ProjectConstant.PUBLISHER_TYPE_GRID:
-					convertTagUsedGridDailyEntity(tagUsedGridDailyMap, articleEntity, tagEntity, dimIdBean);
-					break;
-				case ProjectConstant.PUBLISHER_TYPE_DEPT:
-					convertTagUsedDepartmentDailyEntity(tagUsedDeptDailyMap, articleEntity, tagEntity, dimIdBean);
-					break;
-				case ProjectConstant.PUBLISHER_TYPE_AGENCY:
-					convertTagUsedAgencyDailySelfEntity(dimAgencyEntity.getPid(), tagUsedAgencyDailySelfMap, articleEntity, tagEntity, dimIdBean);
-					break;
+			//转换为 需要插入的Entity
+			Map<String, DimAgencyEntity> dimAgencyEntityMap = agencyDTOList.stream().collect(Collectors.toMap(DimAgencyEntity::getId, o -> o));
+			//转换为 需要插入的Entity key gridId_tagId
+			Map<String, FactTagUsedGridDailyEntity> tagUsedGridDailyMap = new HashMap<>();
+			Map<String, FactTagUsedDepartmentDailyEntity> tagUsedDeptDailyMap = new HashMap<>();
+			Map<String, FactTagUsedAgencyDailyEntity> tagUsedAgencyDailyMap = new HashMap<>();
+			Map<String, FactTagUsedAgencyDailyEntity> tagUsedAgencyDailySelfMap = new HashMap<>();
+			//获取当天的业务数据
+			//1获取文章及机关id,网格Id
+			List<ArticleEntity> publishedArticleList = articleService.getPublishedArticleByPublishTime(customerId, DateUtils.format(statsDate));
+			if (CollectionUtils.isEmpty(publishedArticleList)) {
+				return;
+			}
+			//KEY 文章Id
+			Map<String, ArticleEntity> articleMap = publishedArticleList.stream().collect(Collectors.toMap(ArticleEntity::getId, o -> o));
+			Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
+			Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN);
+			//2 获取文章标签
+			List<ArticleTagsEntity> articleTagsList = articleTagsService.getArticleTagsByCreateTime(customerId, startTime, endTime);
+			if (CollectionUtils.isEmpty(articleTagsList)) {
+				log.error("publicitySummary getArticleTagsByCreateTime customerId:{} have not articleTags,publishedArticleList:{}", customerId, JSON.toJSONString(publishedArticleList));
+				return;
+			}
+			//tagId
+			for (ArticleTagsEntity tagEntity : articleTagsList) {
+				ArticleEntity articleEntity = articleMap.get(tagEntity.getArticleId());
+				if (articleEntity == null) {
+					log.error("publicitySummary articleMap articleId:{} ", tagEntity.getArticleId());
+					return;
+				}
+				DimAgencyEntity dimAgencyEntity = dimAgencyEntityMap.get(articleEntity.getOrgId());
+				convertTagUsedAgencyDailyEntity(dimAgencyEntity.getPid(), tagUsedAgencyDailyMap, articleEntity, tagEntity, dimIdBean);
+				switch (articleEntity.getPublisherType()) {
+					case ProjectConstant.PUBLISHER_TYPE_GRID:
+						convertTagUsedGridDailyEntity(tagUsedGridDailyMap, articleEntity, tagEntity, dimIdBean);
+						break;
+					case ProjectConstant.PUBLISHER_TYPE_DEPT:
+						convertTagUsedDepartmentDailyEntity(tagUsedDeptDailyMap, articleEntity, tagEntity, dimIdBean);
+						break;
+					case ProjectConstant.PUBLISHER_TYPE_AGENCY:
+						convertTagUsedAgencyDailySelfEntity(dimAgencyEntity.getPid(), tagUsedAgencyDailySelfMap, articleEntity, tagEntity, dimIdBean);
+						break;
+				}
 			}
-		}
 
-		factTagUsedGridDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), tagUsedGridDailyMap.values());
-		factTagUsedDepartmentDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), tagUsedDeptDailyMap.values());
-		//向上级机关递归添加 数据
-		Map<String, FactTagUsedAgencyDailyEntity> finalTagUsedAgencyDailyMap = new HashMap<>();
-		finalTagUsedAgencyDailyMap.putAll(tagUsedAgencyDailyMap);
-		for (Map.Entry<String, FactTagUsedAgencyDailyEntity> entry : tagUsedAgencyDailyMap.entrySet()) {
-			String agencyId = entry.getKey().split(StrConstant.UNDER_LINE)[0];
-			FactTagUsedAgencyDailyEntity currentEntity = entry.getValue();
-			DimAgencyEntity dimAgencyEntity = dimAgencyEntityMap.get(currentEntity.getAgencyId());
-			if (dimAgencyEntity == null) {
-				log.error("dimAgencyEntityMap bizData agencyId:{} not exist in dimAgency", agencyId);
-				continue;
+			factTagUsedGridDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), tagUsedGridDailyMap.values());
+			factTagUsedDepartmentDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), tagUsedDeptDailyMap.values());
+			//向上级机关递归添加 数据
+			Map<String, FactTagUsedAgencyDailyEntity> finalTagUsedAgencyDailyMap = new HashMap<>();
+			finalTagUsedAgencyDailyMap.putAll(tagUsedAgencyDailyMap);
+			for (Map.Entry<String, FactTagUsedAgencyDailyEntity> entry : tagUsedAgencyDailyMap.entrySet()) {
+				String agencyId = entry.getKey().split(StrConstant.UNDER_LINE)[0];
+				FactTagUsedAgencyDailyEntity currentEntity = entry.getValue();
+				DimAgencyEntity dimAgencyEntity = dimAgencyEntityMap.get(currentEntity.getAgencyId());
+				if (dimAgencyEntity == null) {
+					log.error("dimAgencyEntityMap bizData agencyId:{} not exist in dimAgency", agencyId);
+					continue;
+				}
+				setTagUsedData2ParentAgency(dimAgencyEntityMap, finalTagUsedAgencyDailyMap, currentEntity, dimIdBean);
+			}
+			if (!CollectionUtils.isEmpty(tagUsedAgencyDailySelfMap)){
+				finalTagUsedAgencyDailyMap.putAll(tagUsedAgencyDailySelfMap);
 			}
-			setTagUsedData2ParentAgency(dimAgencyEntityMap, finalTagUsedAgencyDailyMap, currentEntity, dimIdBean);
+			factTagUsedAgencyDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), finalTagUsedAgencyDailyMap.values());
+		} catch (Exception e) {
+			e.printStackTrace();
+			//log.error();
 		}
-		factTagUsedAgencyDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), finalTagUsedAgencyDailyMap.values());
 	}
 
 	/**
@@ -610,7 +636,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 			if (CollectionUtils.isEmpty(articleTagsList)) {
 				continue;
 			}
-			ArticleEntity articleEntity = articleService.selectById(viewedSummaryDTO.getArticleId());
+			ArticleEntity articleEntity = articleService.selectArticleById(viewedSummaryDTO.getArticleId());
 			if (articleEntity == null) {
 				continue;
 			}
@@ -850,6 +876,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		}
 		parentAgency.setArticleTotalCount(parentAgency.getArticleTotalCount() + agencySummary.getArticleTotalCount());
 		parentAgency.setArticlePublishedCount(parentAgency.getArticlePublishedCount() + agencySummary.getArticlePublishedCount());
+		parentAgency.setPublishedCount(parentAgency.getPublishedCount() + agencySummary.getPublishedCount());
 		pid = parentAgency.getPid();
 		if (!NumConstant.ZERO_STR.equals(pid)) {
 			setPublishedData2ParentAgency(agencyDailyEntityMap, agencySummary, parentAgency);
@@ -872,6 +899,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 			entity.setGridId(dimGridEntity.getId());
 			entity.setArticleTotalCount(0);
 			entity.setArticlePublishedCount(0);
+			entity.setPublishedCount(0);
 			result.put(dimGridEntity.getId(), entity);
 		});
 		return result;
@@ -893,6 +921,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 			entity.setDepartmentId(dimGridEntity.getId());
 			entity.setArticleTotalCount(0);
 			entity.setArticlePublishedCount(0);
+			entity.setPublishedCount(0);
 			result.put(dimGridEntity.getId(), entity);
 		});
 		return result;
@@ -914,6 +943,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 			entity.setAgencyId(dimGridEntity.getId());
 			entity.setArticleTotalCount(0);
 			entity.setArticlePublishedCount(0);
+			entity.setPublishedCount(0);
 			result.put(dimGridEntity.getId(), entity);
 		});
 		return result;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedAgencyDailyServiceImpl.java

@@ -17,6 +17,7 @@
 
 package com.epmet.service.stats.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dao.stats.FactArticlePublishedAgencyDailyDao;
 import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity;
@@ -47,6 +48,7 @@ public class FactArticlePublishedAgencyDailyServiceImpl extends BaseServiceImpl<
 		}
 		int i = baseDao.deleteByDateId(customerId, dateId);
 		log.debug("deleteAndInsertBatch delete customerId:{},rows:{}", customerId,i);
+		log.debug("deleteAndInsertBatch insert customerId:{},values:{}", customerId, JSON.toJSONString(values));
 		this.insertBatch(values, 100);
 		return true;
 	}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleOperateRecordService.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.service.voice;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.voice.ArticleOperateRecordEntity;
+
+/**
+ * 文章操作记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+public interface ArticleOperateRecordService extends BaseService<ArticleOperateRecordEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java

@@ -21,7 +21,6 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.voice.ArticleGridPublishedSummaryDTO;
 import com.epmet.entity.voice.ArticleEntity;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -40,27 +39,29 @@ public interface ArticleService extends BaseService<ArticleEntity> {
 	 * @param publishDate
 	 * @return
 	 */
-	List<ArticleGridPublishedSummaryDTO> getAllDepartmentPublishedCount(String customerId, Date publishDate);
+	List<ArticleGridPublishedSummaryDTO> getAllDepartmentPublishedCount(String customerId, String publishDate);
 	/**
 	 * desc:根据客户id、发布时间 获取文章总数
 	 * @param customerId
 	 * @param publishDate
 	 * @return
 	 */
-	List<ArticleGridPublishedSummaryDTO> getAllAgencyPublishedCount(String customerId, Date publishDate);
+	List<ArticleGridPublishedSummaryDTO> getAllAgencyPublishedCount(String customerId, String publishDate);
 	/**
 	 * desc:根据客户id、发布时间 获取文章总数
 	 * @param customerId
 	 * @param publishDate
 	 * @return
 	 */
-	List<ArticleGridPublishedSummaryDTO> getAllGridPublishedCount(String customerId, Date publishDate);
+	List<ArticleGridPublishedSummaryDTO> getAllGridPublishedCount(String customerId, String publishDate);
 
 	/**
 	 * desc：根据客户id，发布时间 获取文章数据
 	 * @param customerId
-	 * @param statsDate
+	 * @param publishDate
 	 * @return
 	 */
-	List<ArticleEntity> getPublishedArticleByPublishTime(String customerId, Date statsDate);
+	List<ArticleEntity> getPublishedArticleByPublishTime(String customerId, String publishDate);
+
+	ArticleEntity selectArticleById(String articleId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleOperateRecordServiceImpl.java

@@ -0,0 +1,40 @@
+/**
+ * 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.service.voice.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.voice.ArticleOperateRecordDao;
+import com.epmet.entity.voice.ArticleOperateRecordEntity;
+import com.epmet.service.voice.ArticleOperateRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 文章操作记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Slf4j
+@Service
+@DataSource(DataSourceConstant.GOV_VOICE)
+public class ArticleOperateRecordServiceImpl extends BaseServiceImpl<ArticleOperateRecordDao, ArticleOperateRecordEntity> implements ArticleOperateRecordService {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java

@@ -30,7 +30,6 @@ import com.epmet.service.voice.ArticleService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -44,19 +43,19 @@ import java.util.List;
 public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntity> implements ArticleService {
 
 	@Override
-	public List<ArticleGridPublishedSummaryDTO> getAllDepartmentPublishedCount(String customerId, Date publishDate) {
+	public List<ArticleGridPublishedSummaryDTO> getAllDepartmentPublishedCount(String customerId, String publishDate) {
 		checkParam(customerId, publishDate);
 		return baseDao.getAllPublishedCount(customerId,publishDate, ProjectConstant.PUBLISHER_TYPE_DEPT);
 	}
 
 	@Override
-	public List<ArticleGridPublishedSummaryDTO> getAllAgencyPublishedCount(String customerId, Date publishDate) {
+	public List<ArticleGridPublishedSummaryDTO> getAllAgencyPublishedCount(String customerId, String publishDate) {
 		checkParam(customerId, publishDate);
 		return baseDao.getAllPublishedCount(customerId,publishDate, ProjectConstant.PUBLISHER_TYPE_AGENCY);
 	}
 
 	@Override
-	public List<ArticleGridPublishedSummaryDTO> getAllGridPublishedCount(String customerId, Date publishDate) {
+	public List<ArticleGridPublishedSummaryDTO> getAllGridPublishedCount(String customerId, String publishDate) {
 		checkParam(customerId, publishDate);
 		return baseDao.getAllPublishedCount(customerId,publishDate, ProjectConstant.PUBLISHER_TYPE_GRID);
 	}
@@ -64,13 +63,21 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 
 
 	@Override
-	public List<ArticleEntity> getPublishedArticleByPublishTime(String customerId, Date publishDate) {
+	public List<ArticleEntity> getPublishedArticleByPublishTime(String customerId, String publishDate) {
 		checkParam(customerId, publishDate);
-		return baseDao.getPublishedArticleByDay(customerId,publishDate, ProjectConstant.PUBLISHER_TYPE_GRID);
+		return baseDao.getPublishedArticleByDay(customerId,publishDate);
 	}
 
-	private void checkParam(String customerId, Date publishDate) {
-		if (StringUtils.isBlank(customerId) || publishDate == null) {
+	@Override
+	public ArticleEntity selectArticleById(String articleId) {
+		if (StringUtils.isBlank(articleId)){
+			throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
+		}
+		return baseDao.selectById(articleId);
+	}
+
+	private void checkParam(String customerId, String publishDate) {
+		if (StringUtils.isBlank(customerId) || StringUtils.isBlank(publishDate)) {
 			throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
 		}
 	}

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/data_statistical.sql

@@ -25,10 +25,11 @@ SET FOREIGN_KEY_CHECKS = 0;
 DROP TABLE IF EXISTS `fact_article_published_agency_daily`;
 CREATE TABLE `fact_article_published_agency_daily`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
   `ARTICLE_TOTAL_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章累计发文数量 文章数量',
+  `PUBLISHED_COUNT` int(11) NULL DEFAULT NULL COMMENT '今日发布文章数',
   `ARTICLE_PUBLISHED_COUNT` int(11) NULL DEFAULT NULL COMMENT '当前发文数量 当前未下线的文章数量',
   `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 日期ID',
   `WEEK_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周ID 周ID  eg：2020W01 = 2020年第一周',
@@ -50,10 +51,11 @@ CREATE TABLE `fact_article_published_agency_daily`  (
 DROP TABLE IF EXISTS `fact_article_published_department_daily`;
 CREATE TABLE `fact_article_published_department_daily`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布文章单位所属机关ID 发布文章单位所属机关ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布文章单位所属机关ID 发布文章单位所属机关ID',
   `DEPARTMENT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID',
   `ARTICLE_TOTAL_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章累计发文数量 文章数量',
+  `PUBLISHED_COUNT` int(11) NULL DEFAULT NULL COMMENT '今日发布文章数',
   `ARTICLE_PUBLISHED_COUNT` int(11) NULL DEFAULT NULL COMMENT '当前发文数量 当前未下线的文章数量',
   `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 日期ID',
   `WEEK_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周ID 周ID  eg：2020W01 = 2020年第一周',
@@ -75,10 +77,11 @@ CREATE TABLE `fact_article_published_department_daily`  (
 DROP TABLE IF EXISTS `fact_article_published_grid_daily`;
 CREATE TABLE `fact_article_published_grid_daily`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布单位所属机关ID 发布单位所属机关ID',
-  `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布单位所属机关ID 发布单位所属机关ID',
+  `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
   `ARTICLE_TOTAL_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章累计发文数量 文章数量',
+  `PUBLISHED_COUNT` int(11) NULL DEFAULT NULL COMMENT '今日发布文章数',
   `ARTICLE_PUBLISHED_COUNT` int(11) NULL DEFAULT NULL COMMENT '当前发文数量 当前未下线的文章数量',
   `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 日期ID',
   `WEEK_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周ID 周ID  eg：2020W01 = 2020年第一周',
@@ -93,17 +96,16 @@ CREATE TABLE `fact_article_published_grid_daily`  (
   `UPDATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '文章发布数量【网格】日统计表' ROW_FORMAT = Dynamic;
-
 -- ----------------------------
 -- Table structure for fact_tag_used_agency_daily
 -- ----------------------------
 DROP TABLE IF EXISTS `fact_tag_used_agency_daily`;
 CREATE TABLE `fact_tag_used_agency_daily`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数',
   `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 天ID   eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日',
@@ -126,10 +128,10 @@ CREATE TABLE `fact_tag_used_agency_daily`  (
 DROP TABLE IF EXISTS `fact_tag_used_agency_monthly`;
 CREATE TABLE `fact_tag_used_agency_monthly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数',
   `MONTH_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月份ID 月份ID   eg：202006 = 2020年6月、202007 = 2020年7月',
@@ -150,11 +152,11 @@ CREATE TABLE `fact_tag_used_agency_monthly`  (
 DROP TABLE IF EXISTS `fact_tag_used_agency_quarterly`;
 CREATE TABLE `fact_tag_used_agency_quarterly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
-  `TAG_NAME` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数',
   `QUARTER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度',
   `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年',
@@ -173,10 +175,10 @@ CREATE TABLE `fact_tag_used_agency_quarterly`  (
 DROP TABLE IF EXISTS `fact_tag_used_agency_yearly`;
 CREATE TABLE `fact_tag_used_agency_yearly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数',
   `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年',
@@ -195,11 +197,11 @@ CREATE TABLE `fact_tag_used_agency_yearly`  (
 DROP TABLE IF EXISTS `fact_tag_used_department_daily`;
 CREATE TABLE `fact_tag_used_department_daily`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID',
-  `DEPARTMENT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID',
+  `DEPARTMENT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数',
   `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 天ID   eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日',
@@ -222,10 +224,10 @@ CREATE TABLE `fact_tag_used_department_daily`  (
 DROP TABLE IF EXISTS `fact_tag_used_department_monthly`;
 CREATE TABLE `fact_tag_used_department_monthly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
-  `DEPARTMENT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
+  `DEPARTMENT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数',
   `MONTH_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月份ID 月份ID   eg：202006 = 2020年6月、202007 = 2020年7月',
@@ -246,11 +248,11 @@ CREATE TABLE `fact_tag_used_department_monthly`  (
 DROP TABLE IF EXISTS `fact_tag_used_department_quarterly`;
 CREATE TABLE `fact_tag_used_department_quarterly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
-  `DEPARTMENT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
-  `TAG_NAME` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
+  `DEPARTMENT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数',
   `QUARTER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度',
   `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年',
@@ -269,10 +271,10 @@ CREATE TABLE `fact_tag_used_department_quarterly`  (
 DROP TABLE IF EXISTS `fact_tag_used_department_yearly`;
 CREATE TABLE `fact_tag_used_department_yearly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
-  `DEPARTMENT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
+  `DEPARTMENT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数',
   `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年',
@@ -291,10 +293,10 @@ CREATE TABLE `fact_tag_used_department_yearly`  (
 DROP TABLE IF EXISTS `fact_tag_used_grid_daily`;
 CREATE TABLE `fact_tag_used_grid_daily`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
-  `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
+  `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数',
   `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 天ID   eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日',
@@ -317,10 +319,10 @@ CREATE TABLE `fact_tag_used_grid_daily`  (
 DROP TABLE IF EXISTS `fact_tag_used_grid_monthly`;
 CREATE TABLE `fact_tag_used_grid_monthly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
-  `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
+  `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数',
   `MONTH_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月份ID 月份ID   eg：2020-06 = 2020年6月、2020-07 = 2020年7月',
@@ -341,11 +343,11 @@ CREATE TABLE `fact_tag_used_grid_monthly`  (
 DROP TABLE IF EXISTS `fact_tag_used_grid_quarterly`;
 CREATE TABLE `fact_tag_used_grid_quarterly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
-  `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
-  `TAG_NAME` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
+  `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数',
   `QUARTER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度',
   `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年',
@@ -364,10 +366,10 @@ CREATE TABLE `fact_tag_used_grid_quarterly`  (
 DROP TABLE IF EXISTS `fact_tag_used_grid_yearly`;
 CREATE TABLE `fact_tag_used_grid_yearly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
-  `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
+  `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数',
   `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年',
@@ -386,10 +388,10 @@ CREATE TABLE `fact_tag_used_grid_yearly`  (
 DROP TABLE IF EXISTS `fact_tag_viewed_agency_daily`;
 CREATE TABLE `fact_tag_viewed_agency_daily`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数',
   `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 天数ID   eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日',
@@ -412,10 +414,10 @@ CREATE TABLE `fact_tag_viewed_agency_daily`  (
 DROP TABLE IF EXISTS `fact_tag_viewed_agency_monthly`;
 CREATE TABLE `fact_tag_viewed_agency_monthly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数',
   `MONTH_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月份ID 月份ID   eg：2020-06 = 2020年6月、2020-07 = 2020年7月',
@@ -436,10 +438,10 @@ CREATE TABLE `fact_tag_viewed_agency_monthly`  (
 DROP TABLE IF EXISTS `fact_tag_viewed_agency_quarterly`;
 CREATE TABLE `fact_tag_viewed_agency_quarterly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数',
   `QUARTER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度',
@@ -459,10 +461,10 @@ CREATE TABLE `fact_tag_viewed_agency_quarterly`  (
 DROP TABLE IF EXISTS `fact_tag_viewed_agency_yearly`;
 CREATE TABLE `fact_tag_viewed_agency_yearly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数',
   `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年',
@@ -481,10 +483,10 @@ CREATE TABLE `fact_tag_viewed_agency_yearly`  (
 DROP TABLE IF EXISTS `fact_tag_viewed_grid_daily`;
 CREATE TABLE `fact_tag_viewed_grid_daily`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
-  `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
+  `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数',
   `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 天数ID   eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日',
@@ -507,10 +509,10 @@ CREATE TABLE `fact_tag_viewed_grid_daily`  (
 DROP TABLE IF EXISTS `fact_tag_viewed_grid_monthly`;
 CREATE TABLE `fact_tag_viewed_grid_monthly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
-  `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
+  `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数',
   `MONTH_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月份ID 月份ID   eg：2020-06 = 2020年6月、2020-07 = 2020年7月',
@@ -531,10 +533,10 @@ CREATE TABLE `fact_tag_viewed_grid_monthly`  (
 DROP TABLE IF EXISTS `fact_tag_viewed_grid_quarterly`;
 CREATE TABLE `fact_tag_viewed_grid_quarterly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
-  `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
+  `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数',
   `QUARTER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度',
@@ -554,10 +556,10 @@ CREATE TABLE `fact_tag_viewed_grid_quarterly`  (
 DROP TABLE IF EXISTS `fact_tag_viewed_grid_yearly`;
 CREATE TABLE `fact_tag_viewed_grid_yearly`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID',
-  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
-  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
-  `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
-  `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID',
+  `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID',
+  `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID',
   `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称',
   `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数',
   `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年',

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml

@@ -34,12 +34,21 @@
             ORG_ID AS agencyId,
             PUBLISHER_ID,
             count(ID) articleTotalCount,
-            sum( CASE STATUS_FLAG WHEN 'published' THEN 1 ELSE 0 END ) articlePublishedCount
+            sum(
+                CASE
+                    WHEN STATUS_FLAG = 'published' THEN 1
+                    WHEN STATUS_FLAG = 'offline' AND date_format(OFF_LINE_TIME,'%Y-%m-%d') = #{publishDate,jdbcType=VARCHAR} THEN 1
+                ELSE 0  END ) articlePublishedCount,
+	        sum(
+	            CASE PUBLISH_DATE
+	                WHEN #{publishDate,jdbcType=VARCHAR} THEN 1
+	            ELSE 0 END
+	            ) publishedCount
         FROM
             article
         WHERE
             CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
-            AND PUBLISH_DATE <![CDATA[ <#{publishDate,jdbcType=TIMESTAMP}]]>
+            AND PUBLISH_DATE <![CDATA[ <=#{publishDate,jdbcType=VARCHAR}]]>
             AND DEL_FLAG = 0
             AND PUBLISHER_TYPE = #{publisherType,jdbcType=VARCHAR}
         GROUP BY
@@ -56,11 +65,10 @@
         FROM
             article
         WHERE
-            PUBLISH_DATE = #{publishDate,jdbcType=TIMESTAMP}
+            PUBLISH_DATE = #{publishDate,jdbcType=VARCHAR}
             AND DEL_FLAG = 0
             AND TAGS IS NOT NULL
-            AND CUSTOMER_ID = #{customerId,jdbcType=VARCHAR
-            AND PUBLISHER_TYPE = #{publisherType,jdbcType=VARCHAR}
+            AND CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
     </select>
 
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleOperateRecordDao.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.dao.voice.ArticleOperateRecordDao">
+
+</mapper>

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java

@@ -2,13 +2,15 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.service.StatsGroupService;
-import feign.DataStatisticalOpenFeignClient;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * @Author zxc
  * @CreateTime 2020/6/22 14:13
  */
+@Service
 public class StatsGroupServiceImpl implements StatsGroupService {
 
     @Autowired

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java

@@ -2,7 +2,7 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.service.StatsIssueService;
-import feign.DataStatisticalOpenFeignClient;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java

@@ -2,13 +2,15 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.service.StatsProjectService;
-import feign.DataStatisticalOpenFeignClient;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * @Description 数据统计-项目-机关、网格日月统计任务接口
  * @Author sun
  */
+@Service
 public class StatsProjectServiceImpl implements StatsProjectService {
 
     @Autowired

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPublicityTaskServiceImpl.java

@@ -2,7 +2,7 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.service.StatsPublicityTaskService;
-import feign.DataStatisticalOpenFeignClient;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;