Merge remote-tracking branch 'remotes/origin/dev'

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:

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,13 @@ 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);
+                    aBoolean = true;
                     break;
                 case SystemMessageType.USER_PATROL_STOP:
-                    aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm);
+                    //aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm);
+                    aBoolean = true;
                     break;
                 case SystemMessageType.PATROL_ROUTINE_WORK_ADD:
                     aBoolean = SpringContextUtils.getBean(BaseGridDailyworkService.class).insertBaseGridWorkRecord(patrolRecordForm);