소스 검색

20250102_sun

15143018065 3 달 전
부모
커밋
b0f44b7fae
32개의 변경된 파일238개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 0
      ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
  2. 5 0
      ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
  3. 22 0
      ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
  4. 1 1
      ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java
  5. 8 0
      ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
  6. 2 0
      ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqBf.java
  7. 3 1
      ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqBg.java
  8. 2 0
      ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqLr.java
  9. 2 0
      ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqSq.java
  10. 2 0
      ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqTf.java
  11. 2 0
      ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqZj.java
  12. 2 0
      ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqBfServiceImpl.java
  13. 2 0
      ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqBgServiceImpl.java
  14. 1 0
      ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqLrServiceImpl.java
  15. 2 0
      ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqSqServiceImpl.java
  16. 2 0
      ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqTfServiceImpl.java
  17. 2 0
      ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqZjServiceImpl.java
  18. 14 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
  19. 2 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
  20. 2 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
  21. 4 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
  22. 2 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
  23. 4 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java
  24. 2 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
  25. 2 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
  26. 12 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
  27. 21 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
  28. 15 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
  29. 17 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
  30. 7 0
      ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
  31. 7 0
      ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
  32. 64 0
      ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

+ 3 - 0
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java

@@ -31,6 +31,9 @@ public interface RemoteUserService
     @GetMapping("/user/lrinfo/{username}")
     public R<LoginUser> getLrUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    @GetMapping("/user/gljt/register")
+    public R<LoginUser> programRegister(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     @GetMapping("/user/info/openId")
     public R<LoginUser> getUserInfoByOpenId(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 

+ 5 - 0
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java

@@ -37,6 +37,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
                 return R.fail("获取用户失败:" + throwable.getMessage());
             }
 
+            @Override
+            public R<LoginUser> programRegister(SysUser sysUser, String source) {
+                return null;
+            }
+
             @Override
             public R<LoginUser> getUserInfoByOpenId(SysUser sysUser, String source) {
                 return R.fail("获取用户失败:" + throwable.getMessage());

+ 22 - 0
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -235,6 +235,28 @@ public class TokenController
         return R.ok(res);
     }
 
+    @PostMapping("programRegister")
+    public R<?> programRegister(@RequestBody RegisterBody registerBody) {
+        if (StringUtils.isAnyEmpty(registerBody.getOpenid(), registerBody.getUsername())) throw new ServiceException("微信号及openId不能为空");
+        Map<String, Object> res = new LinkedHashMap<>();
+        LoginUser userInfo = sysLoginService.programRegister(registerBody);
+        res.put("token", tokenService.createToken(userInfo));
+        res.put("openId", registerBody.getOpenid());
+        res.put("sysUser", userInfo.getSysUser());
+        return R.ok(res);
+    }
+
+//    @PostMapping("programLogin")
+//    public R<?> programLogin(@RequestBody LoginBody form) {
+//        Map<String, Object> res = new LinkedHashMap<>();
+//        LoginUser userInfo = sysLoginService.login(form.getOpenid());
+//        Map<String, Object> token = tokenService.createToken(userInfo);
+//        res.put("token", token);
+//        res.put("openId", form.getOpenid());
+//        res.put("sysUser", userInfo.getSysUser());
+//        return R.ok(res);
+//    }
+
     /**
      * 养老食堂专用微信解绑
      * @param

+ 1 - 1
ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java

@@ -2,7 +2,7 @@ package com.ruoyi.auth.form;
 
 /**
  * 用户注册对象
- * 
+ *
  * @author ruoyi
  */
 public class RegisterBody extends LoginBody

+ 8 - 0
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.auth.service;
 
 import com.ruoyi.auth.form.LoginBody;
+import com.ruoyi.auth.form.RegisterBody;
 import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.UserConstants;
@@ -361,4 +362,11 @@ public class SysLoginService
         }
         return remoteUserService.getLrUserInfo(userName, SecurityConstants.INNER).getData();
     }
+
+    public LoginUser programRegister(RegisterBody registerBody) {
+        SysUser query = new SysUser();
+        query.setUserName(registerBody.getUsername());
+        query.setOpenid(registerBody.getOpenid());
+        return remoteUserService.programRegister(query, SecurityConstants.INNER).getData();
+    }
 }

+ 2 - 0
ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqBf.java

@@ -309,4 +309,6 @@ public class GljtSqBf extends BaseEntity
     private String age;
 
     private String state;
+
+    private String userId;
 }

+ 3 - 1
ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqBg.java

@@ -263,6 +263,8 @@ public class GljtSqBg extends BaseEntity
 
     @TableField(exist = false)
     private String age;
-    
+
     private String state;
+
+    private String userId;
 }

+ 2 - 0
ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqLr.java

@@ -214,4 +214,6 @@ public class GljtSqLr extends BaseEntity
     private String age;
 
     private String state;
+
+    private String userId;
 }

+ 2 - 0
ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqSq.java

@@ -264,4 +264,6 @@ public class GljtSqSq extends BaseEntity
     private String age;
 
     private String state;
+
+    private String userId;
 }

+ 2 - 0
ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqTf.java

@@ -297,4 +297,6 @@ public class GljtSqTf extends BaseEntity
     private String age;
 
     private String state;
+
+    private String userId;
 }

+ 2 - 0
ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqZj.java

@@ -310,4 +310,6 @@ public class GljtSqZj extends BaseEntity
     private String age;
 
     private String state;
+
+    private String userId;
 }

+ 2 - 0
ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqBfServiceImpl.java

@@ -74,6 +74,7 @@ public class GljtSqBfServiceImpl implements IGljtSqBfService
     public List<GljtSqBf> selectGljtSqBfList(GljtSqBf gljtSqBf) {
         String filter = StringUtils.isEmpty(gljtSqBf.getXzqh()) ? SecurityUtils.getAreaCode() : gljtSqBf.getXzqh();
         gljtSqBf.setXzqh(null);
+        if (StringUtils.equals("99", SecurityUtils.getLoginUser().getSysUser().getUserType())) gljtSqBf.setUserId(String.valueOf(SecurityUtils.getUserId()));
         List<GljtSqBf> res = gljtSqBfMapper.selectList(new LambdaQueryWrapper<>(gljtSqBf).ne(GljtSqBf::getState, "99")
                 .likeRight(GljtSqBf::getXzqh, SubCodeUtil.code2Short(filter)).orderByDesc(GljtSqBf::getCreateTimeStr));
         res.forEach(r -> {
@@ -90,6 +91,7 @@ public class GljtSqBfServiceImpl implements IGljtSqBfService
     public List<GljtSqBf> commonGljtSqBfList(GljtSqBf gljtSqBf) {
         String filter = StringUtils.isEmpty(gljtSqBf.getXzqh()) ? SecurityUtils.getAreaCode() : gljtSqBf.getXzqh();
         gljtSqBf.setXzqh(null);
+        if (StringUtils.equals("99", SecurityUtils.getLoginUser().getSysUser().getUserType())) gljtSqBf.setUserId(String.valueOf(SecurityUtils.getUserId()));
         List<GljtSqBf> res = gljtSqBfMapper.selectList(new LambdaQueryWrapper<>(gljtSqBf)
                 .likeRight(GljtSqBf::getXzqh, SubCodeUtil.code2Short(filter)).orderByDesc(GljtSqBf::getCreateTimeStr));
         res.forEach(r -> {

+ 2 - 0
ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqBgServiceImpl.java

@@ -74,6 +74,7 @@ public class GljtSqBgServiceImpl implements IGljtSqBgService
     public List<GljtSqBg> selectGljtSqBgList(GljtSqBg gljtSqBg) {
         String filter = StringUtils.isEmpty(gljtSqBg.getXzqh()) ? SecurityUtils.getAreaCode() : gljtSqBg.getXzqh();
         gljtSqBg.setXzqh(null);
+        if (StringUtils.equals("99", SecurityUtils.getLoginUser().getSysUser().getUserType())) gljtSqBg.setUserId(String.valueOf(SecurityUtils.getUserId()));
         List<GljtSqBg> res = gljtSqBgMapper.selectList(new LambdaQueryWrapper<>(gljtSqBg).ne(GljtSqBg::getState, "99")
                 .likeRight(GljtSqBg::getXzqh, SubCodeUtil.code2Short(filter)).orderByDesc(GljtSqBg::getCreateTimeStr));
         res.forEach(r -> {
@@ -90,6 +91,7 @@ public class GljtSqBgServiceImpl implements IGljtSqBgService
     public List<GljtSqBg> commonGljtSqBgList(GljtSqBg gljtSqBg) {
         String filter = StringUtils.isEmpty(gljtSqBg.getXzqh()) ? SecurityUtils.getAreaCode() : gljtSqBg.getXzqh();
         gljtSqBg.setXzqh(null);
+        if (StringUtils.equals("99", SecurityUtils.getLoginUser().getSysUser().getUserType())) gljtSqBg.setUserId(String.valueOf(SecurityUtils.getUserId()));
         List<GljtSqBg> res = gljtSqBgMapper.selectList(new LambdaQueryWrapper<>(gljtSqBg)
                 .likeRight(GljtSqBg::getXzqh, SubCodeUtil.code2Short(filter)).orderByDesc(GljtSqBg::getCreateTimeStr));
         res.forEach(r -> {

+ 1 - 0
ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqLrServiceImpl.java

@@ -65,6 +65,7 @@ public class GljtSqLrServiceImpl implements IGljtSqLrService
     {
         String filter = StringUtils.isEmpty(gljtSqLr.getXzqh()) ? SecurityUtils.getAreaCode() : gljtSqLr.getXzqh();
         gljtSqLr.setXzqh(null);
+        if (StringUtils.equals("99", SecurityUtils.getLoginUser().getSysUser().getUserType())) gljtSqLr.setUserId(String.valueOf(SecurityUtils.getUserId()));
         List<GljtSqLr> res = gljtSqLrMapper.selectList(new LambdaQueryWrapper<>(gljtSqLr)
                 .likeRight(GljtSqLr::getXzqh, SubCodeUtil.code2Short(filter)));
         res.forEach(r -> {

+ 2 - 0
ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqSqServiceImpl.java

@@ -77,6 +77,7 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
     {
         String filter = StringUtils.isEmpty(gljtSqSq.getXzqh()) ? SecurityUtils.getAreaCode() : gljtSqSq.getXzqh();
         gljtSqSq.setXzqh(null);
+        if (StringUtils.equals("99", SecurityUtils.getLoginUser().getSysUser().getUserType())) gljtSqSq.setUserId(String.valueOf(SecurityUtils.getUserId()));
         List<GljtSqSq> res = gljtSqSqMapper.selectList(new LambdaQueryWrapper<>(gljtSqSq).ne(GljtSqSq::getState, "99")
                 .likeRight(GljtSqSq::getXzqh, SubCodeUtil.code2Short(filter)).orderByDesc(GljtSqSq::getCreateTimeStr));
         res.forEach(r -> {
@@ -93,6 +94,7 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
     public List<GljtSqSq> commonGljtSqSqList(GljtSqSq gljtSqSq) {
         String filter = StringUtils.isEmpty(gljtSqSq.getXzqh()) ? SecurityUtils.getAreaCode() : gljtSqSq.getXzqh();
         gljtSqSq.setXzqh(null);
+        if (StringUtils.equals("99", SecurityUtils.getLoginUser().getSysUser().getUserType())) gljtSqSq.setUserId(String.valueOf(SecurityUtils.getUserId()));
         List<GljtSqSq> res = gljtSqSqMapper.selectList(new LambdaQueryWrapper<>(gljtSqSq)
                 .likeRight(GljtSqSq::getXzqh, SubCodeUtil.code2Short(filter)).orderByDesc(GljtSqSq::getCreateTimeStr));
         res.forEach(r -> {

+ 2 - 0
ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqTfServiceImpl.java

@@ -76,6 +76,7 @@ public class GljtSqTfServiceImpl implements IGljtSqTfService
     {
         String filter = StringUtils.isEmpty(gljtSqTf.getXzqh()) ? SecurityUtils.getAreaCode() : gljtSqTf.getXzqh();
         gljtSqTf.setXzqh(null);
+        if (StringUtils.equals("99", SecurityUtils.getLoginUser().getSysUser().getUserType())) gljtSqTf.setUserId(String.valueOf(SecurityUtils.getUserId()));
         List<GljtSqTf> res = gljtSqTfMapper.selectList(new LambdaQueryWrapper<>(gljtSqTf).ne(GljtSqTf::getState, "99")
                 .likeRight(GljtSqTf::getXzqh, SubCodeUtil.code2Short(filter)).orderByDesc(GljtSqTf::getCreateTimeStr));
         res.forEach(r -> {
@@ -93,6 +94,7 @@ public class GljtSqTfServiceImpl implements IGljtSqTfService
     {
         String filter = StringUtils.isEmpty(gljtSqTf.getXzqh()) ? SecurityUtils.getAreaCode() : gljtSqTf.getXzqh();
         gljtSqTf.setXzqh(null);
+        if (StringUtils.equals("99", SecurityUtils.getLoginUser().getSysUser().getUserType())) gljtSqTf.setUserId(String.valueOf(SecurityUtils.getUserId()));
         List<GljtSqTf> res = gljtSqTfMapper.selectList(new LambdaQueryWrapper<>(gljtSqTf)
                 .likeRight(GljtSqTf::getXzqh, SubCodeUtil.code2Short(filter)).orderByDesc(GljtSqTf::getCreateTimeStr));
         res.forEach(r -> {

+ 2 - 0
ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqZjServiceImpl.java

@@ -75,6 +75,7 @@ public class GljtSqZjServiceImpl implements IGljtSqZjService
     {
         String filter = StringUtils.isEmpty(gljtSqZj.getXzqh()) ? SecurityUtils.getAreaCode() : gljtSqZj.getXzqh();
         gljtSqZj.setXzqh(null);
+        if (StringUtils.equals("99", SecurityUtils.getLoginUser().getSysUser().getUserType())) gljtSqZj.setUserId(String.valueOf(SecurityUtils.getUserId()));
         List<GljtSqZj> res = gljtSqZjMapper.selectList(new LambdaQueryWrapper<>(gljtSqZj).ne(GljtSqZj::getState, "99")
                 .likeRight(GljtSqZj::getXzqh, SubCodeUtil.code2Short(filter)).orderByDesc(GljtSqZj::getCreateTimeStr));
         res.forEach(r -> {
@@ -92,6 +93,7 @@ public class GljtSqZjServiceImpl implements IGljtSqZjService
     {
         String filter = StringUtils.isEmpty(gljtSqZj.getXzqh()) ? SecurityUtils.getAreaCode() : gljtSqZj.getXzqh();
         gljtSqZj.setXzqh(null);
+        if (StringUtils.equals("99", SecurityUtils.getLoginUser().getSysUser().getUserType())) gljtSqZj.setUserId(String.valueOf(SecurityUtils.getUserId()));
         List<GljtSqZj> res = gljtSqZjMapper.selectList(new LambdaQueryWrapper<>(gljtSqZj)
                 .likeRight(GljtSqZj::getXzqh, SubCodeUtil.code2Short(filter)).orderByDesc(GljtSqZj::getCreateTimeStr));
         res.forEach(r -> {

+ 14 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -168,6 +168,20 @@ public class SysUserController extends BaseController {
         userService.updateOpenId(query);
     }
 
+    @PostMapping("/gljt/register")
+    public R<LoginUser> gljtRegister(@RequestBody SysUser query) {
+        SysUser sysUser = userService.gljtRegister(query);
+        if (StringUtils.isNull(sysUser)) {
+            return R.fail("登录失败");
+        }
+        LoginUser sysUserVo = new LoginUser();
+        sysUserVo.setSysUser(sysUser);
+        sysUserVo.setRoles(permissionService.getGljtRolePermission(sysUser));
+        sysUserVo.setPermissions(permissionService.getGljtMenuPermission(sysUser));
+        String msg = null;
+        return R.ok(sysUserVo, msg);
+    }
+
     @GetMapping("/info/lastChangePwd/{username}")
     public R<Boolean> lastChangePwd(@PathVariable("username") String username) {
         return R.ok(userService.checkLastChangePwd(username));

+ 2 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -54,6 +54,8 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu>
 
     public List<String> selectLrMenuPermsByUserId(Long userId);
 
+    public List<String> selectGljtMenuPermsByUserId();
+
     /**
      * 根据用户ID查询菜单
      *

+ 2 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java

@@ -30,6 +30,8 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRole>
 
     public List<SysRole> selectLrRolePermissionByUserId(Long userId);
 
+    public List<SysRole> selectGljtRolePermissionByUserId(Long userId);
+
     /**
      * 查询所有角色
      *

+ 4 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -56,6 +56,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser>
 
     public SysUser selectLrUserByOpenId(String openId);
 
+    public SysUser selectGljtUserByOpenId(String openId);
+
     public void updateOpenId(SysUser user);
 
     /**
@@ -74,6 +76,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser>
      */
     public int insertUser(SysUser user);
 
+    public int insertGljtUser(SysUser user);
+
     public int insertLrUser(SysUser user);
 
     /**

+ 2 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

@@ -41,6 +41,8 @@ public interface ISysMenuService
 
     public Set<String> selectLrMenuPermsByUserId(Long userId);
 
+    public Set<String> selectGljtMenuPermsByUserId();
+
     /**
      * 根据角色ID查询权限
      *

+ 4 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java

@@ -21,6 +21,8 @@ public interface ISysPermissionService
 
     public Set<String> getLrRolePermission(SysUser user);
 
+    public Set<String> getGljtRolePermission(SysUser user);
+
     /**
      * 获取菜单数据权限
      *
@@ -30,4 +32,6 @@ public interface ISysPermissionService
     public Set<String> getMenuPermission(SysUser user);
 
     public Set<String> getLrMenuPermission(SysUser user);
+
+    public Set<String> getGljtMenuPermission(SysUser user);
 }

+ 2 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -39,6 +39,8 @@ public interface ISysRoleService
 
     public Set<String> selectLrRolePermissionByUserId(Long userId);
 
+    public Set<String> selectGljtRolePermissionByUserId(Long userId);
+
     /**
      * 查询所有角色
      *

+ 2 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -49,6 +49,8 @@ public interface ISysUserService
 
     public SysUser selectLrUserByOpenId(String openId);
 
+    public SysUser gljtRegister(SysUser query);
+
     public void updateOpenId(SysUser user);
 
     /**

+ 12 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -107,6 +107,18 @@ public class SysMenuServiceImpl implements ISysMenuService {
         return permsSet;
     }
 
+    @Override
+    public Set<String> selectGljtMenuPermsByUserId() {
+        List<String> perms = menuMapper.selectGljtMenuPermsByUserId();
+        Set<String> permsSet = new HashSet<>();
+        for (String perm : perms) {
+            if (StringUtils.isNotEmpty(perm)) {
+                permsSet.addAll(Arrays.asList(perm.trim().split(",")));
+            }
+        }
+        return permsSet;
+    }
+
     /**
      * 根据角色ID查询权限
      *

+ 21 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java

@@ -53,6 +53,11 @@ public class SysPermissionServiceImpl implements ISysPermissionService
         return new HashSet<>(roleService.selectLrRolePermissionByUserId(user.getUserId()));
     }
 
+    @Override
+    public Set<String> getGljtRolePermission(SysUser user) {
+        return new HashSet<>(roleService.selectGljtRolePermissionByUserId(user.getUserId()));
+    }
+
     /**
      * 获取菜单数据权限
      *
@@ -118,4 +123,20 @@ public class SysPermissionServiceImpl implements ISysPermissionService
         }
         return perms;
     }
+
+    @Override
+    public Set<String> getGljtMenuPermission(SysUser user)
+    {
+        Set<String> perms = new HashSet<String>();
+        // 管理员拥有所有权限
+        if (user.isAdmin())
+        {
+            perms.add("*:*:*");
+        }
+        else
+        {
+            perms.addAll(menuService.selectGljtMenuPermsByUserId());
+        }
+        return perms;
+    }
 }

+ 15 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -144,6 +144,21 @@ public class SysRoleServiceImpl implements ISysRoleService
         return permsSet;
     }
 
+    @Override
+    public Set<String> selectGljtRolePermissionByUserId(Long userId)
+    {
+        List<SysRole> perms = roleMapper.selectGljtRolePermissionByUserId(userId);
+        Set<String> permsSet = new HashSet<>();
+        for (SysRole perm : perms)
+        {
+            if (StringUtils.isNotNull(perm))
+            {
+                permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
+            }
+        }
+        return permsSet;
+    }
+
     /**
      * 查询所有角色
      *

+ 17 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -202,6 +202,23 @@ public class SysUserServiceImpl implements ISysUserService {
         return res;
     }
 
+    @Override
+    public SysUser gljtRegister(SysUser query) {
+        SysUser res = userMapper.selectGljtUserByOpenId(query.getOpenid());
+        if (ObjectUtils.isEmpty(res)) {
+            SysUser in = new SysUser();
+            in.setOpenid(query.getOpenid());
+            in.setUserName(query.getUserName());
+            in.setNickName(query.getUserName());
+            in.setJgId(IdUtils.simpleUUID());
+            in.setDeptId(1L);
+            in.setUserType("99");
+            userMapper.insertGljtUser(in);
+            res = userMapper.selectGljtUserByOpenId(query.getOpenid());
+        }
+        return res;
+    }
+
     public void updateOpenId(SysUser user) {
         userMapper.updateOpenId(user);
     }

+ 7 - 0
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -131,6 +131,13 @@
 		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
 	</select>
 
+	<select id="selectGljtMenuPermsByUserId" resultType="String">
+		select distinct m.perms
+		from sys_menu m
+				 left join sys_role_menu rm on m.menu_id = rm.menu_id
+		where m.status = '0' and rm.role_id = '999'
+	</select>
+
 	<select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
 		select distinct m.perms
 		from sys_menu m

+ 7 - 0
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -88,6 +88,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE r.del_flag = '0' and ur.user_id = #{userId}
 	</select>
 
+	<select id="selectGljtRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
+		select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
+						r.status, r.del_flag, r.remark, r.power_rids, r.is_default
+		from sys_role r
+		WHERE r.role_id = '999'
+	</select>
+
 	<select id="selectRoleAll" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 	</select>

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 64 - 0
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml