From 8136ab26b8763bbbfd7b11c05e80f4740f09bb85 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 9 Aug 2021 11:19:55 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E9=9B=86=E6=88=90=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-commons/epmet-commons-tools/pom.xml     |   7 +-
 .../dto/datastats/form/BaseDataFormDTO.java   |   1 +
 .../result/SubTopicAndGroupResultDTO.java     |   1 +
 .../result/SubUserTotalResultDTO.java         |   4 +
 .../data-aggregator-server/pom.xml            |   3 +
 .../controller/pub/PubController.java         |  72 ++++++++++++------
 .../datastats/impl/DataStatsServiceImpl.java  |  24 +++---
 .../main/resources/excel/data_template.xlsx   | Bin 0 -> 12085 bytes
 8 files changed, 75 insertions(+), 37 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/excel/data_template.xlsx

diff --git a/epmet-commons/epmet-commons-tools/pom.xml b/epmet-commons/epmet-commons-tools/pom.xml
index 258b1a09b2..d8073505ce 100644
--- a/epmet-commons/epmet-commons-tools/pom.xml
+++ b/epmet-commons/epmet-commons-tools/pom.xml
@@ -18,7 +18,7 @@
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <commons.io.version>2.6</commons.io.version>
         <hutool.version>4.6.1</hutool.version>
-        <easypoi.version>4.1.0</easypoi.version>
+        <easypoi.version>4.1.3</easypoi.version>
         <joda.time.version>2.9.9</joda.time.version>
         <fastjson.version>1.2.60</fastjson.version>
         <gson.version>2.8.6</gson.version>
@@ -95,6 +95,11 @@
             <artifactId>easypoi-web</artifactId>
             <version>${easypoi.version}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-annotation</artifactId>
+            <version>${easypoi.version}</version>
+        </dependency>
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/BaseDataFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/BaseDataFormDTO.java
index 1eae69043b..cbfa41f767 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/BaseDataFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/BaseDataFormDTO.java
@@ -28,6 +28,7 @@ public class BaseDataFormDTO implements Serializable {
     private String dateId;
     private String startDateId;
     private String endDateId;
+    private String agencyName;
     public interface BaseData extends CustomerClientShowGroup{}
     public interface AgencyIdAndLevel extends CustomerClientShowGroup{}
 
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubTopicAndGroupResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubTopicAndGroupResultDTO.java
index 0b76a3d2a1..3210cf7b8c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubTopicAndGroupResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubTopicAndGroupResultDTO.java
@@ -19,5 +19,6 @@ public class SubTopicAndGroupResultDTO implements Serializable {
     private Integer topicTotal = 0;
     //小组总数
     private Integer groupTotal = 0;
+    private Integer sort = 1;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubUserTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubUserTotalResultDTO.java
index 2f87e63143..aea6f6c0a7 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubUserTotalResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubUserTotalResultDTO.java
@@ -19,5 +19,9 @@ public class SubUserTotalResultDTO implements Serializable {
     private Integer userTotal = 0;
     //党员总数
     private Integer partyMemberTotal = 0;
+    /**
+     * 排名
+     */
+    private Integer sort = 1;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index 6c2a9d38c6..84e74d7e89 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -97,6 +97,9 @@
             <resource>
                 <filtering>true</filtering>
                 <directory>${basedir}/src/main/resources</directory>
+                <excludes>
+                    <exclude>**/*.xlsx</exclude>
+                </excludes>
             </resource>
         </resources>
     </build>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java
index 2d6b0fa999..a034d63750 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java
@@ -1,5 +1,9 @@
 package com.epmet.dataaggre.controller.pub;
 
+import cn.afterturn.easypoi.entity.vo.TemplateExcelConstants;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.afterturn.easypoi.view.EasypoiTemplateExcelView;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.BaseDataFormDTO;
@@ -8,16 +12,18 @@ import com.epmet.dataaggre.dto.datastats.result.SubTopicAndGroupResultDTO;
 import com.epmet.dataaggre.dto.datastats.result.SubUserTotalResultDTO;
 import com.epmet.dataaggre.dto.datastats.result.WorkFactResultDTO;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
-import lombok.extern.log4j.Log4j;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 小程序相关配置，可以放在这，目前只放了footbar
@@ -25,7 +31,7 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2021/7/27 18:36
  */
-@Log4j
+@Slf4j
 @RestController
 @RequestMapping("pub")
 public class PubController {
@@ -89,30 +95,52 @@ public class PubController {
     /**
      * 导出数据，使用map接收
      *
-     * @param map
+     * @param formDTO
      * @param response
      * @throws IOException
+     * @return
      */
-    @PostMapping("/exportExcel")
-    public void exportExcel(@RequestBody BaseDataFormDTO formDTO, HttpServletResponse response) throws IOException {
-       /* try {
-            Map<String, Object> mapData = new HashMap<>();
-            BaseStatsDataResultDTO baseStatsData = dataStatsService.getBaseStatsData(formDTO);
-            String templatePath = "excel/trace_temp.xlsx";
-            log.info("exportExcel templatePath:{}",templatePath);
-            mapData.put("dataType", baseStatsData);
+    @RequestMapping("/exportExcel")
+    public ModelAndView exportExcel(@RequestBody(required = false) BaseDataFormDTO formDTO) throws IOException {
+        String paramStr = "{\"agencyId\":\"7b6f9a9f9f38d5f9fa7ce94a93d6eb28\",\"agencyLevel\":\"city\",\"dateId\":\"20210616\",\"type\":\"thisWeek\",\"agencyName\":\"组织名称\"}";
+        formDTO = JSON.parseObject(paramStr, BaseDataFormDTO.class);
+        Map<String, Object> mapData = new HashMap<>();
+        mapData.put("collectData", dataStatsService.getBaseStatsData(formDTO));
+        mapData.put("subWorkFactList", dataStatsService.getSubWorkFact(formDTO));
+        mapData.put("subUserTotalList", dataStatsService.subUserTotal(formDTO));
+        mapData.put("subTopicAndGroupList", dataStatsService.subTopicAndGroup(formDTO));
+        mapData.put("orgName",formDTO.getAgencyName());
+        mapData.put("type",getSearchTimeStr(formDTO.getType()));
+
+        long start = System.currentTimeMillis();
+        //自定义导出字段
+        //String templatePath = this.getClass().getClassLoader().getResource("excel/data_template.xlsx").getPath();
 
-            start = System.currentTimeMillis();
-            Workbook workbook = ExcelExportUtil.exportExcel(new TemplateExportParams(templatePath, "数据汇总"), baseStatsData);
-            //header
-            response.setHeader("content-Type", "application/vnd.ms-excel");
-            response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("继续追踪导出详情-".concat(DateUtils.formatDate()) + ".xlsx", "UTF-8"));
-            //加密
-            log.error("excelExport  build wb cost:{}",System.currentTimeMillis()-start);
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }*/
+        String templatePath = "excel/data_template.xlsx";
+        log.info("exportExcel templatePath:"+templatePath);
 
+        ModelAndView mv = new ModelAndView(new EasypoiTemplateExcelView());
+        mv.addObject(TemplateExcelConstants.FILE_NAME, "数据导出-");
+        TemplateExportParams templateExportParams = new TemplateExportParams(templatePath);
+        Integer[] integers = {0,1,2,3};
+        templateExportParams.setSheetNum(integers);
+        mv.addObject(TemplateExcelConstants.PARAMS, templateExportParams);
+        mv.addObject(TemplateExcelConstants.MAP_DATA, mapData);
+        log.info("excelExport  build wb cost:{}",System.currentTimeMillis()-start);
+        return mv;
+    }
+    private String getSearchTimeStr(String type){
+        //昨日/本周/本月
+        switch (type){
+            case "yesterday":
+                return "昨日";
+            case "thisWeek":
+                return "本周";
+            case "thisMonth":
+                return "本月";
+            default:
+                return "";
+        }
     }
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index ac853e29e7..0fede9e608 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1702,14 +1702,12 @@ public class DataStatsServiceImpl implements DataStatsService {
         }
 
         //4.按用户数降序排序并返回
-        Collections.sort(resultList, new Comparator<SubUserTotalResultDTO>() {
-            @Override
-            public int compare(SubUserTotalResultDTO o1, SubUserTotalResultDTO o2) {
-                //降序
-                return o2.getUserTotal().compareTo(o1.getUserTotal());
-            }
+        Collections.sort(resultList, (o1, o2) -> {
+            //降序
+            return o2.getUserTotal().compareTo(o1.getUserTotal());
         });
-
+        AtomicInteger i = new AtomicInteger(1);
+        resultList.forEach(e->e.setSort(i.getAndIncrement()));
         return resultList;
     }
 
@@ -1792,14 +1790,12 @@ public class DataStatsServiceImpl implements DataStatsService {
         }
 
         //4.按用户数降序排序并返回
-        Collections.sort(resultList, new Comparator<SubTopicAndGroupResultDTO>() {
-            @Override
-            public int compare(SubTopicAndGroupResultDTO o1, SubTopicAndGroupResultDTO o2) {
-                //降序
-                return o2.getTopicTotal().compareTo(o1.getTopicTotal());
-            }
+        Collections.sort(resultList, (o1, o2) -> {
+            //降序
+            return o2.getTopicTotal().compareTo(o1.getTopicTotal());
         });
-
+        AtomicInteger i = new AtomicInteger(1);
+        resultList.forEach(e->e.setSort(i.getAndIncrement()));
         return resultList;
     }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/excel/data_template.xlsx b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/excel/data_template.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..9b2c0c94d981cc9098b268023d5a4b60d8551c79
GIT binary patch
literal 12085
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
EKbHIGrvLx|

literal 0
HcmV?d00001


From 92f8cdc4419df79a706c2afe7ac20cbef254dfb8 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 9 Aug 2021 13:24:42 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/pub/PubController.java         |  13 +++++++------
 .../main/resources/excel/data_template.xlsx   | Bin 12085 -> 12070 bytes
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java
index a034d63750..8a0c8ae877 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java
@@ -3,7 +3,7 @@ package com.epmet.dataaggre.controller.pub;
 import cn.afterturn.easypoi.entity.vo.TemplateExcelConstants;
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import cn.afterturn.easypoi.view.EasypoiTemplateExcelView;
-import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.BaseDataFormDTO;
@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -101,9 +102,9 @@ public class PubController {
      * @return
      */
     @RequestMapping("/exportExcel")
-    public ModelAndView exportExcel(@RequestBody(required = false) BaseDataFormDTO formDTO) throws IOException {
-        String paramStr = "{\"agencyId\":\"7b6f9a9f9f38d5f9fa7ce94a93d6eb28\",\"agencyLevel\":\"city\",\"dateId\":\"20210616\",\"type\":\"thisWeek\",\"agencyName\":\"组织名称\"}";
-        formDTO = JSON.parseObject(paramStr, BaseDataFormDTO.class);
+    public ModelAndView exportExcel(@RequestBody BaseDataFormDTO formDTO) {
+        //String paramStr = "{\"agencyId\":\"7b6f9a9f9f38d5f9fa7ce94a93d6eb28\",\"agencyLevel\":\"city\",\"dateId\":\"20210616\",\"type\":\"thisWeek\",\"agencyName\":\"组织名称\"}";
+        //formDTO = JSON.parseObject(paramStr, BaseDataFormDTO.class);
         Map<String, Object> mapData = new HashMap<>();
         mapData.put("collectData", dataStatsService.getBaseStatsData(formDTO));
         mapData.put("subWorkFactList", dataStatsService.getSubWorkFact(formDTO));
@@ -120,13 +121,13 @@ public class PubController {
         log.info("exportExcel templatePath:"+templatePath);
 
         ModelAndView mv = new ModelAndView(new EasypoiTemplateExcelView());
-        mv.addObject(TemplateExcelConstants.FILE_NAME, "数据导出-");
+        mv.addObject(TemplateExcelConstants.FILE_NAME, DateUtils.format(new Date(),DateUtils.DATE_TIME_NO_SPLIT));
         TemplateExportParams templateExportParams = new TemplateExportParams(templatePath);
         Integer[] integers = {0,1,2,3};
         templateExportParams.setSheetNum(integers);
         mv.addObject(TemplateExcelConstants.PARAMS, templateExportParams);
         mv.addObject(TemplateExcelConstants.MAP_DATA, mapData);
-        log.info("excelExport  build wb cost:{}",System.currentTimeMillis()-start);
+        log.info("excelExport cost:{}",System.currentTimeMillis()-start);
         return mv;
     }
     private String getSearchTimeStr(String type){
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/excel/data_template.xlsx b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/excel/data_template.xlsx
index 9b2c0c94d981cc9098b268023d5a4b60d8551c79..af7104be3259cf76061860da0220c35eb9b5f781 100644
GIT binary patch
delta 2476
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

delta 2504
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
J8vWO>e*-;EZ`S|-


From 837c5b9eadd374e3dde562ba663985ca8f291dbe Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 10 Aug 2021 10:43:53 +0800
Subject: [PATCH 3/5] =?UTF-8?q?resource=20=E4=B8=8Bexcel=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-aggregator/data-aggregator-server/pom.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index 84e74d7e89..0f216610be 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -91,15 +91,23 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
+            <!-- 避免font文件的二进制文件格式压缩破坏 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
         </plugins>
         <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
         <resources>
             <resource>
                 <filtering>true</filtering>
                 <directory>${basedir}/src/main/resources</directory>
-                <excludes>
-                    <exclude>**/*.xlsx</exclude>
-                </excludes>
             </resource>
         </resources>
     </build>

From cf68bd8b880561d032f7316dda59488b640a29a7 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 10 Aug 2021 15:22:07 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=9B=86=E6=88=90=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E5=A4=96=E6=9A=B4=E9=9C=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/src/main/resources/bootstrap.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index dce0862481..1e85e697f9 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -481,6 +481,8 @@ epmet:
     - /message/template/**
     - /data/aggregator/project/projectdistribution
     - /data/aggregator/epmetuser/open-staffdetail
+    - /pub/**
+    - /screen/agency/getStaffAgencyTree
     #stats external包下 公共的类只外部暴露方法 纯外部使用的 暴漏整个
     - /data/stats/statsuser/gm-uploadevent
     - /data/stats/statsuser/gm-uploaddata

From 4b244048c92c186c9e285223194c29897278fc38 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 10 Aug 2021 16:42:39 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=9B=86=E6=88=90=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E5=A4=96=E6=9A=B4=E9=9C=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/src/main/resources/bootstrap.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 1e85e697f9..23c16efb82 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -481,8 +481,7 @@ epmet:
     - /message/template/**
     - /data/aggregator/project/projectdistribution
     - /data/aggregator/epmetuser/open-staffdetail
-    - /pub/**
-    - /screen/agency/getStaffAgencyTree
+    - /data/aggregator/pub/**
     #stats external包下 公共的类只外部暴露方法 纯外部使用的 暴漏整个
     - /data/stats/statsuser/gm-uploadevent
     - /data/stats/statsuser/gm-uploaddata