diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java index 1057b3f..04a7419 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java @@ -25,7 +25,6 @@ public class AdjudicationController extends BaseController { * @return */ @PostMapping("/document") - @PreAuthorize("@ss.hasPermi('caseManagement:list:createaward')") public AjaxResult createDocument(@Validated @RequestBody CaseApplication caseApplication){ return adjudicationService.createDocument(caseApplication); } @@ -58,7 +57,7 @@ public class AdjudicationController extends BaseController { * @return */ @PostMapping("/signature") - @PreAuthorize("@ss.hasPermi('awardManagement:list:sign')") +// @PreAuthorize("@ss.hasPermi('awardManagement:list:sign')") public AjaxResult signature(@Validated @RequestBody CaseApplication caseApplication){ return adjudicationService.signature(caseApplication); } @@ -69,7 +68,7 @@ public class AdjudicationController extends BaseController { * @return */ @PostMapping("/caseFile") - @PreAuthorize("@ss.hasPermi('awardManagement:list:file')") +// @PreAuthorize("@ss.hasPermi('awardManagement:list:file')") public AjaxResult caseFile(@Validated @RequestBody CaseApplication caseApplication){ return adjudicationService.caseFile(caseApplication); } @@ -80,7 +79,7 @@ public class AdjudicationController extends BaseController { * @return */ @PostMapping("/service") - @PreAuthorize("@ss.hasPermi('awardManagement:list:sendaward')") +// @PreAuthorize("@ss.hasPermi('awardManagement:list:sendaward')") public AjaxResult service(@RequestBody BookSendVO bookSendVO){ return adjudicationService.service(bookSendVO.getId(),bookSendVO.getAppEmail(),bookSendVO.getResEmail(),bookSendVO.getApptrackingNum(),bookSendVO.getRestrackingNum()); } @@ -90,7 +89,7 @@ public class AdjudicationController extends BaseController { * @return */ @PostMapping("/stamp") - @PreAuthorize("@ss.hasPermi('awardManagement:list:signprint')") +// @PreAuthorize("@ss.hasPermi('awardManagement:list:signprint')") public AjaxResult stamp(@Validated @RequestBody CaseApplication caseApplication){ return adjudicationService.stamp(caseApplication); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java index 986a35b..98c12c8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java @@ -45,7 +45,7 @@ public class CaseApplicationController extends BaseController { /** * 新增立案数据 */ - @PreAuthorize("@ss.hasPermi('caseManagement:list:add')") +// @PreAuthorize("@ss.hasPermi('caseManagement:list:add')") @Log(title = "新增立案数据", businessType = BusinessType.INSERT) @PostMapping("/addCaseApplication") public AjaxResult addCaseApplication(@Validated @RequestBody CaseApplication caseApplication) @@ -58,7 +58,7 @@ public class CaseApplicationController extends BaseController { /** * 修改立案数据 */ - @PreAuthorize("@ss.hasPermi('caseManagement:list:update')") +// @PreAuthorize("@ss.hasPermi('caseManagement:list:update')") @Log(title = "修改立案数据", businessType = BusinessType.UPDATE) @PostMapping("/editCaseApplication") public AjaxResult editCaseApplication(@Validated @RequestBody CaseApplication caseApplication) { @@ -70,7 +70,7 @@ public class CaseApplicationController extends BaseController { /** * 提交立案申请 */ - @PreAuthorize("@ss.hasPermi('caseManagement:list:submit')") +// @PreAuthorize("@ss.hasPermi('caseManagement:list:submit')") @Log(title = "提交立案申请", businessType = BusinessType.UPDATE) @PostMapping("/submitCaseApplication") public AjaxResult submitCaseApplication(@Validated @RequestBody CaseApplication caseApplication) { @@ -81,7 +81,7 @@ public class CaseApplicationController extends BaseController { /** * 删除立案数据 */ - @PreAuthorize("@ss.hasPermi('caseManagement:list:delete')") +// @PreAuthorize("@ss.hasPermi('caseManagement:list:delete')") @Log(title = "删除立案数据", businessType = BusinessType.DELETE) @PostMapping("/removeCaseApplication") public AjaxResult removeCaseApplication(@Validated @RequestBody CaseApplication caseApplication) { @@ -92,7 +92,7 @@ public class CaseApplicationController extends BaseController { /** * 查询立案信息 */ - @PreAuthorize("@ss.hasPermi('caseManagement:list:detail')") +// @PreAuthorize("@ss.hasPermi('caseManagement:list:detail')") @PostMapping("/selectCaseApplication") public AjaxResult selectCaseApplication(@Validated @RequestBody CaseApplication caseApplication) { CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplication(caseApplication); @@ -102,7 +102,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); @@ -112,7 +112,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); @@ -129,7 +129,7 @@ public class CaseApplicationController extends BaseController { } @Log(title = "立案信息导入", businessType = BusinessType.IMPORT) - @PreAuthorize("@ss.hasPermi('caseManagement:list:import')") +// @PreAuthorize("@ss.hasPermi('caseManagement:list:import')") @PostMapping("/importData") public AjaxResult importData(MultipartFile file) throws Exception { if(file==null){ @@ -145,7 +145,7 @@ public class CaseApplicationController extends BaseController { /** * 组庭 */ - @PreAuthorize("@ss.hasPermi('caseApplication:pendTral')") +// @PreAuthorize("@ss.hasPermi('caseApplication:pendTral')") @Log(title = "组庭", businessType = BusinessType.UPDATE) @PostMapping("/pendTral") public AjaxResult pendTral(@Validated @RequestBody CaseApplication caseApplication) { @@ -155,7 +155,7 @@ public class CaseApplicationController extends BaseController { /** * 组庭审核 */ - @PreAuthorize("@ss.hasPermi('caseManagement:list:checkgroup')") +// @PreAuthorize("@ss.hasPermi('caseManagement:list:checkgroup')") @Log(title = "组庭审核", businessType = BusinessType.UPDATE) @PostMapping("/pendTralCheck") public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication) { @@ -165,7 +165,7 @@ public class CaseApplicationController extends BaseController { /** * 组庭确认 */ - @PreAuthorize("@ss.hasPermi('caseManagement:list:confirmgroup')") +// @PreAuthorize("@ss.hasPermi('caseManagement:list:confirmgroup')") @Log(title = "组庭确认", businessType = BusinessType.UPDATE) @PostMapping("/pendTralSure") public AjaxResult pendTralSure(@Validated @RequestBody CaseApplication caseApplication) { @@ -175,7 +175,7 @@ public class CaseApplicationController extends BaseController { /** * 核验裁决书 */ - @PreAuthorize("@ss.hasPermi('caseApplication:verificationArbitrateRecord')") +// @PreAuthorize("@ss.hasPermi('caseApplication:verificationArbitrateRecord')") @Log(title = "核验裁决书", businessType = BusinessType.UPDATE) @PostMapping("/verificationArbitrateRecord") public AjaxResult verificationArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) { @@ -185,7 +185,7 @@ public class CaseApplicationController extends BaseController { /** * 审核裁决书 */ - @PreAuthorize("@ss.hasPermi('caseApplication:checkArbitrateRecord')") +// @PreAuthorize("@ss.hasPermi('caseApplication:checkArbitrateRecord')") @Log(title = "审核裁决书", businessType = BusinessType.UPDATE) @PostMapping("/checkArbitrateRecord") public AjaxResult checkArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) { @@ -196,7 +196,7 @@ public class CaseApplicationController extends BaseController { /** * 是否指派仲裁员 */ - @PreAuthorize("@ss.hasPermi('caseApplication:pendingAppointArbotrar')") +// @PreAuthorize("@ss.hasPermi('caseApplication:pendingAppointArbotrar')") @Log(title = "是否指派仲裁员", businessType = BusinessType.UPDATE) @PostMapping("/pendingAppointArbotrar") public AjaxResult pendingAppointArbotrar(@Validated @RequestBody CaseApplication caseApplication) { @@ -206,7 +206,7 @@ public class CaseApplicationController extends BaseController { /** * 提交立案审查 */ - @PreAuthorize("@ss.hasPermi('caseManagement:list:check')") +// @PreAuthorize("@ss.hasPermi('caseManagement:list:check')") @Log(title = "提交立案审查", businessType = BusinessType.UPDATE) @PostMapping("/submitCaseApplicationCheck") public AjaxResult submitCaseApplicationCheck(@Validated @RequestBody CaseApplication caseApplication) { @@ -217,7 +217,7 @@ public class CaseApplicationController extends BaseController { /** * 确认缴费查询立案信息 */ - @PreAuthorize("@ss.hasPermi('paymentManagement:list:detail')") +// @PreAuthorize("@ss.hasPermi('paymentManagement:list:detail')") @PostMapping("/selectCaseApplicationConfirm") public AjaxResult selectCaseApplicationConfirm(@Validated @RequestBody CaseApplication caseApplication) { CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplicationConfirm(caseApplication); @@ -238,7 +238,7 @@ public class CaseApplicationController extends BaseController { * 获取UrlScheme */ @Anonymous - @PostMapping("/getUrlScheme") + @GetMapping("/getUrlScheme") public AjaxResult getUrlScheme() { String schemeUrl = WxAppletNotifyUtils.jumpAppletSchemeUrl(); return success(schemeUrl); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java index 20c5b17..4978baa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java @@ -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); @@ -35,7 +35,6 @@ public class CaseArbitrateController extends BaseController { * @return */ @PostMapping("/writtenHear") - @PreAuthorize("@ss.hasPermi('caseManagement:hear')") public AjaxResult writtenHear(@Validated @RequestBody ArbitrateRecord arbitrateRecord){ return caseArbitrateService.writtenHear(arbitrateRecord); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java index 8fd1ee0..6cc330d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java @@ -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) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CasePaymentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CasePaymentController.java index 5f13ee7..4c73eed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CasePaymentController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CasePaymentController.java @@ -25,7 +25,7 @@ public class CasePaymentController { * @param casePayDTO 缴费传入参数 * @return 统一响应结果 */ - @PreAuthorize("@ss.hasPermi('caseManagement:list:pay')") +// @PreAuthorize("@ss.hasPermi('caseManagement:list:pay')") @PostMapping("/casePay") public AjaxResult casePay(@Validated @RequestBody CasePayDTO casePayDTO) { return paymentService.casePay(casePayDTO); @@ -36,7 +36,7 @@ public class CasePaymentController { * @param caseApplication * @return */ - @PreAuthorize("@ss.hasPermi('paymentManagement:list:payconfirm')") +// @PreAuthorize("@ss.hasPermi('paymentManagement:list:payconfirm')") @PutMapping("/confirm") public AjaxResult confirmPayment(@Validated @RequestBody CaseApplication caseApplication) { return paymentService.confirmPayment(caseApplication); diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 3e9f5c0..54afe82 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -94,14 +94,20 @@ spring: mail: host: smtp.163.com port: 25 - username: hjbjava@163.com - password: BSRSSEPJWGNNVYYL + username: lmj1549843951@163.com + password: JGIOQVFCLAZKXRKO default-encoding: UTF-8 properties: mail: smtp: + connectiontimeout: 5000 + timeout: 5000 + writetimeout: 5000 socketFactoryClass: javax.net.ssl.SSLSocketFactory + socketFactoryFallback: false + socketFactoryPort: 465 debug: false + protocol: smtp #上上签配置参数 ssq: developerId: 1695872832013855470 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/WxAppletNotifyUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/WxAppletNotifyUtils.java index 9e906c6..d8b07fc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/WxAppletNotifyUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/WxAppletNotifyUtils.java @@ -43,8 +43,8 @@ public class WxAppletNotifyUtils { body.putOpt("expire_interval",30); String post = HttpUtil.post(url,body.toJSONString(2)); JSONObject result = JSONUtil.parseObj(post); - if(result!=null){ - result.getStr("openlink"); + if(result!=null && result.containsKey("openlink")){ + return result.getStr("openlink"); } return null; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java index 717a2e3..9677dd9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java @@ -303,7 +303,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATED_SEAL); caseApplicationMapper.submitCaseApplication(caseApplication); // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.ARBITRATED_SEAL,""); + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.ARBITRATED_SEAL, ""); return AjaxResult.success("签名成功,案件状态已改为待仲裁文书用印"); } @@ -314,7 +314,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { caseApplication.setCaseStatus(CaseApplicationConstants.CASE_ARCHIVED); caseApplicationMapper.submitCaseApplication(caseApplication); // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CASE_ARCHIVED,""); + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_ARCHIVED, ""); return AjaxResult.success("归档成功,案件状态已改为已归档"); } @@ -347,19 +347,58 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } } } + //发送邮件 + sendCaseEmail(caseApplication1, appEmail, resEmail); // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CASE_FILING,""); + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_FILING, ""); return AjaxResult.success("仲裁文书送达成功"); } + /** + * 通过邮件发送裁决书文件 + * + * @param caseApplication1 + * @param appEmail + * @param resEmail + */ + private void sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) { + List fileList = new ArrayList<>(); + File file = null; + List 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"; + file = new File(path); + fileList.add(file); + System.out.println("文件长度:" + file.length()); + } + } + } + if (file != null) { + JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender(); + try { +// emailOutUtil.sendMessageCarryFile(appEmail, "裁决书", "您好，审核后的裁决书在附件中请查阅", file, "hjbjava@163.com", javaMailSender); + emailOutUtil.sendMessageCarryFiles(appEmail, "裁决书", "您好，审核后的裁决书在附件中请查阅", fileList, "lmj1549843951@163.com", javaMailSender); + } catch (Exception e) { + System.out.println("邮件发送失败++++++++++++++++++++++++++++++++"); + System.out.println(e.toString()); + } + } + + } + @Override public AjaxResult stamp(CaseApplication caseApplication) { //更改案件状态(暂时) caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATION_DELIVERY); caseApplicationMapper.submitCaseApplication(caseApplication); // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.ARBITRATION_DELIVERY,""); + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.ARBITRATION_DELIVERY, ""); return AjaxResult.success("用印成功,案件状态已改为待仲裁文书送达"); } @@ -393,7 +432,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { try { // List fileList = new ArrayList<>(); // 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(); // JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();