宣传能力--代码目录调整

epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedDepartmentDailyDTO.java

@@ -1,121 +0,0 @@
-/**
- * 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.publicity.dto.result;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-
-/**
- * 文章发布数量【部门】日统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Data
-public class FactArticlePublishedDepartmentDailyDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID ID
-     */
-	private String id;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 发布文章单位所属机关ID 发布文章单位所属机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 部门ID
-     */
-	private String departmentId;
-
-    /**
-     * 文章累计发文数量 文章数量
-     */
-	private Integer articleTotalCount;
-
-    /**
-     * 当前发文数量 当前未下线的文章数量
-     */
-	private Integer articlePublishedCount;
-
-    /**
-     * 日期ID 日期ID
-     */
-	private String dateId;
-
-    /**
-     * 周ID 周ID  eg：2020W01 = 2020年第一周
-     */
-	private String weekId;
-
-    /**
-     * 月份ID 月份ID   eg：202006 = 2020年6月、2020-07 = 2020年7月
-     */
-	private String monthId;
-
-    /**
-     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
-     */
-	private String quarterId;
-
-    /**
-     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
-     */
-	private String yearId;
-
-    /**
-     * 删除状态
-     */
-	private Integer delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
-}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedGridDailyDTO.java

@@ -1,121 +0,0 @@
-/**
- * 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.publicity.dto.result;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-
-/**
- * 文章发布数量【网格】日统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Data
-public class FactArticlePublishedGridDailyDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID ID
-     */
-	private String id;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 发布单位所属机关ID 发布单位所属机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 网格ID
-     */
-	private String gridId;
-
-    /**
-     * 文章累计发文数量 文章数量
-     */
-	private Integer articleTotalCount;
-
-    /**
-     * 当前发文数量 当前未下线的文章数量
-     */
-	private Integer articlePublishedCount;
-
-    /**
-     * 日期ID 日期ID
-     */
-	private String dateId;
-
-    /**
-     * 周ID 周ID  eg：2020W01 = 2020年第一周
-     */
-	private String weekId;
-
-    /**
-     * 月份ID 月份ID   eg：202006 = 2020年6月、2020-07 = 2020年7月
-     */
-	private String monthId;
-
-    /**
-     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
-     */
-	private String quarterId;
-
-    /**
-     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
-     */
-	private String yearId;
-
-    /**
-     * 删除状态
-     */
-	private Integer delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridYearlyDao.java → epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDTO.java

@@ -15,19 +15,39 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.publicity;
+package com.epmet.publicity.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
 
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.publicity.FactTagViewedGridYearlyEntity;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 文章引用标签阅读数量【网格】年度统计表
+ * 文章发表数量—下级机关统计
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-06-19
  */
-@Mapper
+@Data
-public interface FactTagViewedGridYearlyDao extends BaseDao<FactTagViewedGridYearlyEntity> {
+public class FactPublishedAgencyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 累计发文总数
+     */
+    private Integer publishedTotal;
+
+    /**
+     * 发布中的文章总数
+     */
+    private Integer publishingTotal;
+
+    /**
+     * 数据截止日期
+     */
+    private String dateName;
+
 
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedAgencyDailyDTO.java → epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDailyDTO.java

@@ -29,7 +29,7 @@ import lombok.Data;
  * @since v1.0.0 2020-06-19
  */
 @Data
-public class FactArticlePublishedAgencyDailyDTO implements Serializable {
+public class FactPublishedAgencyDailyDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyDailyDao.java → epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedDepartmentDTO.java

@@ -15,19 +15,48 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.publicity;
+package com.epmet.publicity.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
 
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.publicity.FactTagViewedAgencyDailyEntity;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 文章引用标签阅读数量【机关】日统计表
+ * 文章发表数量—直属部门统计
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-06-19
  */
-@Mapper
+@Data
-public interface FactTagViewedAgencyDailyDao extends BaseDao<FactTagViewedAgencyDailyEntity> {
+public class FactPublishedDepartmentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关名称
+     */
+    private String name;
+
+    /**
+     * 发文数量
+     */
+    private Integer value;
+
+    /**
+     * 固定值：文章数量
+     */
+    private String type="文章数量";
+
+    /**
+     * 机关Id
+     */
+    private String agencyId;
+
+    /**
+     * 部门Id
+     */
+    private String departmentId;
+
 
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedDepartmentDailyDao.java → epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedGridDTO.java

@@ -15,19 +15,48 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.publicity;
+package com.epmet.publicity.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
 
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.publicity.FactArticlePublishedDepartmentDailyEntity;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 文章发布数量【部门】日统计表
+ * 文章发表数量—直属部门统计
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-06-19
  */
-@Mapper
+@Data
-public interface FactArticlePublishedDepartmentDailyDao extends BaseDao<FactArticlePublishedDepartmentDailyEntity> {
+public class FactPublishedGridDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关名称
+     */
+    private String name;
+
+    /**
+     * 发文数量
+     */
+    private Integer value;
+
+    /**
+     * 固定值：文章数量
+     */
+    private String type="文章数量";
+
+    /**
+     * 机关Id
+     */
+    private String agencyId;
+
+    /**
+     * 网格Id
+     */
+    private String gridId;
+
 
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagAgencyDTO.java

@@ -24,7 +24,7 @@ import java.util.Date;
 
 
 /**
- * 文章引用标签阅读数量【机关】日统计表
+ * 文章引用标签阅读数量【机关】统计表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-06-19

epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyDailyDTO.java

@@ -1,126 +0,0 @@
-/**
- * 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.publicity.dto.result;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-
-/**
- * 文章引用标签阅读数量【机关】日统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Data
-public class FactTagViewedAgencyDailyDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID ID
-     */
-	private String id;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 上级机关ID 上级机关ID
-     */
-	private String pid;
-
-    /**
-     * 机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 日期ID 天数ID   eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日
-     */
-	private String dateId;
-
-    /**
-     * 周ID 周ID  eg：2020W01 = 2020年第一周
-     */
-	private String weekId;
-
-    /**
-     * 月份ID 月份ID   eg：202006 = 2020年6月、2020-07 = 2020年7月
-     */
-	private String monthId;
-
-    /**
-     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
-     */
-	private String quarterId;
-
-    /**
-     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
-     */
-	private String yearId;
-
-    /**
-     * 删除状态
-     */
-	private Integer delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
-}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyMonthlyDTO.java

@@ -1,106 +0,0 @@
-/**
- * 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.publicity.dto.result;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-
-/**
- * 文章引用标签阅读数量【机关】月统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Data
-public class FactTagViewedAgencyMonthlyDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID ID
-     */
-	private String id;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 上级机关ID 上级机关ID
-     */
-	private String pid;
-
-    /**
-     * 机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 月份ID 月份ID   eg：2020-06 = 2020年6月、2020-07 = 2020年7月
-     */
-	private String monthId;
-
-    /**
-     * 删除状态
-     */
-	private Integer delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
-}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyQuarterlyDTO.java

@@ -1,106 +0,0 @@
-/**
- * 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.publicity.dto.result;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-
-/**
- * 文章引用标签阅读数量【机关】季度统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Data
-public class FactTagViewedAgencyQuarterlyDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID ID
-     */
-	private String id;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 上级机关ID 上级机关ID
-     */
-	private String pid;
-
-    /**
-     * 机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
-     */
-	private String quarterId;
-
-    /**
-     * 删除状态
-     */
-	private Integer delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
-}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyYearlyDTO.java

@@ -1,106 +0,0 @@
-/**
- * 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.publicity.dto.result;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-
-/**
- * 文章引用标签阅读数量【机关】年度统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Data
-public class FactTagViewedAgencyYearlyDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID ID
-     */
-	private String id;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 上级机关ID 上级机关ID
-     */
-	private String pid;
-
-    /**
-     * 机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
-     */
-	private String yearId;
-
-    /**
-     * 删除状态
-     */
-	private Integer delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
-}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridDailyDTO.java

@@ -1,126 +0,0 @@
-/**
- * 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.publicity.dto.result;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-
-/**
- * 文章引用标签阅读数量【网格】日统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Data
-public class FactTagViewedGridDailyDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID ID
-     */
-	private String id;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 文章发布所属机关ID 文章发布所属机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 网格ID
-     */
-	private String gridId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 日期ID 天数ID   eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日
-     */
-	private String dateId;
-
-    /**
-     * 周ID 周ID  eg：2020W01 = 2020年第一周
-     */
-	private String weekId;
-
-    /**
-     * 月份ID 月份ID   eg：202006 = 2020年6月、2020-07 = 2020年7月
-     */
-	private String monthId;
-
-    /**
-     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
-     */
-	private String quarterId;
-
-    /**
-     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
-     */
-	private String yearId;
-
-    /**
-     * 删除状态
-     */
-	private Integer delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
-}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridMonthlyDTO.java

@@ -1,106 +0,0 @@
-/**
- * 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.publicity.dto.result;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-
-/**
- * 文章引用标签阅读数量【网格】月统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Data
-public class FactTagViewedGridMonthlyDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID ID
-     */
-	private String id;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 文章发布所属机关ID 文章发布所属机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 网格ID
-     */
-	private String gridId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 月份ID 月份ID   eg：2020-06 = 2020年6月、2020-07 = 2020年7月
-     */
-	private String monthId;
-
-    /**
-     * 删除状态
-     */
-	private Integer delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
-}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridQuarterlyDTO.java

@@ -1,106 +0,0 @@
-/**
- * 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.publicity.dto.result;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-
-/**
- * 文章引用标签阅读数量【网格】季度统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Data
-public class FactTagViewedGridQuarterlyDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID ID
-     */
-	private String id;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 文章发布所属机关ID 文章发布所属机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 网格ID
-     */
-	private String gridId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
-     */
-	private String quarterId;
-
-    /**
-     * 删除状态
-     */
-	private Integer delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
-}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridYearlyDTO.java

@@ -1,106 +0,0 @@
-/**
- * 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.publicity.dto.result;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-
-/**
- * 文章引用标签阅读数量【网格】年度统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Data
-public class FactTagViewedGridYearlyDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID ID
-     */
-	private String id;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 文章发布所属机关ID 文章发布所属机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 网格ID
-     */
-	private String gridId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
-     */
-	private String yearId;
-
-    /**
-     * 删除状态
-     */
-	private Integer delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java

@@ -23,7 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.publicity.dto.form.TagFormDTO;
-import com.epmet.publicity.dto.result.FactArticlePublishedAgencyDailyDTO;
+import com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO;
 import com.epmet.publicity.dto.result.FactTagAgencyDTO;
 import com.epmet.service.publicity.PublicityService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,8 +53,8 @@ public class PublicityController {
      * @Description 宣传能力—工作端—当前机关累计发文和当前发文
      **/
     @PostMapping("summaryinfo")
-    public Result<FactArticlePublishedAgencyDailyDTO> summaryInfo(@LoginUser TokenDto tokenDto) {
+    public Result<FactPublishedAgencyDailyDTO> summaryInfo(@LoginUser TokenDto tokenDto) {
-        return new Result<FactArticlePublishedAgencyDailyDTO>().ok(publicityService.summaryInfo(tokenDto));
+        return new Result<FactPublishedAgencyDailyDTO>().ok(publicityService.summaryInfo(tokenDto));
     }
 
     /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedAgencyDailyDao.java

@@ -1,42 +0,0 @@
-/**
- * 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.publicity;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.publicity.FactArticlePublishedAgencyDailyEntity;
-import com.epmet.publicity.dto.result.FactArticlePublishedAgencyDailyDTO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 文章发布数量【机关】日统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Mapper
-public interface FactArticlePublishedAgencyDailyDao extends BaseDao<FactArticlePublishedAgencyDailyEntity> {
-
-    /**
-     * @Description  宣传能力—工作端—当前机关累计发文和当前发文
-     * @param agencyId
-     * @author jyy
-     */
-    FactArticlePublishedAgencyDailyDTO summaryInfo(@Param("agencyId") String agencyId);
-	
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedGridDailyDao.java

@@ -1,33 +0,0 @@
-/**
- * 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.publicity;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.publicity.FactArticlePublishedGridDailyEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 文章发布数量【网格】日统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Mapper
-public interface FactArticlePublishedGridDailyDao extends BaseDao<FactArticlePublishedGridDailyEntity> {
-	
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyMonthlyDao.java

@@ -1,40 +0,0 @@
-/**
- * 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.publicity;
-
-import com.epmet.publicity.dto.result.FactTagAgencyDTO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 文章引用标签阅读数量【机关】月统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Mapper
-public interface FactTagUsedAgencyMonthlyDao {
-    /**
-     * @param agencyId monthId
-     * @Description 根据标签分组，获取当月每个标签数量，按照数量降序，取前pagesize个
-     * @author zxc
-     */
-    List<FactTagAgencyDTO> getMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize);
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyQuarterlyDao.java

@@ -1,40 +0,0 @@
-/**
- * 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.publicity;
-
-import com.epmet.publicity.dto.result.FactTagAgencyDTO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 文章引用标签阅读数量【机关】季度统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Mapper
-public interface FactTagUsedAgencyQuarterlyDao {
-    /**
-     * @param agencyId monthId
-     * @Description 根据标签分组，获取当月每个标签数量，按照数量降序，取前pagesize个
-     * @author zxc
-     */
-    List<FactTagAgencyDTO> getQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize);
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyYearlyDao.java

@@ -1,40 +0,0 @@
-/**
- * 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.publicity;
-
-import com.epmet.publicity.dto.result.FactTagAgencyDTO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 文章引用标签阅读数量【机关】年度统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Mapper
-public interface FactTagUsedAgencyYearlyDao {
-    /**
-     * @param agencyId monthId
-     * @Description 根据标签分组，获取当月每个标签数量，按照数量降序，取前pagesize个
-     * @author zxc
-     */
-    List<FactTagAgencyDTO> getYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize);
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyMonthlyDao.java

@@ -1,40 +0,0 @@
-/**
- * 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.publicity;
-
-import com.epmet.publicity.dto.result.FactTagAgencyDTO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 文章引用标签阅读数量【机关】月统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Mapper
-public interface FactTagViewedAgencyMonthlyDao  {
-    /**
-     * @param agencyId monthId
-     * @Description 根据标签分组，获取当月每个标签数量，按照数量降序，取前pagesize个
-     * @author zxc
-     */
-    List<FactTagAgencyDTO> getMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize);
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyQuarterlyDao.java

@@ -1,40 +0,0 @@
-/**
- * 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.publicity;
-
-import com.epmet.publicity.dto.result.FactTagAgencyDTO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 文章引用标签阅读数量【机关】季度统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Mapper
-public interface FactTagViewedAgencyQuarterlyDao  {
-    /**
-     * @param agencyId monthId
-     * @Description 根据标签分组，获取当月每个标签数量，按照数量降序，取前pagesize个
-     * @author zxc
-     */
-    List<FactTagAgencyDTO> getQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize);
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyYearlyDao.java

@@ -1,40 +0,0 @@
-/**
- * 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.publicity;
-
-import com.epmet.publicity.dto.result.FactTagAgencyDTO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 文章引用标签阅读数量【机关】年度统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Mapper
-public interface FactTagViewedAgencyYearlyDao {
-    /**
-     * @param agencyId monthId
-     * @Description 根据标签分组，获取当月每个标签数量，按照数量降序，取前pagesize个
-     * @author zxc
-     */
-    List<FactTagAgencyDTO> getYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize);
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridDailyDao.java

@@ -1,33 +0,0 @@
-/**
- * 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.publicity;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.publicity.FactTagViewedGridDailyEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 文章引用标签阅读数量【网格】日统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Mapper
-public interface FactTagViewedGridDailyDao extends BaseDao<FactTagViewedGridDailyEntity> {
-	
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridMonthlyDao.java

@@ -1,33 +0,0 @@
-/**
- * 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.publicity;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.publicity.FactTagViewedGridMonthlyEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 文章引用标签阅读数量【网格】月统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Mapper
-public interface FactTagViewedGridMonthlyDao extends BaseDao<FactTagViewedGridMonthlyEntity> {
-	
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridQuarterlyDao.java

@@ -1,33 +0,0 @@
-/**
- * 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.publicity;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.publicity.FactTagViewedGridQuarterlyEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 文章引用标签阅读数量【网格】季度统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-06-19
- */
-@Mapper
-public interface FactTagViewedGridQuarterlyDao extends BaseDao<FactTagViewedGridQuarterlyEntity> {
-	
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java

@@ -0,0 +1,85 @@
+/**
+ * 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.publicity;
+
+import com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO;
+import com.epmet.publicity.dto.result.FactTagAgencyDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 文章发布数量【机关】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-19
+ */
+@Mapper
+public interface PublicityDao {
+
+    /**
+     * @Description  宣传能力—工作端—当前机关累计发文和当前发文
+     * @param agencyId 机关id
+     * @author jyy
+     */
+    FactPublishedAgencyDailyDTO summaryInfo(@Param("agencyId") String agencyId);
+
+    /**
+     * @Description 当月———获取机关下，获取每个标签阅读数量，按照数量降序，取前pagesize个
+     * @param agencyId,monthId,pageSize 机关id，月，展示数量
+     * @author zxc
+     */
+    List<FactTagAgencyDTO> getViewedMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize);
+
+    /**
+     * @Description 当季———获取机关下，获取每个标签阅读数量，按照数量降序，取前pagesize个
+     * @param agencyId,quarterId,pageSize 机关id，季，展示数量
+     * @author zxc
+     */
+    List<FactTagAgencyDTO> getViewedQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize);
+
+    /**
+     * @Description 当年———获取机关下，获取每个标签阅读数量，按照数量降序，取前pagesize个
+     * @param agencyId,yearId,pageSize 机关id，年，展示数量
+     * @author zxc
+     */
+    List<FactTagAgencyDTO> getViewedYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize);
+
+    /**
+     * @Description 当月———获取机关下，获取每个标签发文数量，按照数量降序，取前pagesize个
+     * @param agencyId,monthId,pageSize 机关id，月，展示数量
+     * @author zxc
+     */
+    List<FactTagAgencyDTO> getUsedMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize);
+
+    /**
+     * @Description 当季———获取机关下，获取每个标签发文数量，按照数量降序，取前pagesize个
+     * @param agencyId,quarterId,pageSize 机关id，季，展示数量
+     * @author zxc
+     */
+    List<FactTagAgencyDTO> getUsedQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize);
+
+    /**
+     * @Description 当年———获取机关下，每个标签发文数量，按照数量降序，取前pagesize个
+     * @param agencyId,yearId,pageSize 机关id，年，展示数量
+     * @author zxc
+     */
+    List<FactTagAgencyDTO> getUsedYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize);
+	
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedAgencyDailyEntity.java

@@ -1,91 +0,0 @@
-/**
- * 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.publicity;
-
-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-19
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("fact_article_published_agency_daily")
-public class FactArticlePublishedAgencyDailyEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 上级机关ID 上级机关ID
-     */
-	private String pid;
-
-    /**
-     * 机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 文章累计发文数量 文章数量
-     */
-	private Integer articleTotalCount;
-
-    /**
-     * 当前发文数量 当前未下线的文章数量
-     */
-	private Integer articlePublishedCount;
-
-    /**
-     * 日期ID 日期ID
-     */
-	private String dateId;
-
-    /**
-     * 周ID 周ID  eg：2020W01 = 2020年第一周
-     */
-	private String weekId;
-
-    /**
-     * 月份ID 月份ID   eg：202006 = 2020年6月、2020-07 = 2020年7月
-     */
-	private String monthId;
-
-    /**
-     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
-     */
-	private String quarterId;
-
-    /**
-     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
-     */
-	private String yearId;
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedDepartmentDailyEntity.java

@@ -1,91 +0,0 @@
-/**
- * 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.publicity;
-
-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-19
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("fact_article_published_department_daily")
-public class FactArticlePublishedDepartmentDailyEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 发布文章单位所属机关ID 发布文章单位所属机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 部门ID
-     */
-	private String departmentId;
-
-    /**
-     * 文章累计发文数量 文章数量
-     */
-	private Integer articleTotalCount;
-
-    /**
-     * 当前发文数量 当前未下线的文章数量
-     */
-	private Integer articlePublishedCount;
-
-    /**
-     * 日期ID 日期ID
-     */
-	private String dateId;
-
-    /**
-     * 周ID 周ID  eg：2020W01 = 2020年第一周
-     */
-	private String weekId;
-
-    /**
-     * 月份ID 月份ID   eg：202006 = 2020年6月、2020-07 = 2020年7月
-     */
-	private String monthId;
-
-    /**
-     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
-     */
-	private String quarterId;
-
-    /**
-     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
-     */
-	private String yearId;
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedGridDailyEntity.java

@@ -1,91 +0,0 @@
-/**
- * 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.publicity;
-
-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-19
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("fact_article_published_grid_daily")
-public class FactArticlePublishedGridDailyEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 发布单位所属机关ID 发布单位所属机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 网格ID
-     */
-	private String gridId;
-
-    /**
-     * 文章累计发文数量 文章数量
-     */
-	private Integer articleTotalCount;
-
-    /**
-     * 当前发文数量 当前未下线的文章数量
-     */
-	private Integer articlePublishedCount;
-
-    /**
-     * 日期ID 日期ID
-     */
-	private String dateId;
-
-    /**
-     * 周ID 周ID  eg：2020W01 = 2020年第一周
-     */
-	private String weekId;
-
-    /**
-     * 月份ID 月份ID   eg：202006 = 2020年6月、2020-07 = 2020年7月
-     */
-	private String monthId;
-
-    /**
-     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
-     */
-	private String quarterId;
-
-    /**
-     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
-     */
-	private String yearId;
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyDailyEntity.java

@@ -1,96 +0,0 @@
-/**
- * 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.publicity;
-
-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-19
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("fact_tag_viewed_agency_daily")
-public class FactTagViewedAgencyDailyEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 上级机关ID 上级机关ID
-     */
-	private String pid;
-
-    /**
-     * 机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 日期ID 天数ID   eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日
-     */
-	private String dateId;
-
-    /**
-     * 周ID 周ID  eg：2020W01 = 2020年第一周
-     */
-	private String weekId;
-
-    /**
-     * 月份ID 月份ID   eg：202006 = 2020年6月、2020-07 = 2020年7月
-     */
-	private String monthId;
-
-    /**
-     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
-     */
-	private String quarterId;
-
-    /**
-     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
-     */
-	private String yearId;
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyMonthlyEntity.java

@@ -1,76 +0,0 @@
-/**
- * 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.publicity;
-
-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-19
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("fact_tag_viewed_agency_monthly")
-public class FactTagViewedAgencyMonthlyEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 上级机关ID 上级机关ID
-     */
-	private String pid;
-
-    /**
-     * 机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 月份ID 月份ID   eg：2020-06 = 2020年6月、2020-07 = 2020年7月
-     */
-	private String monthId;
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyQuarterlyEntity.java

@@ -1,76 +0,0 @@
-/**
- * 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.publicity;
-
-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-19
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("fact_tag_viewed_agency_quarterly")
-public class FactTagViewedAgencyQuarterlyEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 上级机关ID 上级机关ID
-     */
-	private String pid;
-
-    /**
-     * 机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
-     */
-	private String quarterId;
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyYearlyEntity.java

@@ -1,76 +0,0 @@
-/**
- * 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.publicity;
-
-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-19
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("fact_tag_viewed_agency_yearly")
-public class FactTagViewedAgencyYearlyEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 上级机关ID 上级机关ID
-     */
-	private String pid;
-
-    /**
-     * 机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
-     */
-	private String yearId;
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridDailyEntity.java

@@ -1,96 +0,0 @@
-/**
- * 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.publicity;
-
-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-19
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("fact_tag_viewed_grid_daily")
-public class FactTagViewedGridDailyEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 文章发布所属机关ID 文章发布所属机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 网格ID
-     */
-	private String gridId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 日期ID 天数ID   eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日
-     */
-	private String dateId;
-
-    /**
-     * 周ID 周ID  eg：2020W01 = 2020年第一周
-     */
-	private String weekId;
-
-    /**
-     * 月份ID 月份ID   eg：202006 = 2020年6月、2020-07 = 2020年7月
-     */
-	private String monthId;
-
-    /**
-     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
-     */
-	private String quarterId;
-
-    /**
-     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
-     */
-	private String yearId;
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridMonthlyEntity.java

@@ -1,76 +0,0 @@
-/**
- * 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.publicity;
-
-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-19
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("fact_tag_viewed_grid_monthly")
-public class FactTagViewedGridMonthlyEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 文章发布所属机关ID 文章发布所属机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 网格ID
-     */
-	private String gridId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 月份ID 月份ID   eg：2020-06 = 2020年6月、2020-07 = 2020年7月
-     */
-	private String monthId;
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridQuarterlyEntity.java

@@ -1,76 +0,0 @@
-/**
- * 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.publicity;
-
-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-19
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("fact_tag_viewed_grid_quarterly")
-public class FactTagViewedGridQuarterlyEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 文章发布所属机关ID 文章发布所属机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 网格ID
-     */
-	private String gridId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
-     */
-	private String quarterId;
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridYearlyEntity.java

@@ -1,76 +0,0 @@
-/**
- * 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.publicity;
-
-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-19
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("fact_tag_viewed_grid_yearly")
-public class FactTagViewedGridYearlyEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 文章发布所属机关ID 文章发布所属机关ID
-     */
-	private String agencyId;
-
-    /**
-     * 网格ID
-     */
-	private String gridId;
-
-    /**
-     * 标签ID 标签ID
-     */
-	private String tagId;
-
-    /**
-     * 标签名称 标签名称
-     */
-	private String tagName;
-
-    /**
-     * 文章引用标签阅读数 文章引用标签阅读数
-     */
-	private Integer tagReadCount;
-
-    /**
-     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
-     */
-	private String yearId;
-
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java

@@ -18,7 +18,7 @@
 package com.epmet.service.publicity;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.publicity.dto.result.FactArticlePublishedAgencyDailyDTO;
+import com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO;
 import com.epmet.publicity.dto.result.FactTagAgencyDTO;
 
 import java.util.List;
@@ -36,7 +36,7 @@ public interface PublicityService {
      * @param tokenDto
      * @author jyy
      */
-    FactArticlePublishedAgencyDailyDTO summaryInfo(TokenDto tokenDto);
+    FactPublishedAgencyDailyDTO summaryInfo(TokenDto tokenDto);
 
     /**
      * @Description  宣传能力—工作端—宣传能力-获取阅读最多的分类数据

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java

@@ -19,15 +19,13 @@ package com.epmet.service.publicity.impl;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.dao.publicity.FactArticlePublishedAgencyDailyDao;
-import com.epmet.dao.publicity.FactTagViewedAgencyMonthlyDao;
-import com.epmet.dao.publicity.FactTagViewedAgencyQuarterlyDao;
-import com.epmet.dao.publicity.FactTagViewedAgencyYearlyDao;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 
-import com.epmet.publicity.dto.result.FactArticlePublishedAgencyDailyDTO;
+
+import com.epmet.dao.publicity.PublicityDao;
+import com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO;
 
 import com.epmet.publicity.dto.result.FactTagAgencyDTO;
 import com.epmet.service.publicity.PublicityService;
@@ -36,7 +34,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-
 import java.util.Date;
 import java.util.List;
 
@@ -48,15 +45,8 @@ import java.util.List;
  */
 @Service
 public class PublicityServiceImpl implements PublicityService {
-
-    @Autowired
-    private FactArticlePublishedAgencyDailyDao factArticlePublishedAgencyDailyDao;//机关每日发文
-    @Autowired
-    private FactTagViewedAgencyMonthlyDao factTagViewedAgencyMonthlyDao;//机关-每月-阅读
-    @Autowired
-    private FactTagViewedAgencyQuarterlyDao factTagViewedAgencyQuarterlyDao;//机关-每季度-阅读
     @Autowired
-    private FactTagViewedAgencyYearlyDao factTagViewedAgencyYearlyDao;//机关-每年-阅读
+    private PublicityDao publicityDao;//机关每日发文
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
@@ -66,9 +56,10 @@ public class PublicityServiceImpl implements PublicityService {
      * @author jyy
      */
     @Override
-    public FactArticlePublishedAgencyDailyDTO summaryInfo(TokenDto tokenDto) {
+    public FactPublishedAgencyDailyDTO summaryInfo(TokenDto tokenDto) {
         String agencyId = this.getLoginUserDetails(tokenDto);
-        return factArticlePublishedAgencyDailyDao.summaryInfo(agencyId);
+        agencyId="b9e295f8c1906a0d1c5e0b313afcda3f";
+        return publicityDao.summaryInfo(agencyId);
     }
 
 
@@ -87,15 +78,15 @@ public class PublicityServiceImpl implements PublicityService {
 
         if (StringUtils.equals("month", type)) {//当月
             String monthId = strDate.substring(0, 4) + strDate.substring(5, 7);
-            return factTagViewedAgencyMonthlyDao.getMonthlyCountByTag(agencyId, monthId, pageSize);
+            return publicityDao.getViewedMonthlyCountByTag(agencyId, monthId, pageSize);
 
         } else if (StringUtils.equals("quarter", type)) {//当季
             String quarterId = strDate + "Q" + DateUtils.getQuarterIndex(date);
-            return factTagViewedAgencyQuarterlyDao.getQuarterlyCountByTag(agencyId, quarterId, pageSize);
+            return publicityDao.getViewedQuarterlyCountByTag(agencyId, quarterId, pageSize);
 
         } else if (StringUtils.equals("year", type)) {//当年
 
-            return factTagViewedAgencyYearlyDao.getYearlyCountByTag(agencyId, yearId, pageSize);
+            return publicityDao.getViewedYearlyCountByTag(agencyId, yearId, pageSize);
 
         } else {
             return null;
@@ -105,7 +96,7 @@ public class PublicityServiceImpl implements PublicityService {
     }
 
     /**
-     * @param tokenDto,pageSize,type
+     * @param tokenDto pageSize type
      * @Description 宣传能力—工作端—宣传能力-获取发表最多的分类数据
      * @author jyy
      */
@@ -119,15 +110,15 @@ public class PublicityServiceImpl implements PublicityService {
 
         if (StringUtils.equals("month", type)) {//当月
             String monthId = strDate.substring(0, 4) + strDate.substring(5, 7);
-            return factTagViewedAgencyMonthlyDao.getMonthlyCountByTag(agencyId, monthId, pageSize);
+            return publicityDao.getUsedMonthlyCountByTag(agencyId, monthId, pageSize);
 
         } else if (StringUtils.equals("quarter", type)) {//当季
             String quarterId = strDate + "Q" + DateUtils.getQuarterIndex(date);
-            return factTagViewedAgencyQuarterlyDao.getQuarterlyCountByTag(agencyId, quarterId, pageSize);
+            return publicityDao.getUsedQuarterlyCountByTag(agencyId, quarterId, pageSize);
 
         } else if (StringUtils.equals("year", type)) {//当年
 
-            return factTagViewedAgencyYearlyDao.getYearlyCountByTag(agencyId, yearId, pageSize);
+            return publicityDao.getUsedYearlyCountByTag(agencyId, yearId, pageSize);
 
         } else {
             return null;

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedAgencyDailyDao.xml

@@ -1,35 +0,0 @@
-<?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.publicity.FactArticlePublishedAgencyDailyDao">
-
-    <resultMap type="com.epmet.entity.publicity.FactArticlePublishedAgencyDailyEntity" id="factArticlePublishedAgencyDailyMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="pid" column="PID"/>
-        <result property="agencyId" column="AGENCY_ID"/>
-        <result property="articleTotalCount" column="ARTICLE_TOTAL_COUNT"/>
-        <result property="articlePublishedCount" column="ARTICLE_PUBLISHED_COUNT"/>
-        <result property="dateId" column="DATE_ID"/>
-        <result property="weekId" column="WEEK_ID"/>
-        <result property="monthId" column="MONTH_ID"/>
-        <result property="quarterId" column="QUARTER_ID"/>
-        <result property="yearId" column="YEAR_ID"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-    <!-- 机关每日发文：文章累计发文数量、当前发文数量、数据截止日期 -->
-    <select id="summaryInfo" parameterType="java.lang.String" resultType="com.epmet.publicity.dto.result.FactArticlePublishedAgencyDailyDTO">
-        SELECT
-            article_total_count AS publishedTotal,
-            article_published_count AS publishingTotal,
-            DATE_FORMAT( date_id, '%Y-%m-%d' ) AS dateName
-        FROM fact_article_published_agency_daily
-        AND agency_id = #{agencyId}
-    </select>
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedDepartmentDailyDao.xml

@@ -1,27 +0,0 @@
-<?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.FactArticlePublishedDepartmentDailyDao">
-
-    <resultMap type="com.epmet.entity.publicity.FactArticlePublishedDepartmentDailyEntity" id="factArticlePublishedDepartmentDailyMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="agencyId" column="AGENCY_ID"/>
-        <result property="departmentId" column="DEPARTMENT_ID"/>
-        <result property="articleTotalCount" column="ARTICLE_TOTAL_COUNT"/>
-        <result property="articlePublishedCount" column="ARTICLE_PUBLISHED_COUNT"/>
-        <result property="dateId" column="DATE_ID"/>
-        <result property="weekId" column="WEEK_ID"/>
-        <result property="monthId" column="MONTH_ID"/>
-        <result property="quarterId" column="QUARTER_ID"/>
-        <result property="yearId" column="YEAR_ID"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedGridDailyDao.xml

@@ -1,27 +0,0 @@
-<?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.FactArticlePublishedGridDailyDao">
-
-    <resultMap type="com.epmet.entity.publicity.FactArticlePublishedGridDailyEntity" id="factArticlePublishedGridDailyMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="agencyId" column="AGENCY_ID"/>
-        <result property="gridId" column="GRID_ID"/>
-        <result property="articleTotalCount" column="ARTICLE_TOTAL_COUNT"/>
-        <result property="articlePublishedCount" column="ARTICLE_PUBLISHED_COUNT"/>
-        <result property="dateId" column="DATE_ID"/>
-        <result property="weekId" column="WEEK_ID"/>
-        <result property="monthId" column="MONTH_ID"/>
-        <result property="quarterId" column="QUARTER_ID"/>
-        <result property="yearId" column="YEAR_ID"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyMonthlyDao.xml

@@ -1,20 +0,0 @@
-<?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.module.publicity.dao.FactTagUsedAgencyMonthlyDao">
-
-    <select id="getMonthlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
-        SELECT
-            tag_name AS name,
-            agency_id AS agencyId,
-            tag_id AS tagId,
-            COUNT(tag_read_count) AS value
-        FROM fact_tag_viewed_agency_monthly
-        where agency_id = #{agencyId}
-        AND month_id = #{monthId}
-        GROUP BY TAG_ID
-        ORDER BY value DESC
-        LIMIT #{pageSize}
-    </select>
-
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyQuarterlyDao.xml

@@ -1,22 +0,0 @@
-<?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.module.publicity.dao.FactTagUsedAgencyQuarterlyDao">
-
-
-    <select id="getQuarterlyCountByTag" parameterType="java.lang.String"
-            resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
-        SELECT
-            tag_name AS name,
-            agency_id AS agencyId,
-            tag_id AS tagId,
-            COUNT(tag_read_count) AS value
-        FROM fact_tag_viewed_agency_quarterly
-        where agency_id = #{agencyId}
-        AND quarter_id = #{quarterId}
-        GROUP BY TAG_ID
-        ORDER BY value DESC
-        LIMIT #{pageSize}
-    </select>
-
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyYearlyDao.xml

@@ -1,23 +0,0 @@
-<?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.module.publicity.dao.FactTagUsedAgencyYearlyDao">
-
-
-
-    <select id="getYearlyCountByTag" parameterType="map"
-            resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
-        SELECT
-            tag_name AS name,
-            agency_id AS agencyId,
-            tag_id AS tagId,
-            COUNT(tag_read_count) AS value
-        FROM fact_tag_viewed_agency_yearly
-        where agency_id = #{agencyId}
-        AND year_id = #{yearId}
-        GROUP BY tag_id
-        ORDER BY value DESC
-        LIMIT #{pageSize}
-    </select>
-
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyDailyDao.xml

@@ -1,28 +0,0 @@
-<?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.FactTagViewedAgencyDailyDao">
-
-    <resultMap type="com.epmet.entity.publicity.FactTagViewedAgencyDailyEntity" id="factTagViewedAgencyDailyMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="pid" column="PID"/>
-        <result property="agencyId" column="AGENCY_ID"/>
-        <result property="tagId" column="TAG_ID"/>
-        <result property="tagName" column="TAG_NAME"/>
-        <result property="tagReadCount" column="TAG_READ_COUNT"/>
-        <result property="dateId" column="DATE_ID"/>
-        <result property="weekId" column="WEEK_ID"/>
-        <result property="monthId" column="MONTH_ID"/>
-        <result property="quarterId" column="QUARTER_ID"/>
-        <result property="yearId" column="YEAR_ID"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyMonthlyDao.xml

@@ -1,20 +0,0 @@
-<?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.module.publicity.dao.FactTagViewedAgencyMonthlyDao">
-
-    <select id="getMonthlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
-        SELECT
-            tag_name AS name,
-            agency_id AS agencyId,
-            tag_id AS tagId,
-            COUNT(tag_read_count) AS value
-        FROM fact_tag_viewed_agency_monthly
-        where agency_id = #{agencyId}
-        AND month_id = #{monthId}
-        GROUP BY TAG_ID
-        ORDER BY value DESC
-        LIMIT #{pageSize}
-    </select>
-
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyQuarterlyDao.xml

@@ -1,22 +0,0 @@
-<?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.module.publicity.dao.FactTagViewedAgencyQuarterlyDao">
-
-
-    <select id="getQuarterlyCountByTag" parameterType="java.lang.String"
-            resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
-        SELECT
-            tag_name AS name,
-            agency_id AS agencyId,
-            tag_id AS tagId,
-            COUNT(tag_read_count) AS value
-        FROM fact_tag_viewed_agency_quarterly
-        where agency_id = #{agencyId}
-        AND quarter_id = #{quarterId}
-        GROUP BY TAG_ID
-        ORDER BY value DESC
-        LIMIT #{pageSize}
-    </select>
-
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyYearlyDao.xml

@@ -1,23 +0,0 @@
-<?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.module.publicity.dao.FactTagViewedAgencyYearlyDao">
-
-
-
-    <select id="getYearlyCountByTag" parameterType="map"
-            resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
-        SELECT
-            tag_name AS name,
-            agency_id AS agencyId,
-            tag_id AS tagId,
-            COUNT(tag_read_count) AS value
-        FROM fact_tag_viewed_agency_yearly
-        where agency_id = #{agencyId}
-        AND year_id = #{yearId}
-        GROUP BY tag_id
-        ORDER BY value DESC
-        LIMIT #{pageSize}
-    </select>
-
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridDailyDao.xml

@@ -1,28 +0,0 @@
-<?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.FactTagViewedGridDailyDao">
-
-    <resultMap type="com.epmet.entity.publicity.FactTagViewedGridDailyEntity" id="factTagViewedGridDailyMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="agencyId" column="AGENCY_ID"/>
-        <result property="gridId" column="GRID_ID"/>
-        <result property="tagId" column="TAG_ID"/>
-        <result property="tagName" column="TAG_NAME"/>
-        <result property="tagReadCount" column="TAG_READ_COUNT"/>
-        <result property="dateId" column="DATE_ID"/>
-        <result property="weekId" column="WEEK_ID"/>
-        <result property="monthId" column="MONTH_ID"/>
-        <result property="quarterId" column="QUARTER_ID"/>
-        <result property="yearId" column="YEAR_ID"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridMonthlyDao.xml

@@ -1,24 +0,0 @@
-<?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.FactTagViewedGridMonthlyDao">
-
-    <resultMap type="com.epmet.entity.publicity.FactTagViewedGridMonthlyEntity" id="factTagViewedGridMonthlyMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="agencyId" column="AGENCY_ID"/>
-        <result property="gridId" column="GRID_ID"/>
-        <result property="tagId" column="TAG_ID"/>
-        <result property="tagName" column="TAG_NAME"/>
-        <result property="tagReadCount" column="TAG_READ_COUNT"/>
-        <result property="monthId" column="MONTH_ID"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridQuarterlyDao.xml

@@ -1,24 +0,0 @@
-<?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.FactTagViewedGridQuarterlyDao">
-
-    <resultMap type="com.epmet.entity.publicity.FactTagViewedGridQuarterlyEntity" id="factTagViewedGridQuarterlyMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="agencyId" column="AGENCY_ID"/>
-        <result property="gridId" column="GRID_ID"/>
-        <result property="tagId" column="TAG_ID"/>
-        <result property="tagName" column="TAG_NAME"/>
-        <result property="tagReadCount" column="TAG_READ_COUNT"/>
-        <result property="quarterId" column="QUARTER_ID"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridYearlyDao.xml

@@ -1,24 +0,0 @@
-<?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.FactTagViewedGridYearlyDao">
-
-    <resultMap type="com.epmet.entity.publicity.FactTagViewedGridYearlyEntity" id="factTagViewedGridYearlyMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="agencyId" column="AGENCY_ID"/>
-        <result property="gridId" column="GRID_ID"/>
-        <result property="tagId" column="TAG_ID"/>
-        <result property="tagName" column="TAG_NAME"/>
-        <result property="tagReadCount" column="TAG_READ_COUNT"/>
-        <result property="yearId" column="YEAR_ID"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml

@@ -0,0 +1,107 @@
+<?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.publicity.PublicityDao">
+
+    <!-- 机关每日发文：文章累计发文数量、当前发文数量、数据截止日期 -->
+    <select id="summaryInfo" resultType="com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO">
+        SELECT
+            article_total_count AS publishedTotal,
+            article_published_count AS publishingTotal,
+            DATE_FORMAT( date_id, '%Y-%m-%d' ) AS dateName
+        FROM fact_article_published_agency_daily
+        where agency_id = #{agencyId}
+    </select>
+
+    <!-- 机关当月—每个标签阅读数量—前pageSize -->
+    <select id="getViewedMonthlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
+        SELECT
+            tag_name AS name,
+            agency_id AS agencyId,
+            tag_id AS tagId,
+            COUNT(tag_read_count) AS value
+        FROM fact_tag_viewed_agency_monthly
+        where agency_id = #{agencyId}
+        AND month_id = #{monthId}
+        GROUP BY TAG_ID
+        ORDER BY value DESC
+        LIMIT #{pageSize}
+    </select>
+
+    <!-- 机关当季—每个标签阅读数量—前pageSize -->
+    <select id="getViewedQuarterlyCountByTag"  resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
+        SELECT
+            tag_name AS name,
+            agency_id AS agencyId,
+            tag_id AS tagId,
+            COUNT(tag_read_count) AS value
+        FROM fact_tag_viewed_agency_quarterly
+        where agency_id = #{agencyId}
+        AND quarter_id = #{quarterId}
+        GROUP BY TAG_ID
+        ORDER BY value DESC
+        LIMIT #{pageSize}
+    </select>
+
+    <!-- 机关当年—每个标签阅读数量—前pageSize -->
+    <select id="getViewedYearlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
+        SELECT
+            tag_name AS name,
+            agency_id AS agencyId,
+            tag_id AS tagId,
+            COUNT(tag_read_count) AS value
+        FROM fact_tag_viewed_agency_yearly
+        where agency_id = #{agencyId}
+        AND year_id = #{yearId}
+        GROUP BY tag_id
+        ORDER BY value DESC
+        LIMIT #{pageSize}
+    </select>
+
+    <!-- 机关当月—每个标签发文数量—前pageSize -->
+    <select id="getUsedMonthlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
+        SELECT
+            tag_name AS name,
+            agency_id AS agencyId,
+            tag_id AS tagId,
+            COUNT(used_count) AS value
+        FROM fact_tag_used_agency_monthly
+        where agency_id = #{agencyId}
+        AND month_id = #{monthId}
+        GROUP BY TAG_ID
+        ORDER BY value DESC
+        LIMIT #{pageSize}
+    </select>
+
+    <!-- 机关当季—每个标签发文数量—前pageSize -->
+    <select id="getUsedQuarterlyCountByTag" parameterType="java.lang.String"
+            resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
+        SELECT
+            tag_name AS name,
+            agency_id AS agencyId,
+            tag_id AS tagId,
+            COUNT(used_count) AS value
+        FROM fact_tag_used_agency_quarterly
+        where agency_id = #{agencyId}
+        AND quarter_id = #{quarterId}
+        GROUP BY TAG_ID
+        ORDER BY value DESC
+        LIMIT #{pageSize}
+    </select>
+
+    <!-- 机关当年—每个标签发文数量—前pageSize -->
+    <select id="getUsedYearlyCountByTag" parameterType="map"
+            resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
+        SELECT
+            tag_name AS name,
+            agency_id AS agencyId,
+            tag_id AS tagId,
+            COUNT(used_count) AS value
+        FROM fact_tag_used_agency_yearly
+        where agency_id = #{agencyId}
+        AND year_id = #{yearId}
+        GROUP BY tag_id
+        ORDER BY value DESC
+        LIMIT #{pageSize}
+    </select>
+</mapper>