From 16be706ba0aec21d86f0150a782ef179f2395d32 Mon Sep 17 00:00:00 2001 From: NiuZiYuan Date: Thu, 29 May 2025 10:01:25 +0800 Subject: [PATCH] dev --- .../clinic/server/common/doc/entity/ApiInfo.java | 1 + .../clinic/server/common/doc/util/ScanUtil.java | 3 +++ .../server/controller/common/AuthController.java | 12 +++++++++++- .../controller/diagnosis/DiagnosisController.java | 7 +++++++ .../clinic/server/service/common/FileService.java | 14 +------------- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/common/doc/entity/ApiInfo.java b/src/main/java/com/syjiaer/clinic/server/common/doc/entity/ApiInfo.java index 1ed6da2..cf03586 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/doc/entity/ApiInfo.java +++ b/src/main/java/com/syjiaer/clinic/server/common/doc/entity/ApiInfo.java @@ -20,6 +20,7 @@ public class ApiInfo { } @Data public static class Request extends BaseProperty { + private boolean isRequired; // 原有结构保持不变 } diff --git a/src/main/java/com/syjiaer/clinic/server/common/doc/util/ScanUtil.java b/src/main/java/com/syjiaer/clinic/server/common/doc/util/ScanUtil.java index 74f254d..4bd6b20 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/doc/util/ScanUtil.java +++ b/src/main/java/com/syjiaer/clinic/server/common/doc/util/ScanUtil.java @@ -143,6 +143,8 @@ public class ScanUtil { ApiInfo.Request apiParam = new ApiInfo.Request(); apiParam.setComment(param.value()); apiParam.setName(param.name()); + apiParam.setRequired(param.required()); + // 设置参数类型 if (!param.typeName().isEmpty()) { @@ -183,6 +185,7 @@ public class ScanUtil { } else if (!apiReturn.type().equals(Object.class)) { Class returnType = apiReturn.type(); response.setType(returnType.getSimpleName()); + response.setName("对象"); // 递归处理复杂类型 if (isComplexType(returnType)) { diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/AuthController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/AuthController.java index 30a545e..601d167 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/common/AuthController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/AuthController.java @@ -1,6 +1,9 @@ package com.syjiaer.clinic.server.controller.common; import com.alibaba.fastjson.JSONObject; +import com.syjiaer.clinic.server.common.annotations.ApiParam; +import com.syjiaer.clinic.server.common.annotations.ApiParams; +import com.syjiaer.clinic.server.common.annotations.ApiReturn; import com.syjiaer.clinic.server.common.annotations.NoAuthCheck; import com.syjiaer.clinic.server.common.config.Config; import com.syjiaer.clinic.server.common.util.RsaUtil; @@ -18,8 +21,12 @@ public class AuthController extends BaseController { private Config config; @RequestMapping("set") @ApiOperation("设置认证信息") + @ApiParams({ + @ApiParam(name = "ciphertext", value = "密文", required = true, typeName = "String") + }) + @ApiReturn(isNull = true) @NoAuthCheck - public Result set() { + public Result set() { String ciphertext = parmsUtil.getString("ciphertext", "请输入密文"); String data= RsaUtil.decryp(ciphertext); config.set("common","cert",ciphertext); @@ -28,6 +35,7 @@ public class AuthController extends BaseController { @RequestMapping("get") @ApiOperation("获取认证信息") @NoAuthCheck + @ApiReturn(type = String.class) public Result get() { String cert=config.get("common","cert"); return success(cert); @@ -35,6 +43,8 @@ public class AuthController extends BaseController { @RequestMapping("check") @NoAuthCheck + @ApiOperation("检查认证信息") + @ApiReturn(type = JSONObject.class) public Result check(){ String cert=config.get("common","cert"); String data= RsaUtil.decryp(cert); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/DiagnosisController.java b/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/DiagnosisController.java index a8f5d88..75dc175 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/DiagnosisController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/DiagnosisController.java @@ -1,5 +1,8 @@ package com.syjiaer.clinic.server.controller.diagnosis; +import com.syjiaer.clinic.server.common.annotations.ApiParam; +import com.syjiaer.clinic.server.common.annotations.ApiParams; +import com.syjiaer.clinic.server.common.annotations.ApiReturn; import com.syjiaer.clinic.server.common.annotations.RecordCommonLog; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.common.vo.Result; @@ -39,6 +42,10 @@ public class DiagnosisController extends BaseController { @RecordCommonLog(operation = "完成诊断") @ApiOperation("保存诊断") @RequestMapping("/save") + @ApiReturn(type = PatientRegistration.class) + @ApiParams({ + @ApiParam(name = "data", value = "模型", required = true, type = DiagnosisDto.class) + }) public Result save() { DiagnosisDto saveDto = parmsUtil.getObject("data", DiagnosisDto.class); diagnosisService.save(saveDto); diff --git a/src/main/java/com/syjiaer/clinic/server/service/common/FileService.java b/src/main/java/com/syjiaer/clinic/server/service/common/FileService.java index 08267a6..529ba2b 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/common/FileService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/common/FileService.java @@ -45,19 +45,7 @@ public class FileService extends BaseService { } public String getJarDirectory() { - try { - // 获取当前类所在的 JAR 文件路径 - String path = FileService.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath(); - if (path.endsWith(".jar")) { - // 如果是 JAR 包，返回 JAR 所在目录 - return new File(path).getParent(); - } else { - // 如果是开发环境（非 JAR），返回项目根目录或其他合适的路径 - return new File("").getAbsolutePath(); - } - } catch (Exception e) { - throw new RuntimeException("无法获取 JAR 文件路径", e); - } + return System.getProperty("user.dir"); } private String generateTempFileName(MultipartFile file) {