宣传能力--type修改和下级机关去除self

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

@@ -0,0 +1,62 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.publicity.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 文章引用标签阅读数量【机关】统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-19
+ */
+@Data
+public class FactTagUsedAgencyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 标签名称 标签名称
+     */
+    private String name;
+
+    /**
+     * 使用改标签的数量
+     */
+    private Integer value;
+
+    /**
+     * 固定值：文章数量
+     */
+    private String type="文章数量";
+
+    /**
+     * 机关Id
+     */
+    private String agencyId;
+
+    /**
+     * 标签Id
+     */
+    private String tagId;
+
+
+}

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

@@ -30,7 +30,7 @@ import java.util.Date;
  * @since v1.0.0 2020-06-19
  */
 @Data
-public class FactTagAgencyDTO implements Serializable {
+public class FactTagViewedAgencyDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -65,7 +65,7 @@ public class PublicityController {
      * @author jyy
      */
     @PostMapping("tagviewed")
-    public Result<List<FactTagAgencyDTO>> tagviewed(@LoginUser TokenDto tokenDto, @RequestBody TagFormDTO formDTO) {
+    public Result<List<FactTagViewedAgencyDTO>> tagviewed(@LoginUser TokenDto tokenDto, @RequestBody TagFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, TagFormDTO.GroupJava.class);
 
         Integer pageSize = formDTO.getPageSize();
@@ -73,7 +73,7 @@ public class PublicityController {
             pageSize = NumConstant.TEN;
         }
         String type = formDTO.getType();
-        return new Result<List<FactTagAgencyDTO>>().ok(publicityService.tagviewed(tokenDto, pageSize, type));
+        return new Result<List<FactTagViewedAgencyDTO>>().ok(publicityService.tagviewed(tokenDto, pageSize, type));
     }
 
     /**
@@ -82,7 +82,7 @@ public class PublicityController {
      * @author jyy
      */
     @PostMapping("tagused")
-    public Result<List<FactTagAgencyDTO>> tagused(@LoginUser TokenDto tokenDto, @RequestBody TagFormDTO formDTO) {
+    public Result<List<FactTagUsedAgencyDTO>> tagused(@LoginUser TokenDto tokenDto, @RequestBody TagFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, TagFormDTO.GroupJava.class);
 
         Integer pageSize = formDTO.getPageSize();
@@ -90,7 +90,7 @@ public class PublicityController {
             pageSize = NumConstant.TEN;
         }
         String type = formDTO.getType();
-        return new Result<List<FactTagAgencyDTO>>().ok(publicityService.tagused(tokenDto, pageSize, type));
+        return new Result<List<FactTagUsedAgencyDTO>>().ok(publicityService.tagused(tokenDto, pageSize, type));
     }
 
     /**

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

@@ -44,42 +44,42 @@ public interface PublicityDao {
      * @param agencyId,monthId,pageSize 机关id，月，展示数量
      * @author zxc
      */
-    List<FactTagAgencyDTO> getViewedMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize);
+    List<FactTagViewedAgencyDTO> getViewedMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize);
 
     /**
      * @Description 当季———获取机关下，获取每个标签阅读数量，按照数量降序，取前pagesize个
      * @param agencyId,quarterId,pageSize 机关id，季，展示数量
      * @author zxc
      */
-    List<FactTagAgencyDTO> getViewedQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize);
+    List<FactTagViewedAgencyDTO> getViewedQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize);
 
     /**
      * @Description 当年———获取机关下，获取每个标签阅读数量，按照数量降序，取前pagesize个
      * @param agencyId,yearId,pageSize 机关id，年，展示数量
      * @author zxc
      */
-    List<FactTagAgencyDTO> getViewedYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize);
+    List<FactTagViewedAgencyDTO> getViewedYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize);
 
     /**
      * @Description 当月———获取机关下，获取每个标签发文数量，按照数量降序，取前pagesize个
      * @param agencyId,monthId,pageSize 机关id，月，展示数量
      * @author zxc
      */
-    List<FactTagAgencyDTO> getUsedMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize);
+    List<FactTagUsedAgencyDTO> getUsedMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize);
 
     /**
      * @Description 当季———获取机关下，获取每个标签发文数量，按照数量降序，取前pagesize个
      * @param agencyId,quarterId,pageSize 机关id，季，展示数量
      * @author zxc
      */
-    List<FactTagAgencyDTO> getUsedQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize);
+    List<FactTagUsedAgencyDTO> getUsedQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize);
 
     /**
      * @Description 当年———获取机关下，每个标签发文数量，按照数量降序，取前pagesize个
      * @param agencyId,yearId,pageSize 机关id，年，展示数量
      * @author zxc
      */
-    List<FactTagAgencyDTO> getUsedYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize);
+    List<FactTagUsedAgencyDTO> getUsedYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize);
 
     /**
      * @Description 当月———下级机发文数

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

@@ -18,12 +18,8 @@
 package com.epmet.service.publicity;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.publicity.dto.result.*;
-import org.apache.commons.lang3.StringUtils;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -46,14 +42,14 @@ public interface PublicityService {
      * @param tokenDto,formDTO
      * @author jyy
      */
-    public List<FactTagAgencyDTO> tagviewed(TokenDto tokenDto, Integer pageSize, String type)  ;
+    public List<FactTagViewedAgencyDTO> tagviewed(TokenDto tokenDto, Integer pageSize, String type)  ;
 
     /**
      * @Description  宣传能力—工作端—宣传能力-获取发表最多的分类数据
      * @param tokenDto,pageSize,type
      * @author jyy
      */
-    public List<FactTagAgencyDTO> tagused(TokenDto tokenDto, Integer pageSize, String type)  ;
+    public List<FactTagUsedAgencyDTO> tagused(TokenDto tokenDto, Integer pageSize, String type)  ;
 
     /**
      * @param tokenDto type

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

@@ -64,7 +64,7 @@ public class PublicityServiceImpl implements PublicityService {
      * @author jyy
      */
     @Override
-    public List<FactTagAgencyDTO> tagviewed(TokenDto tokenDto, Integer pageSize, String type) {
+    public List<FactTagViewedAgencyDTO> tagviewed(TokenDto tokenDto, Integer pageSize, String type) {
         String agencyId = this.getLoginUserDetails(tokenDto);
         Date date = new Date();
         String strDate = DateUtils.format(date, DateUtils.DATE_PATTERN);
@@ -92,7 +92,7 @@ public class PublicityServiceImpl implements PublicityService {
      * @author jyy
      */
     @Override
-    public List<FactTagAgencyDTO> tagused(TokenDto tokenDto, Integer pageSize, String type) {
+    public List<FactTagUsedAgencyDTO> tagused(TokenDto tokenDto, Integer pageSize, String type) {
         String agencyId = this.getLoginUserDetails(tokenDto);
         Date date = new Date();
         String strDate = DateUtils.format(date, DateUtils.DATE_PATTERN);

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

@@ -14,7 +14,7 @@
     </select>
 
     <!-- 机关当月—每个标签阅读数量—前pageSize -->
-    <select id="getViewedMonthlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
+    <select id="getViewedMonthlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagViewedAgencyDTO">
         SELECT
             tag_name AS name,
             agency_id AS agencyId,
@@ -29,7 +29,7 @@
     </select>
 
     <!-- 机关当季—每个标签阅读数量—前pageSize -->
-    <select id="getViewedQuarterlyCountByTag"  resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
+    <select id="getViewedQuarterlyCountByTag"  resultType="com.epmet.publicity.dto.result.FactTagViewedAgencyDTO">
         SELECT
             tag_name AS name,
             agency_id AS agencyId,
@@ -44,7 +44,7 @@
     </select>
 
     <!-- 机关当年—每个标签阅读数量—前pageSize -->
-    <select id="getViewedYearlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
+    <select id="getViewedYearlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagViewedAgencyDTO">
         SELECT
             tag_name AS name,
             agency_id AS agencyId,
@@ -59,7 +59,7 @@
     </select>
 
     <!-- 机关当月—每个标签发文数量—前pageSize -->
-    <select id="getUsedMonthlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
+    <select id="getUsedMonthlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagUsedAgencyDTO">
         SELECT
             tag_name AS name,
             agency_id AS agencyId,
@@ -74,7 +74,7 @@
     </select>
 
     <!-- 机关当季—每个标签发文数量—前pageSize -->
-    <select id="getUsedQuarterlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
+    <select id="getUsedQuarterlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagUsedAgencyDTO">
         SELECT
             tag_name AS name,
             agency_id AS agencyId,
@@ -89,7 +89,7 @@
     </select>
 
     <!-- 机关当年—每个标签发文数量—前pageSize -->
-    <select id="getUsedYearlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagAgencyDTO">
+    <select id="getUsedYearlyCountByTag" resultType="com.epmet.publicity.dto.result.FactTagUsedAgencyDTO">
         SELECT
             tag_name AS name,
             agency_id AS agencyId,
@@ -116,6 +116,7 @@
         where
             pub.agency_id = agency.id
         AND pub.PID =#{agencyId}
+        AND pub.agency_id  not LIKE '%self%'
         AND pub.month_id=#{monthId}
         GROUP BY pub.agency_id
         ORDER BY value DESC,agencyId ASC
@@ -135,6 +136,7 @@
         where
             pub.agency_id = agency.id
         AND pub.PID =#{agencyId}
+        AND pub.agency_id  not LIKE '%self%'
         AND pub.quarter_id=#{quarterId}
         GROUP BY pub.agency_id
         ORDER BY value DESC,agencyId ASC
@@ -153,6 +155,7 @@
         where
             pub.agency_id = agency.id
         AND pub.PID =#{agencyId}
+        AND pub.agency_id  not LIKE '%self%'
         AND pub.year_id=#{yearId}
         GROUP BY pub.agency_id
         ORDER BY value DESC,agencyId ASC