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 a2c0d78e..ecbd380f 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 @@ -35,6 +35,9 @@ import lombok.extern.slf4j.Slf4j; 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.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -76,6 +79,9 @@ public class ZyInfoStudentController extends JeecgController zyscStu(@RequestBody ZyInfoStudent zyInfoStudent) { + ZyInfoStudent stuPar = zyInfoStudentService.getById(zyInfoStudent.getId()); + ZyInfo zyInfo = zyInfoService.getById(stuPar.getMainId()); + String nameLast = zyInfoStudent.getFilePath().substring(zyInfoStudent.getFilePath().lastIndexOf(".")+1); if(StringUtils.equals("pdf",nameLast)){ zyInfoStudent.setPdfPath(zyInfoStudent.getFilePath()); }else{ - 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); +// 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); + + + 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); - ZyInfoStudent stuPar = zyInfoStudentService.getById(zyInfoStudent.getId()); - ZyInfo zyInfo = zyInfoService.getById(stuPar.getMainId()); //作业代办提醒 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 d50229cc..ff060d6b 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 @@ -390,18 +390,37 @@ 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); +// 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); + + + + 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{ zyJxdg.setJxrlPdfPath(null); } + + + + if(StringUtils.isEmpty(zyJxdg.getId())){ zyJxdgService.save(zyJxdg); }else{ diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/utils/FileHandleUtil.java b/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/utils/FileHandleUtil.java index f5aa343b..74408653 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/utils/FileHandleUtil.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/utils/FileHandleUtil.java @@ -311,9 +311,9 @@ public class FileHandleUtil { return map; } map.put("filePath",uploadFileName); - String fileName = uploadFileName.substring(uploadFileName.lastIndexOf('/')+1, uploadFileName.indexOf("_")); - String suffix = uploadFileName.substring(uploadFileName.lastIndexOf(".")); - fileName = fileName + suffix; + String fileName = uploadFileName.substring(uploadFileName.lastIndexOf('/')+1, uploadFileName.length()); +// String suffix = uploadFileName.substring(uploadFileName.lastIndexOf(".")); +// fileName = fileName + suffix; map.put("fileName",fileName); return map; } 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 094d7c3b..daa11fab 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 @@ -176,8 +176,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