优化

nb-admin/src/main/resources/application.yml

@@ -10,11 +10,6 @@ spring:
     active: dev
   jackson:
     time-zone: GMT+8
-  flyway:
-    baseline-on-migrate: true
-    enabled: true
-    encoding: UTF-8
-    validate-on-migrate: true
 
 server:
   port: 9090

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/HospitalManagerRegister.java

@@ -19,24 +19,21 @@ public class HospitalManagerRegister {
     private ScriptManager scriptManager;
     private ConfigStorageManager configStorageManager;
 
-    private HospitalManager hospitalManager;
     public HospitalManagerRegister(ScriptManager scriptManager, ConfigStorageManager configStorageManager) {
         this.scriptManager = scriptManager;
         this.configStorageManager = configStorageManager;
-        hospitalManager=new HospitalManager("1000",scriptManager,configStorageManager);
     }
 
     public void register(String hospitalId){
-//        managerMap.computeIfAbsent(hospitalId,k->
-//                new HospitalManager(k,scriptManager,configStorageManager)
-//        );
+        managerMap.computeIfAbsent(hospitalId,k->
+                new HospitalManager(k,scriptManager,configStorageManager)
+        );
     };
 
     public HospitalManager get(String hospitalId){
-        return hospitalManager;
-//        return  managerMap.computeIfAbsent(hospitalId,k->
-//                new HospitalManager(k,scriptManager,configStorageManager)
-//        );
+        return  managerMap.computeIfAbsent(hospitalId,k->
+                new HospitalManager(k,scriptManager,configStorageManager)
+        );
     }
 
 

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/HisScriptSession.java

@@ -263,14 +263,12 @@ public class HisScriptSession {
             return null;
         }else {
             BusPatientEntity patient = patientService
-                    .getOne(new QueryWrapper<BusPatientEntity>().lambda().eq(BusPatientEntity::getCode, patientCode)
-                            .orderByDesc(BusPatientEntity::getCreateTime)
-                            .last("limit 1"));
+                    .getOne(new QueryWrapper<BusPatientEntity>().lambda().eq(BusPatientEntity::getCode, patientCode).eq(BusPatientEntity::getTenantId, hospitalId));
             if(patient!=null){
                 List<BusClinicEntity> finalSources = sources;
                 CompletableFuture.runAsync(()->{
-                    conMixService.insertUniqueCon(finalSources,patient.getTenantId());
-                    conDoctorService.insertUniqueDoctor(finalSources,patient.getTenantId());
+                    conMixService.insertUniqueCon(finalSources,hospitalId);
+                    conDoctorService.insertUniqueDoctor(finalSources,hospitalId);
                 })
                         .whenComplete((i,e)->{
                             if(e!=null){
@@ -287,7 +285,7 @@ public class HisScriptSession {
                 }
                 String key=
                         StrUtil.isNullOrUndefined(source.getSurgeryName())?"":source.getSurgeryName()+
-                                DateUtil.formatDateTime(source.getStartTime());
+                        DateUtil.formatDateTime(source.getStartTime());
                 if(!distinct.containsKey(key)){
                     distinct.put(key,source);
                     publish.add(source);
@@ -298,7 +296,6 @@ public class HisScriptSession {
                     .peek(source->{
                         source.setTenantId(hospitalId);
                         if(patient!=null){
-                            source.setTenantId(patient.getTenantId());
                             source.setPatientId(patient.getId());
                             source.setMonitorType(true);
                         }else {

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

@@ -160,7 +160,7 @@ public class LocalBusDeviceService extends BaseService<BusDeviceMapper, BusDevic
         return this.update(new LambdaUpdateWrapper<BusDeviceEntity>()
                 .eq(BusDeviceEntity::getDeviceId,device.getDeviceId())
                 .set(StrUtil.isNotEmpty(device.getMqttConnInfo()),BusDeviceEntity::getMqttConnInfo,device.getMqttConnInfo())
-                .set(StrUtil.isNotEmpty(device.getAlias()),BusDeviceEntity::getAlias,device.getAlias())
+//                .set(StrUtil.isNotEmpty(device.getAlias()),BusDeviceEntity::getAlias,device.getAlias())
                 .set(StrUtil.isNotEmpty(device.getInfusionId()),BusDeviceEntity::getInfusionId,device.getInfusionId())
                 .set(StrUtil.isNotEmpty(device.getSimIccid()),BusDeviceEntity::getSimIccid,device.getSimIccid())
                 .set(StrUtil.isNotEmpty(device.getSimMno()),BusDeviceEntity::getSimMno,device.getSimMno())

nb-service/web-service/src/main/java/com/nb/web/service/bus/websocket/auth/HospitalAuthFilter.java

@@ -29,11 +29,10 @@ public class HospitalAuthFilter implements IWebSocketAuthFilter {
     public boolean auth(HttpRequest httpRequest, HttpResponse httpResponse, ChannelContext channelContext) {
         String authorization = httpRequest.getParam("Authorization");
         String version = httpRequest.getParam("Version");
-        String hospitalId = codeCheck.getHospitalId("1000");
-        HisScriptSession hisScriptSession =  hospitalManagerRegister.get(hospitalId).getScriptSession();
-
+        String hospitalId = codeCheck.getHospitalId(authorization);
         if (CharSequenceUtil.isNotBlank(hospitalId)) {
             channelContext.set(Constants.HOSPITAL_ID,hospitalId);
+            HisScriptSession hisScriptSession =  hospitalManagerRegister.get(hospitalId).getScriptSession();
             //绑定
             hisScriptSession.bindChannel(channelContext,version);
             log.info("医院脚本连接成功，医院编码【{}】",authorization);