Prechádzať zdrojové kódy

add
记录最后一次密码修改时间

lifang 1 deň pred
rodič
commit
c96ebff217

+ 1 - 0
nb-admin/src/main/resources/logback-spring.xml

@@ -106,6 +106,7 @@
     <!-- Spring日志级别控制  -->
     <logger name="org.springframework" level="warn"/>
 
+    <logger name="org.tio.core" level="error"/>
     <!--系统操作日志-->
     <root level="info">
         <appender-ref ref="ERRORLOGEventPublisher"/>

+ 4 - 0
nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusClinicEntity.java

@@ -185,6 +185,10 @@ public class BusClinicEntity extends TenantGenericEntity<String,String> {
     @ApiModelProperty("最后一次的不良评价信息")
     private String lastBadEval;
 
+    @TableField(exist = false)
+    @JsonIgnore
+    private Date finishTime;
+
     public String getWeight() {
         return StrUtil.isBlank(weight)?null:weight;
     }

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

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import com.nb.web.api.bean.UndoDeviceConfig;
 import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.entity.*;
 import com.nb.web.service.bus.listener.event.bean.HisEvent;
@@ -291,7 +292,8 @@ public class HisScriptSession {
                     publish.add(source);
                 }
             }
-            publish=publish.stream().sorted(Comparator.comparing(
+            publish=publish.stream()
+                    .sorted(Comparator.comparing(
                     BusClinicEntity::getStartTime))
                     .peek(source->{
                         source.setTenantId(hospitalId);
@@ -301,6 +303,13 @@ public class HisScriptSession {
                         }else {
                             source.setMonitorType(false);
                         }
+                        //查看是否结束管理
+                        if (ObjectUtil.isNotNull(source.getFinishTime())) {
+                            source.setFinished(Boolean.TRUE);
+                            UndoDeviceConfig undo = new UndoDeviceConfig();
+                            undo.setUndoTime(source.getFinishTime());
+                            source.setUndoConfig(undo);
+                        }
                     })
                     .collect(Collectors.toList());
 

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

@@ -258,7 +258,7 @@ public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusH
             this.baseMapper.updateById(entity);
         });
         configService.saveDefaultConfig();
-//        list.parallelStream().forEach(hospital-> hospitalManagerRegister.refresh(hospital.getId(),true,true,true,true));
+        list.parallelStream().forEach(hospital-> hospitalManagerRegister.refresh(hospital.getId(),true,true,true,true));
     }