From 2c711d60397655cd57af130ed1eadf2520035e00 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 10 Jun 2021 15:46:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A5=E5=BF=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/user/impl/UserServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java index 9be10286b6..59897628e3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java @@ -773,12 +773,10 @@ public class UserServiceImpl implements UserService { userDTO = topicUserMap.get(project.getLinkName()); } if (userDTO != null) { - logger.info("fillScreenProjectData every user data:{}", JSON.toJSONString(userDTO)); project.setLinkName(userDTO.getLinkName()); project.setLinkMobile(userDTO.getLinkMobile()); } } - logger.info("fillScreenProjectData result list:{}", JSON.toJSONString(list)); } /** From ff7f725c86ec6158001c04270afef72b96005e4a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 10 Jun 2021 17:09:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E5=B7=A1?= =?UTF-8?q?=E6=9F=A5=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/StaffPatrolInitResultDTO.java | 4 ++++ .../com/epmet/service/impl/StaffPatrolRecordServiceImpl.java | 1 + 2 files changed, 5 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffPatrolInitResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffPatrolInitResultDTO.java index 56b2589341..062008677e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffPatrolInitResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffPatrolInitResultDTO.java @@ -27,4 +27,8 @@ public class StaffPatrolInitResultDTO implements Serializable { * patrolling：返回最大的序号；status=end时，此列返回-1 */ private Integer latestSerialNum; + /** + * 最小时间间隔，单位s；默认30，后面可以做成客户可配置参数 + */ + private Integer carmDown; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java index f72166928b..a453e39df3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java @@ -87,6 +87,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl