From 1b6c6c0c89ed412eb8b2d5abeec89955560aed65 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 Jun 2020 13:43:32 +0800
Subject: [PATCH] =?UTF-8?q?datareport:=E6=96=87=E7=AB=A0=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95agencyId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deploy/docker-compose-dev.yml                |  2 +-
 .../data-report/data-report-server/pom.xml       |  2 +-
 .../publicity/impl/PublicityServiceImpl.java     | 16 +++++-----------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
index 9b61df8582..aff27c6e10 100644
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.2
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.3
     ports:
       - "8109:8109"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index 5a39916b0a..797ef55a62 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <version>0.3.2</version>
+    <version>0.3.3</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>
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 10f19b3ea0..c5e94f7633 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
@@ -54,7 +54,6 @@ public class PublicityServiceImpl implements PublicityService {
     @Override
     public FactPublishedAgencyDailyDTO summaryInfo(TokenDto tokenDto) {
         String agencyId = this.getLoginUserDetails(tokenDto);
-        agencyId="b9e295f8c1906a0d1c5e0b313afcda3f";
         return publicityDao.summaryInfo(agencyId);
     }
 
@@ -66,8 +65,7 @@ public class PublicityServiceImpl implements PublicityService {
      */
     @Override
     public List<FactTagAgencyDTO> tagviewed(TokenDto tokenDto, Integer pageSize, String type) {
-//        String agencyId = this.getLoginUserDetails(tokenDto);
-        String agencyId = "0d2ffe9fce682b602b9d451226d08fae";
+        String agencyId = this.getLoginUserDetails(tokenDto);
         Date date = new Date();
         String strDate = DateUtils.format(date, DateUtils.DATE_PATTERN);
         String yearId = strDate.substring(0, 4);
@@ -95,8 +93,7 @@ public class PublicityServiceImpl implements PublicityService {
      */
     @Override
     public List<FactTagAgencyDTO> tagused(TokenDto tokenDto, Integer pageSize, String type) {
-//        String agencyId = this.getLoginUserDetails(tokenDto);
-        String agencyId = "0d2ffe9fce682b602b9d451226d08fae";
+        String agencyId = this.getLoginUserDetails(tokenDto);
         Date date = new Date();
         String strDate = DateUtils.format(date, DateUtils.DATE_PATTERN);
         String yearId = strDate.substring(0, 4);
@@ -124,8 +121,7 @@ public class PublicityServiceImpl implements PublicityService {
      */
     @Override
     public List<FactPublishedAgencyDTO> subagencyPublishedarticle(TokenDto tokenDto, String type) {
-//        String agencyId = this.getLoginUserDetails(tokenDto);
-        String agencyId = "1041fe5e8499dbd8add314291d2f6da4";
+        String agencyId = this.getLoginUserDetails(tokenDto);
         Date date = new Date();
         String strDate = DateUtils.format(date, DateUtils.DATE_PATTERN_YYYYMMDD);
         String yearId = strDate.substring(0, 4);
@@ -153,8 +149,7 @@ public class PublicityServiceImpl implements PublicityService {
      */
     @Override
     public List<FactPublishedDepartmentDTO> departmentPublishedarticle(TokenDto tokenDto, String type) {
-//        String agencyId = this.getLoginUserDetails(tokenDto);
-        String agencyId = "0d2ffe9fce682b602b9d451226d08fae";
+        String agencyId = this.getLoginUserDetails(tokenDto);
         Date date = new Date();
         String strDate = DateUtils.format(date, DateUtils.DATE_PATTERN_YYYYMMDD);
         String yearId = strDate.substring(0, 4);
@@ -182,8 +177,7 @@ public class PublicityServiceImpl implements PublicityService {
      */
     @Override
     public List<FactPublishedGridDTO> subgridPublishedarticle(TokenDto tokenDto, String type) {
-//        String agencyId = this.getLoginUserDetails(tokenDto);
-        String agencyId = "0d2ffe9fce682b602b9d451226d08fae";
+        String agencyId = this.getLoginUserDetails(tokenDto);
         Date date = new Date();
         String strDate = DateUtils.format(date, DateUtils.DATE_PATTERN_YYYYMMDD);
         String yearId = strDate.substring(0, 4);