优化sql语句

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

@@ -30,9 +30,9 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.100.32:3306/nbnetpump?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
+    url: jdbc:mysql://localhost:3306/nbnetpump?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
     username: root
-    password: 123456
+    password: root
     druid:
       # 初始连接数
       initialSize: 5

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

@@ -10,6 +10,11 @@ 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/iot-service/src/main/java/com/nb/aliyun/controller/IotController.java

@@ -77,6 +77,7 @@ public class IotController {
             device.setStatus(DeviceStatusEnum2.ONLINE);
             device.setDeviceId(source.getDeviceId());
             device.setStatus(DeviceStatusEnum2.ONLINE);
+            device.setAlias(source.getAlias());
             device.setEnable(true);
             deviceService.saveDevice(device);
             BusHospitalLogEntity hospitalLog = new BusHospitalLogEntity();

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

@@ -264,12 +264,14 @@ public class HisScriptSession {
             return null;
         }else {
             BusPatientEntity patient = patientService
-                    .getOne(new QueryWrapper<BusPatientEntity>().lambda().eq(BusPatientEntity::getCode, patientCode).eq(BusPatientEntity::getTenantId, hospitalId));
+                    .getOne(new QueryWrapper<BusPatientEntity>().lambda().eq(BusPatientEntity::getCode, patientCode)
+                            .orderByDesc(BusPatientEntity::getCreateTime)
+                            .last("limit 1"));
             if(patient!=null){
                 List<BusClinicEntity> finalSources = sources;
                 CompletableFuture.runAsync(()->{
-                    conMixService.insertUniqueCon(finalSources,hospitalId);
-                    conDoctorService.insertUniqueDoctor(finalSources,hospitalId);
+                    conMixService.insertUniqueCon(finalSources,patient.getTenantId());
+                    conDoctorService.insertUniqueDoctor(finalSources,patient.getTenantId());
                 })
                         .whenComplete((i,e)->{
                             if(e!=null){
@@ -286,7 +288,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);
@@ -297,6 +299,7 @@ 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())