From ca4e5bcd426d43ef0343de7311b8daec7db45892 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 7 Apr 2022 17:25:55 +0800 Subject: [PATCH 1/3] - --- .../gov-org/gov-org-server/src/main/resources/bootstrap.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml index 1fda630da8..5a6a066a1b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml @@ -79,6 +79,7 @@ spring: namespace: @nacos.config.namespace@ group: @nacos.config.group@ file-extension: yaml + servlet: # 上传文件限制 multipart: From 7a5ad46370808252f1af4ea1949159c913c44a74 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 8 Apr 2022 11:19:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=AD=E9=97=B4=E5=BA=93=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=20=E5=B7=A1=E6=9F=A5=E6=9A=82=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/listener/OpenDataPatrolChangeEventListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java index c2cd63b509..677d1062ce 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java @@ -16,7 +16,6 @@ import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.constant.SystemMessageType; import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; import com.epmet.opendata.service.BaseGridDailyworkService; -import com.epmet.opendata.service.UserPatrolRecordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; @@ -90,10 +89,11 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr Boolean aBoolean = false; switch (tags) { case SystemMessageType.USER_PATROL_START: - aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).insertPatrolRecord(patrolRecordForm); + //巡查的未对接暂时不用同步了 + //aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).insertPatrolRecord(patrolRecordForm); break; case SystemMessageType.USER_PATROL_STOP: - aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm); + //aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm); break; case SystemMessageType.PATROL_ROUTINE_WORK_ADD: aBoolean = SpringContextUtils.getBean(BaseGridDailyworkService.class).insertBaseGridWorkRecord(patrolRecordForm); From a82feb5d7e183f484391698b1b43d72300e8ca07 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 8 Apr 2022 12:26:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=AD=E9=97=B4=E5=BA=93=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=20=E5=B7=A1=E6=9F=A5=E6=9A=82=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/mq/listener/OpenDataPatrolChangeEventListener.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java index 677d1062ce..d168875abb 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java @@ -91,9 +91,11 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr case SystemMessageType.USER_PATROL_START: //巡查的未对接暂时不用同步了 //aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).insertPatrolRecord(patrolRecordForm); + aBoolean = true; break; case SystemMessageType.USER_PATROL_STOP: //aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm); + aBoolean = true; break; case SystemMessageType.PATROL_ROUTINE_WORK_ADD: aBoolean = SpringContextUtils.getBean(BaseGridDailyworkService.class).insertBaseGridWorkRecord(patrolRecordForm);