Merge branch 'bgy' of SH-Arbitrate/Mediation-Backend into dev

2024-04-18 18:37:41 +08:00
parent 07dd08f824 918c1a8bad
commit 7d6976224d
5 changed files with 92 additions and 44 deletions
@@ -4,15 +4,23 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.domain.entity.shortmessage.MeetingInfo;
 import com.ruoyi.system.domain.entity.sms.MsSmsSendRecordParam;
 import com.ruoyi.system.domain.entity.sms.MsSmsTemplateParam;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.shortmessage.MeetingInfoMapper;
 import com.ruoyi.system.mapper.sms.MsSmsSendHistoryRecordParamMapper;
 import com.ruoyi.system.mapper.sms.MsSmsSendRecordParamMapper;
 import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord;
+import com.ruoyi.wisdomarbitrate.domain.vo.shortmessage.MeetingInfoVO;
 import com.ruoyi.wisdomarbitrate.domain.vo.shortmessage.ReSendMessageVO;
 import com.ruoyi.wisdomarbitrate.mapper.sendrecord.SmsRecordMapper;
 import com.ruoyi.wisdomarbitrate.service.shortmessage.ShortMessageService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
@@ -32,8 +40,10 @@ public class ShortMessageController extends BaseController {
    MsSmsSendRecordParamMapper recordParamMapper;
    @Autowired
    MsSmsSendHistoryRecordParamMapper historyRecordParamMapper;
+
    /**
     * 查询短信发送记录
+     *
     * @param smsSendRecord
     * @return
     */
@@ -84,14 +94,32 @@ public class ShortMessageController extends BaseController {
        return AjaxResult.error("参数缺失");
    }

+    @Autowired
+    MeetingInfoMapper meetingInfoMapper;
+    @Autowired
+    SysUserMapper sysUserMapper;
+    @Autowired
+    private TokenService tokenService;
+
    /**
     * 查询UID好的密钥
     */
    @Anonymous
    @GetMapping("/getMeetingInfo")
    public Object getEncryptInfoByUid(@RequestParam(name = "authId", required = true) String authId) {
+        MeetingInfoVO result = new MeetingInfoVO();
        if (authId != null) {
-            Object result = shortMessageService.getMeetingInfo(authId);
+            MeetingInfo meetingInfo = meetingInfoMapper.selectByPrimaryKey(authId);
+            if (meetingInfo != null && meetingInfo.getUserId() != null) {
+                BeanUtils.copyProperties(meetingInfo, result);
+                SysUser sysUser = sysUserMapper.selectUserById(meetingInfo.getUserId());
+                LoginUser loginUser = new LoginUser();
+                loginUser.setUserId(sysUser.getUserId());
+                loginUser.setUser(sysUser);
+                String token = tokenService.createVideoToken(loginUser, 120);
+//                String createToken = createToken(claims);
+                result.setToken(token);
+            }
            return result;
        }
        return AjaxResult.error("查询失败");
@@ -127,7 +127,20 @@ public class TokenService
        redisCache.setCacheObject(CacheConstants.LOGIN_USERNAME_TOKEN_KEY+loginUser.getUsername(),createToken, expireTime, TimeUnit.MINUTES);
        return createToken;
    }
-
+    public String createVideoToken(LoginUser loginUser,int expireTime)
+    {
+        String token = IdUtils.fastUUID();
+        loginUser.setToken(token);
+        setUserAgent(loginUser);
+        refreshToken(loginUser);
+        Map<String, Object> claims = new HashMap<>();
+        claims.put("userName",loginUser.getUsername());
+        claims.put("userId",loginUser.getUserId());
+        claims.put(Constants.LOGIN_USER_KEY, token);
+        String createToken = createToken(claims);
+        redisCache.setCacheObject(CacheConstants.LOGIN_USERNAME_TOKEN_KEY+loginUser.getUsername(),createToken, expireTime, TimeUnit.MINUTES);
+        return createToken;
+    }
    /**
     * 验证令牌有效期，相差不足20分钟，自动刷新缓存
     *
@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import java.io.File;
+import java.util.Date;
 import java.util.List;

@Service
@@ -46,6 +47,7 @@ public class SendMailRecordServiceImpl implements ISendMailRecordService {
                msSendMailHistoryRecord.setParentId(old.getId());
                msSendMailHistoryRecord.setId(null);
                msSendMailHistoryRecordMapper.insertSelective(msSendMailHistoryRecord);
+                sendMailRecord.setUpdateTime(new Date());
                sendMailRecordMapper.updateSendMailRecord(sendMailRecord);
                return AjaxResult.success("编辑成功");
            } else {
@@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONObject;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginBody;
 import com.ruoyi.common.enums.SMSStatusEnum;
 import com.ruoyi.system.domain.entity.shortmessage.MeetingInfo;
 import com.ruoyi.system.domain.entity.shortmessage.MsSmsSendHistoryRecord;
@@ -11,6 +13,7 @@ import com.ruoyi.system.domain.entity.sms.MsSmsSendHistoryRecordParam;
 import com.ruoyi.system.domain.entity.sms.MsSmsSendRecordParam;
 import com.ruoyi.system.domain.entity.sms.MsSmsTemplate;
 import com.ruoyi.system.domain.entity.sms.MsSmsTemplateParam;
+import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.mapper.shortmessage.MeetingInfoMapper;
 import com.ruoyi.system.mapper.shortmessage.MsSmsSendHistoryRecordMapper;
 import com.ruoyi.system.mapper.sms.MsSmsSendHistoryRecordParamMapper;
@@ -150,6 +153,7 @@ public class ShortMessageServiceImpl implements ShortMessageService {

        return records;
    }
+
    /**
     * 新增发送历史记录
     *
@@ -62,10 +62,11 @@
    </insert>
    <update id="updateSendMailRecord">
        update ms_send_mail_record
-        set mail_content= #{mailContent},
-            update_time=#{updateTime},
-            send_time=#{sendTime},
-            send_status=#{sendStatus}
+        set
+        <if test="mailContent != null ">mail_content= #{mailContent}</if>
+        <if test="updateTime != null ">,update_time=#{updateTime}</if>
+        <if test="sendTime != null ">,send_time=#{sendTime}</if>
+        <if test="sendStatus != null ">,send_status=#{sendStatus}</if>
        where id = #{id}
    </update>
    <select id="querySendMailRecordById" resultMap="SendMailRecordResult">