优化sql语句

nb-common/config-common/src/main/java/com/nb/common/config/mybatisplus/interceptor/DefaultTenantLineInnerInterceptor.java

@@ -38,7 +38,7 @@ import static org.springframework.web.context.request.RequestAttributes.SCOPE_RE
 @ConditionalOnBean(TenantIdManager.class)
 @Configuration
 public class DefaultTenantLineInnerInterceptor {
-    private final List<String> ignoreUrlTenantId= Arrays.asList("/login","/getUserInfo","/token","/bus/device/info/hospitalCode");
+    private final List<String> ignoreUrlTenantId= Arrays.asList("/login","/getUserInfo","/token","/bus/device/info/hospitalCode","/getAccountInfo","/bus/hospital/add");
     private final List<Class<?>> tableClass;
 
     private Set<String> ignoreTableName;

nb-service/iot-service/src/main/java/com/nb/aliyun/service/consumer/NBAndFourGConsumerGroupService.java

@@ -127,7 +127,7 @@ public class NBAndFourGConsumerGroupService extends AbstractAliConsumer {
         }
     };
 
-    private void processMessage(Message message) {
+    public void processMessage(Message message) {
         BusHospitalLogEntity hospitalLog = new BusHospitalLogEntity();
         long startTime = System.currentTimeMillis();
         String deviceName=null;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusHospitalService.java

@@ -142,15 +142,13 @@ public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusH
 
     @Override
     public void postSave(BusHospitalEntity entity) {
-        CompletableFuture.runAsync(()->{
-            List<BusHospitalConfigEntity> configs =
-                    configService.list(new QueryWrapper<BusHospitalConfigEntity>().lambda()
-                            .or()
-                            .eq(BusHospitalConfigEntity::getTenantId, 1));
-            configs.forEach(config->{
-                config.setId(null);
-                config.setTenantId(entity.getId());
-            });
+        List<BusHospitalConfigEntity> configs =
+                configService.list(new QueryWrapper<BusHospitalConfigEntity>().lambda()
+                        .or()
+                        .eq(BusHospitalConfigEntity::getTenantId, 1));
+        configs.forEach(config->{
+            config.setId(null);
+            config.setTenantId(entity.getId());
             configService.saveBatch(configs);
 
             //设置默认更新策略
@@ -179,7 +177,6 @@ public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusH
                     mix.setTenantId(entity.getId());
                 }).collect(Collectors.toSet()));
             }
-
             //设置默认报警原因
             List<BusConAlarmEntity> alarmCauses = conAlarmService.list(new QueryWrapper<BusConAlarmEntity>()
                     .lambda().eq(BusConAlarmEntity::getTenantId, "1"));
@@ -189,12 +186,7 @@ public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusH
                     alarmCause.setTenantId(entity.getId());
                 }).collect(Collectors.toSet()));
             }
-        })
-                .whenComplete((i,e)->{
-                    if(e!=null){
-                        log.error("新增医院默认配置失败,",e);
-                    }
-                });
+        });
     }
 
     @Override