From e43cbc27e70376092c4751c775c64d55acecd160 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 19 五月 2026 16:04:29 +0800
Subject: [PATCH] yxh,java1.8适配
---
ruoyi-admin/pom.xml | 4 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java | 25 ++++++++++++++++++-------
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index a1ba1bf..21801c1 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -129,8 +129,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>11</source>
- <target>11</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
index 9603720..a5abf64 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
@@ -38,6 +38,7 @@
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
@@ -187,24 +188,27 @@
*/
@ApiOperation("閬椾綋鍣ㄥ畼鑾峰彇浼︾悊瀹℃煡琛�")
@GetMapping(value = "/download")
- public Result downloadInfo(String nitiateId) throws IOException {
- if(ObjectUtils.isEmpty(nitiateId)){
+ public Result downloadInfo(String initiateId) throws IOException {
+ if(ObjectUtils.isEmpty(initiateId)){
return Result.error("nitiateId浼︾悊瀹℃煡id涓嶈兘涓虹┖");
}
EthicalReviewVO reviewVO =new EthicalReviewVO();
- reviewVO.setNitiateId(nitiateId);
+ reviewVO.setNitiateId(initiateId);
List<EthicalReviewVO> list = serviceEthicalreviewopinionsService.selectVOList(reviewVO);
if(list.size()==0){
return Result.error("浼︾悊瀹℃煡id鏃犵浉鍏虫暟鎹�");
}
- EthicalreviewopinionsStateTotalVO stateTotalVO=serviceEthicalreviewopinionsService.stateTotalAll(nitiateId);
+ EthicalreviewopinionsStateTotalVO stateTotalVO=serviceEthicalreviewopinionsService.stateTotalAll(initiateId);
String filePath = getClass().getResource("/template/").getPath();
if(filePath.substring(0,1).equals("/"))
filePath=filePath.substring(1);
String content ="";
Template t = null;
try {
- content = Files.readString(Paths.get(filePath+"閬椾綋鍣ㄥ畼鑾峰彇浼︾悊瀹℃煡琛ㄩ椤�.xml"), StandardCharsets.UTF_8);
+// content = Files.readString(Paths.get(filePath+"閬椾綋鍣ㄥ畼鑾峰彇浼︾悊瀹℃煡琛ㄩ椤�.xml"), StandardCharsets.UTF_8);
+ Path path = Paths.get(filePath + "閬椾綋鍣ㄥ畼鑾峰彇浼︾悊瀹℃煡琛ㄩ椤�.xml");
+ byte[] bytes = Files.readAllBytes(path);
+ content = new String(bytes, StandardCharsets.UTF_8);
String name=list.get(0).getName()+"锛堜綇闄㈠彿锛�"+list.get(0).getInpatientno()+"锛�";
content=content.replace("$name",name);//椤圭洰鍚嶇О
@@ -260,7 +264,7 @@
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "閬椾綋鍣ㄥ畼鑾峰彇浼︾悊瀹℃煡琛╛"+nitiateId+"_" + newTime;
+ String name = "閬椾綋鍣ㄥ畼鑾峰彇浼︾悊瀹℃煡琛╛"+initiateId+"_" + newTime;
String filePathData =RuoYiConfig.getProfile() + "/download/wordtemplate";
//鍒涘缓鏂囦欢澶�
@@ -268,12 +272,19 @@
if (!folderPath.exists()) {
folderPath.mkdirs();
}
-
+/*
try {
Files.writeString(Paths.get(filePathData+ "/" + name + ".doc"),content);
} catch (Exception e1) {
e1.printStackTrace();
}
+*/
+ try {
+ Path path = Paths.get(filePathData + "/" + name + ".doc");
+ Files.write(path, content.getBytes(StandardCharsets.UTF_8));
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/download/wordtemplate/" + name + ".doc");
--
Gitblit v1.9.3