diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedDepartmentDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedDepartmentDailyDTO.java deleted file mode 100644 index 63dcdf8194..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedDepartmentDailyDTO.java +++ /dev/null @@ -1,121 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedGridDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedGridDailyDTO.java deleted file mode 100644 index ef9441018c..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedGridDailyDTO.java +++ /dev/null @@ -1,121 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridYearlyDao.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDTO.java similarity index 61% rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridYearlyDao.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDTO.java index 39abffa211..6d1144a2c8 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridYearlyDao.java +++ b/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 . */ -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 -public interface FactTagViewedGridYearlyDao extends BaseDao { - +@Data +public class FactPublishedAgencyDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * 累计发文总数 + */ + private Integer publishedTotal; + + /** + * 发布中的文章总数 + */ + private Integer publishingTotal; + + /** + * 数据截止日期 + */ + private String dateName; + + } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedAgencyDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDailyDTO.java similarity index 97% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedAgencyDailyDTO.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDailyDTO.java index 8aa0274eab..50f07bcb8f 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedAgencyDailyDTO.java +++ b/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; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyDailyDao.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedDepartmentDTO.java similarity index 57% rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyDailyDao.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedDepartmentDTO.java index f07422bba4..bc26c9fb50 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyDailyDao.java +++ b/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 . */ -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 -public interface FactTagViewedAgencyDailyDao extends BaseDao { - +@Data +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; + + } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedDepartmentDailyDao.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedGridDTO.java similarity index 57% rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedDepartmentDailyDao.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedGridDTO.java index c4c74294b6..ad8a3e6c9e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedDepartmentDailyDao.java +++ b/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 . */ -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 -public interface FactArticlePublishedDepartmentDailyDao extends BaseDao { - +@Data +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; + + } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagAgencyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagAgencyDTO.java index 766a95393a..1d91a3287a 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagAgencyDTO.java +++ b/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 diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyDailyDTO.java deleted file mode 100644 index f9bb58d4ed..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyDailyDTO.java +++ /dev/null @@ -1,126 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyMonthlyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyMonthlyDTO.java deleted file mode 100644 index 9e66642afb..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyMonthlyDTO.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyQuarterlyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyQuarterlyDTO.java deleted file mode 100644 index b5e845f6f8..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyQuarterlyDTO.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyYearlyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyYearlyDTO.java deleted file mode 100644 index 9f420f6b37..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyYearlyDTO.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridDailyDTO.java deleted file mode 100644 index d34da43745..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridDailyDTO.java +++ /dev/null @@ -1,126 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridMonthlyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridMonthlyDTO.java deleted file mode 100644 index a1c6e3209d..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridMonthlyDTO.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridQuarterlyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridQuarterlyDTO.java deleted file mode 100644 index 10b049d10f..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridQuarterlyDTO.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridYearlyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridYearlyDTO.java deleted file mode 100644 index 2864b508de..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridYearlyDTO.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java index 2d79a95762..9f64bec3e4 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java +++ b/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 summaryInfo(@LoginUser TokenDto tokenDto) { - return new Result().ok(publicityService.summaryInfo(tokenDto)); + public Result summaryInfo(@LoginUser TokenDto tokenDto) { + return new Result().ok(publicityService.summaryInfo(tokenDto)); } /** diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedAgencyDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedAgencyDailyDao.java deleted file mode 100644 index 6f1c09e7db..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedAgencyDailyDao.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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 { - - /** - * @Description 宣传能力—工作端—当前机关累计发文和当前发文 - * @param agencyId - * @author jyy - */ - FactArticlePublishedAgencyDailyDTO summaryInfo(@Param("agencyId") String agencyId); - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedGridDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedGridDailyDao.java deleted file mode 100644 index 7b4277b25e..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedGridDailyDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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 { - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyMonthlyDao.java deleted file mode 100644 index c7e6d8dd9b..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyMonthlyDao.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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 getMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize); -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyQuarterlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyQuarterlyDao.java deleted file mode 100644 index 62655117ab..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyQuarterlyDao.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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 getQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize); -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyYearlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyYearlyDao.java deleted file mode 100644 index da999eb748..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyYearlyDao.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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 getYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize); -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyMonthlyDao.java deleted file mode 100644 index 4b9f72873a..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyMonthlyDao.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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 getMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize); -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyQuarterlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyQuarterlyDao.java deleted file mode 100644 index 5ba0a377ed..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyQuarterlyDao.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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 getQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize); -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyYearlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyYearlyDao.java deleted file mode 100644 index db124cb121..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyYearlyDao.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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 getYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize); -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridDailyDao.java deleted file mode 100644 index 524f2dafe0..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridDailyDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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 { - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridMonthlyDao.java deleted file mode 100644 index e616dbd156..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridMonthlyDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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 { - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridQuarterlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridQuarterlyDao.java deleted file mode 100644 index a83964bb1e..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridQuarterlyDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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 { - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java new file mode 100644 index 0000000000..aa2475e2c5 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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 getViewedMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize); + + /** + * @Description 当季———获取机关下，获取每个标签阅读数量，按照数量降序，取前pagesize个 + * @param agencyId,quarterId,pageSize 机关id，季，展示数量 + * @author zxc + */ + List getViewedQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize); + + /** + * @Description 当年———获取机关下，获取每个标签阅读数量，按照数量降序，取前pagesize个 + * @param agencyId,yearId,pageSize 机关id，年，展示数量 + * @author zxc + */ + List getViewedYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize); + + /** + * @Description 当月———获取机关下，获取每个标签发文数量，按照数量降序，取前pagesize个 + * @param agencyId,monthId,pageSize 机关id，月，展示数量 + * @author zxc + */ + List getUsedMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize); + + /** + * @Description 当季———获取机关下，获取每个标签发文数量，按照数量降序，取前pagesize个 + * @param agencyId,quarterId,pageSize 机关id，季，展示数量 + * @author zxc + */ + List getUsedQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize); + + /** + * @Description 当年———获取机关下，每个标签发文数量，按照数量降序，取前pagesize个 + * @param agencyId,yearId,pageSize 机关id，年，展示数量 + * @author zxc + */ + List getUsedYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize); + +} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedAgencyDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedAgencyDailyEntity.java deleted file mode 100644 index 673699742d..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedAgencyDailyEntity.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedDepartmentDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedDepartmentDailyEntity.java deleted file mode 100644 index 2a67346010..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedDepartmentDailyEntity.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedGridDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedGridDailyEntity.java deleted file mode 100644 index 743724c2ab..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedGridDailyEntity.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyDailyEntity.java deleted file mode 100644 index fb3d59a1ca..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyDailyEntity.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyMonthlyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyMonthlyEntity.java deleted file mode 100644 index 35cac8e93f..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyMonthlyEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyQuarterlyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyQuarterlyEntity.java deleted file mode 100644 index 318cfc19f4..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyQuarterlyEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyYearlyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyYearlyEntity.java deleted file mode 100644 index 5680665c68..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyYearlyEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridDailyEntity.java deleted file mode 100644 index 878f9d3428..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridDailyEntity.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridMonthlyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridMonthlyEntity.java deleted file mode 100644 index eeae33a44a..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridMonthlyEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridQuarterlyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridQuarterlyEntity.java deleted file mode 100644 index 75243cc1cc..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridQuarterlyEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridYearlyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridYearlyEntity.java deleted file mode 100644 index 9842520a5b..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridYearlyEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -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; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java index 5d3ee0c762..e79ed8c1d5 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java +++ b/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 宣传能力—工作端—宣传能力-获取阅读最多的分类数据 diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java index fecabf3eaf..e65b569d23 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java +++ b/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; diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedAgencyDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedAgencyDailyDao.xml deleted file mode 100644 index c7897f6aec..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedAgencyDailyDao.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedDepartmentDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedDepartmentDailyDao.xml deleted file mode 100644 index 9ea91a5f1a..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedDepartmentDailyDao.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedGridDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedGridDailyDao.xml deleted file mode 100644 index a38deee2c2..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedGridDailyDao.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyMonthlyDao.xml deleted file mode 100644 index f4806e8e40..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyMonthlyDao.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyQuarterlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyQuarterlyDao.xml deleted file mode 100644 index 9c10faf1b1..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyQuarterlyDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyYearlyDao.xml deleted file mode 100644 index 3384db1368..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyYearlyDao.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyDailyDao.xml deleted file mode 100644 index 9800e7e6d8..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyDailyDao.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyMonthlyDao.xml deleted file mode 100644 index 937da74e63..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyMonthlyDao.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyQuarterlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyQuarterlyDao.xml deleted file mode 100644 index 5ff395280d..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyQuarterlyDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyYearlyDao.xml deleted file mode 100644 index e0b274080d..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyYearlyDao.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridDailyDao.xml deleted file mode 100644 index 0c7fa42162..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridDailyDao.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridMonthlyDao.xml deleted file mode 100644 index dab09fcbc0..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridMonthlyDao.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridQuarterlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridQuarterlyDao.xml deleted file mode 100644 index e54d037353..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridQuarterlyDao.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridYearlyDao.xml deleted file mode 100644 index 347c54204a..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridYearlyDao.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml new file mode 100644 index 0000000000..73ec0850fb --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file