整合最新的代码 #90

Merged
bgy merged 3 commits from bgy into dev 2023-10-13 10:28:04 +00:00
5 changed files with 304 additions and 272 deletions
Showing only changes of commit edfd847318 - Show all commits
@@ -101,7 +101,7 @@ public class CaseApplicationController extends BaseController {
/** /**
* 查询签名链接 * 查询签名链接
*/ */
@PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')") // @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
@PostMapping("/selectSignUrl") @PostMapping("/selectSignUrl")
public AjaxResult selectSignUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException { public AjaxResult selectSignUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
SealSignRecord sealSignRecordselect = caseApplicationService.selectSignUrl(caseApplication); SealSignRecord sealSignRecordselect = caseApplicationService.selectSignUrl(caseApplication);
@@ -111,7 +111,7 @@ public class CaseApplicationController extends BaseController {
/** /**
* 查询用印链接 * 查询用印链接
*/ */
@PreAuthorize("@ss.hasPermi('caseManagement:list:selectSealUrl')") // @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSealUrl')")
@PostMapping("/selectSealUrl") @PostMapping("/selectSealUrl")
public AjaxResult selectSealUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException { public AjaxResult selectSealUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
SealSignRecord sealUrlRecordselect = caseApplicationService.selectSealUrl(caseApplication); SealSignRecord sealUrlRecordselect = caseApplicationService.selectSealUrl(caseApplication);
@@ -23,7 +23,7 @@ public class CaseArbitrateController extends BaseController {
* @return * @return
*/ */
@PutMapping("/method") @PutMapping("/method")
@PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')") // @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
,Integer opinion){ ,Integer opinion){
return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion); return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);
@@ -22,7 +22,7 @@ public class CaseLogRecordController extends BaseController {
/** /**
* 查询案件日志列表 * 查询案件日志列表
*/ */
@PreAuthorize("@ss.hasPermi('caseLog:list')") // @PreAuthorize("@ss.hasPermi('caseLog:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(CaseLogRecord caseLogRecord) public TableDataInfo list(CaseLogRecord caseLogRecord)
{ {
@@ -364,20 +364,20 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
private void sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) { private void sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) {
List<File> fileList = new ArrayList<>(); List<File> fileList = new ArrayList<>();
File file = null; File file = null;
// List<CaseAttach> caseAttachList = caseApplication1.getCaseAttachList(); List<CaseAttach> caseAttachList = caseApplication1.getCaseAttachList();
// if (caseAttachList != null && caseAttachList.size() > 0) { if (caseAttachList != null && caseAttachList.size() > 0) {
// for (CaseAttach caseAttach : caseAttachList) { for (CaseAttach caseAttach : caseAttachList) {
// if (caseAttach.getAnnexType() == 3) { if (caseAttach.getAnnexType() == 3) {
// String annexPath = caseAttach.getAnnexPath(); String annexPath = caseAttach.getAnnexPath();
// String path = "/home/ruoyi/" + annexPath; String path = "/home/ruoyi/" + annexPath;
// String path = "/home/ruoyi/uploadPath/upload/2023/10/12/裁决书测试20231012test.docx"; // String path = "/home/ruoyi/uploadPath/upload/2023/10/12/裁决书测试20231012test.docx";
String path = "E:/WorkDoc/SH/裁决书测试20231012test.docx"; // String path = "E:/WorkDoc/SH/裁决书测试20231012test.docx";
file = new File(path); file = new File(path);
fileList.add(file); fileList.add(file);
System.out.println("文件长度:" + file.length()); System.out.println("文件长度:" + file.length());
// } }
// } }
// } }
if (file != null) { if (file != null) {
JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender(); JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();
try { try {
@@ -431,7 +431,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
try { try {
// List<File> fileList = new ArrayList<>(); // List<File> fileList = new ArrayList<>();
// fileList.add(new File("D:\\home\\ruoyi\\uploadPath\\upload\\2023\\10\\7\\b442880179844a848f1f8b08c29e3d0c.docx")); // fileList.add(new File("D:\\home\\ruoyi\\uploadPath\\upload\\2023\\10\\7\\b442880179844a848f1f8b08c29e3d0c.docx"));
// File file = fileList.get(0);//System.out.println("这是文件"+file); // File file = fileList.get(0);//System.out.println("这是文件"+file);
//电子邮件送达 //电子邮件送达
// EmailOutUtil emailOutUtil = new EmailOutUtil(); // EmailOutUtil emailOutUtil = new EmailOutUtil();
// JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender(); // JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();