From 78e307e262e2918467316132741e0136ea82a0da Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 27 May 2024 15:03:58 +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 --- .../mapper/xml/WjxWjxxTmlbMapper.xml | 2 +- .../controller/ZyInfoStudentController.java | 58 ++--- .../zyJxdg/controller/ZyJxdgController.java | 205 ++++++++++-------- .../src/main/resources/application-dev.yml | 5 +- .../src/main/resources/application-test.yml | 8 +- 5 files changed, 147 insertions(+), 131 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmlbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmlbMapper.xml index f5592d49..3918726a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmlbMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmlbMapper.xml @@ -3,7 +3,7 @@ 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 ecbd380f..773166ec 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 @@ -84,6 +84,11 @@ public class ZyInfoStudentController extends JeecgController map = zykService.saveToZykJxdg(zykInfo); - String fileName = map.get("data"); - String pdfName = map.get("pdfData"); - zyInfoStudent.setFilePath(fileName); - zyInfoStudent.setPdfPath(pdfName); - + if(StringUtils.equals("local",uploadType)){ + Global global = SpringContextHolder.getBean(Global.class); + FileUtil.mkdir(global.getContractDickPath()); + String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); + String docPath = upLoadPath+ File.separator+ zyInfoStudent.getFilePath(); + String namePath = dd + ".pdf"; + String pdfPath = global.getContractDickPath() + namePath; + System.out.println("filPath:"+zyInfoStudent.getFilePath()); + System.out.println("docPath:"+docPath); + System.out.println("pdfPath:"+pdfPath); + PDFUtil.office2PDF(docPath,pdfPath); + zyInfoStudent.setPdfPath("contract/"+namePath); + }else{ + ZykInfo zykInfo = new ZykInfo(); + zykInfo.setBizId(zyInfoStudent.getId()); + zykInfo.setBizTable("zy_jxdg"); + zykInfo.setWjlx(WjlxEnum.JXDG.getType()); + zykInfo.setRwbh(zyInfo.getRwbh()); + zykInfo.setFileName(zyInfoStudent.getFilePath()); + Map map = zykService.saveToZykJxdg(zykInfo); + String fileName = map.get("data"); + String pdfName = map.get("pdfData"); + zyInfoStudent.setFilePath(fileName); + zyInfoStudent.setPdfPath(pdfName); + } } zyInfoStudentService.updateById(zyInfoStudent); - - - //作业代办提醒 ZyDbtx zyDbtx = new ZyDbtx(); zyDbtx.setCreateBy(zyInfo.getCreateBy()); 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 ff060d6b..542a17b3 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 @@ -62,6 +62,10 @@ public class ZyJxdgController extends JeecgController { private String upLoadPath; @Autowired private IZykService zykService; + + + @Value(value="${jeecg.uploadType}") + private String uploadType; /** * 分页列表查询 * @@ -107,17 +111,20 @@ public class ZyJxdgController extends JeecgController { if(StringUtils.equals("pdf",nameLast)){ zyJxdg.setPdfPath(zyJxdg.getFilePath()); }else{ - Global global = SpringContextHolder.getBean(Global.class); - FileUtil.mkdir(global.getContractDickPath()); - String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); - String docPath = upLoadPath+ File.separator+ zyJxdg.getFilePath(); - String namePath = dd + ".pdf"; - String pdfPath = global.getContractDickPath() + namePath; - System.out.println("filPath:"+zyJxdg.getFilePath()); - System.out.println("docPath:"+docPath); - System.out.println("pdfPath:"+pdfPath); - PDFUtil.office2PDF(docPath,pdfPath); - zyJxdg.setPdfPath("contract/"+namePath); + + if(StringUtils.equals("local",uploadType)){ + Global global = SpringContextHolder.getBean(Global.class); + FileUtil.mkdir(global.getContractDickPath()); + String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); + String docPath = upLoadPath+ File.separator+ zyJxdg.getFilePath(); + String namePath = dd + ".pdf"; + String pdfPath = global.getContractDickPath() + namePath; + PDFUtil.office2PDF(docPath,pdfPath); + zyJxdg.setPdfPath("contract/"+namePath); + }else{ + + } + } }else if(StringUtils.isNotEmpty(zyJxdg.getJxrlFilePath())){ @@ -126,14 +133,20 @@ public class ZyJxdgController extends JeecgController { if(StringUtils.equals("pdf",nameLast)){ zyJxdg.setJxrlPdfPath(zyJxdg.getJxrlFilePath()); }else{ - Global global = SpringContextHolder.getBean(Global.class); - FileUtil.mkdir(global.getContractDickPath()); - String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); - String docPath = upLoadPath+ File.separator+ zyJxdg.getJxrlFilePath(); - String namePath = dd + ".pdf"; - String pdfPath = global.getContractDickPath() + namePath; - PDFUtil.office2PDF(docPath,pdfPath); - zyJxdg.setJxrlPdfPath("contract/"+namePath); + + if(StringUtils.equals("local",uploadType)){ + Global global = SpringContextHolder.getBean(Global.class); + FileUtil.mkdir(global.getContractDickPath()); + String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); + String docPath = upLoadPath+ File.separator+ zyJxdg.getJxrlFilePath(); + String namePath = dd + ".pdf"; + String pdfPath = global.getContractDickPath() + namePath; + PDFUtil.office2PDF(docPath,pdfPath); + zyJxdg.setJxrlPdfPath("contract/"+namePath); + }else{ + + } + } } @@ -170,17 +183,22 @@ public class ZyJxdgController extends JeecgController { update.set("file_path",zyJxdg.getFilePath()); update.set("pdf_path",zyJxdg.getFilePath()); }else{ - Global global = SpringContextHolder.getBean(Global.class); - FileUtil.mkdir(global.getContractDickPath()); - String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); - String docPath = upLoadPath+ File.separator+ zyJxdg.getFilePath(); - String namePath = dd + ".pdf"; - String pdfPath = global.getContractDickPath() + namePath; - System.out.println("filPath:"+zyJxdg.getFilePath()); - System.out.println("docPath:"+docPath); - System.out.println("pdfPath:"+pdfPath); - PDFUtil.office2PDF(docPath,pdfPath); - zyJxdg.setPdfPath("contract/"+namePath); + + if(StringUtils.equals("local",uploadType)) { + Global global = SpringContextHolder.getBean(Global.class); + FileUtil.mkdir(global.getContractDickPath()); + String dd = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss"); + String docPath = upLoadPath + File.separator + zyJxdg.getFilePath(); + String namePath = dd + ".pdf"; + String pdfPath = global.getContractDickPath() + namePath; + System.out.println("filPath:" + zyJxdg.getFilePath()); + System.out.println("docPath:" + docPath); + System.out.println("pdfPath:" + pdfPath); + PDFUtil.office2PDF(docPath, pdfPath); + zyJxdg.setPdfPath("contract/" + namePath); + }else { + + } update.set("file_path",zyJxdg.getFilePath()); update.set("pdf_path",zyJxdg.getPdfPath()); @@ -193,14 +211,18 @@ public class ZyJxdgController extends JeecgController { update.set("jxrl_file_path",zyJxdg.getJxrlFilePath()); update.set("jxrl_pdf_path",zyJxdg.getJxrlFilePath()); }else{ - Global global = SpringContextHolder.getBean(Global.class); - FileUtil.mkdir(global.getContractDickPath()); - String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); - String docPath = upLoadPath+ File.separator+ zyJxdg.getJxrlFilePath(); - String namePath = dd + ".pdf"; - String pdfPath = global.getContractDickPath() + namePath; - PDFUtil.office2PDF(docPath,pdfPath); - zyJxdg.setJxrlPdfPath("contract/"+namePath); + if(StringUtils.equals("local",uploadType)) { + Global global = SpringContextHolder.getBean(Global.class); + FileUtil.mkdir(global.getContractDickPath()); + String dd = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss"); + String docPath = upLoadPath + File.separator + zyJxdg.getJxrlFilePath(); + String namePath = dd + ".pdf"; + String pdfPath = global.getContractDickPath() + namePath; + PDFUtil.office2PDF(docPath, pdfPath); + zyJxdg.setJxrlPdfPath("contract/" + namePath); + }else { + + } update.set("jxrl_file_path",zyJxdg.getJxrlFilePath()); update.set("jxrl_pdf_path",zyJxdg.getJxrlPdfPath()); @@ -323,50 +345,37 @@ public class ZyJxdgController extends JeecgController { if(StringUtils.equals("pdf",nameLast)){ zyJxdg.setPdfPath(zyJxdg.getFilePath()); }else{ -// Global global = SpringContextHolder.getBean(Global.class); -// FileUtil.mkdir(global.getContractDickPath()); -// String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); -//// String docPath = upLoadPath+ File.separator+ zyJxdg.getFilePath(); -// String docPath = zyJxdg.getFilePath(); -// String namePath = dd + ".pdf"; -// String pdfPath = global.getContractDickPath() + namePath; -// Map map = zykService.downloadRemoteFile(docPath); -// PDFUtil.office2PDF(map.get("data"),pdfPath); -// zyJxdg.setPdfPath("contract/"+namePath); - 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()); - Map map = zykService.saveToZykJxdg(zykInfo); - String fileName = map.get("data"); - String pdfName = map.get("pdfData"); - zyJxdg.setFilePath(fileName); - zyJxdg.setPdfPath(pdfName); + if(StringUtils.equals("local",uploadType)) { + Global global = SpringContextHolder.getBean(Global.class); + FileUtil.mkdir(global.getContractDickPath()); + String dd = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss"); +// String docPath = zyJxdg.getFilePath(); + String docPath = upLoadPath + File.separator + zyJxdg.getFilePath(); + String namePath = dd + ".pdf"; + String pdfPath = global.getContractDickPath() + namePath; +// Map map = zykService.downloadRemoteFile(docPath); + PDFUtil.office2PDF(docPath, pdfPath); + zyJxdg.setPdfPath("contract/" + namePath); + }else { + 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()); + Map map = zykService.saveToZykJxdg(zykInfo); + String fileName = map.get("data"); + String pdfName = map.get("pdfData"); + zyJxdg.setFilePath(fileName); + zyJxdg.setPdfPath(pdfName); + + } + } }else{ zyJxdg.setPdfPath(null); } - //--------上传ftp工具--------------- -// Map saveToZyk(ZykInfo zykInfo); -// if(StringUtils.isNotEmpty(zyJxdg.getFilePath())){ -// 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 map = zykService.saveToZyk(zykInfo); -// String fileName = map.get("data"); -// String pdfName = map.get("pdfData"); -// zyJxdg.setFilePath(fileName); -// zyJxdg.setPdfPath(pdfName); -// } - //--------上传ftp工具--------------- - if(isAdd){ zyJxdgService.save(zyJxdg); @@ -390,28 +399,32 @@ public class ZyJxdgController extends JeecgController { if(StringUtils.equals("pdf",nameLast)){ zyJxdg.setJxrlPdfPath(zyJxdg.getJxrlFilePath()); }else{ -// Global global = SpringContextHolder.getBean(Global.class); -// FileUtil.mkdir(global.getContractDickPath()); -// String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); -// String docPath = upLoadPath+ File.separator+ zyJxdg.getJxrlFilePath(); -// String namePath = dd + ".pdf"; -// String pdfPath = global.getContractDickPath() + namePath; -// PDFUtil.office2PDF(docPath,pdfPath); -// zyJxdg.setJxrlPdfPath("contract/"+namePath); + + if(StringUtils.equals("local",uploadType)) { + Global global = SpringContextHolder.getBean(Global.class); + FileUtil.mkdir(global.getContractDickPath()); + String dd = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss"); + String docPath = upLoadPath + File.separator + zyJxdg.getJxrlFilePath(); + String namePath = dd + ".pdf"; + String pdfPath = global.getContractDickPath() + namePath; + PDFUtil.office2PDF(docPath, pdfPath); + zyJxdg.setJxrlPdfPath("contract/" + namePath); + }else{ + ZykInfo zykInfo = new ZykInfo(); + zykInfo.setBizId(zyJxdg.getId()); + zykInfo.setBizTable("zy_jxdg"); + zykInfo.setWjlx(WjlxEnum.JXRL.getType()); + zykInfo.setRwbh(zyJxdg.getRwbh()); + zykInfo.setFileName(zyJxdg.getJxrlFilePath()); + Map map = zykService.saveToZykJxdg(zykInfo); + String fileName = map.get("data"); + String pdfName = map.get("pdfData"); + zyJxdg.setJxrlFilePath(fileName); + zyJxdg.setJxrlPdfPath(pdfName); + } - ZykInfo zykInfo = new ZykInfo(); - zykInfo.setBizId(zyJxdg.getId()); - zykInfo.setBizTable("zy_jxdg"); - zykInfo.setWjlx(WjlxEnum.JXRL.getType()); - zykInfo.setRwbh(zyJxdg.getRwbh()); - zykInfo.setFileName(zyJxdg.getJxrlFilePath()); - Map map = zykService.saveToZykJxdg(zykInfo); - String fileName = map.get("data"); - String pdfName = map.get("pdfData"); - zyJxdg.setJxrlFilePath(fileName); - zyJxdg.setJxrlPdfPath(pdfName); } }else{ diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index daa11fab..01ab2730 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -136,6 +136,7 @@ spring: url: jdbc:mysql://127.0.0.1:3306/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: root +# password: ABCabc@123 driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 # multi-oracle: @@ -176,8 +177,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://localhost:3100 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 f3dd95a3..6b18b7f6 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 @@ -347,10 +347,10 @@ wjx: url: https://www.wjx.cn/openapi/default.aspx #SFTP sftp: - hostname: 192.168.2.200 + hostname: 210.47.29.99 port: 22 username: sftp - password: sftp + password: Nenujwc@99 timeout: 1000 uploadpath: /kczx fullpath: /home/sftp \ No newline at end of file