From 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 13:48:56 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java |   55 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
index bfe3cf6..6060ef6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.controller.sys;
 
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
@@ -12,10 +13,15 @@
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.dto.AppEditUserDto;
+import com.ruoyi.system.api.domain.poji.config.SysTag;
 import com.ruoyi.system.api.domain.poji.sys.SysDept;
 import com.ruoyi.system.api.domain.poji.sys.SysRole;
 import com.ruoyi.system.api.domain.poji.sys.SysUser;
+import com.ruoyi.system.api.model.AppMiniLoginVo;
 import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.model.QwH5LoginVo;
+import com.ruoyi.system.api.model.QwUserDetailDto;
+import com.ruoyi.system.service.config.SysTagService;
 import com.ruoyi.system.service.sys.*;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,15 +29,17 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
  * 用户信息
- * 
+ *
  * @author jqs
  */
 @RestController
@@ -136,12 +144,33 @@
         {
             return R.fail("保存用户'" + username + "'失败，注册账号已存在");
         }
-        return R.ok(userService.registerUser(sysUser));
+        return R.ok(userService.registerUser(sysUser)!=null);
     }
 
     /**
+     * 企业微信H5登录
+     * @param qwUserDetail
+     * @return
+     */
+    @PostMapping("/qwH5Login")
+    public R<QwH5LoginVo> qwH5Login(@RequestBody QwUserDetailDto qwUserDetail)
+    {
+        String mobile = qwUserDetail.getMobile();
+        SysUser sysUser = userService.selectUserByPhoneNumber(mobile);
+        Optional.ofNullable(sysUser).orElseThrow(() -> new ServiceException("登录失败，未查询到用户"));
+
+        // 构造登录返回信息
+        QwH5LoginVo qwH5LoginVo = new QwH5LoginVo();
+        qwH5LoginVo.setUserid(qwUserDetail.getUserid());
+        qwH5LoginVo.setMobile(qwUserDetail.getMobile());
+        qwH5LoginVo.setSysUser(sysUser);
+        return R.ok(qwH5LoginVo);
+    }
+
+
+    /**
      * 获取用户信息
-     * 
+     *
      * @return 用户信息
      */
     @GetMapping("getInfo")
@@ -321,24 +350,24 @@
      * @date 2023/4/30 15:36
      * @version 1.0
      */
-    @InnerAuth
-    @PostMapping("/user/getSysUser")
+    @PostMapping("/getSysUser")
     public R<SysUser> getSysUser(@RequestBody Long userId){
+        logger.info("userId"+userId);
         SysUser sysUser = userService.selectUserById(userId);
+        logger.info("sysUser"+sysUser.toString());
         return R.ok(sysUser);
     }
 
     /**
-     * @description: 更新用户手机
+     * @description: 注册新用户
      * @author jqs34
      * @date 2023/4/30 15:32
      * @version 1.0
      */
-    @InnerAuth
-    @PostMapping("/user/registerUser")
-    public R registerUser(@RequestBody SysUser sysUser){
+    @PostMapping("/registerUser")
+    public R<SysUser> registerUser(@RequestBody SysUser sysUser){
         userService.registerUser(sysUser);
-        return R.ok();
+        return R.ok(sysUser);
     }
 
 
@@ -349,8 +378,7 @@
      * @date 2023/4/30 15:32
      * @version 1.0
      */
-    @InnerAuth
-    @PostMapping("/user/updateUserMobile")
+    @PostMapping("/updateUserMobile")
     public R updateUserMobile(@RequestBody SysUser sysUser){
         userService.updateUserMobile(sysUser);
         return R.ok();
@@ -361,8 +389,7 @@
      * @param appEditUserDto
      * @return
      */
-    @InnerAuth
-    @PostMapping("/user/editUserInfo")
+    @PostMapping("/editUserInfo")
     public R editUserInfo(@RequestBody AppEditUserDto appEditUserDto){
         userService.editUserInfo(appEditUserDto);
         return R.ok();

--
Gitblit v1.7.1