Merge remote-tracking branch 'origin/V0.0.1' into V0.0.1

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/Role.java

@@ -14,7 +14,7 @@ public class Role extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**角色id */
-    private long id;
+    private Long id;
 
     /**角色名字*/
     private String roleName;
@@ -42,11 +42,11 @@ public class Role extends BaseEntity {
     @TableField(exist = false)
     private Set<String> permissions;
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/ConfigController.java

@@ -0,0 +1,96 @@
+package com.xunmei.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import org.springframework.web.bind.annotation.*;
+import com.xunmei.system.service.IConfigService;
+import com.xunmei.system.domain.Config;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import javax.annotation.Resource;
+import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.core.web.controller.BaseController;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * ConfigController 前端控制器
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+@Api(tags = {"ConfigController"})
+@RestController
+@RequestMapping("/config")
+public class ConfigController extends BaseController {
+
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    @Resource
+    private IConfigService configService;
+
+
+    @ApiOperation(value = "新增参数配置表")
+    @RequiresPermissions("system:config:add")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody Config config){
+        try {
+            return configService.add(config);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "删除参数配置表")
+    @RequiresPermissions("system:config:delete")
+    @DeleteMapping("/{id}")
+    public AjaxResult delete(@PathVariable("id") Long id){
+        try {
+            return configService.delete(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "更新参数配置表")
+    @RequiresPermissions("system:config:update")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody Config config){
+        try {
+            return configService.updateData(config);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "查询参数配置表分页数据")
+    @RequiresPermissions("system:config:findByPage")
+    @GetMapping("/findByPage")
+    public AjaxResult findListByPage(Page<Config> page,Config config){
+        try {
+            return configService.findListByPage(page, config);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "id查询参数配置表")
+    @RequiresPermissions("system:config:findById")
+    @GetMapping("/{id}")
+    public AjaxResult findById(@PathVariable Long id){
+        try {
+            return configService.findById(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/MenuController.java

@@ -42,10 +42,9 @@ public class MenuController {
 
     @ApiOperation(value = "根据用户id获取菜单")
     @RequiresPermissions("system:SysMenu:findMenuByUserId")
-    @GetMapping(value = {"/findMenuByUserId", "/group/list"})
-    AjaxResult findMenuByUserId(@PathVariable(required = false) AppType appType) {
-
-        List<Menu> result = sysMenuService.findMenuByUserId(SecurityUtils.getUserId());
+    @GetMapping(value = {"/findMenuByUserId"})
+    AjaxResult findMenuByUserId(Integer platformType) {
+        List<Menu> result = sysMenuService.findMenuByUserId(SecurityUtils.getUserId(),platformType);
         return success(result);
         //}
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/OrgController.java

@@ -1,22 +1,97 @@
 package com.xunmei.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
-import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.system.api.domain.Org;
+import org.springframework.web.bind.annotation.*;
 import com.xunmei.system.service.IOrgService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import javax.annotation.Resource;
+import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.core.web.controller.BaseController;
+
 import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * <p>
+ * OrgController 前端控制器
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+@Api(tags = {"OrgController"})
 @RestController
 @RequestMapping("/org")
 public class OrgController extends BaseController {
-    @Autowired
+
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    @Resource
     private IOrgService orgService;
 
+
+    @ApiOperation(value = "新增")
+    @RequiresPermissions("system:org:add")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody Org org){
+        try {
+            return orgService.add(org);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "删除")
+    @RequiresPermissions("system:org:delete")
+    @DeleteMapping("/{id}")
+    public AjaxResult delete(@PathVariable("id") Long id){
+        try {
+            return orgService.delete(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "更新")
+    @RequiresPermissions("system:org:update")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody Org org){
+        try {
+            return orgService.updateData(org);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "查询分页数据")
+    @RequiresPermissions("system:org:findByPage")
+    @GetMapping("/findByPage")
+    public AjaxResult findListByPage(Page<Org> page,Org org){
+        try {
+            return orgService.findListByPage(page, org);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "id查询")
+    @RequiresPermissions("system:org:findById")
+    @GetMapping("/{id}")
+    public AjaxResult findById(@PathVariable Long id){
+        try {
+            return orgService.findById(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
     /**
      * 获取部门列表
      */
@@ -24,11 +99,7 @@ public class OrgController extends BaseController {
     @GetMapping("/list")
     public AjaxResult list(Page<Org> page, Org org)
     {
-        orgService.selectPage(page, org);
+        orgService.findListByPage(page, org);
         return success(page);
     }
-
-
-
-
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/RoleController.java

@@ -0,0 +1,96 @@
+package com.xunmei.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.system.api.domain.Role;
+import org.springframework.web.bind.annotation.*;
+import com.xunmei.system.service.IRoleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import javax.annotation.Resource;
+import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.core.web.controller.BaseController;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * RoleController 前端控制器
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+@Api(tags = {"RoleController"})
+@RestController
+@RequestMapping("/role")
+public class RoleController extends BaseController {
+
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    @Resource
+    private IRoleService roleService;
+
+
+    @ApiOperation(value = "新增角色信息表")
+    @RequiresPermissions("system:role:add")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody Role role){
+        try {
+            return roleService.add(role);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "删除角色信息表")
+    @RequiresPermissions("system:role:delete")
+    @DeleteMapping("/{id}")
+    public AjaxResult delete(@PathVariable("id") Long id){
+        try {
+            return roleService.delete(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "更新角色信息表")
+    @RequiresPermissions("system:role:update")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody Role role){
+        try {
+            return roleService.updateData(role);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "查询角色信息表分页数据")
+    @RequiresPermissions("system:role:findByPage")
+    @GetMapping("/findByPage")
+    public AjaxResult findListByPage(Page<Role> page,Role role){
+        try {
+            return roleService.findListByPage(page, role);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "id查询角色信息表")
+    @RequiresPermissions("system:role:findById")
+    @GetMapping("/{id}")
+    public AjaxResult findById(@PathVariable Long id){
+        try {
+            return roleService.findById(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/RoleMenuController.java

@@ -0,0 +1,96 @@
+package com.xunmei.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import org.springframework.web.bind.annotation.*;
+import com.xunmei.system.service.IRoleMenuService;
+import com.xunmei.system.domain.RoleMenu;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import javax.annotation.Resource;
+import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.core.web.controller.BaseController;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * RoleMenuController 前端控制器
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+@Api(tags = {"RoleMenuController"})
+@RestController
+@RequestMapping("/roleMenu")
+public class RoleMenuController extends BaseController {
+
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    @Resource
+    private IRoleMenuService roleMenuService;
+
+
+    @ApiOperation(value = "新增角色和菜单关联表")
+    @RequiresPermissions("system:roleMenu:add")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody RoleMenu roleMenu){
+        try {
+            return roleMenuService.add(roleMenu);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "删除角色和菜单关联表")
+    @RequiresPermissions("system:roleMenu:delete")
+    @DeleteMapping("/{id}")
+    public AjaxResult delete(@PathVariable("id") Long id){
+        try {
+            return roleMenuService.delete(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "更新角色和菜单关联表")
+    @RequiresPermissions("system:roleMenu:update")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody RoleMenu roleMenu){
+        try {
+            return roleMenuService.updateData(roleMenu);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "查询角色和菜单关联表分页数据")
+    @RequiresPermissions("system:roleMenu:findByPage")
+    @GetMapping("/findByPage")
+    public AjaxResult findListByPage(Page<RoleMenu> page,RoleMenu roleMenu){
+        try {
+            return roleMenuService.findListByPage(page, roleMenu);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "id查询角色和菜单关联表")
+    @RequiresPermissions("system:roleMenu:findById")
+    @GetMapping("/{id}")
+    public AjaxResult findById(@PathVariable Long id){
+        try {
+            return roleMenuService.findById(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/UserRoleController.java

@@ -0,0 +1,96 @@
+package com.xunmei.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import org.springframework.web.bind.annotation.*;
+import com.xunmei.system.service.IUserRoleService;
+import com.xunmei.system.domain.UserRole;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import javax.annotation.Resource;
+import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.core.web.controller.BaseController;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * UserRoleController 前端控制器
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+@Api(tags = {"UserRoleController"})
+@RestController
+@RequestMapping("/userRole")
+public class UserRoleController extends BaseController {
+
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    @Resource
+    private IUserRoleService userRoleService;
+
+
+    @ApiOperation(value = "新增用户和角色关联表")
+    @RequiresPermissions("system:userRole:add")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody UserRole userRole){
+        try {
+            return userRoleService.add(userRole);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "删除用户和角色关联表")
+    @RequiresPermissions("system:userRole:delete")
+    @DeleteMapping("/{id}")
+    public AjaxResult delete(@PathVariable("id") Long id){
+        try {
+            return userRoleService.delete(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "更新用户和角色关联表")
+    @RequiresPermissions("system:userRole:update")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody UserRole userRole){
+        try {
+            return userRoleService.updateData(userRole);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "查询用户和角色关联表分页数据")
+    @RequiresPermissions("system:userRole:findByPage")
+    @GetMapping("/findByPage")
+    public AjaxResult findListByPage(Page<UserRole> page,UserRole userRole){
+        try {
+            return userRoleService.findListByPage(page, userRole);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "id查询用户和角色关联表")
+    @RequiresPermissions("system:userRole:findById")
+    @GetMapping("/{id}")
+    public AjaxResult findById(@PathVariable Long id){
+        try {
+            return userRoleService.findById(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/Config.java

@@ -0,0 +1,62 @@
+package com.xunmei.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+/**
+ * <p>
+ * 参数配置表
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_config")
+@ApiModel(value="Config对象", description="参数配置表")
+public class Config implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "参数主键")
+    @TableId(value = "config_id", type = IdType.AUTO)
+    private Integer configId;
+
+    @ApiModelProperty(value = "参数名称")
+    private String configName;
+
+    @ApiModelProperty(value = "参数键名")
+    private String configKey;
+
+    @ApiModelProperty(value = "参数键值")
+    private String configValue;
+
+    @ApiModelProperty(value = "系统内置（Y是 N否）")
+    private String configType;
+
+    @ApiModelProperty(value = "创建者")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新者")
+    private String updateBy;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/RoleMenu.java

@@ -0,0 +1,34 @@
+package com.xunmei.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+/**
+ * <p>
+ * 角色和菜单关联表
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_role_menu")
+@ApiModel(value="RoleMenu对象", description="角色和菜单关联表")
+public class RoleMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "角色ID")
+    private Long roleId;
+
+    @ApiModelProperty(value = "菜单ID")
+    private Long menuId;
+
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/UserRole.java

@@ -0,0 +1,34 @@
+package com.xunmei.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+/**
+ * <p>
+ * 用户和角色关联表
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_user_role")
+@ApiModel(value="UserRole对象", description="用户和角色关联表")
+public class UserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    @ApiModelProperty(value = "角色ID")
+    private Long roleId;
+
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/ConfigMapper.java

@@ -0,0 +1,16 @@
+package com.xunmei.system.mapper;
+
+import com.xunmei.system.domain.Config;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 参数配置表 Mapper 接口
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+public interface ConfigMapper extends BaseMapper<Config> {
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/MenuMapper.java

@@ -2,6 +2,7 @@ package com.xunmei.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.domain.Menu;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,5 +30,5 @@ public interface MenuMapper extends BaseMapper<Menu> {
      */
     List<String> selectMenuPermsByUserId(Long userId);
 
-    List<Menu> selectMenuByUserIdWhereMF(Long userId);
+    List<Menu> selectMenuByUserIdWhereMF(@Param("userId") Long userId,@Param("platformType") Integer platformType);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/OrgMapper.java

@@ -1,19 +1,16 @@
 package com.xunmei.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.system.api.domain.Org;
-import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+public interface OrgMapper extends BaseMapper<Org> {
 
- public interface OrgMapper extends BaseMapper<Org> {
-
-     /**
-      * 分页数据
-      * @param page
-      * @param org
-      * @return
-      */
-    Page<Org> selectPage(Page<Org> page,@Param("info") Org org);
- }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/RoleMapper.java

@@ -5,15 +5,19 @@ import com.xunmei.system.api.domain.Role;
 
 import java.util.List;
 
+/**
+ * <p>
+ * 角色信息表 Mapper 接口
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
 public interface RoleMapper extends BaseMapper<Role> {
-
     /**
      * 根据用户ID查询角色
      * @param userId 用户ID
      * @return 角色列表
      */
     List<Role> selectRolePermissionByUserId(Long userId);
-
-
-
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/RoleMenuMapper.java

@@ -0,0 +1,16 @@
+package com.xunmei.system.mapper;
+
+import com.xunmei.system.domain.RoleMenu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 角色和菜单关联表 Mapper 接口
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+public interface RoleMenuMapper extends BaseMapper<RoleMenu> {
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/UserRoleMapper.java

@@ -0,0 +1,16 @@
+package com.xunmei.system.mapper;
+
+import com.xunmei.system.domain.UserRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户和角色关联表 Mapper 接口
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+public interface UserRoleMapper extends BaseMapper<UserRole> {
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/IConfigService.java

@@ -0,0 +1,58 @@
+package com.xunmei.system.service;
+
+import com.xunmei.system.domain.Config;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
+
+/**
+ * <p>
+ * 参数配置表 服务类
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+public interface IConfigService extends IService<Config> {
+
+    /**
+     * 查询参数配置表分页数据
+     *
+     * @param page      页码
+     * @param config 每页条数
+     * @return AjaxResult
+     */
+    AjaxResult findListByPage(Page<Config> page,Config config);
+
+    /**
+     * 添加参数配置表
+     *
+     * @param config 参数配置表
+     * @return JsonBean
+     */
+    AjaxResult add(Config config);
+
+    /**
+     * 删除参数配置表
+     *
+     * @param id 主键
+     * @return AjaxResult
+     */
+    AjaxResult delete(Long id);
+
+    /**
+     * 修改参数配置表
+     *
+     * @param config 参数配置表
+     * @return AjaxResult
+     */
+    AjaxResult updateData(Config config);
+
+    /**
+     * id查询数据
+     *
+     * @param id id
+     * @return AjaxResult
+     */
+    AjaxResult findById(Long id);
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/IMenuService.java

@@ -68,5 +68,5 @@ public interface IMenuService extends IService<Menu> {
      */
     AjaxResult findById(Long id);
 
-    List<Menu> findMenuByUserId(Long id);
+    List<Menu> findMenuByUserId(Long id,Integer platformType);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/IOrgService.java

@@ -1,23 +1,59 @@
 package com.xunmei.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.system.api.domain.Org;
-import com.xunmei.system.domain.vo.TreeSelect;
-
-import java.util.List;
 
 /**
- * 机构管理
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
  */
 public interface IOrgService extends IService<Org> {
 
     /**
-     * 获取分页数据
+     * 查询分页数据
+     *
+     * @param page      页码
+     * @param org 每页条数
+     * @return AjaxResult
+     */
+    AjaxResult findListByPage(Page<Org> page,Org org);
+
+    /**
+     * 添加
+     *
+     * @param org 
+     * @return JsonBean
+     */
+    AjaxResult add(Org org);
+
+    /**
+     * 删除
+     *
+     * @param id 主键
+     * @return AjaxResult
+     */
+    AjaxResult delete(Long id);
+
+    /**
+     * 修改
      *
-     * @param page
-     * @param org
-     * @return
+     * @param org 
+     * @return AjaxResult
      */
-    Page<Org> selectPage(Page<Org> page, Org org);
+    AjaxResult updateData(Org org);
+
+    /**
+     * id查询数据
+     *
+     * @param id id
+     * @return AjaxResult
+     */
+    AjaxResult findById(Long id);
+
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/IRoleMenuService.java

@@ -0,0 +1,58 @@
+package com.xunmei.system.service;
+
+import com.xunmei.system.domain.RoleMenu;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
+
+/**
+ * <p>
+ * 角色和菜单关联表 服务类
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+public interface IRoleMenuService extends IService<RoleMenu> {
+
+    /**
+     * 查询角色和菜单关联表分页数据
+     *
+     * @param page      页码
+     * @param roleMenu 每页条数
+     * @return AjaxResult
+     */
+    AjaxResult findListByPage(Page<RoleMenu> page,RoleMenu roleMenu);
+
+    /**
+     * 添加角色和菜单关联表
+     *
+     * @param roleMenu 角色和菜单关联表
+     * @return JsonBean
+     */
+    AjaxResult add(RoleMenu roleMenu);
+
+    /**
+     * 删除角色和菜单关联表
+     *
+     * @param id 主键
+     * @return AjaxResult
+     */
+    AjaxResult delete(Long id);
+
+    /**
+     * 修改角色和菜单关联表
+     *
+     * @param roleMenu 角色和菜单关联表
+     * @return AjaxResult
+     */
+    AjaxResult updateData(RoleMenu roleMenu);
+
+    /**
+     * id查询数据
+     *
+     * @param id id
+     * @return AjaxResult
+     */
+    AjaxResult findById(Long id);
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/IRoleService.java

@@ -1,18 +1,65 @@
 package com.xunmei.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.system.api.domain.Role;
 
 import java.util.List;
 import java.util.Set;
 
 /**
- * 角色业务
- * @author xunmei
+ * <p>
+ * 角色信息表 服务类
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
  */
 public interface IRoleService extends IService<Role> {
 
     /**
+     * 查询角色信息表分页数据
+     *
+     * @param page      页码
+     * @param role 每页条数
+     * @return AjaxResult
+     */
+    AjaxResult findListByPage(Page<Role> page,Role role);
+
+    /**
+     * 添加角色信息表
+     *
+     * @param role 角色信息表
+     * @return JsonBean
+     */
+    AjaxResult add(Role role);
+
+    /**
+     * 删除角色信息表
+     *
+     * @param id 主键
+     * @return AjaxResult
+     */
+    AjaxResult delete(Long id);
+
+    /**
+     * 修改角色信息表
+     *
+     * @param role 角色信息表
+     * @return AjaxResult
+     */
+    AjaxResult updateData(Role role);
+
+    /**
+     * id查询数据
+     *
+     * @param id id
+     * @return AjaxResult
+     */
+    AjaxResult findById(Long id);
+
+    /**
      * 根据条件查询角色数据
      * @param role 角色信息
      * @return 角色数据集合

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/IUserRoleService.java

@@ -0,0 +1,58 @@
+package com.xunmei.system.service;
+
+import com.xunmei.system.domain.UserRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
+
+/**
+ * <p>
+ * 用户和角色关联表 服务类
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+public interface IUserRoleService extends IService<UserRole> {
+
+    /**
+     * 查询用户和角色关联表分页数据
+     *
+     * @param page      页码
+     * @param userRole 每页条数
+     * @return AjaxResult
+     */
+    AjaxResult findListByPage(Page<UserRole> page,UserRole userRole);
+
+    /**
+     * 添加用户和角色关联表
+     *
+     * @param userRole 用户和角色关联表
+     * @return JsonBean
+     */
+    AjaxResult add(UserRole userRole);
+
+    /**
+     * 删除用户和角色关联表
+     *
+     * @param id 主键
+     * @return AjaxResult
+     */
+    AjaxResult delete(Long id);
+
+    /**
+     * 修改用户和角色关联表
+     *
+     * @param userRole 用户和角色关联表
+     * @return AjaxResult
+     */
+    AjaxResult updateData(UserRole userRole);
+
+    /**
+     * id查询数据
+     *
+     * @param id id
+     * @return AjaxResult
+     */
+    AjaxResult findById(Long id);
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/ConfigServiceImpl.java

@@ -0,0 +1,49 @@
+package com.xunmei.system.service.impl;
+
+import com.xunmei.system.domain.Config;
+import com.xunmei.system.mapper.ConfigMapper;
+import com.xunmei.system.service.IConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import static com.xunmei.common.core.web.domain.AjaxResult.success;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * <p>
+ * 参数配置表 服务实现类
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+@Service
+public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> implements IConfigService {
+
+    @Override
+    public AjaxResult findListByPage(Page<Config> page,Config config){
+    QueryWrapper<Config> where = new QueryWrapper<>(config);
+        return success(baseMapper.selectPage(page,where));
+    }
+
+    @Override
+    public AjaxResult add(Config config){
+        return success(baseMapper.insert(config));
+    }
+
+    @Override
+    public AjaxResult delete(Long id){
+        return success(baseMapper.deleteById(id));
+    }
+
+    @Override
+    public AjaxResult updateData(Config config){
+        return success(baseMapper.updateById(config));
+    }
+
+    @Override
+    public AjaxResult findById(Long id){
+        return success(baseMapper.selectById(id));
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/MenuServiceImpl.java

@@ -47,8 +47,8 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
     }
 
     @Override
-    public List<Menu> findMenuByUserId(Long id) {
-        List<Menu> list = recursionMethod(baseMapper.selectMenuByUserIdWhereMF(id));
+    public List<Menu> findMenuByUserId(Long id,Integer platformType) {
+        List<Menu> list = recursionMethod(baseMapper.selectMenuByUserIdWhereMF(id,platformType));
         return list;
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/OrgServiceImpl.java

@@ -1,21 +1,56 @@
 package com.xunmei.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.system.api.domain.Org;
 import com.xunmei.system.mapper.OrgMapper;
 import com.xunmei.system.service.IOrgService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import static com.xunmei.common.core.web.domain.AjaxResult.success;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
 @Service
 public class OrgServiceImpl extends ServiceImpl<OrgMapper, Org> implements IOrgService {
 
+    @Override
+    public AjaxResult findListByPage(Page<Org> page,Org org){
+    QueryWrapper<Org> where = new QueryWrapper<>(org);
+        return success(baseMapper.selectPage(page,where));
+    }
+
+    @Override
+    public AjaxResult add(Org org){
+        return success(baseMapper.insert(org));
+    }
+
+    @Override
+    public AjaxResult delete(Long id){
+        return success(baseMapper.deleteById(id));
+    }
+
+    @Override
+    public AjaxResult updateData(Org org){
+        return success(baseMapper.updateById(org));
+    }
 
+    @Override
+    public AjaxResult findById(Long id){
+        return success(baseMapper.selectById(id));
+    }
     private void recursionFn(List<Org> list, Org t)
     {
         // 得到子节点列表
@@ -53,8 +88,5 @@ public class OrgServiceImpl extends ServiceImpl<OrgMapper, Org> implements IOrgS
         return tlist;
     }
 
-    @Override
-    public Page<Org> selectPage(Page<Org> page, Org org) {
-        return baseMapper.selectPage(page,org);
-    }
+
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/RoleMenuServiceImpl.java

@@ -0,0 +1,49 @@
+package com.xunmei.system.service.impl;
+
+import com.xunmei.system.domain.RoleMenu;
+import com.xunmei.system.mapper.RoleMenuMapper;
+import com.xunmei.system.service.IRoleMenuService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import static com.xunmei.common.core.web.domain.AjaxResult.success;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * <p>
+ * 角色和菜单关联表 服务实现类
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+@Service
+public class RoleMenuServiceImpl extends ServiceImpl<RoleMenuMapper, RoleMenu> implements IRoleMenuService {
+
+    @Override
+    public AjaxResult findListByPage(Page<RoleMenu> page,RoleMenu roleMenu){
+    QueryWrapper<RoleMenu> where = new QueryWrapper<>(roleMenu);
+        return success(baseMapper.selectPage(page,where));
+    }
+
+    @Override
+    public AjaxResult add(RoleMenu roleMenu){
+        return success(baseMapper.insert(roleMenu));
+    }
+
+    @Override
+    public AjaxResult delete(Long id){
+        return success(baseMapper.deleteById(id));
+    }
+
+    @Override
+    public AjaxResult updateData(RoleMenu roleMenu){
+        return success(baseMapper.updateById(roleMenu));
+    }
+
+    @Override
+    public AjaxResult findById(Long id){
+        return success(baseMapper.selectById(id));
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/RoleServiceImpl.java

@@ -1,21 +1,58 @@
 package com.xunmei.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.system.api.domain.Role;
 import com.xunmei.system.mapper.RoleMapper;
 import com.xunmei.system.service.IRoleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import static com.xunmei.common.core.web.domain.AjaxResult.success;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+/**
+ * <p>
+ * 角色信息表 服务实现类
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
 @Service
 public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IRoleService {
 
     @Override
+    public AjaxResult findListByPage(Page<Role> page,Role role){
+    QueryWrapper<Role> where = new QueryWrapper<>(role);
+        return success(baseMapper.selectPage(page,where));
+    }
+
+    @Override
+    public AjaxResult add(Role role){
+        return success(baseMapper.insert(role));
+    }
+
+    @Override
+    public AjaxResult delete(Long id){
+        return success(baseMapper.deleteById(id));
+    }
+
+    @Override
+    public AjaxResult updateData(Role role){
+        return success(baseMapper.updateById(role));
+    }
+
+    @Override
+    public AjaxResult findById(Long id){
+        return success(baseMapper.selectById(id));
+    }
+    @Override
     public List<Role> selectRoleList(Role role) {
         return null;
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/UserRoleServiceImpl.java

@@ -0,0 +1,49 @@
+package com.xunmei.system.service.impl;
+
+import com.xunmei.system.domain.UserRole;
+import com.xunmei.system.mapper.UserRoleMapper;
+import com.xunmei.system.service.IUserRoleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import static com.xunmei.common.core.web.domain.AjaxResult.success;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * <p>
+ * 用户和角色关联表 服务实现类
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-07
+ */
+@Service
+public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements IUserRoleService {
+
+    @Override
+    public AjaxResult findListByPage(Page<UserRole> page,UserRole userRole){
+    QueryWrapper<UserRole> where = new QueryWrapper<>(userRole);
+        return success(baseMapper.selectPage(page,where));
+    }
+
+    @Override
+    public AjaxResult add(UserRole userRole){
+        return success(baseMapper.insert(userRole));
+    }
+
+    @Override
+    public AjaxResult delete(Long id){
+        return success(baseMapper.deleteById(id));
+    }
+
+    @Override
+    public AjaxResult updateData(UserRole userRole){
+        return success(baseMapper.updateById(userRole));
+    }
+
+    @Override
+    public AjaxResult findById(Long id){
+        return success(baseMapper.selectById(id));
+    }
+}

soc-modules/soc-modules-system/src/main/resources/mapper/system/ConfigMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xunmei.system.mapper.ConfigMapper">
+
+        <!-- 通用查询映射结果 -->
+        <resultMap id="BaseResultMap" type="com.xunmei.system.domain.Config">
+                    <id column="config_id" property="configId"/>
+                    <result column="config_name" property="configName"/>
+                    <result column="config_key" property="configKey"/>
+                    <result column="config_value" property="configValue"/>
+                    <result column="config_type" property="configType"/>
+                    <result column="create_by" property="createBy"/>
+                    <result column="create_time" property="createTime"/>
+                    <result column="update_by" property="updateBy"/>
+                    <result column="update_time" property="updateTime"/>
+                    <result column="remark" property="remark"/>
+        </resultMap>
+
+        <!-- 通用查询结果列 -->
+        <sql id="Base_Column_List">
+            config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark
+        </sql>
+
+</mapper>

soc-modules/soc-modules-system/src/main/resources/mapper/system/MenuMapper.xml

@@ -70,12 +70,16 @@
             m.menu_type,
             m.icon,
             m.order_num,
-            m.create_time
+            m.create_time,
+            m.platform_type
         FROM
             sys_menu m
                 LEFT JOIN sys_role_menu rm ON m.id = rm.menu_id
                 LEFT JOIN sys_user_role ur ON rm.role_id = ur.role_id
                 LEFT JOIN sys_role ro ON ur.role_id = ro.id
-        where m.menu_type in ('M','F') and ur.user_id = #{params.userId}
+        where m.menu_type in ('M','F')  and ur.user_id = #{userId}
+        <if test="platformType != null ">
+            AND m.platform_type = #{platformType}
+        </if>
     </select>
 </mapper>

soc-modules/soc-modules-system/src/main/resources/mapper/system/OrgMapper.xml

@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.system.mapper.OrgMapper">
-
-	<select id="selectPage" resultType="com.xunmei.system.api.domain.Org">
+    <select id="selectPage" resultType="com.xunmei.system.api.domain.Org">
         select * from  sys_org
     </select>
 
-</mapper> 
+</mapper>

soc-modules/soc-modules-system/src/main/resources/mapper/system/RoleMenuMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xunmei.system.mapper.RoleMenuMapper">
+
+        <!-- 通用查询映射结果 -->
+        <resultMap id="BaseResultMap" type="com.xunmei.system.domain.RoleMenu">
+                    <id column="role_id" property="roleId"/>
+                    <result column="menu_id" property="menuId"/>
+        </resultMap>
+
+        <!-- 通用查询结果列 -->
+        <sql id="Base_Column_List">
+            role_id, menu_id
+        </sql>
+
+</mapper>

soc-modules/soc-modules-system/src/main/resources/mapper/system/UserRoleMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xunmei.system.mapper.UserRoleMapper">
+
+        <!-- 通用查询映射结果 -->
+        <resultMap id="BaseResultMap" type="com.xunmei.system.domain.UserRole">
+                    <id column="user_id" property="userId"/>
+                    <result column="role_id" property="roleId"/>
+        </resultMap>
+
+        <!-- 通用查询结果列 -->
+        <sql id="Base_Column_List">
+            user_id, role_id
+        </sql>
+
+</mapper>