From 373be9bd89da2c6105a212abdce9286de3adcf82 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Sat, 6 Jul 2024 18:14:39 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B47=E6=9C=886=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BlStuAnswerController.java     |  8 ++++-
 .../service/impl/BlStuAnswerServiceImpl.java  | 29 +++++++++++++------
 .../jeecg/modules/tools/word/ExportWord.java  |  4 +++
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/controller/BlStuAnswerController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/controller/BlStuAnswerController.java
index 12eaabb..8b5b5b6 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/controller/BlStuAnswerController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/controller/BlStuAnswerController.java
@@ -184,6 +184,12 @@ public class BlStuAnswerController extends JeecgController<BlStuAnswer, IBlStuAn
 				//400条 saveBatch消耗时间1592毫秒  循环插入消耗时间1947毫秒
 				//1200条  saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
 				log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
+
+				//直接导出附件
+				WordOperator wo = service.createWordTjfx(id);
+				//保存到本地附件里
+
+				ExportWord.download_by_is();
 				//update-end-author:taoyan date:20190528 for:批量插入数据
 				return Result.ok("文件导入成功！数据行数：" + list.size());
 			} catch (Exception e) {
@@ -200,7 +206,7 @@ public class BlStuAnswerController extends JeecgController<BlStuAnswer, IBlStuAn
 				try {
 					file.getInputStream().close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					log.error(e.getMessage(), e);
 				}
 			}
 		}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/service/impl/BlStuAnswerServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/service/impl/BlStuAnswerServiceImpl.java
index a4e3559..b8c424f 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/service/impl/BlStuAnswerServiceImpl.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/service/impl/BlStuAnswerServiceImpl.java
@@ -669,6 +669,10 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		return WebDriverUtil.getImgByte400(json);
 	}
 
+	public String getRadarChart100(Map<String, String> map){
+		return getRadarChart(map, "100", "单位：%");
+	}
+
 
 	public String getRadarChart(Map<String, String> map) {
 		return getRadarChart(map, "5", "单位：分");
@@ -703,7 +707,14 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 			  radar: {
 			  	radius: '50%%',
 				indicator: %s,
-				axisName: { fontSize: 15, color: '#000', padding: 70, },
+				axisName: {
+				  fontSize: 15, color: '#000', padding: 70,
+				  formatter: (v) => {
+				    let l = String(v).split('');let r = '';
+				    l.forEach((x,i) => { if((i+1) %% 12 == 0){ r += x + '\\n'; } else { r += x; } });
+				    return r;
+				  }
+				},
 			  },
 			  series: [
 				{
@@ -1170,7 +1181,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i2_6(WordOperator wo, Map<String, Object> result, String id) {
 		var list = baseMapper.i2_6(id);
 		if(list != null && !list.isEmpty()){
-			String imagePath = getRadarChart(list.get(0));
+			String imagePath = getRadarChart100(list.get(0));
 			result.put("i2_6", imagePath);
 		}
 	}
@@ -1342,7 +1353,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i2_18(WordOperator wo, Map<String, Object> result, String id) {
 		var list = baseMapper.i2_18(id);
 		if(list != null && !list.isEmpty()){
-			String imagePath = getRadarChart(list.get(0));
+			String imagePath = getRadarChart100(list.get(0));
 			result.put("i2_18", imagePath);
 		}
 	}
@@ -1413,7 +1424,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i2_23(WordOperator wo, Map<String, Object> result, String id) {
 		var list = baseMapper.i2_23(id);
 		if(list != null && !list.isEmpty()){
-			String imagePath = getRadarChart(list.get(0));
+			String imagePath = getRadarChart100(list.get(0));
 			result.put("i2_23", imagePath);
 		}
 	}
@@ -1471,7 +1482,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i2_27(WordOperator wo, Map<String, Object> result, String id) {
 		var list = baseMapper.i2_27(id);
 		if(list != null && !list.isEmpty()){
-			String imagePath = getRadarChart(list.get(0));
+			String imagePath = getRadarChart100(list.get(0));
 			result.put("i2_27", imagePath);
 		}
 	}
@@ -1565,7 +1576,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i2_34(WordOperator wo, Map<String, Object> result, String id) {
 		var list = baseMapper.i2_34(id);
 		if(list != null && !list.isEmpty()){
-			String imagePath = getRadarChart(list.get(0));
+			String imagePath = getRadarChart100(list.get(0));
 			result.put("i2_34", imagePath);
 		}
 	}
@@ -1621,7 +1632,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i3_2(WordOperator wo, Map<String, Object> result, String id) {
 		var list = baseMapper.i3_2(id);
 		if(list != null && !list.isEmpty()){
-			String imagePath = getRadarChart(list.get(0));
+			String imagePath = getRadarChart100(list.get(0));
 			result.put("i3_2", imagePath);
 		}
 	}
@@ -1892,7 +1903,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i4_9(WordOperator wo, Map<String, Object> result, String id) {
 		var list = baseMapper.i4_9(id);
 		if(list != null && !list.isEmpty()){
-			String imagePath = getRadarChart(list.get(0));
+			String imagePath = getRadarChart100(list.get(0));
 			result.put("i4_9", imagePath);
 		}
 	}
@@ -1953,7 +1964,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i4_13(WordOperator wo, Map<String, Object> result, String id) {
 		var list = baseMapper.i4_13(id);
 		if(list != null && !list.isEmpty()){
-			String imagePath = getRadarChart(list.get(0));
+			String imagePath = getRadarChart100(list.get(0));
 			result.put("i4_13", imagePath);
 		}
 	}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/ExportWord.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/ExportWord.java
index 05bcb68..c5ac178 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/ExportWord.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/ExportWord.java
@@ -73,6 +73,10 @@ public class ExportWord {
 		return new WordOperator(is);
 	}
 
+//	public static String getWordPathToLocalFile(String biz){
+//
+//	}
+
 	/**
 	 * 下载生成的word文档
 	 * @param request		请求