From e4728b289653b5ccd61725a83b579efc49eea778 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Jun 2020 12:36:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?datereport=E5=8F=91=E5=B8=83130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 e2981ef533..9b61df8582 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.1 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.2 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 9ae8ec1dc4..5a39916b0a 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"> - 0.3.1 + 0.3.2 data-report-server 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 2/4] =?UTF-8?q?datareport:=E6=96=87=E7=AB=A0=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=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"> - 0.3.2 + 0.3.3 data-report-server 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 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 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 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 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 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); From 0e61ae249b8afb622f0262cc1beff9869fa92c11 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 24 Jun 2020 14:48:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E7=BB=B4=E5=BA=A6=E6=97=B6=E5=80=99=EF=BC=8Clast=5Fex?= =?UTF-8?q?ec=5Ftime=E7=9A=84exec=5Ftime=E4=B8=BAnow=E7=9A=84bug=EF=BC=8C?= =?UTF-8?q?=E5=88=9D=E6=AC=A1=E5=88=9B=E5=BB=BA=E6=97=B6=E5=80=99=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E4=B8=BAnull=EF=BC=8Cinit=E4=B9=8B=E5=90=8E=E6=94=B9?= =?UTF-8?q?=E4=B8=BAnow=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/stats/impl/LastExecRecordServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java index 5fe4e6f924..ba6e33d157 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java @@ -25,9 +25,7 @@ public class LastExecRecordServiceImpl implements LastExecRecordService { */ @Override public LastExecRecordEntity createLastExecRecord(String statsSubject) { - Date now = new Date(); LastExecRecordEntity entity = new LastExecRecordEntity(); - entity.setExecTime(now); entity.setSubject(statsSubject); entity.setCreatedBy(RobotConstant.DIMENSION_ROBOT); entity.setUpdatedBy(RobotConstant.DIMENSION_ROBOT); From dbf10bd3de825047c510e9e9d7c6c8c5856244c5 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 24 Jun 2020 14:48:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml index f49b9ac74d..738ce59964 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml +++ b/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 # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index defb93920d..ece13a9d61 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.2 + 0.3.3 data-statistical com.epmet