Преглед на файлове

优化通过uid查询视频会议信息接口

wangqiong преди 2 години
родител
ревизия
918c1a8bad

+ 40
- 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/sendrecord/ShortMessageController.java Целия файл

4
 import com.ruoyi.common.annotation.Anonymous;
4
 import com.ruoyi.common.annotation.Anonymous;
5
 import com.ruoyi.common.core.controller.BaseController;
5
 import com.ruoyi.common.core.controller.BaseController;
6
 import com.ruoyi.common.core.domain.AjaxResult;
6
 import com.ruoyi.common.core.domain.AjaxResult;
7
+import com.ruoyi.common.core.domain.entity.SysUser;
8
+import com.ruoyi.common.core.domain.model.LoginUser;
7
 import com.ruoyi.common.core.page.TableDataInfo;
9
 import com.ruoyi.common.core.page.TableDataInfo;
10
+import com.ruoyi.framework.web.service.TokenService;
11
+import com.ruoyi.system.domain.entity.shortmessage.MeetingInfo;
8
 import com.ruoyi.system.domain.entity.sms.MsSmsSendRecordParam;
12
 import com.ruoyi.system.domain.entity.sms.MsSmsSendRecordParam;
9
 import com.ruoyi.system.domain.entity.sms.MsSmsTemplateParam;
13
 import com.ruoyi.system.domain.entity.sms.MsSmsTemplateParam;
14
+import com.ruoyi.system.mapper.SysUserMapper;
15
+import com.ruoyi.system.mapper.shortmessage.MeetingInfoMapper;
10
 import com.ruoyi.system.mapper.sms.MsSmsSendHistoryRecordParamMapper;
16
 import com.ruoyi.system.mapper.sms.MsSmsSendHistoryRecordParamMapper;
11
 import com.ruoyi.system.mapper.sms.MsSmsSendRecordParamMapper;
17
 import com.ruoyi.system.mapper.sms.MsSmsSendRecordParamMapper;
12
 import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord;
18
 import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord;
19
+import com.ruoyi.wisdomarbitrate.domain.vo.shortmessage.MeetingInfoVO;
13
 import com.ruoyi.wisdomarbitrate.domain.vo.shortmessage.ReSendMessageVO;
20
 import com.ruoyi.wisdomarbitrate.domain.vo.shortmessage.ReSendMessageVO;
14
 import com.ruoyi.wisdomarbitrate.mapper.sendrecord.SmsRecordMapper;
21
 import com.ruoyi.wisdomarbitrate.mapper.sendrecord.SmsRecordMapper;
15
 import com.ruoyi.wisdomarbitrate.service.shortmessage.ShortMessageService;
22
 import com.ruoyi.wisdomarbitrate.service.shortmessage.ShortMessageService;
23
+import org.springframework.beans.BeanUtils;
16
 import org.springframework.beans.factory.annotation.Autowired;
24
 import org.springframework.beans.factory.annotation.Autowired;
17
 import org.springframework.web.bind.annotation.*;
25
 import org.springframework.web.bind.annotation.*;
18
 import tk.mybatis.mapper.entity.Example;
26
 import tk.mybatis.mapper.entity.Example;
32
     MsSmsSendRecordParamMapper recordParamMapper;
40
     MsSmsSendRecordParamMapper recordParamMapper;
33
     @Autowired
41
     @Autowired
34
     MsSmsSendHistoryRecordParamMapper historyRecordParamMapper;
42
     MsSmsSendHistoryRecordParamMapper historyRecordParamMapper;
43
+
35
     /**
44
     /**
36
      * 查询短信发送记录
45
      * 查询短信发送记录
46
+     *
37
      * @param smsSendRecord
47
      * @param smsSendRecord
38
      * @return
48
      * @return
39
      */
49
      */
40
     @GetMapping("/recordList")
50
     @GetMapping("/recordList")
41
-    public TableDataInfo smsSendRecordList( SmsSendRecord smsSendRecord){
51
+    public TableDataInfo smsSendRecordList(SmsSendRecord smsSendRecord) {
42
         startPage();
52
         startPage();
43
         List<SmsSendRecord> list = shortMessageService.smsSendRecordList(smsSendRecord);
53
         List<SmsSendRecord> list = shortMessageService.smsSendRecordList(smsSendRecord);
44
         return getDataTable(list);
54
         return getDataTable(list);
47
     @Anonymous
57
     @Anonymous
48
     @PostMapping("/updateSendContent")
58
     @PostMapping("/updateSendContent")
49
     public AjaxResult update(@RequestBody SmsSendRecord smsSendRecord) {
59
     public AjaxResult update(@RequestBody SmsSendRecord smsSendRecord) {
50
-        if(smsSendRecord == null|| smsSendRecord.getId() == null || CollectionUtil.isEmpty(smsSendRecord.getTemplateParams())){
60
+        if (smsSendRecord == null || smsSendRecord.getId() == null || CollectionUtil.isEmpty(smsSendRecord.getTemplateParams())) {
51
             return AjaxResult.error("参数校验失败");
61
             return AjaxResult.error("参数校验失败");
52
         }
62
         }
53
-             // 查询当前版本记录
63
+        // 查询当前版本记录
54
         SmsSendRecord oldSendRecord = smsRecordMapper.selectById(smsSendRecord.getId());
64
         SmsSendRecord oldSendRecord = smsRecordMapper.selectById(smsSendRecord.getId());
55
         smsSendRecord.setUpdateTime(new Date());
65
         smsSendRecord.setUpdateTime(new Date());
56
-            //  更新短信内容,先删除短信记录参数表
57
-            Example recordParamExam = new Example(MsSmsSendRecordParam.class);
58
-            recordParamExam.createCriteria().andEqualTo("smsRecordId", smsSendRecord.getId());
59
-            recordParamMapper.deleteByExample(recordParamExam);
60
-            // 新增短信记录参数表
66
+        //  更新短信内容,先删除短信记录参数表
67
+        Example recordParamExam = new Example(MsSmsSendRecordParam.class);
68
+        recordParamExam.createCriteria().andEqualTo("smsRecordId", smsSendRecord.getId());
69
+        recordParamMapper.deleteByExample(recordParamExam);
70
+        // 新增短信记录参数表
61
         List<MsSmsSendRecordParam> recordParams = new ArrayList<>();
71
         List<MsSmsSendRecordParam> recordParams = new ArrayList<>();
62
         for (MsSmsTemplateParam templateParam : smsSendRecord.getTemplateParams()) {
72
         for (MsSmsTemplateParam templateParam : smsSendRecord.getTemplateParams()) {
63
             MsSmsSendRecordParam recordParam = new MsSmsSendRecordParam();
73
             MsSmsSendRecordParam recordParam = new MsSmsSendRecordParam();
65
             recordParam.setParamValue(templateParam.getParamValue());
75
             recordParam.setParamValue(templateParam.getParamValue());
66
             recordParams.add(recordParam);
76
             recordParams.add(recordParam);
67
         }
77
         }
68
-            recordParamMapper.batchInsert(recordParams);
69
-            shortMessageService.insertShortMessageHistoryRecord(oldSendRecord,recordParams);
70
-            return AjaxResult.success();
78
+        recordParamMapper.batchInsert(recordParams);
79
+        shortMessageService.insertShortMessageHistoryRecord(oldSendRecord, recordParams);
80
+        return AjaxResult.success();
71
 
81
 
72
     }
82
     }
73
 
83
 
84
         return AjaxResult.error("参数缺失");
94
         return AjaxResult.error("参数缺失");
85
     }
95
     }
86
 
96
 
97
+    @Autowired
98
+    MeetingInfoMapper meetingInfoMapper;
99
+    @Autowired
100
+    SysUserMapper sysUserMapper;
101
+    @Autowired
102
+    private TokenService tokenService;
103
+
87
     /**
104
     /**
88
      * 查询UID好的密钥
105
      * 查询UID好的密钥
89
      */
106
      */
90
     @Anonymous
107
     @Anonymous
91
     @GetMapping("/getMeetingInfo")
108
     @GetMapping("/getMeetingInfo")
92
     public Object getEncryptInfoByUid(@RequestParam(name = "authId", required = true) String authId) {
109
     public Object getEncryptInfoByUid(@RequestParam(name = "authId", required = true) String authId) {
110
+        MeetingInfoVO result = new MeetingInfoVO();
93
         if (authId != null) {
111
         if (authId != null) {
94
-            Object result = shortMessageService.getMeetingInfo(authId);
112
+            MeetingInfo meetingInfo = meetingInfoMapper.selectByPrimaryKey(authId);
113
+            if (meetingInfo != null && meetingInfo.getUserId() != null) {
114
+                BeanUtils.copyProperties(meetingInfo, result);
115
+                SysUser sysUser = sysUserMapper.selectUserById(meetingInfo.getUserId());
116
+                LoginUser loginUser = new LoginUser();
117
+                loginUser.setUserId(sysUser.getUserId());
118
+                loginUser.setUser(sysUser);
119
+                String token = tokenService.createVideoToken(loginUser, 120);
120
+//                String createToken = createToken(claims);
121
+                result.setToken(token);
122
+            }
95
             return result;
123
             return result;
96
         }
124
         }
97
         return AjaxResult.error("查询失败");
125
         return AjaxResult.error("查询失败");

+ 14
- 1
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java Целия файл

127
         redisCache.setCacheObject(CacheConstants.LOGIN_USERNAME_TOKEN_KEY+loginUser.getUsername(),createToken, expireTime, TimeUnit.MINUTES);
127
         redisCache.setCacheObject(CacheConstants.LOGIN_USERNAME_TOKEN_KEY+loginUser.getUsername(),createToken, expireTime, TimeUnit.MINUTES);
128
         return createToken;
128
         return createToken;
129
     }
129
     }
130
-
130
+    public String createVideoToken(LoginUser loginUser,int expireTime)
131
+    {
132
+        String token = IdUtils.fastUUID();
133
+        loginUser.setToken(token);
134
+        setUserAgent(loginUser);
135
+        refreshToken(loginUser);
136
+        Map<String, Object> claims = new HashMap<>();
137
+        claims.put("userName",loginUser.getUsername());
138
+        claims.put("userId",loginUser.getUserId());
139
+        claims.put(Constants.LOGIN_USER_KEY, token);
140
+        String createToken = createToken(claims);
141
+        redisCache.setCacheObject(CacheConstants.LOGIN_USERNAME_TOKEN_KEY+loginUser.getUsername(),createToken, expireTime, TimeUnit.MINUTES);
142
+        return createToken;
143
+    }
131
     /**
144
     /**
132
      * 验证令牌有效期,相差不足20分钟,自动刷新缓存
145
      * 验证令牌有效期,相差不足20分钟,自动刷新缓存
133
      *
146
      *

+ 31
- 27
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/shortmessage/impl/ShortMessageServiceImpl.java Целия файл

4
 import cn.hutool.json.JSONObject;
4
 import cn.hutool.json.JSONObject;
5
 import com.ruoyi.common.constant.Constants;
5
 import com.ruoyi.common.constant.Constants;
6
 import com.ruoyi.common.core.domain.AjaxResult;
6
 import com.ruoyi.common.core.domain.AjaxResult;
7
+import com.ruoyi.common.core.domain.entity.SysUser;
8
+import com.ruoyi.common.core.domain.model.LoginBody;
7
 import com.ruoyi.common.enums.SMSStatusEnum;
9
 import com.ruoyi.common.enums.SMSStatusEnum;
8
 import com.ruoyi.system.domain.entity.shortmessage.MeetingInfo;
10
 import com.ruoyi.system.domain.entity.shortmessage.MeetingInfo;
9
 import com.ruoyi.system.domain.entity.shortmessage.MsSmsSendHistoryRecord;
11
 import com.ruoyi.system.domain.entity.shortmessage.MsSmsSendHistoryRecord;
11
 import com.ruoyi.system.domain.entity.sms.MsSmsSendRecordParam;
13
 import com.ruoyi.system.domain.entity.sms.MsSmsSendRecordParam;
12
 import com.ruoyi.system.domain.entity.sms.MsSmsTemplate;
14
 import com.ruoyi.system.domain.entity.sms.MsSmsTemplate;
13
 import com.ruoyi.system.domain.entity.sms.MsSmsTemplateParam;
15
 import com.ruoyi.system.domain.entity.sms.MsSmsTemplateParam;
16
+import com.ruoyi.system.mapper.SysUserMapper;
14
 import com.ruoyi.system.mapper.shortmessage.MeetingInfoMapper;
17
 import com.ruoyi.system.mapper.shortmessage.MeetingInfoMapper;
15
 import com.ruoyi.system.mapper.shortmessage.MsSmsSendHistoryRecordMapper;
18
 import com.ruoyi.system.mapper.shortmessage.MsSmsSendHistoryRecordMapper;
16
 import com.ruoyi.system.mapper.sms.MsSmsSendHistoryRecordParamMapper;
19
 import com.ruoyi.system.mapper.sms.MsSmsSendHistoryRecordParamMapper;
56
     @Override
59
     @Override
57
     public List<SmsSendRecord> smsSendRecordList(SmsSendRecord smsSendRecord) {
60
     public List<SmsSendRecord> smsSendRecordList(SmsSendRecord smsSendRecord) {
58
         List<SmsSendRecord> records = smsRecordMapper.getSmsSendRecord(smsSendRecord);
61
         List<SmsSendRecord> records = smsRecordMapper.getSmsSendRecord(smsSendRecord);
59
-        if(CollectionUtil.isEmpty(records)){
62
+        if (CollectionUtil.isEmpty(records)) {
60
             return null;
63
             return null;
61
         }
64
         }
62
         List<Long> templateIds = records.stream().map(SmsSendRecord::getMsSmsTemplateId).collect(Collectors.toList());
65
         List<Long> templateIds = records.stream().map(SmsSendRecord::getMsSmsTemplateId).collect(Collectors.toList());
63
-        if(CollectionUtil.isEmpty(templateIds)){
66
+        if (CollectionUtil.isEmpty(templateIds)) {
64
             return records;
67
             return records;
65
         }
68
         }
66
         List<Long> ids = records.stream().map(SmsSendRecord::getId).collect(Collectors.toList());
69
         List<Long> ids = records.stream().map(SmsSendRecord::getId).collect(Collectors.toList());
68
         Example recordParamExam = new Example(MsSmsSendRecordParam.class);
71
         Example recordParamExam = new Example(MsSmsSendRecordParam.class);
69
         recordParamExam.createCriteria().andIn("smsRecordId", ids);
72
         recordParamExam.createCriteria().andIn("smsRecordId", ids);
70
         List<MsSmsSendRecordParam> recordParams = recordParamMapper.selectByExample(recordParamExam);
73
         List<MsSmsSendRecordParam> recordParams = recordParamMapper.selectByExample(recordParamExam);
71
-        if(CollectionUtil.isEmpty(recordParams)){
74
+        if (CollectionUtil.isEmpty(recordParams)) {
72
             return records;
75
             return records;
73
         }
76
         }
74
         // 根据模板id查询模板参数
77
         // 根据模板id查询模板参数
75
         Example templateParamExam = new Example(MsSmsTemplateParam.class);
78
         Example templateParamExam = new Example(MsSmsTemplateParam.class);
76
         templateParamExam.createCriteria().andIn("smsTemplateId", templateIds);
79
         templateParamExam.createCriteria().andIn("smsTemplateId", templateIds);
77
         List<MsSmsTemplateParam> templateParams = templateParamMapper.selectByExample(templateParamExam);
80
         List<MsSmsTemplateParam> templateParams = templateParamMapper.selectByExample(templateParamExam);
78
-        if(CollectionUtil.isEmpty(templateParams)){
81
+        if (CollectionUtil.isEmpty(templateParams)) {
79
             return records;
82
             return records;
80
         }
83
         }
81
         // 根据模板id对模板参数分组
84
         // 根据模板id对模板参数分组
85
         Map<Long, List<String>> recordParamContentMap = new HashMap<>();
88
         Map<Long, List<String>> recordParamContentMap = new HashMap<>();
86
         for (MsSmsSendRecordParam recordParam : recordParams) {
89
         for (MsSmsSendRecordParam recordParam : recordParams) {
87
             List<String> list = recordParamContentMap.get(recordParam.getSmsRecordId());
90
             List<String> list = recordParamContentMap.get(recordParam.getSmsRecordId());
88
-            if(CollectionUtil.isEmpty(list)){
89
-                list=new ArrayList<>();
91
+            if (CollectionUtil.isEmpty(list)) {
92
+                list = new ArrayList<>();
90
             }
93
             }
91
             list.add(recordParam.getParamValue());
94
             list.add(recordParam.getParamValue());
92
-            recordParamContentMap.put(recordParam.getSmsRecordId(),list);
95
+            recordParamContentMap.put(recordParam.getSmsRecordId(), list);
93
         }
96
         }
94
         // 根据模板id查询模板
97
         // 根据模板id查询模板
95
         Example templateExam = new Example(MsSmsTemplate.class);
98
         Example templateExam = new Example(MsSmsTemplate.class);
96
         templateExam.createCriteria().andIn("id", templateIds);
99
         templateExam.createCriteria().andIn("id", templateIds);
97
         List<MsSmsTemplate> templates = templateMapper.selectByExample(templateExam);
100
         List<MsSmsTemplate> templates = templateMapper.selectByExample(templateExam);
98
-        if(CollectionUtil.isEmpty(templates)){
101
+        if (CollectionUtil.isEmpty(templates)) {
99
             return records;
102
             return records;
100
         }
103
         }
101
         // 根据主键id获取模板内容
104
         // 根据主键id获取模板内容
103
         Map<Long, String> templateIdMap = templates.stream().collect(Collectors.toMap(MsSmsTemplate::getId, MsSmsTemplate::getTemplateId, (k1, k2) -> k2));
106
         Map<Long, String> templateIdMap = templates.stream().collect(Collectors.toMap(MsSmsTemplate::getId, MsSmsTemplate::getTemplateId, (k1, k2) -> k2));
104
         // 组装模板内容
107
         // 组装模板内容
105
         for (SmsSendRecord record : records) {
108
         for (SmsSendRecord record : records) {
106
-            if(record.getMsSmsTemplateId()==null){
109
+            if (record.getMsSmsTemplateId() == null) {
107
                 continue;
110
                 continue;
108
             }
111
             }
109
-            if(!templateMap.containsKey(record.getMsSmsTemplateId())){
112
+            if (!templateMap.containsKey(record.getMsSmsTemplateId())) {
110
                 continue;
113
                 continue;
111
             }
114
             }
112
 
115
 
113
-            if(!recordParamContentMap.containsKey(record.getId())){
116
+            if (!recordParamContentMap.containsKey(record.getId())) {
114
                 continue;
117
                 continue;
115
             }
118
             }
116
-            if(templateIdMap.containsKey(record.getMsSmsTemplateId())){
117
-              record.setTemplateId(templateIdMap.get(record.getMsSmsTemplateId()));
119
+            if (templateIdMap.containsKey(record.getMsSmsTemplateId())) {
120
+                record.setTemplateId(templateIdMap.get(record.getMsSmsTemplateId()));
118
             }
121
             }
119
             String templateContent = templateMap.get(record.getMsSmsTemplateId());
122
             String templateContent = templateMap.get(record.getMsSmsTemplateId());
120
             record.setTemplateContent(templateContent);
123
             record.setTemplateContent(templateContent);
121
             List<String> recordParamList = recordParamContentMap.get(record.getId());
124
             List<String> recordParamList = recordParamContentMap.get(record.getId());
122
-            if(recordParamContentMap.containsKey(record.getId()) && templateParamMap.containsKey(record.getMsSmsTemplateId())){
125
+            if (recordParamContentMap.containsKey(record.getId()) && templateParamMap.containsKey(record.getMsSmsTemplateId())) {
123
                 List<MsSmsTemplateParam> templateParamList = templateParamMap.get(record.getMsSmsTemplateId());
126
                 List<MsSmsTemplateParam> templateParamList = templateParamMap.get(record.getMsSmsTemplateId());
124
                 ArrayList<MsSmsTemplateParam> copyParamList = new ArrayList<>();
127
                 ArrayList<MsSmsTemplateParam> copyParamList = new ArrayList<>();
125
                 for (int i = 0; i < templateParamList.size(); i++) {
128
                 for (int i = 0; i < templateParamList.size(); i++) {
126
                     MsSmsTemplateParam templateParam = templateParamList.get(i);
129
                     MsSmsTemplateParam templateParam = templateParamList.get(i);
127
-                    MsSmsTemplateParam msSmsTemplateParam =new MsSmsTemplateParam();
130
+                    MsSmsTemplateParam msSmsTemplateParam = new MsSmsTemplateParam();
128
                     msSmsTemplateParam.setParam(templateParam.getParam());
131
                     msSmsTemplateParam.setParam(templateParam.getParam());
129
                     msSmsTemplateParam.setSmsTemplateId(templateParam.getSmsTemplateId());
132
                     msSmsTemplateParam.setSmsTemplateId(templateParam.getSmsTemplateId());
130
                     msSmsTemplateParam.setParamName(templateParam.getParamName());
133
                     msSmsTemplateParam.setParamName(templateParam.getParamName());
136
 
139
 
137
             }
140
             }
138
             // 按顺序替换占位符
141
             // 按顺序替换占位符
139
-            if(CollectionUtil.isNotEmpty(recordParamList)){
140
-                recordParamList.add(0,"0");
142
+            if (CollectionUtil.isNotEmpty(recordParamList)) {
143
+                recordParamList.add(0, "0");
141
 
144
 
142
                 // 将List<String>转换为String[]数组
145
                 // 将List<String>转换为String[]数组
143
                 String[] paramArray = recordParamList.toArray(new String[recordParamList.size()]);
146
                 String[] paramArray = recordParamList.toArray(new String[recordParamList.size()]);
150
 
153
 
151
         return records;
154
         return records;
152
     }
155
     }
156
+
153
     /**
157
     /**
154
      * 新增发送历史记录
158
      * 新增发送历史记录
155
      *
159
      *
157
      */
161
      */
158
     @Transactional
162
     @Transactional
159
     @Override
163
     @Override
160
-    public void insertShortMessageHistoryRecord(SmsSendRecord smsSendRecord,List<MsSmsSendRecordParam> recordParams) {
161
-        if(smsSendRecord!=null){
162
-            MsSmsSendHistoryRecord historyRecord=new MsSmsSendHistoryRecord();
163
-            BeanUtils.copyProperties(smsSendRecord,historyRecord);
164
+    public void insertShortMessageHistoryRecord(SmsSendRecord smsSendRecord, List<MsSmsSendRecordParam> recordParams) {
165
+        if (smsSendRecord != null) {
166
+            MsSmsSendHistoryRecord historyRecord = new MsSmsSendHistoryRecord();
167
+            BeanUtils.copyProperties(smsSendRecord, historyRecord);
164
             historyRecord.setId(null);
168
             historyRecord.setId(null);
165
             historyRecord.setParentId(smsSendRecord.getId());
169
             historyRecord.setParentId(smsSendRecord.getId());
166
             int i = msSmsSendHistoryRecordMapper.insert(historyRecord);
170
             int i = msSmsSendHistoryRecordMapper.insert(historyRecord);
167
-            if(i>0 && CollectionUtil.isNotEmpty(recordParams)){
171
+            if (i > 0 && CollectionUtil.isNotEmpty(recordParams)) {
168
                 // 新增参数表
172
                 // 新增参数表
169
                 List<MsSmsSendHistoryRecordParam> historyRecordParams = new ArrayList<>();
173
                 List<MsSmsSendHistoryRecordParam> historyRecordParams = new ArrayList<>();
170
                 for (MsSmsSendRecordParam templateParam : recordParams) {
174
                 for (MsSmsSendRecordParam templateParam : recordParams) {
171
                     MsSmsSendHistoryRecordParam recordParam = new MsSmsSendHistoryRecordParam();
175
                     MsSmsSendHistoryRecordParam recordParam = new MsSmsSendHistoryRecordParam();
172
-                    BeanUtils.copyProperties(templateParam,recordParam);
176
+                    BeanUtils.copyProperties(templateParam, recordParam);
173
                     recordParam.setId(null);
177
                     recordParam.setId(null);
174
                     recordParam.setSmsRecordHistoryId(historyRecord.getId());
178
                     recordParam.setSmsRecordHistoryId(historyRecord.getId());
175
                     historyRecordParams.add(recordParam);
179
                     historyRecordParams.add(recordParam);
189
         if (reSendMessageVO != null && reSendMessageVO.getTemplateId() != null && reSendMessageVO.getPhone() != null && reSendMessageVO.getTemplateParams() != null && reSendMessageVO.getTemplateParams().size() > 0 && reSendMessageVO.getId() != null) {
193
         if (reSendMessageVO != null && reSendMessageVO.getTemplateId() != null && reSendMessageVO.getPhone() != null && reSendMessageVO.getTemplateParams() != null && reSendMessageVO.getTemplateParams().size() > 0 && reSendMessageVO.getId() != null) {
190
             // 根据id查询短信记录
194
             // 根据id查询短信记录
191
             SmsSendRecord smsSendRecord = smsRecordMapper.selectById(reSendMessageVO.getId());
195
             SmsSendRecord smsSendRecord = smsRecordMapper.selectById(reSendMessageVO.getId());
192
-            if(smsSendRecord == null){
196
+            if (smsSendRecord == null) {
193
                 return AjaxResult.warn("短信记录不存在");
197
                 return AjaxResult.warn("短信记录不存在");
194
             }
198
             }
195
 
199
 
204
             // 修改sid和状态
208
             // 修改sid和状态
205
             if (resultObj.get("status") != null && !resultObj.get("status").equals(SMSStatusEnum.FAIL.getCode())) {
209
             if (resultObj.get("status") != null && !resultObj.get("status").equals(SMSStatusEnum.FAIL.getCode())) {
206
                 smsSendRecord.setSendStatus(SMSStatusEnum.SENDING.getCode());
210
                 smsSendRecord.setSendStatus(SMSStatusEnum.SENDING.getCode());
207
-                smsSendRecord.setSid(resultObj.get("sid")==null?null:resultObj.get("sid").toString());
211
+                smsSendRecord.setSid(resultObj.get("sid") == null ? null : resultObj.get("sid").toString());
208
                 smsSendRecord.setReason(null);
212
                 smsSendRecord.setReason(null);
209
                 // 修改
213
                 // 修改
210
                 smsRecordMapper.update(smsSendRecord);
214
                 smsRecordMapper.update(smsSendRecord);
211
 
215
 
212
                 return AjaxResult.success("重新发送成功");
216
                 return AjaxResult.success("重新发送成功");
213
             } else {
217
             } else {
214
-                smsSendRecord.setSid(resultObj.get("sid")==null?null:resultObj.get("sid").toString());
218
+                smsSendRecord.setSid(resultObj.get("sid") == null ? null : resultObj.get("sid").toString());
215
                 smsSendRecord.setSendStatus(SMSStatusEnum.FAIL.getCode());
219
                 smsSendRecord.setSendStatus(SMSStatusEnum.FAIL.getCode());
216
-                smsSendRecord.setSid(resultObj.get("reason")==null?null:resultObj.get("reason").toString());
220
+                smsSendRecord.setSid(resultObj.get("reason") == null ? null : resultObj.get("reason").toString());
217
                 // 修改
221
                 // 修改
218
                 smsRecordMapper.update(smsSendRecord);
222
                 smsRecordMapper.update(smsSendRecord);
219
                 return AjaxResult.warn("重新发送失败");
223
                 return AjaxResult.warn("重新发送失败");