From e8a2b1e0d71b2c08891dcc3fd583ebe5a5c0dacf Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Sat, 25 May 2024 14:25:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ZyInfoStudentController.java   |  2 +-
 .../zyJxdg/controller/ZyJxdgController.java   | 26 ++++++++++++++++++-
 .../org/jeecg/modules/zyk/entity/ZykInfo.java |  7 +++++
 .../src/main/resources/application-test.yml   |  4 +--
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java
index f43d6cc8..a2c0d78e 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java
@@ -286,7 +286,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
 
 
 
-		 return Result.OK("编辑成功!");
+		 return Result.OK("提交成功!");
 	 }
 
 
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java
index 7649769a..8253b684 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java
@@ -25,6 +25,9 @@ import org.jeecg.modules.kc.zyJxdg.entity.ZyJxdg;
 import org.jeecg.modules.kc.zyJxdg.service.IZyJxdgService;
 import org.jeecg.modules.tools.Global;
 import org.jeecg.modules.tools.pdf.PDFUtil;
+import org.jeecg.modules.zyk.entity.ZykInfo;
+import org.jeecg.modules.zyk.service.IZykService;
+import org.jeecg.modules.zyk.utils.WjlxEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -35,6 +38,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * @Description: 教学大纲
@@ -55,7 +59,8 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
 
 	@Value("${jeecg.path.upload}")
 	private String upLoadPath;
-
+	@Autowired
+	private IZykService zykService;
 	 /**
 	 * 分页列表查询
 	 *
@@ -324,6 +329,24 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
 		}else{
 			zyJxdg.setPdfPath(null);
 		}
+		//--------上传ftp工具---------------
+//		Map<String,String> saveToZyk(ZykInfo zykInfo);
+		ZykInfo zykInfo = new ZykInfo();
+		zykInfo.setBizId(zyJxdg.getId());
+		zykInfo.setBizTable("zy_jxdg");
+		zykInfo.setWjlx(WjlxEnum.JXDG.getType());
+		zykInfo.setRwbh(zyJxdg.getRwbh());
+		zykInfo.setFileName(zyJxdg.getFilePath());
+		zykInfo.setPdfName(zyJxdg.getPdfPath());
+		Map<String,String> map = zykService.saveToZyk(zykInfo);
+		String fileName = map.get("fileName");
+		String pdfName = map.get("pdfName");
+		zyJxdg.setFilePath(fileName);
+		zyJxdg.setPdfPath(pdfName);
+		//--------上传ftp工具---------------
+
+
+
 		if(StringUtils.isEmpty(zyJxdg.getId())){
 			zyJxdgService.save(zyJxdg);
 		}else{
@@ -333,6 +356,7 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
 			updateWrapper.eq("id",zyJxdg.getId());
 			zyJxdgService.update(updateWrapper);
 		}
+
 		return Result.OK(zyJxdg);
 	}
 
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/entity/ZykInfo.java b/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/entity/ZykInfo.java
index 5fa26b30..c8b1ad19 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/entity/ZykInfo.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/entity/ZykInfo.java
@@ -60,6 +60,12 @@ public class ZykInfo implements Serializable {
     /**PDF文件名称*/
     @ApiModelProperty(value = "PDF文件名称")
     private String pdfName;
+
+    private String rwbh;
+
+
+
+
     /**学号*/
     @TableField(exist = false)
     private String xh;
@@ -73,6 +79,7 @@ public class ZykInfo implements Serializable {
     @TableField(exist = false)
     private String section;
 
+
     @TableField(exist = false)
     private List<ZykInfo> xqxnList;
 
diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml
index 282f26f2..f3dd95a3 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml
+++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml
@@ -175,8 +175,8 @@ jeecg:
   # 签名拦截接口
   signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
   #local\minio\alioss
-  uploadType: local
-#  uploadType: sftp
+#  uploadType: local
+  uploadType: sftp
   # 前端访问地址
   domainUrl:
     pc: http://210.47.17.166