From 2cf5e11d3cc6574b5d24a93a0b9329b4743e081b Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Tue, 31 Oct 2023 14:21:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VirtualPatientRasaApplication.java | 4 ++-- .../rasa/config/ThreadPoolExecutorConfig.java | 2 +- .../rasa/controller/RasaCmdController.java | 7 +++---- .../rasa/controller/RasaFileController.java | 6 ++---- .../rasa/controller/RasaTalkController.java | 4 ++-- .../rasa/pojo/dto/RasaReqDTO.java | 2 +- .../rasa/pojo/dto/RasaResDTO.java | 2 +- .../rasa/pojo/vo/RasaArgument.java | 2 +- .../rasa/service/RasaCmdService.java | 4 ++-- .../rasa/service/RasaFileService.java | 2 +- .../rasa/service/RasaTalkService.java | 2 +- .../rasa/service/impl/RasaCmdServiceImpl.java | 13 ++++--------- .../rasa/service/impl/RasaFileServiceImpl.java | 4 ++-- .../rasa/service/impl/RasaTalkServiceImpl.java | 8 ++++---- .../rasa/util/PortUtil.java | 5 +---- .../rasa/VirtualPatientRasaApplicationTests.java | 2 +- 16 files changed, 29 insertions(+), 40 deletions(-) rename virtual-patient-rasa/src/main/java/com/{superversion/rasa => supervision}/VirtualPatientRasaApplication.java (75%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/config/ThreadPoolExecutorConfig.java (96%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/controller/RasaCmdController.java (92%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/controller/RasaFileController.java (85%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/controller/RasaTalkController.java (88%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/pojo/dto/RasaReqDTO.java (74%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/pojo/dto/RasaResDTO.java (74%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/pojo/vo/RasaArgument.java (89%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/service/RasaCmdService.java (82%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/service/RasaFileService.java (82%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/service/RasaTalkService.java (76%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/service/impl/RasaCmdServiceImpl.java (90%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/service/impl/RasaFileServiceImpl.java (94%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/service/impl/RasaTalkServiceImpl.java (82%) rename virtual-patient-rasa/src/main/java/com/{superversion => supervision}/rasa/util/PortUtil.java (82%) rename virtual-patient-rasa/src/test/java/com/{superversion => supervision}/rasa/VirtualPatientRasaApplicationTests.java (86%) diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/VirtualPatientRasaApplication.java b/virtual-patient-rasa/src/main/java/com/supervision/VirtualPatientRasaApplication.java similarity index 75% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/VirtualPatientRasaApplication.java rename to virtual-patient-rasa/src/main/java/com/supervision/VirtualPatientRasaApplication.java index 2b22484c..59d845fb 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/VirtualPatientRasaApplication.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/VirtualPatientRasaApplication.java @@ -1,4 +1,4 @@ -package com.superversion.rasa; +package com.supervision; import com.supervision.config.WebConfig; import org.mybatis.spring.annotation.MapperScan; @@ -9,7 +9,7 @@ import org.springframework.context.annotation.FilterType; @SpringBootApplication @MapperScan(basePackages = {"com.supervision.**.mapper"}) -@ComponentScan(basePackages = {"com.superversion"},excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {WebConfig.class})) +@ComponentScan(basePackages = {"com.supervision"},excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {WebConfig.class})) public class VirtualPatientRasaApplication { public static void main(String[] args) { diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/config/ThreadPoolExecutorConfig.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/config/ThreadPoolExecutorConfig.java similarity index 96% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/config/ThreadPoolExecutorConfig.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/config/ThreadPoolExecutorConfig.java index 1ab09e89..953a09ee 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/config/ThreadPoolExecutorConfig.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/config/ThreadPoolExecutorConfig.java @@ -1,4 +1,4 @@ -package com.superversion.rasa.config; +package com.supervision.rasa.config; import java.util.concurrent.*; diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/controller/RasaCmdController.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaCmdController.java similarity index 92% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/controller/RasaCmdController.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaCmdController.java index a7938af0..3ad2d295 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/controller/RasaCmdController.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaCmdController.java @@ -1,8 +1,8 @@ -package com.superversion.rasa.controller; +package com.supervision.rasa.controller; import cn.hutool.core.util.StrUtil; -import com.superversion.rasa.pojo.vo.RasaArgument; -import com.superversion.rasa.service.RasaCmdService; +import com.supervision.rasa.pojo.vo.RasaArgument; +import com.supervision.rasa.service.RasaCmdService; import com.supervision.exception.BusinessException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.io.*; -import java.net.ServerSocket; import java.util.concurrent.*; @Api(tags = "rasa文件保存") diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/controller/RasaFileController.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaFileController.java similarity index 85% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/controller/RasaFileController.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaFileController.java index 396fc250..eafcf0f3 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/controller/RasaFileController.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaFileController.java @@ -1,7 +1,7 @@ -package com.superversion.rasa.controller; +package com.supervision.rasa.controller; -import com.superversion.rasa.service.RasaFileService; +import com.supervision.rasa.service.RasaFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -9,9 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.io.File; import java.io.IOException; -import java.util.UUID; @Api(tags = "rasa文件保存") @RestController diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/controller/RasaTalkController.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaTalkController.java similarity index 88% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/controller/RasaTalkController.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaTalkController.java index a24e4ec0..59f33fef 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/controller/RasaTalkController.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaTalkController.java @@ -1,6 +1,6 @@ -package com.superversion.rasa.controller; +package com.supervision.rasa.controller; -import com.superversion.rasa.service.RasaTalkService; +import com.supervision.rasa.service.RasaTalkService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/pojo/dto/RasaReqDTO.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/RasaReqDTO.java similarity index 74% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/pojo/dto/RasaReqDTO.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/RasaReqDTO.java index 230e90cc..00bb4843 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/pojo/dto/RasaReqDTO.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/RasaReqDTO.java @@ -1,4 +1,4 @@ -package com.superversion.rasa.pojo.dto; +package com.supervision.rasa.pojo.dto; import lombok.Data; diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/pojo/dto/RasaResDTO.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/RasaResDTO.java similarity index 74% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/pojo/dto/RasaResDTO.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/RasaResDTO.java index 1bd8b98f..8fab87d0 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/pojo/dto/RasaResDTO.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/RasaResDTO.java @@ -1,4 +1,4 @@ -package com.superversion.rasa.pojo.dto; +package com.supervision.rasa.pojo.dto; import lombok.Data; diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/pojo/vo/RasaArgument.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/vo/RasaArgument.java similarity index 89% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/pojo/vo/RasaArgument.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/vo/RasaArgument.java index cbbbf7b4..504811e2 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/pojo/vo/RasaArgument.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/vo/RasaArgument.java @@ -1,4 +1,4 @@ -package com.superversion.rasa.pojo.vo; +package com.supervision.rasa.pojo.vo; import lombok.Data; diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/service/RasaCmdService.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/service/RasaCmdService.java similarity index 82% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/service/RasaCmdService.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/service/RasaCmdService.java index 4b0473af..076a228a 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/service/RasaCmdService.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/service/RasaCmdService.java @@ -1,6 +1,6 @@ -package com.superversion.rasa.service; +package com.supervision.rasa.service; -import com.superversion.rasa.pojo.vo.RasaArgument; +import com.supervision.rasa.pojo.vo.RasaArgument; import java.io.IOException; import java.util.concurrent.ExecutionException; diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/service/RasaFileService.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/service/RasaFileService.java similarity index 82% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/service/RasaFileService.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/service/RasaFileService.java index 7fb8eee7..8fd9e934 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/service/RasaFileService.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/service/RasaFileService.java @@ -1,4 +1,4 @@ -package com.superversion.rasa.service; +package com.supervision.rasa.service; import org.springframework.web.multipart.MultipartFile; diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/service/RasaTalkService.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/service/RasaTalkService.java similarity index 76% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/service/RasaTalkService.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/service/RasaTalkService.java index 05a5ee0b..2630f7fa 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/service/RasaTalkService.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/service/RasaTalkService.java @@ -1,4 +1,4 @@ -package com.superversion.rasa.service; +package com.supervision.rasa.service; import java.util.List; diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/service/impl/RasaCmdServiceImpl.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/service/impl/RasaCmdServiceImpl.java similarity index 90% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/service/impl/RasaCmdServiceImpl.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/service/impl/RasaCmdServiceImpl.java index 1c4281c3..3dd4c46c 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/service/impl/RasaCmdServiceImpl.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/service/impl/RasaCmdServiceImpl.java @@ -1,20 +1,15 @@ -package com.superversion.rasa.service.impl; +package com.supervision.rasa.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.StrUtil; -import com.superversion.rasa.config.ThreadPoolExecutorConfig; -import com.superversion.rasa.pojo.vo.RasaArgument; -import com.superversion.rasa.service.RasaCmdService; -import com.supervision.model.RasaModelInfo; +import com.supervision.rasa.config.ThreadPoolExecutorConfig; +import com.supervision.rasa.pojo.vo.RasaArgument; +import com.supervision.rasa.service.RasaCmdService; import com.supervision.model.User; -import com.supervision.service.RasaModeService; import com.supervision.service.UserService; -import com.supervision.service.impl.UserServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.omg.CORBA.TRANSACTION_MODE; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/service/impl/RasaFileServiceImpl.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/service/impl/RasaFileServiceImpl.java similarity index 94% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/service/impl/RasaFileServiceImpl.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/service/impl/RasaFileServiceImpl.java index d1927eb3..6eafab9a 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/service/impl/RasaFileServiceImpl.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/service/impl/RasaFileServiceImpl.java @@ -1,8 +1,8 @@ -package com.superversion.rasa.service.impl; +package com.supervision.rasa.service.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ZipUtil; -import com.superversion.rasa.service.RasaFileService; +import com.supervision.rasa.service.RasaFileService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/service/impl/RasaTalkServiceImpl.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/service/impl/RasaTalkServiceImpl.java similarity index 82% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/service/impl/RasaTalkServiceImpl.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/service/impl/RasaTalkServiceImpl.java index a0aca9f9..b8c4624d 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/service/impl/RasaTalkServiceImpl.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/service/impl/RasaTalkServiceImpl.java @@ -1,10 +1,10 @@ -package com.superversion.rasa.service.impl; +package com.supervision.rasa.service.impl; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; -import com.superversion.rasa.pojo.dto.RasaReqDTO; -import com.superversion.rasa.pojo.dto.RasaResDTO; -import com.superversion.rasa.service.RasaTalkService; +import com.supervision.rasa.pojo.dto.RasaReqDTO; +import com.supervision.rasa.pojo.dto.RasaResDTO; +import com.supervision.rasa.service.RasaTalkService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/virtual-patient-rasa/src/main/java/com/superversion/rasa/util/PortUtil.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/util/PortUtil.java similarity index 82% rename from virtual-patient-rasa/src/main/java/com/superversion/rasa/util/PortUtil.java rename to virtual-patient-rasa/src/main/java/com/supervision/rasa/util/PortUtil.java index fd68f91f..8070ccff 100644 --- a/virtual-patient-rasa/src/main/java/com/superversion/rasa/util/PortUtil.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/util/PortUtil.java @@ -1,12 +1,9 @@ -package com.superversion.rasa.util; +package com.supervision.rasa.util; -import jdk.nashorn.internal.runtime.regexp.JoniRegExp; import lombok.extern.slf4j.Slf4j; import java.io.IOException; import java.net.Socket; -import java.util.TreeMap; -import java.util.function.Predicate; @Slf4j public class PortUtil { diff --git a/virtual-patient-rasa/src/test/java/com/superversion/rasa/VirtualPatientRasaApplicationTests.java b/virtual-patient-rasa/src/test/java/com/supervision/rasa/VirtualPatientRasaApplicationTests.java similarity index 86% rename from virtual-patient-rasa/src/test/java/com/superversion/rasa/VirtualPatientRasaApplicationTests.java rename to virtual-patient-rasa/src/test/java/com/supervision/rasa/VirtualPatientRasaApplicationTests.java index f54092c8..a6b4f6f6 100644 --- a/virtual-patient-rasa/src/test/java/com/superversion/rasa/VirtualPatientRasaApplicationTests.java +++ b/virtual-patient-rasa/src/test/java/com/supervision/rasa/VirtualPatientRasaApplicationTests.java @@ -1,4 +1,4 @@ -package com.superversion.rasa; +package com.supervision.rasa; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest;