Merge branches 'dev' and 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats

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.1
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.3
     ports:
       - "8109:8109"
     network_mode: host # 使用现有网络

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.1</version>
+    <version>0.3.3</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>

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);

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.2
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.3
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>