整合最新的代码

This commit is contained in:
gy b
2023-10-13 18:25:51 +08:00
parent 36ad2c9ecd
commit edfd847318
5 changed files with 304 additions and 272 deletions
@@ -101,7 +101,7 @@ public class CaseApplicationController extends BaseController {
/**
* 查询签名链接
*/
@PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
// @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
@PostMapping("/selectSignUrl")
public AjaxResult selectSignUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
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")
public AjaxResult selectSealUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
SealSignRecord sealUrlRecordselect = caseApplicationService.selectSealUrl(caseApplication);
@@ -23,7 +23,7 @@ public class CaseArbitrateController extends BaseController {
* @return
*/
@PutMapping("/method")
@PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
// @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
,Integer 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")
public TableDataInfo list(CaseLogRecord caseLogRecord)
{
@@ -364,20 +364,20 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
private void sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) {
List<File> fileList = new ArrayList<>();
File file = null;
// List<CaseAttach> caseAttachList = caseApplication1.getCaseAttachList();
// if (caseAttachList != null && caseAttachList.size() > 0) {
// for (CaseAttach caseAttach : caseAttachList) {
// if (caseAttach.getAnnexType() == 3) {
// String annexPath = caseAttach.getAnnexPath();
// String path = "/home/ruoyi/" + annexPath;
List<CaseAttach> caseAttachList = caseApplication1.getCaseAttachList();
if (caseAttachList != null && caseAttachList.size() > 0) {
for (CaseAttach caseAttach : caseAttachList) {
if (caseAttach.getAnnexType() == 3) {
String annexPath = caseAttach.getAnnexPath();
String path = "/home/ruoyi/" + annexPath;
// 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);
fileList.add(file);
System.out.println("文件长度:" + file.length());
// }
// }
// }
}
}
}
if (file != null) {
JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();
try {