lyhzzz пре 2 година
родитељ
комит
d9e478ae38

+ 75 - 0
src/main/java/com/fdkankan/ucenter/entity/SysRole.java

@@ -0,0 +1,75 @@
+package com.fdkankan.ucenter.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+@TableName("sys_role")
+public class SysRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 角色表
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 角色名称
+     */
+    @TableField("role_name")
+    private String roleName;
+
+    /**
+     * 角色类型
+     */
+    @TableField("role_type")
+    private String roleType;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    /**
+     * 创建者id
+     */
+    @TableField("create_user_id")
+    private Integer createUserId;
+
+    /**
+     * 是否禁用 0禁用 1启用
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 角色说明
+     */
+    @TableField("description")
+    private String description;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

+ 63 - 0
src/main/java/com/fdkankan/ucenter/entity/UserRole.java

@@ -0,0 +1,63 @@
+package com.fdkankan.ucenter.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 用户角色关系表
+ * </p>
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+@TableName("t_user_role")
+public class UserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 用户表id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 角色表id
+     */
+    @TableField("role_id")
+    private Long roleId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 记录的状态,A: 生效,I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

+ 1 - 1
src/main/java/com/fdkankan/ucenter/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"ucenter", getTables(new String[]{
-                "t_agent_new_log",
+                "sys_role","t_user_role"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

+ 18 - 0
src/main/java/com/fdkankan/ucenter/mapper/ISysRoleMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.ucenter.mapper;
+
+import com.fdkankan.ucenter.entity.SysRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+@Mapper
+public interface ISysRoleMapper extends BaseMapper<SysRole> {
+
+}

+ 18 - 0
src/main/java/com/fdkankan/ucenter/mapper/IUserRoleMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.ucenter.mapper;
+
+import com.fdkankan.ucenter.entity.UserRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户角色关系表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+@Mapper
+public interface IUserRoleMapper extends BaseMapper<UserRole> {
+
+}

+ 16 - 0
src/main/java/com/fdkankan/ucenter/service/ISysRoleService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.ucenter.service;
+
+import com.fdkankan.ucenter.entity.SysRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+public interface ISysRoleService extends IService<SysRole> {
+
+}

+ 18 - 0
src/main/java/com/fdkankan/ucenter/service/IUserRoleService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.ucenter.service;
+
+import com.fdkankan.ucenter.entity.SysRole;
+import com.fdkankan.ucenter.entity.UserRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户角色关系表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+public interface IUserRoleService extends IService<UserRole> {
+
+    SysRole getByUserId(Long userId);
+}

+ 12 - 1
src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -52,6 +52,10 @@ public class AppSceneService {
     RedisUtil redisUtil;
     @Autowired
     ISceneCooperationService sceneCooperationService;
+    @Autowired
+    ISysRoleService sysRoleService;
+    @Autowired
+    IUserRoleService userRoleService;
 
     @Autowired
     IScenePlusMapper scenePlusMapper;
@@ -77,6 +81,7 @@ public class AppSceneService {
         }
 
         List<String> cooperationNumList = new ArrayList<>();
+        Boolean canDelBut = false;
         if(StringUtils.isNotBlank(param.getPhoneNum())){
             User user = userService.getByUserName(param.getPhoneNum());
             if(user == null){
@@ -87,6 +92,10 @@ public class AppSceneService {
                 param.setCooperationNumList(cooperationNumList );
             }
             param.setUserId(user.getId());
+            SysRole role = userRoleService.getByUserId(user.getId());
+            if(role != null && "super-admin".equals(role.getRoleType())){
+                canDelBut = true;
+            }
         }
 
         Page<AppSceneVo> page =  scenePlusMapper.pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
@@ -141,7 +150,9 @@ public class AppSceneService {
                 }
 
             }
-
+            if(canDelBut){
+                record.setSceneSourceType(1);
+            }
         }
         return PageInfo.PageInfo(page);
     }

+ 20 - 0
src/main/java/com/fdkankan/ucenter/service/impl/SysRoleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.ucenter.service.impl;
+
+import com.fdkankan.ucenter.entity.SysRole;
+import com.fdkankan.ucenter.mapper.ISysRoleMapper;
+import com.fdkankan.ucenter.service.ISysRoleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+@Service
+public class SysRoleServiceImpl extends ServiceImpl<ISysRoleMapper, SysRole> implements ISysRoleService {
+
+}

+ 39 - 0
src/main/java/com/fdkankan/ucenter/service/impl/UserRoleServiceImpl.java

@@ -0,0 +1,39 @@
+package com.fdkankan.ucenter.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.ucenter.entity.SysRole;
+import com.fdkankan.ucenter.entity.UserRole;
+import com.fdkankan.ucenter.mapper.IUserRoleMapper;
+import com.fdkankan.ucenter.service.ISysRoleService;
+import com.fdkankan.ucenter.service.IUserRoleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户角色关系表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+@Service
+public class UserRoleServiceImpl extends ServiceImpl<IUserRoleMapper, UserRole> implements IUserRoleService {
+
+    @Autowired
+    ISysRoleService  sysRoleService;
+
+    @Override
+    public SysRole getByUserId(Long userId) {
+        LambdaQueryWrapper<UserRole> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(UserRole::getUserId,userId);
+        List<UserRole> list = this.list(wrapper);
+        if(list == null || list.size() <=0){
+            return null;
+        }
+        return sysRoleService.getById(list.get(0).getRoleId());
+    }
+}

+ 5 - 0
src/main/resources/mapper/ucenter/SysRoleMapper.xml

@@ -0,0 +1,5 @@
+<?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.fdkankan.ucenter.mapper.ISysRoleMapper">
+
+</mapper>

+ 5 - 0
src/main/resources/mapper/ucenter/UserRoleMapper.xml

@@ -0,0 +1,5 @@
+<?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.fdkankan.ucenter.mapper.IUserRoleMapper">
+
+</mapper>