授权用户列表

src/main/java/com/fdkankan/manage/controller/JyPremController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2023-08-21
- */
-@RestController
-@RequestMapping("/manage/jyPrem")
-public class JyPremController {
-
-}
-

src/main/java/com/fdkankan/manage/controller/JySceneAuthController.java

@@ -1,36 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import com.fdkankan.manage.common.ResultData;
-import com.fdkankan.manage.entity.JySceneAuth;
-import com.fdkankan.manage.service.IJySceneAuthService;
-import com.fdkankan.manage.vo.request.JySceneAuthParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2023-08-21
- */
-@RestController
-@RequestMapping("/service/manage/jySceneAuth")
-public class JySceneAuthController {
-
-    @Autowired
-    IJySceneAuthService jySceneAuthService;
-
-    @PostMapping("/authUser")
-    public ResultData authUser(@RequestBody JySceneAuthParam param){
-        jySceneAuthService.authUser(param);
-        return ResultData.ok();
-    }
-}
-

src/main/java/com/fdkankan/manage/controller/SceneUserController.java

@@ -0,0 +1,24 @@
+package com.fdkankan.manage.controller;
+
+import com.fdkankan.manage.common.Result;
+import com.fdkankan.manage.common.ResultData;
+import com.fdkankan.manage.service.IJySceneUserAuthService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/service/manage/sceneUserAuth")
+public class SceneUserController {
+
+    @Autowired
+    IJySceneUserAuthService jySceneUserAuthService;
+
+    @GetMapping("/getAuthList")
+    public ResultData getAuthList(@RequestParam(required = false) String num){
+
+        return ResultData.ok(jySceneUserAuthService.getAuthList(num));
+    }
+}

src/main/java/com/fdkankan/manage/entity/JyPrem.java

@@ -1,51 +0,0 @@
-package com.fdkankan.manage.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-08-21
- */
-@Getter
-@Setter
-@TableName("t_jy_prem")
-public class JyPrem implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @TableField("parent_id")
-    private Integer parentId;
-
-    @TableField("prem_name")
-    private String premName;
-
-    @TableField("prem_en")
-    private String premEn;
-
-    @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
-    private String recStatus;
-
-    @TableField("create_time")
-    private Date createTime;
-
-    @TableField("update_time")
-    private Date updateTime;
-
-
-}

src/main/java/com/fdkankan/manage/entity/JySceneAuth.java

@@ -1,72 +0,0 @@
-package com.fdkankan.manage.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 com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 
- * @since 2023-08-21
- */
-@Getter
-@Setter
-@TableName("t_jy_scene_auth")
-public class JySceneAuth implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 场景码
-     */
-    @TableField("num")
-    private String num;
-
-    @TableField("jy_user_id")
-    private Integer jyUserId;
-
-    @TableField("prem_id")
-    private Integer premId;
-
-    /**
-     * 授权时间类型
-     */
-    @TableField("time_type")
-    private Integer timeType;
-
-    @TableField("start_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @TableField("end_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-
-    @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
-    private String recStatus;
-
-    @TableField("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    @TableField("update_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-
-}

src/main/java/com/fdkankan/manage/entity/JySceneUserAuth.java

@@ -0,0 +1,93 @@
+package com.fdkankan.manage.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-08-24
+ */
+@Getter
+@Setter
+@TableName("jy_scene_user_auth")
+public class JySceneUserAuth implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    @TableField("jy_user_id")
+    private Integer jyUserId;
+
+    /**
+     * 是否有浏览权限0否，1不限时查看，2限时查看
+     */
+    @TableField("look_auth")
+    private Integer lookAuth;
+
+    /**
+     * 是否有编辑权限0否，1不限时编辑，2限时编辑
+     */
+    @TableField("edit_auth")
+    private Integer editAuth;
+
+    /**
+     * 浏览截止时间
+     */
+    @TableField("look_end_time")
+    private Date lookEndTime;
+
+    /**
+     * 编辑截止时间
+     */
+    @TableField("edit_end_time")
+    private Date editEndTime;
+
+    /**
+     * 是否有授权他人权限，0否，1是
+     */
+    @TableField("is_author")
+    private Integer isAuthor;
+
+    /**
+     * 是否有授权他人查看权限 0否，1是
+     */
+    @TableField("can_auth_look")
+    private Integer canAuthLook;
+
+    /**
+     * 是否有授权他人编辑权限 0 否，1是
+     */
+    @TableField("can_edit_look")
+    private Integer canEditLook;
+
+    @TableField("rec_status")
+    @TableLogic
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/manage/entity/JyUser.java

@@ -20,7 +20,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@TableName("t_jy_user")
+@TableName("jy_user")
 public class JyUser implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/fdkankan/manage/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"manage", getTables(new String[]{
-                "t_jy_prem","t_jy_scene_auth","t_jy_user"
+                "jy_scene_user_auth"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/manage/mapper/IJySceneAuthMapper.java

@@ -1,18 +0,0 @@
-package com.fdkankan.manage.mapper;
-
-import com.fdkankan.manage.entity.JySceneAuth;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 
- * @since 2023-08-21
- */
-@Mapper
-public interface IJySceneAuthMapper extends BaseMapper<JySceneAuth> {
-
-}

src/main/java/com/fdkankan/manage/mapper/IJyPremMapper.java

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.mapper;
 
-import com.fdkankan.manage.entity.JyPrem;
+import com.fdkankan.manage.entity.JySceneUserAuth;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -10,9 +10,9 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author 
- * @since 2023-08-21
+ * @since 2023-08-24
  */
 @Mapper
-public interface IJyPremMapper extends BaseMapper<JyPrem> {
+public interface IJySceneUserAuthMapper extends BaseMapper<JySceneUserAuth> {
 
 }

src/main/java/com/fdkankan/manage/service/IJyPremService.java

@@ -1,16 +0,0 @@
-package com.fdkankan.manage.service;
-
-import com.fdkankan.manage.entity.JyPrem;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 
- * @since 2023-08-21
- */
-public interface IJyPremService extends IService<JyPrem> {
-
-}

src/main/java/com/fdkankan/manage/service/IJySceneAuthService.java

@@ -1,18 +0,0 @@
-package com.fdkankan.manage.service;
-
-import com.fdkankan.manage.entity.JySceneAuth;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.manage.vo.request.JySceneAuthParam;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 
- * @since 2023-08-21
- */
-public interface IJySceneAuthService extends IService<JySceneAuth> {
-
-    void authUser(JySceneAuthParam param);
-}

src/main/java/com/fdkankan/manage/service/IJySceneUserAuthService.java

@@ -0,0 +1,17 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.JySceneUserAuth;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-08-24
+ */
+public interface IJySceneUserAuthService extends IService<JySceneUserAuth> {
+
+    Object getAuthList(String num);
+}

src/main/java/com/fdkankan/manage/service/IJyUserService.java

@@ -3,6 +3,9 @@ package com.fdkankan.manage.service;
 import com.fdkankan.manage.entity.JyUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IJyUserService extends IService<JyUser> {
 
+    HashMap<Integer, JyUser> getByIds(List<Integer> jyUserIds);
 }

src/main/java/com/fdkankan/manage/service/impl/JyPremServiceImpl.java

@@ -1,20 +0,0 @@
-package com.fdkankan.manage.service.impl;
-
-import com.fdkankan.manage.entity.JyPrem;
-import com.fdkankan.manage.mapper.IJyPremMapper;
-import com.fdkankan.manage.service.IJyPremService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 
- * @since 2023-08-21
- */
-@Service
-public class JyPremServiceImpl extends ServiceImpl<IJyPremMapper, JyPrem> implements IJyPremService {
-
-}

src/main/java/com/fdkankan/manage/service/impl/JySceneAuthServiceImpl.java

@@ -1,50 +0,0 @@
-package com.fdkankan.manage.service.impl;
-import java.util.Date;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.fdkankan.manage.common.ResultCode;
-import com.fdkankan.manage.entity.JySceneAuth;
-import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.manage.mapper.IJySceneAuthMapper;
-import com.fdkankan.manage.service.IJySceneAuthService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.manage.vo.request.JyPermParam;
-import com.fdkankan.manage.vo.request.JySceneAuthParam;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 
- * @since 2023-08-21
- */
-@Service
-public class JySceneAuthServiceImpl extends ServiceImpl<IJySceneAuthMapper, JySceneAuth> implements IJySceneAuthService {
-
-
-    @Override
-    public void authUser(JySceneAuthParam param) {
-        if(StringUtils.isBlank(param.getNum()) || param.getJyUserId() == null || CollectionUtil.isEmpty(param.getPremList())){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
-        }
-        for (JyPermParam jyPermParam : param.getPremList()) {
-            if(jyPermParam.getPermId() == null ){
-                throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
-            }
-            JySceneAuth jySceneAuth = new JySceneAuth();
-            jySceneAuth.setNum(param.getNum());
-            jySceneAuth.setJyUserId(param.getJyUserId());
-            jySceneAuth.setPremId(jyPermParam.getPermId());
-            jySceneAuth.setTimeType(jyPermParam.getTimeType());
-            if(jyPermParam.getTimeType() == 1){
-                jySceneAuth.setStartTime(jyPermParam.getStartTime());
-                jySceneAuth.setEndTime(jyPermParam.getEndTime());
-            }
-            this.save(jySceneAuth);
-        }
-
-    }
-}

src/main/java/com/fdkankan/manage/service/impl/JySceneUserAuthServiceImpl.java

@@ -0,0 +1,44 @@
+package com.fdkankan.manage.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.manage.entity.JySceneUserAuth;
+import com.fdkankan.manage.entity.JyUser;
+import com.fdkankan.manage.mapper.IJySceneUserAuthMapper;
+import com.fdkankan.manage.service.IJySceneUserAuthService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.IJyUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-08-24
+ */
+@Service
+public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapper, JySceneUserAuth> implements IJySceneUserAuthService {
+
+    @Autowired
+    IJyUserService jyUserService;
+
+    @Override
+    public Object getAuthList(String num) {
+        LambdaQueryWrapper<JySceneUserAuth> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JySceneUserAuth::getNum,num);
+        wrapper.orderByDesc(JySceneUserAuth::getCreateTime);
+        List<JySceneUserAuth> list = this.list(wrapper);
+        if(list.isEmpty()){
+            return list;
+        }
+        List<Integer> jyUserIds = list.stream().map(JySceneUserAuth::getJyUserId).collect(Collectors.toList());
+        HashMap<Integer, JyUser> map = jyUserService.getByIds(jyUserIds);
+        return
+    }
+}

src/main/java/com/fdkankan/manage/service/impl/JyUserServiceImpl.java

@@ -1,11 +1,15 @@
 package com.fdkankan.manage.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.manage.entity.JyUser;
 import com.fdkankan.manage.mapper.IJyUserMapper;
 import com.fdkankan.manage.service.IJyUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +21,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implements IJyUserService {
 
+    @Override
+    public HashMap<Integer, JyUser> getByIds(List<Integer> jyUserIds) {
+        HashMap<Integer, JyUser> map = new HashMap<>();
+        if(jyUserIds.size() >0){
+            List<JyUser> jyUsers = this.listByIds(jyUserIds);
+            for (JyUser jyUser : jyUsers) {
+                map.put(jyUser.getId(),jyUser);
+            }
+        }
+        return map;
+    }
 }

src/main/java/com/fdkankan/manage/vo/request/JyPermParam.java

@@ -1,20 +0,0 @@
-package com.fdkankan.manage.vo.request;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class JyPermParam {
-
-    private Integer permId;
-
-    private Integer timeType;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-}

src/main/java/com/fdkankan/manage/vo/request/JySceneAuthParam.java

@@ -1,15 +0,0 @@
-package com.fdkankan.manage.vo.request;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class JySceneAuthParam {
-
-    private Integer jyUserId;
-
-    private String num;
-
-    private List<JyPermParam> premList;
-}

src/main/resources/mapper/manage/JySceneAuthMapper.xml

@@ -1,5 +0,0 @@
-<?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.manage.mapper.IJySceneAuthMapper">
-
-</mapper>

src/main/resources/mapper/manage/JyPremMapper.xml

@@ -1,5 +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.manage.mapper.IJyPremMapper">
+<mapper namespace="com.fdkankan.manage.mapper.IJySceneUserAuthMapper">
 
 </mapper>