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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system;
 import java.util.List;
 import java.util.Set;
 
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication;
 import com.ruoyi.wisdomarbitrate.service.IdentityAuthenticationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,8 @@ public class SysLoginController {
     private SysPermissionService permissionService;
     @Autowired
     IdentityAuthenticationService identityAuthenticationService;
+    @Autowired
+    private ISysUserService sysUserService;
 
     /**
      * 登录方法
@@ -57,8 +60,10 @@ public class SysLoginController {
         String status = identityAuthenticationService.checkIsAuthentication(identityAuthentication);
 
         ajax.put("certificationStatus", status);
-        ajax.put("userId", SecurityUtils.getUserId());
-        ajax.put("userName", SecurityUtils.getUsername());
+        // 获取用户信息
+        SysUser sysUser = sysUserService.selectUserByUserName(loginBody.getUsername());
+        ajax.put("userId", sysUser!=null?sysUser.getUserId():"");
+        ajax.put("userName", sysUser!=null?sysUser.getUserName():"");
         return ajax;
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -3,18 +3,14 @@ package com.ruoyi.web.controller.system;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.annotation.Anonymous;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -248,4 +244,14 @@ public class SysUserController extends BaseController
     {
         return success(deptService.selectDeptTreeList(dept));
     }
+    /**
+     * 根据userId获取用户信息
+     * @param userId
+     * @return
+     */
+    @Anonymous
+    @GetMapping("/generateUserSign")
+    public AjaxResult generateUserSign(@RequestParam(required = true) Long userId){
+        return AjaxResult.success(userService.selectUserById(userId));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -375,4 +376,16 @@ public class CaseApplicationController extends BaseController {
         return caseApplicationService.reservedConference(reservedConferenceVO);
     }
 
+    /**
+     * 腾讯云销毁房间回调
+     * @param body
+     * @param request
+     * @return
+     */
+    @Anonymous
+    @PostMapping("/destroyRoomBack")
+    public AjaxResult destroyRoomBack(  @RequestBody String body, HttpServletRequest request) {
+        caseApplicationService.destroyRoomBack(body,request);
+        return success();
+    }
 }