hejinbo 2 vuotta sitten
vanhempi
commit
2ae2155808

+ 13
- 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java Näytä tiedosto

9
 import com.ruoyi.common.enums.BusinessType;
9
 import com.ruoyi.common.enums.BusinessType;
10
 import com.ruoyi.common.exception.EsignDemoException;
10
 import com.ruoyi.common.exception.EsignDemoException;
11
 import com.ruoyi.common.utils.WxAppletNotifyUtils;
11
 import com.ruoyi.common.utils.WxAppletNotifyUtils;
12
-import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord;
13
-import com.ruoyi.wisdomarbitrate.domain.BatchCaseApplication;
14
-import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
15
-import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
12
+import com.ruoyi.wisdomarbitrate.domain.*;
16
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
13
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
17
 import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount;
14
 import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount;
18
 import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService;
15
 import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService;
336
         return AjaxResult.success(caseApplicationService.updateCaseLockStatus(caseApplication));
333
         return AjaxResult.success(caseApplicationService.updateCaseLockStatus(caseApplication));
337
     }
334
     }
338
 
335
 
336
+    /**
337
+     * 查询短信发送记录
338
+     * @param smsSendRecord
339
+     * @return
340
+     */
341
+    @PostMapping("/smsRecord")
342
+    public TableDataInfo getSmsSendRecord(@RequestBody SmsSendRecord smsSendRecord){
343
+        startPage();
344
+        List<SmsSendRecord> list = caseApplicationService.getSmsSendRecord(smsSendRecord);
345
+        return getDataTable(list);
346
+    }
347
+
339
 }
348
 }

+ 36
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SmsSendRecord.java Näytä tiedosto

1
+package com.ruoyi.wisdomarbitrate.domain;
2
+
3
+import com.fasterxml.jackson.annotation.JsonFormat;
4
+import com.ruoyi.common.core.domain.BaseEntity;
5
+import lombok.AllArgsConstructor;
6
+import lombok.Data;
7
+import lombok.NoArgsConstructor;
8
+
9
+import java.util.Date;
10
+
11
+@Data
12
+@AllArgsConstructor
13
+@NoArgsConstructor
14
+public class SmsSendRecord extends BaseEntity {
15
+    /**
16
+     * ID
17
+     */
18
+    private Long id;
19
+    /**
20
+     * 案件申请id
21
+     */
22
+    private Long caseId;
23
+    /**
24
+     * 手机号
25
+     */
26
+    private String phone;
27
+    /**
28
+     * 发送时间
29
+     */
30
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
31
+    private Date sendTime;
32
+    /**
33
+     * 发送内容
34
+     */
35
+    private String sendContent;
36
+}

+ 14
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SmsRecordMapper.java Näytä tiedosto

1
+package com.ruoyi.wisdomarbitrate.mapper;
2
+
3
+import com.ruoyi.wisdomarbitrate.domain.SmsSendRecord;
4
+import org.apache.ibatis.annotations.Mapper;
5
+
6
+import java.util.List;
7
+
8
+@Mapper
9
+public interface SmsRecordMapper {
10
+
11
+    int saveSmsSendRecord(SmsSendRecord smsSendRecord);
12
+
13
+    List<SmsSendRecord> getSmsSendRecord(SmsSendRecord smsSendRecord);
14
+}

+ 7
- 4
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java Näytä tiedosto

2
 
2
 
3
 import com.ruoyi.common.core.domain.AjaxResult;
3
 import com.ruoyi.common.core.domain.AjaxResult;
4
 import com.ruoyi.common.exception.EsignDemoException;
4
 import com.ruoyi.common.exception.EsignDemoException;
5
-import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord;
6
-import com.ruoyi.wisdomarbitrate.domain.BatchCaseApplication;
7
-import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
8
-import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
5
+import com.ruoyi.wisdomarbitrate.domain.*;
9
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
6
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
10
 import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount;
7
 import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount;
11
 import org.springframework.web.multipart.MultipartFile;
8
 import org.springframework.web.multipart.MultipartFile;
75
     int updateCaseLockStatus(CaseApplication caseApplication);
72
     int updateCaseLockStatus(CaseApplication caseApplication);
76
 
73
 
77
     AjaxResult uploadZipFile(MultipartFile file, Long id, String username, Long userId);
74
     AjaxResult uploadZipFile(MultipartFile file, Long id, String username, Long userId);
75
+    /**
76
+     * 查询短信发送记录
77
+     * @param smsSendRecord
78
+     * @return
79
+     */
80
+    List<SmsSendRecord> getSmsSendRecord(SmsSendRecord smsSendRecord);
78
 }
81
 }

+ 54
- 7
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Näytä tiedosto

87
     private CaseLogRecordMapper caseLogRecordMapper;
87
     private CaseLogRecordMapper caseLogRecordMapper;
88
     @Autowired
88
     @Autowired
89
     private   CaseEvidenceDirectoryMapper caseEvidenceDirectoryMapper;
89
     private   CaseEvidenceDirectoryMapper caseEvidenceDirectoryMapper;
90
+    @Autowired
91
+    private SmsRecordMapper smsRecordMapper;
90
     // 手机号正则
92
     // 手机号正则
91
     private static final Pattern TELEPHONE_REGX =  Pattern.compile("^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$");
93
     private static final Pattern TELEPHONE_REGX =  Pattern.compile("^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$");
92
 
94
 
458
 
460
 
459
     }
461
     }
460
 
462
 
463
+    @Override
464
+    public  List<SmsSendRecord> getSmsSendRecord(SmsSendRecord smsSendRecord) {
465
+        return smsRecordMapper.getSmsSendRecord(smsSendRecord);
466
+    }
467
+
461
     private List<CaseLogRecord> getNofinishCasenode(Integer caseStatus) {
468
     private List<CaseLogRecord> getNofinishCasenode(Integer caseStatus) {
462
         CaseLogRecord caseLogRecord1 = new CaseLogRecord();
469
         CaseLogRecord caseLogRecord1 = new CaseLogRecord();
463
         caseLogRecord1.setCaseNodeName("立案审查");
470
         caseLogRecord1.setCaseNodeName("立案审查");
959
                 }
966
                 }
960
                 if (insertUserRow > 0) {
967
                 if (insertUserRow > 0) {
961
                     caseAffiliate.setApplicantAgentUserId(String.valueOf(agentUser.getUserId()));
968
                     caseAffiliate.setApplicantAgentUserId(String.valueOf(agentUser.getUserId()));
962
-                    // 明天改下模板id:1956159 普通短信 通知用户认证注册 尊敬的{1},您的代理的案件已接入仲裁系统,复制访问https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 进入小程序进行认证注册。如非本人操作,请忽略本短信
969
+                    // 尊敬的{1},您的代理的案件已接入仲裁系统,复制访问https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 进入小程序进行认证注册。如非本人操作,请忽略本短信
963
                     SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
970
                     SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
964
                     request.setTemplateId("1956159");
971
                     request.setTemplateId("1956159");
965
                     request.setPhone(agentUser.getPhonenumber());
972
                     request.setPhone(agentUser.getPhonenumber());
966
                     request.setTemplateParamSet(new String[]{agentUser.getNickName()});
973
                     request.setTemplateParamSet(new String[]{agentUser.getNickName()});
967
-                    SmsUtils.sendSms(request);
974
+                    if (SmsUtils.sendSms(request)){
975
+                        //保存短信发送记录
976
+                        SmsSendRecord smsSendRecord = new SmsSendRecord();
977
+                        smsSendRecord.setCaseId(caseAffiliate.getCaseAppliId());
978
+                        smsSendRecord.setPhone(request.getPhone());
979
+                        smsSendRecord.setSendTime(new Date());
980
+                        String content="尊敬的"+agentUser.getNickName()+",您的代理的案件已接入仲裁系统,复制访问https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 进入小程序进行认证注册。如非本人操作,请忽略本短信";
981
+                        smsSendRecord.setSendContent(content);
982
+                        smsSendRecord.setCreateBy(getUsername());
983
+                        smsRecordMapper.saveSmsSendRecord(smsSendRecord);
984
+                    }
968
                 }
985
                 }
969
             } else if (null != agentUser.getDeptId() && !String.valueOf(agentUser.getDeptId()).equals(caseAffiliate.getApplicationOrganId())) {
986
             } else if (null != agentUser.getDeptId() && !String.valueOf(agentUser.getDeptId()).equals(caseAffiliate.getApplicationOrganId())) {
970
 //                return "该申请代理人已在"+agentUser.getDeptName()+"申请机构下存在,请检查填写信息是否正确";
987
 //                return "该申请代理人已在"+agentUser.getDeptName()+"申请机构下存在,请检查填写信息是否正确";
1741
         //发送短信通知
1758
         //发送短信通知
1742
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
1759
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
1743
         request.setTemplateId("1952136");
1760
         request.setTemplateId("1952136");
1744
-        // 1948332 普通短信 开庭审理房间号通知 尊敬的{1}用户,您的{2}仲裁案件,开庭审理房间号为{3},请知晓,如非本人操作,请忽略本短信。
1761
+        // 1948332 普通短信 尊敬的{1}用户,您的{2}仲裁案件,开庭审理房间号为{3},请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓,如非本人操作,请忽略本短信。
1745
         request.setPhone(caseAffiliate.getContactTelphone());
1762
         request.setPhone(caseAffiliate.getContactTelphone());
1746
         request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()});
1763
         request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()});
1747
-        SmsUtils.sendSms(request);
1748
-
1764
+        if (SmsUtils.sendSms(request)){
1765
+            //保存短信发送记录
1766
+            SmsSendRecord smsSendRecord = new SmsSendRecord();
1767
+            smsSendRecord.setCaseId(messageVO.getId());
1768
+            smsSendRecord.setPhone(request.getPhone());
1769
+            smsSendRecord.setSendTime(new Date());
1770
+            String content="尊敬的"+caseAffiliate.getName()+"用户,您的"+ caseApplicationselect.getCaseNum()+"仲裁案件,开庭审理房间号为"+ messageVO.getRoomNo()+",请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓,如非本人操作,请忽略本短信。";
1771
+            smsSendRecord.setSendContent(content);
1772
+            smsSendRecord.setCreateBy(getUsername());
1773
+            smsRecordMapper.saveSmsSendRecord(smsSendRecord);
1774
+        }
1749
         return "短信发送成功";
1775
         return "短信发送成功";
1750
     }
1776
     }
1751
 
1777
 
2026
                     // 1947342 普通短信 开庭日期通知 尊敬的{1}用户,您的{2}仲裁案件,开庭日期已确定为{3},请知晓,如非本人操作,请忽略本短信。
2052
                     // 1947342 普通短信 开庭日期通知 尊敬的{1}用户,您的{2}仲裁案件,开庭日期已确定为{3},请知晓,如非本人操作,请忽略本短信。
2027
                     String name = user.getNickName();
2053
                     String name = user.getNickName();
2028
                     request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
2054
                     request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
2029
-                    SmsUtils.sendSms(request);
2055
+                    if (SmsUtils.sendSms(request)){
2056
+                        //保存短信发送记录
2057
+                        SmsSendRecord smsSendRecord = new SmsSendRecord();
2058
+                        smsSendRecord.setCaseId(caseApplication.getId());
2059
+                        smsSendRecord.setPhone(request.getPhone());
2060
+                        smsSendRecord.setSendTime(new Date());
2061
+                        String content="尊敬的"+name+"用户,您的"+caseNum+"仲裁案件,开庭日期已确定为"+hearDatestr+",请知晓,如非本人操作,请忽略本短信。";
2062
+                        smsSendRecord.setSendContent(content);
2063
+                        smsSendRecord.setCreateBy(getUsername());
2064
+                        smsRecordMapper.saveSmsSendRecord(smsSendRecord);
2065
+                    }
2030
 
2066
 
2031
                 }
2067
                 }
2032
             }
2068
             }
2050
                 // 1947342 普通短信 开庭日期通知 尊敬的{1}用户,您的{2}仲裁案件,开庭日期已确定为{3},请知晓,如非本人操作,请忽略本短信。
2086
                 // 1947342 普通短信 开庭日期通知 尊敬的{1}用户,您的{2}仲裁案件,开庭日期已确定为{3},请知晓,如非本人操作,请忽略本短信。
2051
                 String name = caseAffiliateselect.getName();
2087
                 String name = caseAffiliateselect.getName();
2052
                 request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
2088
                 request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
2053
-                SmsUtils.sendSms(request);
2089
+                if (SmsUtils.sendSms(request)){
2090
+                    //保存短信发送记录
2091
+                    SmsSendRecord smsSendRecord = new SmsSendRecord();
2092
+                    smsSendRecord.setCaseId(caseApplication.getId());
2093
+                    smsSendRecord.setPhone(request.getPhone());
2094
+                    smsSendRecord.setSendTime(new Date());
2095
+                    String content="尊敬的"+name+"用户,您的"+caseNum+"仲裁案件,开庭日期已确定为"+hearDatestr+",请知晓,如非本人操作,请忽略本短信。";
2096
+                    smsSendRecord.setSendContent(content);
2097
+                    smsSendRecord.setCreateBy(getUsername());
2098
+                    smsRecordMapper.saveSmsSendRecord(smsSendRecord);
2099
+                }
2054
             }
2100
             }
2055
         }
2101
         }
2056
         // 新增日志
2102
         // 新增日志
2223
         caseApplicationNew.setFeePayable(caseApplicationinsertDiffer.getFeePayable());
2269
         caseApplicationNew.setFeePayable(caseApplicationinsertDiffer.getFeePayable());
2224
     }
2270
     }
2225
 
2271
 
2272
+
2226
 //    @Transactional
2273
 //    @Transactional
2227
 //    public void fixExecuteSelectFlowDetailUtils() throws EsignDemoException {
2274
 //    public void fixExecuteSelectFlowDetailUtils() throws EsignDemoException {
2228
 //
2275
 //

+ 71
- 105
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java Näytä tiedosto

24
 import java.util.function.Function;
24
 import java.util.function.Function;
25
 import java.util.stream.Collectors;
25
 import java.util.stream.Collectors;
26
 
26
 
27
+import static com.ruoyi.common.utils.SecurityUtils.getUsername;
28
+
27
 @Service
29
 @Service
28
 public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
30
 public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
29
     @Autowired
31
     @Autowired
36
     private ArbitrateRecordMapper arbitrateRecordMapper;
38
     private ArbitrateRecordMapper arbitrateRecordMapper;
37
     @Autowired
39
     @Autowired
38
     private CaseAttachMapper caseAttachMapper;
40
     private CaseAttachMapper caseAttachMapper;
41
+    @Autowired
42
+    private SmsRecordMapper smsRecordMapper;
39
 
43
 
40
     @Override
44
     @Override
41
     @Transactional
45
     @Transactional
46
             return AjaxResult.success();
50
             return AjaxResult.success();
47
         }
51
         }
48
         Integer arbitratMethod = caseApplication1.getArbitratMethod();
52
         Integer arbitratMethod = caseApplication1.getArbitratMethod();
49
-        if(arbitratMethod==null) {
53
+        if (arbitratMethod == null) {
50
             return AjaxResult.error("请先指定仲裁方式");
54
             return AjaxResult.error("请先指定仲裁方式");
51
         }
55
         }
52
-            String caseNum = caseApplication1.getCaseNum();
53
-            if (opinion == 0) {   //拒绝
54
-                if (arbitratMethod == 2) {
55
-                    caseApplication1.setArbitratMethod(1);  // 更改仲裁方式
56
-                    //修改案件状态为待开庭审理
56
+        String caseNum = caseApplication1.getCaseNum();
57
+        if (opinion == 0) {   //拒绝
58
+            if (arbitratMethod == 2) {
59
+                caseApplication1.setArbitratMethod(1);  // 更改仲裁方式
60
+                //修改案件状态为待开庭审理
57
 //                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
61
 //                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
58
-                    //修改案件状态为待修改开庭时间
59
-                    caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
60
-                    // 新增日志
61
-                    CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
62
-
63
-                } else {
64
-                    caseApplication1.setArbitratMethod(2);
65
-                    //修改案件状态为待书面审理
66
-                    caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR);
67
-                    // 新增日志
68
-                    CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, "");
62
+                //修改案件状态为待修改开庭时间
63
+                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
64
+                // 新增日志
65
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
69
 
66
 
70
-                }
71
             } else {
67
             } else {
72
-                if (arbitratMethod == 2) {
73
-                    //修改案件状态为待书面审理
74
-                    caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR);
75
-                    // 新增日志
76
-                    CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, "");
68
+                caseApplication1.setArbitratMethod(2);
69
+                //修改案件状态为待书面审理
70
+                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR);
71
+                // 新增日志
72
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, "");
77
 
73
 
78
-                } else {
79
-                    //修改案件状态为待开庭审理
74
+            }
75
+        } else {
76
+            if (arbitratMethod == 2) {
77
+                //修改案件状态为待书面审理
78
+                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR);
79
+                // 新增日志
80
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, "");
81
+
82
+            } else {
83
+                //修改案件状态为待开庭审理
80
 //                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
84
 //                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
81
-                    //修改案件状态为待修改开庭时间
82
-                    caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
83
-                    // 新增日志
84
-                    CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
85
+                //修改案件状态为待修改开庭时间
86
+                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
87
+                // 新增日志
88
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
85
 
89
 
86
-                }
87
             }
90
             }
88
-            int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
89
-            if (i > 0) {
90
-                String arbitratMethodStr = caseApplication1.getArbitratMethod() == 1 ? "开庭审理" : "书面审理";
91
-                //发送短信通知
92
-                SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
91
+        }
92
+        int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
93
+        if (i > 0) {
94
+            String arbitratMethodStr = caseApplication1.getArbitratMethod() == 1 ? "开庭审理" : "书面审理";
95
+            //发送短信通知
96
+            SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
93
 
97
 
94
-                CaseAffiliate caseAffiliate = new CaseAffiliate();
95
-                caseAffiliate.setCaseAppliId(caseApplication1.getId());
96
-                List<CaseAffiliate> caseAffiliates = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate);            //获取案件关联人信息
97
-                if (caseAffiliates != null && caseAffiliates.size() > 0) {
98
-                    for (CaseAffiliate affiliate : caseAffiliates) {
99
-                        //获取身份类型
100
-                        int identityType = affiliate.getIdentityType();
101
-                        if (identityType == 1) {    //申请人
102
-                            request.setTemplateId("1931000");
103
-                            request.setPhone(affiliate.getContactTelphone());
104
-                            // 这个值,要看你的模板中是否预留了占位符,如果没有则不需要设置
105
-                            // 1931000 普通短信 确定仲裁方式通知 尊敬的{1}用户,您的{2}仲裁案件,仲裁方式已确定为{3},请知晓,如非本人操作,请忽略本短信。
106
-                            String name = affiliate.getName();
107
-                            request.setTemplateParamSet(new String[]{name, caseNum, arbitratMethodStr});
108
-                            SmsUtils.sendSms(request);
109
-                        } else {       //被申请人
110
-                            request.setTemplateId("1928006");
111
-                            request.setPhone(affiliate.getContactTelphone());
112
-                            // 模板id1928006 普通短信 案件应诉通知 尊敬的{1}用户,您的{2}案件{3}已成功受理,请点击https://phmapp.xayunmei.com选择是否应诉。
113
-                            String name = affiliate.getName();
114
-                            request.setTemplateParamSet(new String[]{name, caseNum, arbitratMethodStr});
115
-                            SmsUtils.sendSms(request);
116
-                        }
98
+            CaseAffiliate caseAffiliate = new CaseAffiliate();
99
+            caseAffiliate.setCaseAppliId(caseApplication1.getId());
100
+            List<CaseAffiliate> caseAffiliates = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate);            //获取案件关联人信息
101
+            if (caseAffiliates != null && caseAffiliates.size() > 0) {
102
+                for (CaseAffiliate affiliate : caseAffiliates) {
103
+                    request.setTemplateId("1931000");
104
+                    request.setPhone(affiliate.getContactTelphone());
105
+                    // 这个值,要看你的模板中是否预留了占位符,如果没有则不需要设置
106
+                    // 1931000 尊敬的{1}用户,您的{2}仲裁案件,仲裁方式已确定为{3},请知晓,如非本人操作,请忽略本短信。
107
+                    String name = affiliate.getName();
108
+                    request.setTemplateParamSet(new String[]{name, caseNum, arbitratMethodStr});
109
+                    if (SmsUtils.sendSms(request)) {
110
+                        //保存短信发送记录
111
+                        SmsSendRecord smsSendRecord = new SmsSendRecord();
112
+                        smsSendRecord.setCaseId(caseApplication.getId());
113
+                        smsSendRecord.setPhone(request.getPhone());
114
+                        smsSendRecord.setSendTime(new Date());
115
+                        String content = "尊敬的" + name + "用户,您的" + caseNum + "仲裁案件,仲裁方式已确定为" + arbitratMethodStr + ",请知晓,如非本人操作,请忽略本短信。";
116
+                        smsSendRecord.setSendContent(content);
117
+                        smsSendRecord.setCreateBy(getUsername());
118
+                        smsRecordMapper.saveSmsSendRecord(smsSendRecord);
117
                     }
119
                     }
118
                 }
120
                 }
119
-
120
-                return AjaxResult.success("审核成功");
121
             }
121
             }
122
-        return AjaxResult.success();
123
-    }
124
 
122
 
125
-    /**
126
-     * 发送短信
127
-     * @param caseApplicationById
128
-     * @param request
129
-     * @param caseNum
130
-     */
131
-    private void sendArbitratMethodMes(CaseApplication caseApplicationById, SmsUtils.SendSmsRequest request, String caseNum) {
132
-        String arbitratMethodStr = caseApplicationById.getArbitratMethod() == 1 ? "开庭审理" : "书面审理";
133
-
134
-        CaseAffiliate caseAffiliate = new CaseAffiliate();
135
-        caseAffiliate.setCaseAppliId(caseApplicationById.getId());
136
-        List<CaseAffiliate> caseAffiliates = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate);            //获取案件关联人信息
137
-        if (CollectionUtil.isEmpty(caseAffiliates)) {
138
-            return;
139
-        }
140
-        for (CaseAffiliate affiliate : caseAffiliates) {
141
-            //获取身份类型
142
-            int identityType = affiliate.getIdentityType();
143
-            if (identityType == 1) {    //申请人
144
-                request.setTemplateId("1931000");
145
-                request.setPhone(affiliate.getContactTelphone());
146
-                // 这个值,要看你的模板中是否预留了占位符,如果没有则不需要设置
147
-                // 1931000 普通短信 确定仲裁方式通知 尊敬的{1}用户,您的{2}仲裁案件,仲裁方式已确定为{3},请知晓,如非本人操作,请忽略本短信。
148
-                String name = affiliate.getName();
149
-                request.setTemplateParamSet(new String[]{name, caseNum, arbitratMethodStr});
150
-                SmsUtils.sendSms(request);
151
-            } else {       //被申请人
152
-                request.setTemplateId("1928006");
153
-                request.setPhone(affiliate.getContactTelphone());
154
-                // 模板id1928006 普通短信 案件应诉通知 尊敬的{1}用户,您的{2}案件{3}已成功受理,请点击https://phmapp.xayunmei.com选择是否应诉。
155
-                String name = affiliate.getName();
156
-                request.setTemplateParamSet(new String[]{name, caseNum, arbitratMethodStr});
157
-                SmsUtils.sendSms(request);
158
-            }
123
+            return AjaxResult.success("审核成功");
159
         }
124
         }
125
+        return AjaxResult.success();
160
     }
126
     }
161
 
127
 
162
     @Override
128
     @Override
170
 
136
 
171
         //先判断案件是否已经提交过仲裁结果
137
         //先判断案件是否已经提交过仲裁结果
172
         ArbitrateRecord arbitrateRecord1 = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecord);
138
         ArbitrateRecord arbitrateRecord1 = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecord);
173
-        if (arbitrateRecord1!=null){
139
+        if (arbitrateRecord1 != null) {
174
             int i = arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
140
             int i = arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
175
-            if (i>0){
141
+            if (i > 0) {
176
                 //案件日志表里添加数据
142
                 //案件日志表里添加数据
177
                 CaseLogRecord caseLogRecord = new CaseLogRecord();
143
                 CaseLogRecord caseLogRecord = new CaseLogRecord();
178
                 caseLogRecord.setCaseAppliId(caseApplication1.getId());
144
                 caseLogRecord.setCaseAppliId(caseApplication1.getId());
179
                 caseLogRecord.setCaseNode(caseApplication1.getCaseStatus());
145
                 caseLogRecord.setCaseNode(caseApplication1.getCaseStatus());
180
-                if (createBy!=null){
146
+                if (createBy != null) {
181
                     caseLogRecord.setCreateBy(createBy);
147
                     caseLogRecord.setCreateBy(createBy);
182
                 }
148
                 }
183
                 caseLogRecordMapper.insertCaseLogRecord(caseLogRecord);
149
                 caseLogRecordMapper.insertCaseLogRecord(caseLogRecord);
184
                 // 新增日志
150
                 // 新增日志
185
-                CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.GENERATED_ARBITRATION,"");
151
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.GENERATED_ARBITRATION, "");
186
 
152
 
187
             }
153
             }
188
-        }else {
154
+        } else {
189
             //提交仲裁结果
155
             //提交仲裁结果
190
-            int i =  arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecord);
156
+            int i = arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecord);
191
 
157
 
192
-            if (i>0){
158
+            if (i > 0) {
193
                 //案件日志表里添加数据
159
                 //案件日志表里添加数据
194
                 CaseLogRecord caseLogRecord = new CaseLogRecord();
160
                 CaseLogRecord caseLogRecord = new CaseLogRecord();
195
                 caseLogRecord.setCaseAppliId(caseApplication1.getId());
161
                 caseLogRecord.setCaseAppliId(caseApplication1.getId());
196
                 caseLogRecord.setCaseNode(caseApplication1.getCaseStatus());
162
                 caseLogRecord.setCaseNode(caseApplication1.getCaseStatus());
197
-                if (createBy!=null){
163
+                if (createBy != null) {
198
                     caseLogRecord.setCreateBy(createBy);
164
                     caseLogRecord.setCreateBy(createBy);
199
                 }
165
                 }
200
                 caseLogRecordMapper.insertCaseLogRecord(caseLogRecord);
166
                 caseLogRecordMapper.insertCaseLogRecord(caseLogRecord);
201
                 // 新增日志
167
                 // 新增日志
202
-                CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.GENERATED_ARBITRATION,"");
168
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.GENERATED_ARBITRATION, "");
203
 
169
 
204
             }
170
             }
205
         }
171
         }

+ 35
- 13
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CasePaymentServiceImpl.java Näytä tiedosto

4
 import cn.hutool.core.collection.CollectionUtil;
4
 import cn.hutool.core.collection.CollectionUtil;
5
 import com.ruoyi.ElegentPay;
5
 import com.ruoyi.ElegentPay;
6
 import com.ruoyi.common.constant.CaseApplicationConstants;
6
 import com.ruoyi.common.constant.CaseApplicationConstants;
7
+import com.ruoyi.common.constant.HttpStatus;
7
 import com.ruoyi.common.core.domain.AjaxResult;
8
 import com.ruoyi.common.core.domain.AjaxResult;
8
 import com.ruoyi.common.core.domain.model.LoginUser;
9
 import com.ruoyi.common.core.domain.model.LoginUser;
10
+import com.ruoyi.common.exception.ServiceException;
9
 import com.ruoyi.common.utils.SecurityUtils;
11
 import com.ruoyi.common.utils.SecurityUtils;
10
-import com.ruoyi.wisdomarbitrate.domain.CaseAttach;
12
+import com.ruoyi.wisdomarbitrate.domain.*;
11
 import com.ruoyi.wisdomarbitrate.domain.dto.CaseConfirmPayDTO;
13
 import com.ruoyi.wisdomarbitrate.domain.dto.CaseConfirmPayDTO;
12
-import com.ruoyi.wisdomarbitrate.mapper.CaseAttachMapper;
14
+import com.ruoyi.wisdomarbitrate.mapper.*;
13
 import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
15
 import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
14
 import com.ruoyi.common.utils.SmsUtils;
16
 import com.ruoyi.common.utils.SmsUtils;
15
 import com.ruoyi.dto.PayRequest;
17
 import com.ruoyi.dto.PayRequest;
16
 import com.ruoyi.dto.PayResponse;
18
 import com.ruoyi.dto.PayResponse;
17
-import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
18
-import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
19
-import com.ruoyi.wisdomarbitrate.domain.CasePaymentRecord;
20
 import com.ruoyi.wisdomarbitrate.domain.dto.CasePayDTO;
19
 import com.ruoyi.wisdomarbitrate.domain.dto.CasePayDTO;
21
-import com.ruoyi.wisdomarbitrate.mapper.CaseAffiliateMapper;
22
-import com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper;
23
-import com.ruoyi.wisdomarbitrate.mapper.CasePaymentRecordMapper;
24
 import com.ruoyi.wisdomarbitrate.service.ICasePaymentService;
20
 import com.ruoyi.wisdomarbitrate.service.ICasePaymentService;
25
 import org.springframework.beans.factory.annotation.Autowired;
21
 import org.springframework.beans.factory.annotation.Autowired;
26
 import org.springframework.stereotype.Service;
22
 import org.springframework.stereotype.Service;
28
 
24
 
29
 import java.util.Date;
25
 import java.util.Date;
30
 import java.util.List;
26
 import java.util.List;
27
+import static com.ruoyi.common.utils.SecurityUtils.getUsername;
31
 
28
 
32
 @Service
29
 @Service
33
 public class CasePaymentServiceImpl implements ICasePaymentService {
30
 public class CasePaymentServiceImpl implements ICasePaymentService {
37
     private final CaseAffiliateMapper caseAffiliateMapper;
34
     private final CaseAffiliateMapper caseAffiliateMapper;
38
     @Autowired
35
     @Autowired
39
     private  CaseAttachMapper caseAttachMapper;
36
     private  CaseAttachMapper caseAttachMapper;
37
+    @Autowired
38
+    private SmsRecordMapper smsRecordMapper;
40
 
39
 
41
     @Autowired
40
     @Autowired
42
     public CasePaymentServiceImpl(ElegentPay elegentPay
41
     public CasePaymentServiceImpl(ElegentPay elegentPay
116
                         request.setPhone(affiliate.getContactTelphone());
115
                         request.setPhone(affiliate.getContactTelphone());
117
                         request.setTemplateId("1928003"); //传入申请人模板id
116
                         request.setTemplateId("1928003"); //传入申请人模板id
118
                         // 这个值,要看你的模板中是否预留了占位符,如果没有则不需要设置
117
                         // 这个值,要看你的模板中是否预留了占位符,如果没有则不需要设置
119
-                        // 模板id:1928003 普通短信 案件受理通知 尊敬的{1}用户,您的{2}案件{3}已成功受理。
118
+                        // 模板id:1928003 普通短信 案件受理通知
120
                         String name = affiliate.getName();
119
                         String name = affiliate.getName();
121
                         request.setTemplateParamSet(new String[]{name, caseName, caseNum});
120
                         request.setTemplateParamSet(new String[]{name, caseName, caseNum});
122
-                        SmsUtils.sendSms(request);
121
+                        if (SmsUtils.sendSms(request)){
122
+                            //保存短信发送记录
123
+                            SmsSendRecord smsSendRecord = new SmsSendRecord();
124
+                            smsSendRecord.setCaseId(caseApplication.getId());
125
+                            smsSendRecord.setPhone(request.getPhone());
126
+                            smsSendRecord.setSendTime(new Date());
127
+                            String content="尊敬的"+name+"用户,您的"+caseName+"案件"+caseNum+"已成功受理。";
128
+                            smsSendRecord.setSendContent(content);
129
+                            smsSendRecord.setCreateBy(getUsername());
130
+                            smsRecordMapper.saveSmsSendRecord(smsSendRecord);
131
+                        }
123
                     } else {       //被申请人
132
                     } else {       //被申请人
124
                         request.setPhone(affiliate.getContactTelphone());
133
                         request.setPhone(affiliate.getContactTelphone());
125
-                        request.setTemplateId("1928006");
126
-                        // 模板id1928006 普通短信 案件应诉通知 尊敬的{1}用户,您的{2}案件{3}已成功受理,请点击https://phmapp.xayunmei.com选择是否应诉。
134
+                        request.setTemplateId("1952840");
135
+                        // 1952840 尊敬的{1}用户,您的{2}案件{3}已成功受理,请点击链接:https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 选择是否应诉。如非本人操作,请忽略本短信
127
                         String name = affiliate.getName();
136
                         String name = affiliate.getName();
128
                         request.setTemplateParamSet(new String[]{name, caseName, caseNum});
137
                         request.setTemplateParamSet(new String[]{name, caseName, caseNum});
129
-                        SmsUtils.sendSms(request);
138
+                        if (SmsUtils.sendSms(request)){
139
+                            //保存短信发送记录
140
+                            SmsSendRecord smsSendRecord = new SmsSendRecord();
141
+                            smsSendRecord.setCaseId(caseApplication.getId());
142
+                            smsSendRecord.setPhone(request.getPhone());
143
+                            smsSendRecord.setSendTime(new Date());
144
+                            String content="尊敬的"+name+"用户,您的"+caseName+"案件"+caseNum+"已成功受理,请点击链接:https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 选择是否应诉。如非本人操作,请忽略本短信";
145
+                            smsSendRecord.setSendContent(content);
146
+                            smsSendRecord.setCreateBy(getUsername());
147
+                            smsRecordMapper.saveSmsSendRecord(smsSendRecord);
148
+                        }
130
                     }
149
                     }
131
                 }
150
                 }
132
                 // 新增日志
151
                 // 新增日志
164
 
183
 
165
         return AjaxResult.success("确认缴费成功");
184
         return AjaxResult.success("确认缴费成功");
166
     }
185
     }
186
+
187
+
188
+
167
 }
189
 }

+ 49
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SmsRecordMapper.xml Näytä tiedosto

1
+<?xml version="1.0" encoding="UTF-8" ?>
2
+<!DOCTYPE mapper
3
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5
+
6
+<mapper namespace="com.ruoyi.wisdomarbitrate.mapper.SmsRecordMapper">
7
+    <resultMap type="SmsSendRecord" id="SmsSendRecordResult">
8
+        <id     property="id"       column="id"      />
9
+        <result property="caseId"       column="case_appli_id"      />
10
+        <result property="phone"     column="phone"    />
11
+        <result property="sendTime"     column="send_time"    />
12
+        <result property="sendContent"        column="send_content"        />
13
+        <result property="createTime"   column="create_time"  />
14
+        <result property="updateTime"   column="update_time"  />
15
+        <result property="createBy"   column="create_by"  />
16
+        <result property="updateBy"   column="update_by"  />
17
+    </resultMap>
18
+    <insert id="saveSmsSendRecord" parameterType="SmsSendRecord" useGeneratedKeys="true" keyProperty="id">
19
+
20
+        insert into sms_send_record(
21
+        <if test="caseId != null ">case_appli_id,</if>
22
+        <if test="phone != null and phone != ''">phone,</if>
23
+        <if test="sendTime != null ">send_time,</if>
24
+        <if test="sendContent != null ">send_content,</if>
25
+        <if test="createBy != null and createBy != ''">create_by,</if>
26
+        create_time
27
+        )values(
28
+        <if test="caseId != null ">#{caseId},</if>
29
+        <if test="phone != null and phone != ''">#{phone},</if>
30
+        <if test="sendTime != null ">#{sendTime},</if>
31
+        <if test="sendContent != null ">#{sendContent},</if>
32
+        <if test="createBy != null  and createBy != ''">#{createBy},</if>
33
+        sysdate()
34
+        )
35
+    </insert>
36
+
37
+    <select id="getSmsSendRecord" parameterType="SmsSendRecord" resultMap="SmsSendRecordResult">
38
+
39
+        select id ,case_appli_id ,phone ,send_time ,send_content
40
+        from sms_send_record
41
+        <where>
42
+            <if test="caseId != null ">
43
+                AND case_appli_id = #{caseId}
44
+            </if>
45
+        </where>
46
+        order by send_time desc
47
+    </select>
48
+</mapper>
49
+