升级jdk17

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.5.RELEASE</version>
+        <version>3.2.5</version>
     </parent>
 
     <groupId>com.supervision</groupId>
@@ -27,18 +27,17 @@
     </modules>
 
     <properties>
+        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.target>17</maven.compiler.target>
-
+        <alibaba.cloud.version>2023.0.1.0</alibaba.cloud.version>
-
+        <spring.cloud.version>2023.0.1</spring.cloud.version>
-        <alibaba.cloud.version>2.2.5.RELEASE</alibaba.cloud.version>
+        <nacos.common.version>2.3.2</nacos.common.version>
-        <spring.cloud.version>Hoxton.SR6</spring.cloud.version>
+        <spring.boot.version>3.2.5</spring.boot.version>
-        <nacos.common.version>1.4.1</nacos.common.version>
-        <spring.boot.version>2.3.5.RELEASE</spring.boot.version>
         <fastjson.version>1.2.76</fastjson.version>
-        <mybatis-puls-spring-boot.version>3.3.1</mybatis-puls-spring-boot.version>
+        <mybatis-puls-spring-boot.version>3.5.5</mybatis-puls-spring-boot.version>
-        <druid.version>1.1.22</druid.version>
+        <druid.version>1.2.21</druid.version>
         <hutool.version>5.8.16</hutool.version>
         <knife4j.version>3.0.3</knife4j.version>
         <lombok.version>1.18.20</lombok.version>
@@ -114,7 +113,7 @@
 
             <dependency>
                 <groupId>com.alibaba</groupId>
-                <artifactId>druid-spring-boot-starter</artifactId>
+                <artifactId>druid-spring-boot-3-starter</artifactId>
                 <version>${druid.version}</version>
             </dependency>
 
@@ -123,7 +122,7 @@
 
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
                 <version>${mybatis-puls-spring-boot.version}</version>
             </dependency>
 

virtual-patient-common/pom.xml

@@ -12,8 +12,9 @@
     <artifactId>virtual-patient-common</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
+        <java.version>17</java.version>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -79,7 +80,7 @@
 
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
+            <artifactId>druid-spring-boot-3-starter</artifactId>
         </dependency>
 
 
@@ -87,7 +88,7 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
 
         <dependency>

virtual-patient-common/src/main/java/com/supervision/config/JwtInterceptor.java

@@ -1,29 +1,23 @@
 package com.supervision.config;
 
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import cn.hutool.jwt.JWT;
 import cn.hutool.jwt.JWTUtil;
-import com.supervision.constant.UserTokenConstant;
 import com.supervision.exception.BusinessException;
-import com.supervision.util.SpringBeanUtil;
 import com.supervision.util.TokenUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
 
 @Slf4j
 public class JwtInterceptor implements HandlerInterceptor {
@@ -57,7 +51,7 @@ public class JwtInterceptor implements HandlerInterceptor {
 
 
     @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler,
+    public void afterCompletion(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, @NotNull Object handler,
                                 @Nullable Exception ex) throws Exception {
         // 请求结束,将用户信息从thread中移除
         clearAuth();

virtual-patient-common/src/main/java/com/supervision/config/MybatisPlusConfig.java

@@ -1,32 +0,0 @@
-/*
- * 文 件 名:  MybatisPlusConfig
- * 版    权:
- * 描    述:  <描述>
- * 修 改 人:  RedName
- * 修改时间:  2022/8/9
- * 跟踪单号:  <跟踪单号>
- * 修改单号:  <修改单号>
- * 修改内容:  <修改内容>
- */
-package com.supervision.config;
-
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * <功能详细描述>
- *
- * @author RedName
- * @version [版本号, 2022/8/9]
- * @see [相关类/方法]
- * @since [产品/模块版本]
- */
-@Configuration
-public class MybatisPlusConfig {
-
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
-    }
-}

virtual-patient-common/src/main/java/com/supervision/config/RequestLogConfig.java

@@ -2,6 +2,9 @@ package com.supervision.config;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
@@ -16,9 +19,6 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 

virtual-patient-graph/pom.xml

@@ -13,8 +13,9 @@
     <packaging>jar</packaging>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
+        <java.version>17</java.version>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -53,7 +54,7 @@
         <dependency>
             <groupId>org.nebula-contrib</groupId>
             <artifactId>ngbatis</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-jdk17</version>
         </dependency>
 
         <dependency>

virtual-patient-graph/src/main/java/com/supervision/domain/AllergyHistoryVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 过敏史
  */

virtual-patient-graph/src/main/java/com/supervision/domain/AncillaryResultVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 辅助检查结果
  */

virtual-patient-graph/src/main/java/com/supervision/domain/AncillaryVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 体格检查节点
  */

virtual-patient-graph/src/main/java/com/supervision/domain/DiagnosisVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 诊断(疾病)节点
  */

virtual-patient-graph/src/main/java/com/supervision/domain/FamilyHistoryVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 家族史
  */

virtual-patient-graph/src/main/java/com/supervision/domain/IllnessHistoryVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 现病史节点
  */

virtual-patient-graph/src/main/java/com/supervision/domain/MarriageChildHistoryVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 婚育史
  */

virtual-patient-graph/src/main/java/com/supervision/domain/MedicalRecVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 @Data
 @Table(name = "medical_rec")
 public class MedicalRecVertex {

virtual-patient-graph/src/main/java/com/supervision/domain/NoPropertyEdge.java

@@ -1,8 +1,8 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Table;
 
 /**
  * 无属性节点

virtual-patient-graph/src/main/java/com/supervision/domain/OperationHistoryVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 手术史
  */

virtual-patient-graph/src/main/java/com/supervision/domain/PatientVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 患者信息
  */

virtual-patient-graph/src/main/java/com/supervision/domain/PersonalHistoryVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 个人史
  */

virtual-patient-graph/src/main/java/com/supervision/domain/PhysicalResultVertex.java

@@ -1,9 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
 
 /**
  * 辅助检查结果信息

virtual-patient-graph/src/main/java/com/supervision/domain/PhysicalVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 体格检查节点
  */

virtual-patient-graph/src/main/java/com/supervision/domain/PreviousHistoryVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 既往病史节点
  */

virtual-patient-graph/src/main/java/com/supervision/domain/ProcessMedicalVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 @Data
 @Table(name = "process_medical")
 public class ProcessMedicalVertex {

virtual-patient-graph/src/main/java/com/supervision/domain/SelfDescVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 @Data
 @Table(name = "self_desc")
 public class SelfDescVertex {

virtual-patient-graph/src/main/java/com/supervision/domain/SinglePropertyEdge.java

@@ -1,10 +1,10 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Table;
 
 /**
  * 单一属性节点

virtual-patient-graph/src/main/java/com/supervision/domain/SymptomsVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 症状
  */

virtual-patient-graph/src/main/java/com/supervision/domain/TreatmentPlanVertex.java

@@ -1,10 +1,9 @@
 package com.supervision.domain;
 
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 治疗计划节点
  */

virtual-patient-manage/pom.xml

@@ -2,25 +2,32 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
+    <parent>
-		<groupId>com.supervision</groupId>
+        <groupId>com.supervision</groupId>
-		<artifactId>virtual-patient</artifactId>
+        <artifactId>virtual-patient</artifactId>
-		<version>1.0-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
-	</parent>
+    </parent>
-
+
-	<artifactId>virtual-patient-manage</artifactId>
+    <artifactId>virtual-patient-manage</artifactId>
-	<name>virtual-patient-manage</name>
+    <name>virtual-patient-manage</name>
-	<packaging>jar</packaging>
+    <packaging>jar</packaging>
-
+
-
+    <properties>
-	<dependencies>
+        <java.version>17</java.version>
-
+        <maven.compiler.source>17</maven.compiler.source>
-		<dependency>
+        <maven.compiler.target>17</maven.compiler.target>
-			<groupId>com.alibaba.cloud</groupId>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+    </properties>
-			<exclusions>
+
-				<exclusion>
+
-					<groupId>com.alibaba</groupId>
+    <dependencies>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba</groupId>
 					<artifactId>fastjson</artifactId>
 				</exclusion>
 				<exclusion>

virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AskQuestionLibraryManageController.java

@@ -11,11 +11,11 @@ import com.supervision.vo.manage.AskQuestionLibraryResVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @Api(tags = "问题库管理")

virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/FileManageController.java

@@ -4,11 +4,11 @@ import com.supervision.manage.service.FileManageService;
 import com.supervision.model.FileResource;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 
 @Api(tags = "文件管理")
 @RestController

virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java

@@ -5,20 +5,20 @@ import com.supervision.manage.pojo.vo.MedicalAnswerVideoResVo;
 import com.supervision.manage.pojo.vo.MedicalRecInfoVO;
 import com.supervision.manage.pojo.vo.MedicalRecManageVO;
 import com.supervision.manage.pojo.vo.MedicalRecQaVO;
+import com.supervision.manage.service.MedicalRecManageService;
+import com.supervision.model.Disease;
 import com.supervision.vo.manage.DiseaseAncillaryResVo;
 import com.supervision.vo.manage.DiseasePhysicalResVo;
 import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
 import com.supervision.vo.manage.MedicalRecPageResVO;
-import com.supervision.manage.service.MedicalRecManageService;
-import com.supervision.model.Disease;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @Api(tags = "病历管理")

virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java

@@ -3,10 +3,10 @@ package com.supervision.manage.pojo.vo;
 import com.supervision.model.MedicalRec;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)

virtual-patient-manage/src/main/java/com/supervision/manage/service/AskQuestionLibraryManageService.java

@@ -6,9 +6,9 @@ import com.supervision.model.AskTemplateQuestionLibrary;
 import com.supervision.model.CommonDic;
 import com.supervision.vo.manage.AskQuestionLibraryReqVo;
 import com.supervision.vo.manage.AskQuestionLibraryResVo;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 public interface AskQuestionLibraryManageService {

virtual-patient-manage/src/main/java/com/supervision/manage/service/FileManageService.java

@@ -1,9 +1,9 @@
 package com.supervision.manage.service;
 
 import com.supervision.model.FileResource;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.InputStream;
 

virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java

@@ -5,14 +5,14 @@ import com.supervision.manage.pojo.vo.MedicalAnswerVideoResVo;
 import com.supervision.manage.pojo.vo.MedicalRecInfoVO;
 import com.supervision.manage.pojo.vo.MedicalRecManageVO;
 import com.supervision.manage.pojo.vo.MedicalRecQaVO;
+import com.supervision.model.Disease;
 import com.supervision.vo.manage.DiseaseAncillaryResVo;
 import com.supervision.vo.manage.DiseasePhysicalResVo;
 import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
 import com.supervision.vo.manage.MedicalRecPageResVO;
-import com.supervision.model.Disease;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 public interface MedicalRecManageService {

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java

@@ -24,6 +24,8 @@ import com.supervision.service.CommonDicService;
 import com.supervision.util.RedisSequenceUtil;
 import com.supervision.vo.manage.AskQuestionLibraryReqVo;
 import com.supervision.vo.manage.AskQuestionLibraryResVo;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;
@@ -32,8 +34,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.InputStream;

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java

@@ -133,7 +133,7 @@ public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlan
 
         //如果一级措施id为空，则判断一级措施是否已经存在，如果存在，则抛出异常
         if(StrUtil.isBlank(configTreatmentPlan.getFirstMeasuresId())){
-            Integer count = configTreatmentPlanService.lambdaQuery()
+            Long count = configTreatmentPlanService.lambdaQuery()
                     .eq(ConfigTreatmentPlan::getDisposalMethod, configTreatmentPlan.getDisposalMethod())
                     .eq(ConfigTreatmentPlan::getDisposalPlanId, configTreatmentPlan.getDisposalPlanId())
                     .eq(ConfigTreatmentPlan::getFirstMeasures, configTreatmentPlan.getFirstMeasures()).count();

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DirectoryInfoManageServiceImpl.java

@@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.supervision.manage.pojo.vo.DirectoryInfoVO;
 import com.supervision.manage.service.DirectoryInfoManageService;
-import com.supervision.manage.service.FileManageService;
 import com.supervision.model.DirectoryInfo;
 import com.supervision.model.MaterialLibrary;
 import com.supervision.service.DirectoryInfoService;
@@ -17,7 +16,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -56,7 +54,7 @@ public class DirectoryInfoManageServiceImpl implements DirectoryInfoManageServic
 
         Assert.notEmpty(directoryId, "文件目录id不能为空");
 
-        Integer count = directoryInfoService.lambdaQuery()
+        Long count = directoryInfoService.lambdaQuery()
                 .eq(DirectoryInfo::getParentId, directoryId).count();
         Assert.isTrue(count == 0, "目录下有子目录，不能删除");
 

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java

@@ -220,7 +220,7 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl
         Assert.notEmpty(diseaseTreatmentPlan.getTreatmentPlanId(),"处置计划id不能为空");
 
         // 根据疾病id和处置计划id进行重复校验
-        Integer count = diseaseTreatmentPlanService.lambdaQuery()
+        Long count = diseaseTreatmentPlanService.lambdaQuery()
                 .eq(DiseaseTreatmentPlan::getTreatmentPlanId, diseaseTreatmentPlan.getTreatmentPlanId())
                 .eq(DiseaseTreatmentPlan::getDiseaseId, diseaseTreatmentPlan.getDiseaseId()).count();
         Assert.isFalse(count > 0, "该处置计划已存在");

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/FileManageServiceImpl.java

@@ -8,13 +8,13 @@ import com.supervision.manage.service.FileManageService;
 import com.supervision.model.FileResource;
 import com.supervision.service.FileResourceService;
 import com.supervision.util.MinioUtil;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileOutputStream;

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MaterialLibraryManageServiceImpl.java

@@ -3,7 +3,6 @@ package com.supervision.manage.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.supervision.manage.service.FileManageService;
@@ -94,7 +93,7 @@ public class MaterialLibraryManageServiceImpl implements MaterialLibraryManageSe
 
         if (!material.getMaterialName().equals(materialLibrary.getMaterialName())){
             // 如果素材名发生改变，需要校验素材名是否已经存在
-            Integer count = materialLibraryService.lambdaQuery().eq(MaterialLibrary::getMaterialName, materialLibrary.getMaterialName()).count();
+            Long count = materialLibraryService.lambdaQuery().eq(MaterialLibrary::getMaterialName, materialLibrary.getMaterialName()).count();
             Assert.isTrue(count == 0, "素材名已存在");
             List<String> split = StrUtil.split(material.getMaterialName(), ".");
             if (split.size() > 1){

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java

@@ -19,6 +19,8 @@ import com.supervision.vo.manage.DiseaseAncillaryResVo;
 import com.supervision.vo.manage.DiseasePhysicalResVo;
 import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
 import com.supervision.vo.manage.MedicalRecPageResVO;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;
@@ -27,8 +29,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.function.Function;

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java

@@ -78,7 +78,7 @@ public class PhysicalToolManageServiceImpl implements PhysicalToolManageService
         Assert.notBlank(physicalToolVO.getToolName(), () -> new BusinessException("体格检查工具名称不能为空"));
         Assert.notBlank(physicalToolVO.getType(), () -> new BusinessException("体格检查工具类型不能为空"));
         // 校验,相同类型下,不允许存在相同名称的工具
-        Integer nameCount = configPhysicalToolService.lambdaQuery().eq(ConfigPhysicalTool::getType, physicalToolVO.getType())
+        Long nameCount = configPhysicalToolService.lambdaQuery().eq(ConfigPhysicalTool::getType, physicalToolVO.getType())
                 .eq(ConfigPhysicalTool::getToolName, physicalToolVO.getToolName()).count();
         if (nameCount > 0) {
             throw new BusinessException("体格检查工具类型:" + physicalToolVO.getType() + " 存在重复名称");
@@ -115,7 +115,7 @@ public class PhysicalToolManageServiceImpl implements PhysicalToolManageService
         Assert.notBlank(physicalToolVO.getToolName(), () -> new BusinessException("体格检查工具名称不能为空"));
         Assert.notBlank(physicalToolVO.getType(), () -> new BusinessException("体格检查工具类型不能为空"));
         // 校验,相同类型下,不允许存在除这个ID相同名称的工具
-        Integer nameCount = configPhysicalToolService.lambdaQuery().eq(ConfigPhysicalTool::getType, physicalToolVO.getType())
+        Long nameCount = configPhysicalToolService.lambdaQuery().eq(ConfigPhysicalTool::getType, physicalToolVO.getType())
                 .ne(ConfigPhysicalTool::getId, physicalToolVO.getId())
                 .eq(ConfigPhysicalTool::getToolName, physicalToolVO.getToolName()).count();
         if (nameCount > 0) {
@@ -152,7 +152,7 @@ public class PhysicalToolManageServiceImpl implements PhysicalToolManageService
     @Transactional(rollbackFor = Exception.class)
     public void deleteConfigPhysicalTool(String id) {
         // 删除之前,校验这个工具是否在某些地方已经被配置了,如果配置了,就不允许删除
-        Integer count = diseasePhysicalService.lambdaQuery().eq(DiseasePhysical::getToolId, id).count();
+        Long count = diseasePhysicalService.lambdaQuery().eq(DiseasePhysical::getToolId, id).count();
         if (count > 0 ) {
             throw new BusinessException("工具已被使用,不允许删除");
         }

virtual-patient-model/pom.xml

@@ -13,6 +13,9 @@
     <name>virtual-patient-model</name>
 
     <properties>
+        <java.version>17</java.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseAncillaryServiceImpl.java

@@ -1,20 +1,15 @@
 package com.supervision.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.supervision.dto.DiseaseAncillaryDto;
 import com.supervision.exception.BusinessException;
-import com.supervision.model.Disease;
+import com.supervision.mapper.DiseaseAncillaryMapper;
 import com.supervision.model.DiseaseAncillary;
 import com.supervision.service.DiseaseAncillaryService;
-import com.supervision.mapper.DiseaseAncillaryMapper;
 import com.supervision.vo.manage.DiseaseAncillaryResVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import sun.awt.image.BufImgSurfaceData;
 
 import java.util.List;
 import java.util.function.Supplier;

virtual-patient-model/src/main/java/com/supervision/vo/ask/ModifyPrimaryDiseaseInfoReqVO.java

@@ -1,9 +1,9 @@
 package com.supervision.vo.ask;
 
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @Data

virtual-patient-rasa/pom.xml

@@ -16,6 +16,9 @@
 
 
     <properties>
+        <java.version>17</java.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

virtual-patient-rasa/src/main/java/com/supervision/rasa/util/PortUtil.java

@@ -1,14 +1,11 @@
 package com.supervision.rasa.util;
 
 import cn.hutool.core.collection.CollectionUtil;
-import jdk.nashorn.internal.runtime.regexp.JoniRegExp;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
 import java.net.Socket;
 import java.util.List;
-import java.util.TreeMap;
-import java.util.function.Predicate;
 
 @Slf4j
 public class PortUtil {

virtual-patient-web/pom.xml

@@ -14,6 +14,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>17</java.version>
     </properties>
 
     <dependencies>

virtual-patient-web/src/main/java/com/supervision/controller/AskController.java

@@ -1,21 +1,15 @@
 package com.supervision.controller;
 
-import cn.hutool.json.JSONUtil;
-import com.supervision.pojo.paddlespeech.req.TtsReqDTO;
-import com.supervision.pojo.vo.TalkReqVO;
 import com.supervision.pojo.vo.TalkResultResVO;
 import com.supervision.pojo.vo.TalkVideoReqVO;
 import com.supervision.service.AskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.OutputStream;
 
 @Api(tags = "问诊")
 @RestController

virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java

@@ -12,12 +12,12 @@ import com.supervision.vo.ask.ModifyPrimaryDiseaseInfoReqVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @Api(tags = "初步诊断")

virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskAncillaryResultReqVO.java

@@ -2,9 +2,9 @@ package com.supervision.pojo.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 
 @Data
 @ApiModel

virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskPhysicalResultReqVO.java

@@ -2,9 +2,9 @@ package com.supervision.pojo.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @Data

virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmNodeReqVO.java

@@ -1,9 +1,9 @@
 package com.supervision.pojo.vo;
 
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @Data

virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java

@@ -1,9 +1,9 @@
 package com.supervision.pojo.vo;
 
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @Data

virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java

@@ -1,15 +1,10 @@
 package com.supervision.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.supervision.model.DiagnosisPrimary;
-import com.supervision.model.DiagnosisPrimaryRelation;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @Data

virtual-patient-web/src/main/java/com/supervision/service/AskService.java

@@ -1,15 +1,10 @@
 package com.supervision.service;
 
-import com.supervision.pojo.vo.TalkReqVO;
 import com.supervision.pojo.vo.TalkResultResVO;
 import com.supervision.pojo.vo.TalkVideoReqVO;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.OutputStream;
 
 public interface AskService {
 

virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java

@@ -504,10 +504,10 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
      * ( 用户命中病历配置问题数 / 病历问题总数 ) * (用户提问命中病历配置问题数 / 用户实际提问的数量 )
      */
     private ChartNodeVO computeAncillaryChart(Process process) {
-        Integer userHitCount = diagnosisAncillaryRecordService.lambdaQuery().isNotNull(DiagnosisAncillaryRecord::getAncillaryId)
+        Long userHitCount = diagnosisAncillaryRecordService.lambdaQuery().isNotNull(DiagnosisAncillaryRecord::getAncillaryId)
                 .eq(DiagnosisAncillaryRecord::getProcessId, process.getId()).count();
-        Integer userCount = diagnosisAncillaryRecordService.lambdaQuery().eq(DiagnosisAncillaryRecord::getProcessId, process.getId()).count();
+        Long userCount = diagnosisAncillaryRecordService.lambdaQuery().eq(DiagnosisAncillaryRecord::getProcessId, process.getId()).count();
-        Integer medicalCount = diseaseAncillaryService.lambdaQuery().eq(DiseaseAncillary::getDiseaseId, process.getDiseaseId()).count();
+        Long medicalCount = diseaseAncillaryService.lambdaQuery().eq(DiseaseAncillary::getDiseaseId, process.getDiseaseId()).count();
         // 过程数据3：问诊vs问诊正确率
         BigDecimal num3 = BigDecimal.ZERO;
         if (userCount > 0) {
@@ -522,9 +522,9 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
         ChartNodeVO chartNodeVO = new ChartNodeVO();
         chartNodeVO.setNodePer(num2.multiply(num3).multiply(BigDecimal.valueOf(100)));
         chartNodeVO.setScoreLevel(chartNodeVO.computeScoreLevel());
-        chartNodeVO.setCorrect(userHitCount);
+        chartNodeVO.setCorrect(Math.toIntExact(userHitCount));
-        chartNodeVO.setUnCorrect(medicalCount - userHitCount);
+        chartNodeVO.setUnCorrect((int) (medicalCount - userHitCount));
-        chartNodeVO.setStandard(medicalCount);
+        chartNodeVO.setStandard(Math.toIntExact(medicalCount));
         chartNodeVO.setTotal(NumberUtil.add(chartNodeVO.getUnCorrect(), chartNodeVO.getStandard(), chartNodeVO.getCorrect()).intValue());
 
         return chartNodeVO;
@@ -536,12 +536,12 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
      */
     private ChartNodeVO computePhysicalChart(Process process) {
         // 查询用户命中病历配置问题数
-        Integer userHitCount = diagnosisPhysicalRecordService.lambdaQuery().isNotNull(DiagnosisPhysicalRecord::getPhysicalId)
+        Long userHitCount = diagnosisPhysicalRecordService.lambdaQuery().isNotNull(DiagnosisPhysicalRecord::getPhysicalId)
                 .eq(DiagnosisPhysicalRecord::getProcessId, process.getId()).count();
         // 查询用户实际检查数量
-        Integer userCount = diagnosisPhysicalRecordService.lambdaQuery().eq(DiagnosisPhysicalRecord::getProcessId, process.getId()).count();
+        Long userCount = diagnosisPhysicalRecordService.lambdaQuery().eq(DiagnosisPhysicalRecord::getProcessId, process.getId()).count();
         // 查询病例配置的数量
-        Integer medicalCount = diseasePhysicalService.lambdaQuery().eq(DiseasePhysical::getDiseaseId, process.getDiseaseId()).count();
+        Long medicalCount = diseasePhysicalService.lambdaQuery().eq(DiseasePhysical::getDiseaseId, process.getDiseaseId()).count();
         // 过程数据3：问诊vs问诊正确率
         BigDecimal num3 = BigDecimal.ZERO;
         if (userCount > 0) {
@@ -555,9 +555,9 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
         ChartNodeVO chartNodeVO = new ChartNodeVO();
         chartNodeVO.setNodePer(num2.multiply(num3).multiply(BigDecimal.valueOf(100)));
         chartNodeVO.setScoreLevel(chartNodeVO.computeScoreLevel());
-        chartNodeVO.setCorrect(userHitCount);
+        chartNodeVO.setCorrect(Math.toIntExact(userHitCount));
-        chartNodeVO.setUnCorrect(medicalCount - userHitCount);
+        chartNodeVO.setUnCorrect((int) (medicalCount - userHitCount));
-        chartNodeVO.setStandard(medicalCount);
+        chartNodeVO.setStandard(Math.toIntExact(medicalCount));
         chartNodeVO.setTotal(NumberUtil.add(chartNodeVO.getUnCorrect(), chartNodeVO.getStandard(), chartNodeVO.getCorrect()).intValue());
 
         return chartNodeVO;

virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java

@@ -120,7 +120,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
     @Transactional(rollbackFor = Exception.class)
     public void savePrimary(SaveDiagnosisPrimaryReqVO reqVO) {
         // 新增初步诊断之前,校验是否已经存在相同的初步诊断,如果有了,则不允许重复添加
-        Integer count = diagnosisPrimaryService.lambdaQuery().eq(DiagnosisPrimary::getProcessId, reqVO.getProcessId())
+        Long count = diagnosisPrimaryService.lambdaQuery().eq(DiagnosisPrimary::getProcessId, reqVO.getProcessId())
                 .eq(DiagnosisPrimary::getPrimaryDiagnosisId, reqVO.getPrimaryDiagnosisId()).count();
         if (0 < count) {
             throw new BusinessException("已经存在该疾病的初步诊断");
@@ -207,7 +207,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
         // 如果 != 1 ,不是暂存,那么就校验电子病历是否填写
         if (ObjectUtil.isEmpty(reqVO.getTempSaveFlag()) || 1 != reqVO.getTempSaveFlag()) {
             // 校验,如果没有填写病历,那么就不允许诊毕
-            Integer count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, reqVO.getProcessId()).count();
+            Long count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, reqVO.getProcessId()).count();
             if (count < 1) {
                 throw new BusinessException("电子病历未填写,请填写电子病例后诊毕");
             }
@@ -262,11 +262,11 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
     public void deletePrimary(String id) {
         // 如果本项初步诊断已经做过了辅助检查和体格检查,则不允许删除
         DiagnosisPrimary primary = diagnosisPrimaryService.getById(id);
-        Integer ancillaryCount = diagnosisAncillaryRecordService.lambdaQuery().eq(DiagnosisAncillaryRecord::getProcessId, primary.getProcessId()).count();
+        Long ancillaryCount = diagnosisAncillaryRecordService.lambdaQuery().eq(DiagnosisAncillaryRecord::getProcessId, primary.getProcessId()).count();
         if (ancillaryCount > 0) {
             throw new BusinessException("仅支持删除没有做过体格、辅助检查的初步诊断项目");
         }
-        Integer physicalCount = diagnosisPhysicalRecordService.lambdaQuery().eq(DiagnosisPhysicalRecord::getProcessId, primary.getProcessId()).count();
+        Long physicalCount = diagnosisPhysicalRecordService.lambdaQuery().eq(DiagnosisPhysicalRecord::getProcessId, primary.getProcessId()).count();
         if (physicalCount > 0) {
             throw new BusinessException("仅支持删除没有做过体格、辅助检查的初步诊断项目");
         }

virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java

@@ -125,7 +125,7 @@ public class MedicalRecordServiceImpl implements MedicalRecordService {
         }
 
 
-        Integer count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, processMedical.getProcessId()).count();
+        Long count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, processMedical.getProcessId()).count();
         Assert.isFalse(count > 0, "当前实例已经存在电子病例信息");
     }
 }