From 3de21afa3b1fde4cceb2e5e3a36f716f1f37eb69 Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Mon, 28 Oct 2024 12:40:05 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=B9=E6=B3=95=20=E4=BF=AE=E6=94=B9ftppdf?= =?UTF-8?q?=E5=92=8Cftpimage=20=E6=96=B9=E6=B3=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1c236d72073db2597917c78a387aaf5bd3d085c5. --- .../framework/common/util/io/FileUtils.java | 45 +------ .../framework/common/util/io/IoUtils.java | 1 - .../PatientexamlistController.java | 115 +++++++--------- .../vo/inspdfscreenshotVO.java | 4 - .../ultrasonic/medicalimg/SaveFileBase64.java | 19 --- .../medicalimg/insimagescreenshotVO.java | 3 - .../ultrasonic/ultrasonicController.java | 125 ++++++++---------- 7 files changed, 103 insertions(+), 209 deletions(-) delete mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/SaveFileBase64.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/FileUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/FileUtils.java index 0483b7d5f..2f870d738 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/FileUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/FileUtils.java @@ -8,12 +8,8 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.DigestUtil; import lombok.SneakyThrows; -import java.io.*; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardOpenOption; -import java.util.Base64; +import java.io.ByteArrayInputStream; +import java.io.File; /** * 文件工具类 @@ -85,41 +81,4 @@ public class FileUtils { return sha256Hex + '.' + FileTypeUtil.getType(new ByteArrayInputStream(content)); } - /** - * 将Base64编码的字符串保存为文件。 - * - * @param base64String Base64编码的字符串 - * @param folderPath 文件保存的文件夹路径 - * @param fileName 文件名（不包含扩展名） - * @param extension 文件扩展名（例如 "png", "jpg", "txt"） - * @throws IOException 如果写入文件时发生错误 - */ - public static void saveBase64ToFile(String base64String, String folderPath, String fileName, String extension) throws IOException { - // 检查文件名是否有效 - if (fileName.contains("..") || fileName.contains("/") || fileName.contains("\\")) { - throw new IllegalArgumentException("Invalid file name."); - } - - // 解码Base64字符串为字节数组 - byte[] decodedBytes = Base64.getDecoder().decode(base64String); - - - // 创建文件的路径 - Path folder = Paths.get(folderPath); - if (!Files.exists(folder)) { - // 如果文件夹不存在，则创建它 - Files.createDirectories(folder); - } - // 构建完整的文件名（包括扩展名） - Path filePath = folder.resolve(fileName + "." + extension); - - // 使用Files.newOutputStream创建OutputStream，并设置为追加模式 - try (java.io.OutputStream outputStream = Files.newOutputStream(filePath, StandardOpenOption.CREATE, StandardOpenOption.WRITE)) { - outputStream.write(decodedBytes); - - } catch (IOException e) { - - throw e; - } - } } diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/IoUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/IoUtils.java index 2e4e3019c..4a19f479d 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/IoUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/IoUtils.java @@ -25,5 +25,4 @@ public class IoUtils { return StrUtil.utf8Str(IoUtil.read(in, isClose)); } - } diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java index 8e02b2f9e..9ec8deff7 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.tblist.controller.admin.patientexamlist; import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.framework.common.util.io.FileUtils; import cn.iocoder.yudao.module.system.dal.dataobject.org.OrgUnitDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.org.OrgUnitService; @@ -397,80 +396,64 @@ public class PatientexamlistController { @Operation(summary = "获取pdf上传ftp") public void FtpPdf(@RequestBody inspdfscreenshotVO insimagescreenshotVO) { String base64String = insimagescreenshotVO.getImagebase(); + String ftpServer = "114.55.171.231"; + int ftpPort = 21; // FTP端口，默认为21 + String ftpUser = "pacs"; + String ftpPassword = "pacs"; + String uploadPath = "/"; String fileName = System.currentTimeMillis() + ".pdf"; - if(insimagescreenshotVO.getModel().equals("0")) - { + + FTPClient ftpClient = new FTPClient(); + + ftpClient.enterLocalPassiveMode(); + try { + // 连接FTP服务器 + ftpClient.connect(ftpServer, ftpPort); + ftpClient.login(ftpUser, ftpPassword); + + // 设置文件传输类型为二进制 + ftpClient.setFileType(FTP.BINARY_FILE_TYPE); // 解码Base64字符串 - String base64Image = base64String.split(",")[1]; - try - { - FileUtils.saveBase64ToFile(base64Image,insimagescreenshotVO.getFolderPath(),fileName.split("\\.")[0],"pdf"); + String base64Image = base64String.split(",")[1]; // 去掉数据URL的头部 + // 解码Base64字符串 + byte[] decodedBytes = Base64.getDecoder().decode(base64Image); + + // 创建输入流 + InputStream inputStream = new ByteArrayInputStream(decodedBytes); + + // 上传文件 + boolean result = ftpClient.storeFile(uploadPath + "/" + fileName, inputStream); + if (result) { + //上传成功 + //当前时间 + LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + AdminUserDO user = userService.getUser(getLoginUserId()); + PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO(); + updateReqVO.setId(insimagescreenshotVO.getID()); + updateReqVO.setPdfurl("http://114.55.171.231:48082/" + fileName); + patientexamlistService.updatePatientexamlist(updateReqVO); + } else { + System.out.println("文件上传失败"); } - catch (Exception ignored) - { - System.out.println("文件上传失败"+ignored.getMessage()); - } - } - else - { - String ftpServer = "114.55.171.231"; - int ftpPort = 21; // FTP端口，默认为21 - String ftpUser = "pacs"; - String ftpPassword = "pacs"; - String uploadPath = "/"; - - FTPClient ftpClient = new FTPClient(); - - ftpClient.enterLocalPassiveMode(); + // 断开连接 + ftpClient.logout(); + ftpClient.disconnect(); + } catch (SocketException e) { + System.err.println("无法连接到FTP服务器: " + e.getMessage()); + } catch (IOException e) { + System.err.println("IO异常: " + e.getMessage()); + } finally { try { - // 连接FTP服务器 - ftpClient.connect(ftpServer, ftpPort); - ftpClient.login(ftpUser, ftpPassword); - - // 设置文件传输类型为二进制 - ftpClient.setFileType(FTP.BINARY_FILE_TYPE); - // 解码Base64字符串 - String base64Image = base64String.split(",")[1]; // 去掉数据URL的头部 - // 解码Base64字符串 - byte[] decodedBytes = Base64.getDecoder().decode(base64Image); - - // 创建输入流 - InputStream inputStream = new ByteArrayInputStream(decodedBytes); - - // 上传文件 - boolean result = ftpClient.storeFile(uploadPath + "/" + fileName, inputStream); - - - // 断开连接 - ftpClient.logout(); - ftpClient.disconnect(); - } catch (SocketException e) { - System.err.println("无法连接到FTP服务器: " + e.getMessage()); - } catch (IOException e) { - System.err.println("IO异常: " + e.getMessage()); - } finally { - try { - if (ftpClient.isConnected()) { - ftpClient.disconnect(); - } - } catch (IOException ignored) { - + if (ftpClient.isConnected()) { + ftpClient.disconnect(); } + } catch (IOException ignored) { + } } - //上传成功 - //当前时间 - LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), - DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - AdminUserDO user = userService.getUser(getLoginUserId()); - PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO(); - updateReqVO.setId(insimagescreenshotVO.getID()); - updateReqVO.setPdfurl("https://pacs.gw12320.com/video/" +insimagescreenshotVO.getID()+"/"+ fileName); - patientexamlistService.updatePatientexamlist(updateReqVO); - - } diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/inspdfscreenshotVO.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/inspdfscreenshotVO.java index c64e109ce..903abfe81 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/inspdfscreenshotVO.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/inspdfscreenshotVO.java @@ -9,8 +9,4 @@ public class inspdfscreenshotVO { private String imagebase; - private String model; - - private String folderPath; - } diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/SaveFileBase64.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/SaveFileBase64.java deleted file mode 100644 index bdb4dee9d..000000000 --- a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/SaveFileBase64.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.medicalimg; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Data -public class SaveFileBase64 { - - @Schema(description = "文件保存的文件夹路径") - private String folderPath; - @Schema(description = "Base64编码的字符串") - private String imagebase; - @Schema(description = "文件名（不包含扩展名）") - private String fileName; - @Schema(description = "文件扩展名（例如 \"png\", \"jpg\", \"txt\"）") - private String extension; - - private String orgId; -} diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/insimagescreenshotVO.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/insimagescreenshotVO.java index 74ebd2764..467b00b50 100644 --- a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/insimagescreenshotVO.java +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/insimagescreenshotVO.java @@ -17,8 +17,5 @@ public class insimagescreenshotVO { private String imgDescription; private String orgId; - // - private String model; - private String folderPath; } diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java index 7bde64811..797866f02 100644 --- a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic; import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.framework.common.util.io.FileUtils; import cn.iocoder.yudao.module.system.dal.dataobject.dicomworklist.DicomImagesDO; import cn.iocoder.yudao.module.system.dal.dataobject.dicomworklist.DicomSeriesDO; import cn.iocoder.yudao.module.system.dal.dataobject.dicomworklist.DicompatientDO; @@ -15,7 +14,6 @@ import cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.image.I import cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.image.PatientInfoVO; import cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.image.SeriesVO; import cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.image.StudyVO; -import cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.medicalimg.SaveFileBase64; import cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.medicalimg.insimagescreenshotVO; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.medicalimg.upmedicalimgVO; @@ -37,11 +35,15 @@ import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -428,32 +430,17 @@ public class ultrasonicController { @Operation(summary = "获取图片上传ftp") public void FtpImage(@RequestBody insimagescreenshotVO insimagescreenshotVO) { String base64String = insimagescreenshotVO.getImagebase(); + String ftpServer = "192.168.0.110"; //114.55.171.231 + int ftpPort = 21; // FTP端口，默认为21 + String ftpUser = "pacs"; + String ftpPassword = "pacs123"; + String uploadPath = "/"; String fileName = System.currentTimeMillis() + ".jpg"; - if(insimagescreenshotVO.getModel().equals("0")) - { - // 解码Base64字符串 - String base64Image = base64String.split(",")[1]; - try - { - FileUtils.saveBase64ToFile(base64Image,insimagescreenshotVO.getFolderPath(),fileName.split("\\.")[0],"jpg"); - } - catch (Exception ignored) - { - System.out.println("文件上传失败"+ignored.getMessage()); - } - } - else - { - String ftpServer = "192.168.0.110"; //114.55.171.231 - int ftpPort = 21; // FTP端口，默认为21 - String ftpUser = "pacs"; - String ftpPassword = "pacs123"; - String uploadPath = "/"; + FTPClient ftpClient = new FTPClient(); - FTPClient ftpClient = new FTPClient(); - try { - ftpClient.enterLocalPassiveMode(); + ftpClient.enterLocalPassiveMode(); + try { // 连接FTP服务器 ftpClient.connect(ftpServer, ftpPort); ftpClient.login(ftpUser, ftpPassword); @@ -470,48 +457,51 @@ public class ultrasonicController { // 上传文件 boolean result = ftpClient.storeFile(uploadPath + "/" + fileName, inputStream); + if (result) { + //上传成功 + //当前时间 + LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + AdminUserDO user = userService.getUser(getLoginUserId()); + // 生成随机 UUID + UUID randomUUID = UUID.randomUUID(); + medicalimgDO medicalimgDO = new medicalimgDO(); + medicalimgDO.setId(randomUUID.toString()); + medicalimgDO.setImgUrl("http://192.168.0.110:48082/" + fileName); + medicalimgDO.setCreatePerson(""); + medicalimgDO.setCreateDate(dateTime); + medicalimgDO.setRegId(insimagescreenshotVO.getID()); + if (insimagescreenshotVO.getOrgId() != null && !insimagescreenshotVO.getOrgId().trim().equals("")) + medicalimgDO.setOrgId(insimagescreenshotVO.getOrgId().trim()); + else if (user != null && user.getOrgId() != null) + medicalimgDO.setOrgId(user.getOrgId()); + medicalimgDO.setSelected("0"); + if (insimagescreenshotVO.getImgType() == null || insimagescreenshotVO.getImgType().trim().equals("")) + medicalimgDO.setImgType("1"); + else + medicalimgDO.setImgType(insimagescreenshotVO.getImgType().trim()); + int count = medicalimgService.insimage(medicalimgDO); + } else { + System.out.println("文件上传失败"); + } - // 断开连接 - ftpClient.logout(); - ftpClient.disconnect(); - } catch (SocketException e) { - System.err.println("无法连接到FTP服务器: " + e.getMessage()); - } catch (IOException e) { - System.err.println("IO异常: " + e.getMessage()); - } finally { - try { - if (ftpClient.isConnected()) { - ftpClient.disconnect(); - } - } catch (IOException ignored) { - + // 断开连接 + ftpClient.logout(); + ftpClient.disconnect(); + } catch (SocketException e) { + System.err.println("无法连接到FTP服务器: " + e.getMessage()); + } catch (IOException e) { + System.err.println("IO异常: " + e.getMessage()); + } finally { + try { + if (ftpClient.isConnected()) { + ftpClient.disconnect(); } + } catch (IOException ignored) { + } } - //上传成功 - //当前时间 - LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), - DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - AdminUserDO user = userService.getUser(getLoginUserId()); - // 生成随机 UUID - UUID randomUUID = UUID.randomUUID(); - medicalimgDO medicalimgDO = new medicalimgDO(); - medicalimgDO.setId(randomUUID.toString()); - medicalimgDO.setImgUrl("/video/" +insimagescreenshotVO.getID()+"/"+ fileName); - medicalimgDO.setCreatePerson(""); - medicalimgDO.setCreateDate(dateTime); - medicalimgDO.setRegId(insimagescreenshotVO.getID()); - if (insimagescreenshotVO.getOrgId() != null && !insimagescreenshotVO.getOrgId().trim().equals("")) - medicalimgDO.setOrgId(insimagescreenshotVO.getOrgId().trim()); - else if (user != null && user.getOrgId() != null) - medicalimgDO.setOrgId(user.getOrgId()); - medicalimgDO.setSelected("0"); - if (insimagescreenshotVO.getImgType() == null || insimagescreenshotVO.getImgType().trim().equals("")) - medicalimgDO.setImgType("1"); - else - medicalimgDO.setImgType(insimagescreenshotVO.getImgType().trim()); - int count = medicalimgService.insimage(medicalimgDO); } @@ -632,16 +622,5 @@ public class ultrasonicController { return success("插入成功"); } - @PostMapping("/SaveFileBase64") - @Operation(summary = "base64保存文件") - public String SaveFileBase64(@RequestBody SaveFileBase64 fileBase64){ - try{ - String base=fileBase64.getImagebase(); - FileUtils.saveBase64ToFile(base,fileBase64.getFolderPath(),fileBase64.getFileName(),fileBase64.getExtension()); - return "上传成功"; - } catch (Exception e) { - return "上传失败" +e.getMessage(); - } - } }