Pārlūkot izejas kodu

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz3

qitz 2 gadus atpakaļ
vecāks
revīzija
c64b709e33

+ 4
- 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java Parādīt failu

25
      * @return
25
      * @return
26
      */
26
      */
27
     @PostMapping("/document")
27
     @PostMapping("/document")
28
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:createaward')")
29
     public AjaxResult createDocument(@Validated @RequestBody CaseApplication caseApplication){
28
     public AjaxResult createDocument(@Validated @RequestBody CaseApplication caseApplication){
30
         return adjudicationService.createDocument(caseApplication);
29
         return adjudicationService.createDocument(caseApplication);
31
     }
30
     }
58
      * @return
57
      * @return
59
      */
58
      */
60
     @PostMapping("/signature")
59
     @PostMapping("/signature")
61
-    @PreAuthorize("@ss.hasPermi('awardManagement:list:sign')")
60
+//    @PreAuthorize("@ss.hasPermi('awardManagement:list:sign')")
62
     public AjaxResult signature(@Validated @RequestBody CaseApplication caseApplication){
61
     public AjaxResult signature(@Validated @RequestBody CaseApplication caseApplication){
63
         return adjudicationService.signature(caseApplication);
62
         return adjudicationService.signature(caseApplication);
64
     }
63
     }
69
      * @return
68
      * @return
70
      */
69
      */
71
     @PostMapping("/caseFile")
70
     @PostMapping("/caseFile")
72
-    @PreAuthorize("@ss.hasPermi('awardManagement:list:file')")
71
+//    @PreAuthorize("@ss.hasPermi('awardManagement:list:file')")
73
     public AjaxResult caseFile(@Validated @RequestBody CaseApplication caseApplication){
72
     public AjaxResult caseFile(@Validated @RequestBody CaseApplication caseApplication){
74
         return adjudicationService.caseFile(caseApplication);
73
         return adjudicationService.caseFile(caseApplication);
75
     }
74
     }
80
      * @return
79
      * @return
81
      */
80
      */
82
     @PostMapping("/service")
81
     @PostMapping("/service")
83
-    @PreAuthorize("@ss.hasPermi('awardManagement:list:sendaward')")
82
+//    @PreAuthorize("@ss.hasPermi('awardManagement:list:sendaward')")
84
     public AjaxResult service(@RequestBody BookSendVO bookSendVO){
83
     public AjaxResult service(@RequestBody BookSendVO bookSendVO){
85
         return adjudicationService.service(bookSendVO.getId(),bookSendVO.getAppEmail(),bookSendVO.getResEmail(),bookSendVO.getApptrackingNum(),bookSendVO.getRestrackingNum());
84
         return adjudicationService.service(bookSendVO.getId(),bookSendVO.getAppEmail(),bookSendVO.getResEmail(),bookSendVO.getApptrackingNum(),bookSendVO.getRestrackingNum());
86
     }
85
     }
90
      * @return
89
      * @return
91
      */
90
      */
92
     @PostMapping("/stamp")
91
     @PostMapping("/stamp")
93
-    @PreAuthorize("@ss.hasPermi('awardManagement:list:signprint')")
92
+//    @PreAuthorize("@ss.hasPermi('awardManagement:list:signprint')")
94
     public AjaxResult stamp(@Validated @RequestBody CaseApplication caseApplication){
93
     public AjaxResult stamp(@Validated @RequestBody CaseApplication caseApplication){
95
         return adjudicationService.stamp(caseApplication);
94
         return adjudicationService.stamp(caseApplication);
96
     }
95
     }

+ 17
- 17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java Parādīt failu

45
     /**
45
     /**
46
      * 新增立案数据
46
      * 新增立案数据
47
      */
47
      */
48
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:add')")
48
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:add')")
49
     @Log(title = "新增立案数据", businessType = BusinessType.INSERT)
49
     @Log(title = "新增立案数据", businessType = BusinessType.INSERT)
50
     @PostMapping("/addCaseApplication")
50
     @PostMapping("/addCaseApplication")
51
     public AjaxResult addCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
51
     public AjaxResult addCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
58
     /**
58
     /**
59
      * 修改立案数据
59
      * 修改立案数据
60
      */
60
      */
61
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:update')")
61
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:update')")
62
     @Log(title = "修改立案数据", businessType = BusinessType.UPDATE)
62
     @Log(title = "修改立案数据", businessType = BusinessType.UPDATE)
63
     @PostMapping("/editCaseApplication")
63
     @PostMapping("/editCaseApplication")
64
     public AjaxResult editCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
64
     public AjaxResult editCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
70
     /**
70
     /**
71
      * 提交立案申请
71
      * 提交立案申请
72
      */
72
      */
73
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:submit')")
73
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:submit')")
74
     @Log(title = "提交立案申请", businessType = BusinessType.UPDATE)
74
     @Log(title = "提交立案申请", businessType = BusinessType.UPDATE)
75
     @PostMapping("/submitCaseApplication")
75
     @PostMapping("/submitCaseApplication")
76
     public AjaxResult submitCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
76
     public AjaxResult submitCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
81
     /**
81
     /**
82
      * 删除立案数据
82
      * 删除立案数据
83
      */
83
      */
84
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:delete')")
84
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:delete')")
85
     @Log(title = "删除立案数据", businessType = BusinessType.DELETE)
85
     @Log(title = "删除立案数据", businessType = BusinessType.DELETE)
86
     @PostMapping("/removeCaseApplication")
86
     @PostMapping("/removeCaseApplication")
87
     public AjaxResult removeCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
87
     public AjaxResult removeCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
92
     /**
92
     /**
93
      * 查询立案信息
93
      * 查询立案信息
94
      */
94
      */
95
-     @PreAuthorize("@ss.hasPermi('caseManagement:list:detail')")
95
+//     @PreAuthorize("@ss.hasPermi('caseManagement:list:detail')")
96
     @PostMapping("/selectCaseApplication")
96
     @PostMapping("/selectCaseApplication")
97
     public AjaxResult selectCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
97
     public AjaxResult selectCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
98
         CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplication(caseApplication);
98
         CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplication(caseApplication);
102
     /**
102
     /**
103
      * 查询签名链接
103
      * 查询签名链接
104
      */
104
      */
105
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
105
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
106
     @PostMapping("/selectSignUrl")
106
     @PostMapping("/selectSignUrl")
107
     public AjaxResult selectSignUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
107
     public AjaxResult selectSignUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
108
         SealSignRecord sealSignRecordselect = caseApplicationService.selectSignUrl(caseApplication);
108
         SealSignRecord sealSignRecordselect = caseApplicationService.selectSignUrl(caseApplication);
112
     /**
112
     /**
113
      * 查询用印链接
113
      * 查询用印链接
114
      */
114
      */
115
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSealUrl')")
115
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSealUrl')")
116
     @PostMapping("/selectSealUrl")
116
     @PostMapping("/selectSealUrl")
117
     public AjaxResult selectSealUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
117
     public AjaxResult selectSealUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
118
         SealSignRecord sealUrlRecordselect = caseApplicationService.selectSealUrl(caseApplication);
118
         SealSignRecord sealUrlRecordselect = caseApplicationService.selectSealUrl(caseApplication);
129
     }
129
     }
130
 
130
 
131
     @Log(title = "立案信息导入", businessType = BusinessType.IMPORT)
131
     @Log(title = "立案信息导入", businessType = BusinessType.IMPORT)
132
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:import')")
132
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:import')")
133
     @PostMapping("/importData")
133
     @PostMapping("/importData")
134
     public AjaxResult importData(MultipartFile file) throws Exception {
134
     public AjaxResult importData(MultipartFile file) throws Exception {
135
         if(file==null){
135
         if(file==null){
145
     /**
145
     /**
146
      * 组庭
146
      * 组庭
147
      */
147
      */
148
-    @PreAuthorize("@ss.hasPermi('caseApplication:pendTral')")
148
+//    @PreAuthorize("@ss.hasPermi('caseApplication:pendTral')")
149
     @Log(title = "组庭", businessType = BusinessType.UPDATE)
149
     @Log(title = "组庭", businessType = BusinessType.UPDATE)
150
     @PostMapping("/pendTral")
150
     @PostMapping("/pendTral")
151
     public AjaxResult pendTral(@Validated @RequestBody CaseApplication caseApplication) {
151
     public AjaxResult pendTral(@Validated @RequestBody CaseApplication caseApplication) {
155
     /**
155
     /**
156
      * 组庭审核
156
      * 组庭审核
157
      */
157
      */
158
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkgroup')")
158
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkgroup')")
159
     @Log(title = "组庭审核", businessType = BusinessType.UPDATE)
159
     @Log(title = "组庭审核", businessType = BusinessType.UPDATE)
160
     @PostMapping("/pendTralCheck")
160
     @PostMapping("/pendTralCheck")
161
     public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication) {
161
     public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication) {
165
     /**
165
     /**
166
      * 组庭确认
166
      * 组庭确认
167
      */
167
      */
168
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:confirmgroup')")
168
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:confirmgroup')")
169
     @Log(title = "组庭确认", businessType = BusinessType.UPDATE)
169
     @Log(title = "组庭确认", businessType = BusinessType.UPDATE)
170
     @PostMapping("/pendTralSure")
170
     @PostMapping("/pendTralSure")
171
     public AjaxResult pendTralSure(@Validated @RequestBody CaseApplication caseApplication) {
171
     public AjaxResult pendTralSure(@Validated @RequestBody CaseApplication caseApplication) {
175
     /**
175
     /**
176
      * 核验裁决书
176
      * 核验裁决书
177
      */
177
      */
178
-    @PreAuthorize("@ss.hasPermi('caseApplication:verificationArbitrateRecord')")
178
+//    @PreAuthorize("@ss.hasPermi('caseApplication:verificationArbitrateRecord')")
179
     @Log(title = "核验裁决书", businessType = BusinessType.UPDATE)
179
     @Log(title = "核验裁决书", businessType = BusinessType.UPDATE)
180
     @PostMapping("/verificationArbitrateRecord")
180
     @PostMapping("/verificationArbitrateRecord")
181
     public AjaxResult verificationArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) {
181
     public AjaxResult verificationArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) {
185
     /**
185
     /**
186
      * 审核裁决书
186
      * 审核裁决书
187
      */
187
      */
188
-    @PreAuthorize("@ss.hasPermi('caseApplication:checkArbitrateRecord')")
188
+//    @PreAuthorize("@ss.hasPermi('caseApplication:checkArbitrateRecord')")
189
     @Log(title = "审核裁决书", businessType = BusinessType.UPDATE)
189
     @Log(title = "审核裁决书", businessType = BusinessType.UPDATE)
190
     @PostMapping("/checkArbitrateRecord")
190
     @PostMapping("/checkArbitrateRecord")
191
     public AjaxResult checkArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) {
191
     public AjaxResult checkArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) {
196
     /**
196
     /**
197
      * 是否指派仲裁员
197
      * 是否指派仲裁员
198
      */
198
      */
199
-    @PreAuthorize("@ss.hasPermi('caseApplication:pendingAppointArbotrar')")
199
+//    @PreAuthorize("@ss.hasPermi('caseApplication:pendingAppointArbotrar')")
200
     @Log(title = "是否指派仲裁员", businessType = BusinessType.UPDATE)
200
     @Log(title = "是否指派仲裁员", businessType = BusinessType.UPDATE)
201
     @PostMapping("/pendingAppointArbotrar")
201
     @PostMapping("/pendingAppointArbotrar")
202
     public AjaxResult pendingAppointArbotrar(@Validated @RequestBody CaseApplication caseApplication) {
202
     public AjaxResult pendingAppointArbotrar(@Validated @RequestBody CaseApplication caseApplication) {
206
     /**
206
     /**
207
      * 提交立案审查
207
      * 提交立案审查
208
      */
208
      */
209
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:check')")
209
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:check')")
210
     @Log(title = "提交立案审查", businessType = BusinessType.UPDATE)
210
     @Log(title = "提交立案审查", businessType = BusinessType.UPDATE)
211
     @PostMapping("/submitCaseApplicationCheck")
211
     @PostMapping("/submitCaseApplicationCheck")
212
     public AjaxResult submitCaseApplicationCheck(@Validated @RequestBody CaseApplication caseApplication) {
212
     public AjaxResult submitCaseApplicationCheck(@Validated @RequestBody CaseApplication caseApplication) {
217
     /**
217
     /**
218
      * 确认缴费查询立案信息
218
      * 确认缴费查询立案信息
219
      */
219
      */
220
-    @PreAuthorize("@ss.hasPermi('paymentManagement:list:detail')")
220
+//    @PreAuthorize("@ss.hasPermi('paymentManagement:list:detail')")
221
     @PostMapping("/selectCaseApplicationConfirm")
221
     @PostMapping("/selectCaseApplicationConfirm")
222
     public AjaxResult selectCaseApplicationConfirm(@Validated @RequestBody CaseApplication caseApplication) {
222
     public AjaxResult selectCaseApplicationConfirm(@Validated @RequestBody CaseApplication caseApplication) {
223
         CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplicationConfirm(caseApplication);
223
         CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplicationConfirm(caseApplication);
238
      * 获取UrlScheme
238
      * 获取UrlScheme
239
      */
239
      */
240
     @Anonymous
240
     @Anonymous
241
-    @PostMapping("/getUrlScheme")
241
+    @GetMapping("/getUrlScheme")
242
     public AjaxResult getUrlScheme() {
242
     public AjaxResult getUrlScheme() {
243
         String schemeUrl = WxAppletNotifyUtils.jumpAppletSchemeUrl();
243
         String schemeUrl = WxAppletNotifyUtils.jumpAppletSchemeUrl();
244
         return success(schemeUrl);
244
         return success(schemeUrl);

+ 1
- 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java Parādīt failu

23
      * @return
23
      * @return
24
      */
24
      */
25
     @PutMapping("/method")
25
     @PutMapping("/method")
26
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
26
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
27
     public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
27
     public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
28
             ,Integer opinion){
28
             ,Integer opinion){
29
         return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);
29
         return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);
35
      * @return
35
      * @return
36
      */
36
      */
37
     @PostMapping("/writtenHear")
37
     @PostMapping("/writtenHear")
38
-    @PreAuthorize("@ss.hasPermi('caseManagement:hear')")
39
     public AjaxResult writtenHear(@Validated @RequestBody ArbitrateRecord arbitrateRecord){
38
     public AjaxResult writtenHear(@Validated @RequestBody ArbitrateRecord arbitrateRecord){
40
         return caseArbitrateService.writtenHear(arbitrateRecord);
39
         return caseArbitrateService.writtenHear(arbitrateRecord);
41
     }
40
     }

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java Parādīt failu

22
     /**
22
     /**
23
      * 查询案件日志列表
23
      * 查询案件日志列表
24
      */
24
      */
25
-    @PreAuthorize("@ss.hasPermi('caseLog:list')")
25
+//    @PreAuthorize("@ss.hasPermi('caseLog:list')")
26
     @GetMapping("/list")
26
     @GetMapping("/list")
27
     public TableDataInfo list(CaseLogRecord caseLogRecord)
27
     public TableDataInfo list(CaseLogRecord caseLogRecord)
28
     {
28
     {

+ 2
- 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CasePaymentController.java Parādīt failu

25
      * @param casePayDTO 缴费传入参数
25
      * @param casePayDTO 缴费传入参数
26
      * @return 统一响应结果
26
      * @return 统一响应结果
27
      */
27
      */
28
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:pay')")
28
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:pay')")
29
     @PostMapping("/casePay")
29
     @PostMapping("/casePay")
30
     public AjaxResult casePay(@Validated @RequestBody CasePayDTO casePayDTO) {
30
     public AjaxResult casePay(@Validated @RequestBody CasePayDTO casePayDTO) {
31
         return paymentService.casePay(casePayDTO);
31
         return paymentService.casePay(casePayDTO);
36
      * @param caseApplication
36
      * @param caseApplication
37
      * @return
37
      * @return
38
      */
38
      */
39
-    @PreAuthorize("@ss.hasPermi('paymentManagement:list:payconfirm')")
39
+//    @PreAuthorize("@ss.hasPermi('paymentManagement:list:payconfirm')")
40
     @PutMapping("/confirm")
40
     @PutMapping("/confirm")
41
     public AjaxResult confirmPayment(@Validated @RequestBody CaseApplication caseApplication) {
41
     public AjaxResult confirmPayment(@Validated @RequestBody CaseApplication caseApplication) {
42
         return paymentService.confirmPayment(caseApplication);
42
         return paymentService.confirmPayment(caseApplication);

+ 8
- 2
ruoyi-admin/src/main/resources/application.yml Parādīt failu

94
   mail:
94
   mail:
95
     host: smtp.163.com
95
     host: smtp.163.com
96
     port: 25
96
     port: 25
97
-    username: hjbjava@163.com
98
-    password: BSRSSEPJWGNNVYYL
97
+    username: lmj1549843951@163.com
98
+    password: JGIOQVFCLAZKXRKO
99
     default-encoding: UTF-8
99
     default-encoding: UTF-8
100
     properties:
100
     properties:
101
       mail:
101
       mail:
102
         smtp:
102
         smtp:
103
+          connectiontimeout: 5000
104
+          timeout: 5000
105
+          writetimeout: 5000
103
           socketFactoryClass: javax.net.ssl.SSLSocketFactory
106
           socketFactoryClass: javax.net.ssl.SSLSocketFactory
107
+          socketFactoryFallback: false
108
+          socketFactoryPort: 465
104
         debug: false
109
         debug: false
110
+    protocol: smtp
105
 #上上签配置参数
111
 #上上签配置参数
106
 ssq:
112
 ssq:
107
   developerId: 1695872832013855470
113
   developerId: 1695872832013855470

+ 2
- 2
ruoyi-common/src/main/java/com/ruoyi/common/utils/WxAppletNotifyUtils.java Parādīt failu

43
         body.putOpt("expire_interval",30);
43
         body.putOpt("expire_interval",30);
44
         String post = HttpUtil.post(url,body.toJSONString(2));
44
         String post = HttpUtil.post(url,body.toJSONString(2));
45
         JSONObject result = JSONUtil.parseObj(post);
45
         JSONObject result = JSONUtil.parseObj(post);
46
-        if(result!=null){
47
-            result.getStr("openlink");
46
+        if(result!=null && result.containsKey("openlink")){
47
+         return    result.getStr("openlink");
48
         }
48
         }
49
         return null;
49
         return null;
50
     }
50
     }

+ 44
- 5
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java Parādīt failu

303
         caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATED_SEAL);
303
         caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATED_SEAL);
304
         caseApplicationMapper.submitCaseApplication(caseApplication);
304
         caseApplicationMapper.submitCaseApplication(caseApplication);
305
         // 新增日志
305
         // 新增日志
306
-        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.ARBITRATED_SEAL,"");
306
+        CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.ARBITRATED_SEAL, "");
307
 
307
 
308
         return AjaxResult.success("签名成功,案件状态已改为待仲裁文书用印");
308
         return AjaxResult.success("签名成功,案件状态已改为待仲裁文书用印");
309
     }
309
     }
314
         caseApplication.setCaseStatus(CaseApplicationConstants.CASE_ARCHIVED);
314
         caseApplication.setCaseStatus(CaseApplicationConstants.CASE_ARCHIVED);
315
         caseApplicationMapper.submitCaseApplication(caseApplication);
315
         caseApplicationMapper.submitCaseApplication(caseApplication);
316
         // 新增日志
316
         // 新增日志
317
-        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CASE_ARCHIVED,"");
317
+        CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_ARCHIVED, "");
318
 
318
 
319
         return AjaxResult.success("归档成功,案件状态已改为已归档");
319
         return AjaxResult.success("归档成功,案件状态已改为已归档");
320
     }
320
     }
347
                 }
347
                 }
348
             }
348
             }
349
         }
349
         }
350
+        //发送邮件
351
+        sendCaseEmail(caseApplication1, appEmail, resEmail);
350
         // 新增日志
352
         // 新增日志
351
-        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CASE_FILING,"");
353
+        CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_FILING, "");
352
 
354
 
353
         return AjaxResult.success("仲裁文书送达成功");
355
         return AjaxResult.success("仲裁文书送达成功");
354
     }
356
     }
355
 
357
 
358
+    /**
359
+     * 通过邮件发送裁决书文件
360
+     *
361
+     * @param caseApplication1
362
+     * @param appEmail
363
+     * @param resEmail
364
+     */
365
+    private void sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) {
366
+        List<File> fileList = new ArrayList<>();
367
+        File file = null;
368
+        List<CaseAttach> caseAttachList = caseApplication1.getCaseAttachList();
369
+        if (caseAttachList != null && caseAttachList.size() > 0) {
370
+            for (CaseAttach caseAttach : caseAttachList) {
371
+                if (caseAttach.getAnnexType() == 3) {
372
+                    String annexPath = caseAttach.getAnnexPath();
373
+                    String path = "/home/ruoyi/" + annexPath;
374
+//        String path = "/home/ruoyi/uploadPath/upload/2023/10/12/裁决书测试20231012test.docx";
375
+//        String path = "E:/WorkDoc/SH/裁决书测试20231012test.docx";
376
+                    file = new File(path);
377
+                    fileList.add(file);
378
+                    System.out.println("文件长度:" + file.length());
379
+                }
380
+            }
381
+        }
382
+        if (file != null) {
383
+            JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();
384
+            try {
385
+//                emailOutUtil.sendMessageCarryFile(appEmail, "裁决书", "您好,审核后的裁决书在附件中请查阅", file, "hjbjava@163.com", javaMailSender);
386
+                emailOutUtil.sendMessageCarryFiles(appEmail, "裁决书", "您好,审核后的裁决书在附件中请查阅", fileList, "lmj1549843951@163.com", javaMailSender);
387
+            } catch (Exception e) {
388
+                System.out.println("邮件发送失败++++++++++++++++++++++++++++++++");
389
+                System.out.println(e.toString());
390
+            }
391
+        }
392
+
393
+    }
394
+
356
     @Override
395
     @Override
357
     public AjaxResult stamp(CaseApplication caseApplication) {
396
     public AjaxResult stamp(CaseApplication caseApplication) {
358
         //更改案件状态(暂时)
397
         //更改案件状态(暂时)
359
         caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATION_DELIVERY);
398
         caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATION_DELIVERY);
360
         caseApplicationMapper.submitCaseApplication(caseApplication);
399
         caseApplicationMapper.submitCaseApplication(caseApplication);
361
         // 新增日志
400
         // 新增日志
362
-        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.ARBITRATION_DELIVERY,"");
401
+        CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.ARBITRATION_DELIVERY, "");
363
 
402
 
364
         return AjaxResult.success("用印成功,案件状态已改为待仲裁文书送达");
403
         return AjaxResult.success("用印成功,案件状态已改为待仲裁文书送达");
365
     }
404
     }
393
         try {
432
         try {
394
 //            List<File> fileList = new ArrayList<>();
433
 //            List<File> fileList = new ArrayList<>();
395
 //            fileList.add(new File("D:\\home\\ruoyi\\uploadPath\\upload\\2023\\10\\7\\b442880179844a848f1f8b08c29e3d0c.docx"));
434
 //            fileList.add(new File("D:\\home\\ruoyi\\uploadPath\\upload\\2023\\10\\7\\b442880179844a848f1f8b08c29e3d0c.docx"));
396
- //           File file = fileList.get(0);//System.out.println("这是文件"+file);
435
+            //           File file = fileList.get(0);//System.out.println("这是文件"+file);
397
             //电子邮件送达
436
             //电子邮件送达
398
 //            EmailOutUtil emailOutUtil = new EmailOutUtil();
437
 //            EmailOutUtil emailOutUtil = new EmailOutUtil();
399
 //            JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();
438
 //            JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();