update 改变脚本路径

coffee-system/src/main/java/com/coffee/bus/controller/BusHospitalController.java

@@ -6,7 +6,7 @@ import cn.dev33.satoken.annotation.SaMode;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.coffee.bus.bean.Script;
 import com.coffee.bus.entity.BusHospitalEntity;
-import com.coffee.bus.script.ScriptManager;
+import com.coffee.bus.hospital.script.ScriptManager;
 import com.coffee.bus.service.LocalBusHospitalService;
 import com.coffee.common.crud.BaseService;
 import com.coffee.common.crud.controller.BaseCrudController;

coffee-system/src/main/java/com/coffee/bus/hospital/HospitalManager.java

@@ -14,8 +14,8 @@ import com.coffee.bus.hospital.config.bean.*;
 import com.coffee.bus.hospital.his.HisScriptSession;
 import com.coffee.bus.registry.device.DeviceRegistry;
 import com.coffee.bus.registry.patient.PatientRegistry;
-import com.coffee.bus.script.ScriptManager;
-import com.coffee.bus.script.ScriptParse;
+import com.coffee.bus.hospital.script.ScriptManager;
+import com.coffee.bus.hospital.script.ScriptParse;
 import com.coffee.bus.service.*;
 import com.coffee.bus.utils.WsPublishUtils;
 import com.coffee.common.cache.ConfigStorage;

coffee-system/src/main/java/com/coffee/bus/hospital/HospitalManagerRegister.java

@@ -2,7 +2,7 @@ package com.coffee.bus.hospital;
 
 import com.coffee.bus.registry.device.DeviceRegistry;
 import com.coffee.bus.registry.patient.PatientRegistry;
-import com.coffee.bus.script.ScriptManager;
+import com.coffee.bus.hospital.script.ScriptManager;
 import com.coffee.bus.service.*;
 import com.coffee.bus.utils.WsPublishUtils;
 import com.coffee.common.cache.manager.ConfigStorageManager;

coffee-system/src/main/java/com/coffee/bus/hospital/his/HisScriptSession.java

@@ -14,21 +14,18 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.coffee.bus.entity.BusClinicEntity;
 import com.coffee.bus.entity.BusHospitalEntity;
 import com.coffee.bus.listener.event.bean.HisEvent;
-import com.coffee.bus.script.DefaultParse;
-import com.coffee.bus.script.ExecuteResult;
-import com.coffee.bus.script.ScriptManager;
-import com.coffee.bus.script.ScriptParse;
+import com.coffee.bus.hospital.script.DefaultParse;
+import com.coffee.bus.hospital.script.ExecuteResult;
+import com.coffee.bus.hospital.script.ScriptManager;
+import com.coffee.bus.hospital.script.ScriptParse;
 import com.coffee.bus.service.LocalBusClinicService;
 import com.coffee.bus.service.LocalBusHospitalService;
-import com.coffee.common.cache.ClusterConfigStorage;
 import com.coffee.common.cache.ConfigStorage;
-import com.coffee.common.cache.manager.ClusterConfigStorageManager;
 import com.coffee.common.cache.manager.ConfigStorageManager;
 import com.coffee.common.cache.value.Value;
 import com.coffee.common.exception.CustomException;
 import com.coffee.common.result.R;
 import lombok.extern.slf4j.Slf4j;
-import org.redisson.api.RedissonClient;
 import org.springframework.util.Assert;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.tio.core.ChannelContext;

coffee-system/src/main/java/com/coffee/bus/hospital/his/HisScriptSessionManager.java

@@ -1,6 +1,6 @@
 package com.coffee.bus.hospital.his;
 
-import com.coffee.bus.script.ScriptManager;
+import com.coffee.bus.hospital.script.ScriptManager;
 import com.coffee.bus.service.LocalBusClinicService;
 import com.coffee.bus.service.LocalBusHospitalService;
 import com.coffee.common.cache.manager.ClusterConfigStorageManager;

coffee-system/src/main/java/com/coffee/bus/script/DefaultParse.java → coffee-system/src/main/java/com/coffee/bus/hospital/script/DefaultParse.java

@@ -1,7 +1,5 @@
-package com.coffee.bus.script;
+package com.coffee.bus.hospital.script;
 
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 
 /**

coffee-system/src/main/java/com/coffee/bus/script/ExecuteResult.java → coffee-system/src/main/java/com/coffee/bus/hospital/script/ExecuteResult.java

@@ -1,8 +1,7 @@
-package com.coffee.bus.script;
+package com.coffee.bus.hospital.script;
 
 import cn.hutool.json.JSON;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.script.ScriptException;

coffee-system/src/main/java/com/coffee/bus/script/PythonParse.java → coffee-system/src/main/java/com/coffee/bus/hospital/script/PythonParse.java

@@ -1,4 +1,4 @@
-package com.coffee.bus.script;
+package com.coffee.bus.hospital.script;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSON;

coffee-system/src/main/java/com/coffee/bus/script/ScriptManager.java → coffee-system/src/main/java/com/coffee/bus/hospital/script/ScriptManager.java

@@ -1,4 +1,4 @@
-package com.coffee.bus.script;
+package com.coffee.bus.hospital.script;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.coffee.bus.service.LocalBusHospitalService;

coffee-system/src/main/java/com/coffee/bus/script/ScriptParse.java → coffee-system/src/main/java/com/coffee/bus/hospital/script/ScriptParse.java

@@ -1,6 +1,4 @@
-package com.coffee.bus.script;
-
-import cn.hutool.json.JSON;
+package com.coffee.bus.hospital.script;
 
 /**
  * @author lifang