1111

src/main/java/com/fdkankan/jp/xspace/controller/BaseController.java

@@ -3,8 +3,10 @@ package com.fdkankan.jp.xspace.controller;
 import com.fdkankan.common.util.DateEditor;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.jp.xspace.common.ResultCode;
+import com.fdkankan.jp.xspace.entity.SysUser;
 import com.fdkankan.jp.xspace.entity.User;
 import com.fdkankan.jp.xspace.common.exception.BusinessException;
+import com.fdkankan.jp.xspace.service.ISysUserService;
 import com.fdkankan.jp.xspace.service.IUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +29,8 @@ public class BaseController {
 
     @Autowired
     IUserService userService;
+    @Autowired
+    private ISysUserService sysUserService;
 
     @InitBinder
     protected void initBinder(WebDataBinder webDataBinder) {
@@ -66,12 +70,12 @@ public class BaseController {
         return StringUtils.isBlank(request.getHeader("lang") ) ? "zh" : request.getHeader("lang");
     }
 
-    protected User getUser(){
+    protected SysUser getUser(){
         String username = JwtUtil.getUsername(getToken());
         if(StringUtils.isBlank(username)){
             throw new BusinessException(ResultCode.USER_NOT_LOGIN);
         }
-        User user = userService.getByUserName(username);
+        SysUser user = sysUserService.getByUserName(username);
         if(user == null){
             throw new BusinessException(ResultCode.USER_NOT_LOGIN);
         }

src/main/java/com/fdkankan/jp/xspace/controller/UnityConfigController.java

@@ -60,6 +60,7 @@ public class UnityConfigController {
         UnityConfig bean = BeanUtil.toBean(param, UnityConfig.class);
         unityConfigService.updateById(bean);
         return Result.success();
+
     }
 
 

src/main/java/com/fdkankan/jp/xspace/entity/ScenePlus.java

@@ -119,7 +119,7 @@ public class ScenePlus implements Serializable {
     @TableLogic(value = "A", delval = "I")
     private String recStatus;
 
-    @TableField("laser_title")
+    @TableField(value = "laser_title", exist = false)
     private String laserTitle;
 
 

src/main/java/com/fdkankan/jp/xspace/entity/SysUser.java

@@ -0,0 +1,76 @@
+package com.fdkankan.jp.xspace.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author
+ * @since 2022-06-09
+ */
+@Getter
+@Setter
+@TableName("sys_user")
+public class SysUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 系统用户表
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 账号
+     */
+    @TableField("user_name")
+    private String userName;
+
+    /**
+     * 密码
+     */
+    @TableField("password")
+    private String password;
+    /**
+     * 昵称
+     */
+    @TableField("nick_name")
+    private String nickName;
+
+    /**
+     * 角色id
+     */
+    @TableField("role_id")
+    private Long roleId;
+
+    /**
+     * 创建者id
+     */
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 是否禁用 0禁用，1启用
+     */
+    @TableField("status")
+    private Integer status;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+
+}

src/main/java/com/fdkankan/jp/xspace/entity/User.java

@@ -3,8 +3,10 @@ package com.fdkankan.jp.xspace.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -12,10 +14,11 @@ import java.io.Serializable;
  * </p>
  *
  * @author
- * @since 2022-12-23
+ * @since 2021-12-24
  */
 @Getter
 @Setter
+@ToString
 @TableName("t_user")
 public class User implements Serializable {
 
@@ -46,7 +49,7 @@ public class User implements Serializable {
      * 注册时间
      */
     @TableField("register_time")
-    private String registerTime;
+    private Date registerTime;
 
     /**
      * 用户名
@@ -118,35 +121,20 @@ public class User implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    private String createTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
-    private String recStatus;
+    private Date createTime;
 
     /**
      * 更新时间
      */
     @TableField("update_time")
-    private String updateTime;
-
-    @TableField("company_id")
-    private Long companyId;
+    private Date updateTime;
 
     /**
-     * 深时场景下载总次数
+     * A正常，I删除
      */
-    @TableField("ss_download_num_total")
-    private Integer ssDownloadNumTotal;
-
-    /**
-     * 深时场景已下载次数
-     */
-    @TableField("ss_download_num")
-    private Integer ssDownloadNum;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

src/main/java/com/fdkankan/jp/xspace/interceptor/CheckPlatAdminPermitAspect.java

@@ -1,63 +1,67 @@
-package com.fdkankan.jp.xspace.interceptor;
-
-import com.fdkankan.common.util.JwtUtil;
-import com.fdkankan.jp.xspace.common.ResultCode;
-import com.fdkankan.jp.xspace.common.exception.BusinessException;
-import com.fdkankan.jp.xspace.entity.User;
-import com.fdkankan.jp.xspace.service.IUserRoleService;
-import com.fdkankan.jp.xspace.service.IUserService;
-import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.Set;
-
-@Log4j2
-@Aspect
-@Component
-public class CheckPlatAdminPermitAspect {
-
-	@Autowired
-	private IUserService userService;
-	@Autowired
-	private IUserRoleService userRoleService;
-
-	@Pointcut("@annotation(com.fdkankan.jp.xspace.common.annotation.CheckPlatformAdminPermit)")
-	public void CheckPlatformAdminPermit() {
-	}
-
-	/**
-	 * 前置通知 用于判断用户协作场景是否有协作权限
-	 *
-	 * @param joinPoint
-	 *            切点
-	 * @throws IOException
-	 */
-	@Before("CheckPlatformAdminPermit()")
-	public void doBefore(JoinPoint joinPoint) throws Exception {
-		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-		String token = request.getHeader("token");
-		String username = JwtUtil.getUsername(token);
-		if(StringUtils.isBlank(username)){
-			throw new BusinessException(ResultCode.USER_NOT_LOGIN);
-		}
-		User user = userService.getByUserName(username);
-		if(user == null){
-			throw new BusinessException(ResultCode.USER_NOT_LOGIN);
-		}
-		Set<Long> roleIds = userRoleService.getByUser(user);
-		if(!roleIds.contains(5L)){
-			throw new BusinessException(ResultCode.NOT_PERMISSION);
-		}
-	}
-
-}
+//package com.fdkankan.jp.xspace.interceptor;
+//
+//import com.fdkankan.common.util.JwtUtil;
+//import com.fdkankan.jp.xspace.common.ResultCode;
+//import com.fdkankan.jp.xspace.common.exception.BusinessException;
+//import com.fdkankan.jp.xspace.entity.SysUser;
+//import com.fdkankan.jp.xspace.entity.User;
+//import com.fdkankan.jp.xspace.service.ISysUserService;
+//import com.fdkankan.jp.xspace.service.IUserRoleService;
+//import com.fdkankan.jp.xspace.service.IUserService;
+//import lombok.extern.log4j.Log4j2;
+//import org.apache.commons.lang3.StringUtils;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Before;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.context.request.RequestContextHolder;
+//import org.springframework.web.context.request.ServletRequestAttributes;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import java.io.IOException;
+//import java.util.Set;
+//
+//@Log4j2
+//@Aspect
+//@Component
+//public class CheckPlatAdminPermitAspect {
+//
+//	@Autowired
+//	private IUserService userService;
+//	@Autowired
+//	private IUserRoleService userRoleService;
+//	@Autowired
+//	private ISysUserService sysUserService;
+//
+//	@Pointcut("@annotation(com.fdkankan.jp.xspace.common.annotation.CheckPlatformAdminPermit)")
+//	public void CheckPlatformAdminPermit() {
+//	}
+//
+//	/**
+//	 * 前置通知 用于判断用户协作场景是否有协作权限
+//	 *
+//	 * @param joinPoint
+//	 *            切点
+//	 * @throws IOException
+//	 */
+//	@Before("CheckPlatformAdminPermit()")
+//	public void doBefore(JoinPoint joinPoint) throws Exception {
+//		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+//		String token = request.getHeader("token");
+//		String username = JwtUtil.getUsername(token);
+//		if(StringUtils.isBlank(username)){
+//			throw new BusinessException(ResultCode.USER_NOT_LOGIN);
+//		}
+//		SysUser user = sysUserService.getByUserName(username);
+//		if(user == null){
+//			throw new BusinessException(ResultCode.USER_NOT_LOGIN);
+//		}
+//		Set<Long> roleIds = userRoleService.getByUser(user);
+//		if(!roleIds.contains(5L)){
+//			throw new BusinessException(ResultCode.NOT_PERMISSION);
+//		}
+//	}
+//
+//}

src/main/java/com/fdkankan/jp/xspace/mapper/ISysUserMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.jp.xspace.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.jp.xspace.entity.SysUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2022-06-09
+ */
+@Mapper
+public interface ISysUserMapper extends BaseMapper<SysUser> {
+
+}

src/main/java/com/fdkankan/jp/xspace/service/IFileService.java

@@ -1,5 +1,6 @@
 package com.fdkankan.jp.xspace.service;
 
+import com.fdkankan.jp.xspace.entity.SysUser;
 import com.fdkankan.jp.xspace.entity.User;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -7,6 +8,6 @@ import java.io.IOException;
 
 public interface IFileService {
 
-    String uploadXspaceSceneFile(MultipartFile file, String num, String fileName, User user) throws IOException;
+    String uploadXspaceSceneFile(MultipartFile file, String num, String fileName, SysUser user) throws IOException;
 
 }

src/main/java/com/fdkankan/jp/xspace/service/IScenePlusService.java

@@ -4,6 +4,7 @@ import com.fdkankan.jp.xspace.common.PageInfo;
 import com.fdkankan.jp.xspace.dto.SceneDTO;
 import com.fdkankan.jp.xspace.entity.ScenePlus;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.jp.xspace.entity.SysUser;
 import com.fdkankan.jp.xspace.entity.User;
 
 import java.util.List;
@@ -18,6 +19,6 @@ import java.util.List;
  */
 public interface IScenePlusService extends IService<ScenePlus> {
 
-     PageInfo pageSgMesh(SceneDTO param, User user);
+     PageInfo pageSgMesh(SceneDTO param, SysUser user);
 
 }

src/main/java/com/fdkankan/jp/xspace/service/ISceneXspaceService.java

@@ -5,6 +5,7 @@ import com.fdkankan.jp.xspace.common.Result;
 import com.fdkankan.jp.xspace.dto.XspacePageDTO;
 import com.fdkankan.jp.xspace.entity.SceneXspace;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.jp.xspace.entity.SysUser;
 import com.fdkankan.jp.xspace.entity.User;
 
 import java.util.List;
@@ -19,11 +20,11 @@ import java.util.List;
  */
 public interface ISceneXspaceService extends IService<SceneXspace> {
 
-    PageInfo pageXspace(XspacePageDTO param, User user);
+    PageInfo pageXspace(XspacePageDTO param, SysUser user);
 
-    Result delete(List<Long> ids, User user);
+    Result delete(List<Long> ids, SysUser user);
 
-    Result sync(List<String> nums, User user);
+    Result sync(List<String> nums, SysUser user);
 
     SceneXspace getByNumAndUserId(String num, long userId);
 

src/main/java/com/fdkankan/jp/xspace/service/ISysUserService.java

@@ -0,0 +1,19 @@
+package com.fdkankan.jp.xspace.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.jp.xspace.entity.SysUser;
+import com.fdkankan.jp.xspace.entity.User;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author
+ * @since 2022-06-09
+ */
+public interface ISysUserService extends IService<SysUser> {
+
+    SysUser getByUserName(String managerPhone);
+
+}

src/main/java/com/fdkankan/jp/xspace/service/IXspaceUserService.java

@@ -3,6 +3,7 @@ package com.fdkankan.jp.xspace.service;
 import com.fdkankan.jp.xspace.common.Result;
 import com.fdkankan.jp.xspace.dto.PageXspaceUserDTO;
 import com.fdkankan.jp.xspace.dto.XspaceUserDTO;
+import com.fdkankan.jp.xspace.entity.SysUser;
 import com.fdkankan.jp.xspace.entity.User;
 import com.fdkankan.jp.xspace.entity.XspaceUser;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -17,7 +18,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IXspaceUserService extends IService<XspaceUser> {
 
-    Result pageUser(PageXspaceUserDTO param, User user);
+    Result pageUser(PageXspaceUserDTO param, SysUser user);
 
     XspaceUser getByUserId(Long userId);
 

src/main/java/com/fdkankan/jp/xspace/service/impl/FileServiceImpl.java

@@ -9,6 +9,7 @@ import com.fdkankan.jp.xspace.common.constant.NasPathConstant;
 import com.fdkankan.jp.xspace.common.constant.OSSPathConstant;
 import com.fdkankan.jp.xspace.common.exception.BusinessException;
 import com.fdkankan.jp.xspace.entity.SceneXspace;
+import com.fdkankan.jp.xspace.entity.SysUser;
 import com.fdkankan.jp.xspace.entity.User;
 import com.fdkankan.jp.xspace.entity.XspaceUser;
 import com.fdkankan.jp.xspace.service.IFileService;
@@ -35,7 +36,7 @@ public class FileServiceImpl implements IFileService {
 
 
     @Override
-    public String uploadXspaceSceneFile(MultipartFile file, String num, String fileName, User user) throws IOException {
+    public String uploadXspaceSceneFile(MultipartFile file, String num, String fileName, SysUser user) throws IOException {
         SceneXspace sceneXspace = sceneXspaceService.getByNumAndUserId(num, user.getId());
         if(Objects.isNull(sceneXspace)){
             throw new BusinessException(ResultCode.SCENE_NOT_EXIT);

src/main/java/com/fdkankan/jp/xspace/service/impl/ScenePlusServiceImpl.java

@@ -4,9 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.jp.xspace.common.PageInfo;
 import com.fdkankan.jp.xspace.dto.SceneDTO;
 import com.fdkankan.jp.xspace.entity.ScenePlus;
+import com.fdkankan.jp.xspace.entity.SysUser;
 import com.fdkankan.jp.xspace.entity.User;
 import com.fdkankan.jp.xspace.mapper.IScenePlusMapper;
 import com.fdkankan.jp.xspace.service.IScenePlusService;
@@ -37,19 +39,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     private IUserService userService;
 
     @Override
-    public PageInfo pageSgMesh(SceneDTO param, User user) {
-
-//        公司员工：仅能看到自己的场景并且同步自己的场景数据
-//        公司管理员：仅能看到自己的场景并且同步自己的场景数据
-//        平台管理员：能查看全部场景数据并且支持同步全部得数据 (平台管理员同步后的场景还是归属于之前这个场景的归属者)
-        Set<Long> roleIds = userRoleService.getByUser(user);
-        if(!roleIds.contains(5L)){//平台管理员可以看到所有
-//            if(roleIds.contains(6L)){//公司管理员可以看到同一公司下所有
-//                param.setCompanyId(user.getCompanyId());
-//            }else{//普通员工只能看到自己的
-                param.setUserId(user.getId());
-//            }
-        }
+    public PageInfo pageSgMesh(SceneDTO param, SysUser user) {
 
         Page<ScenePlus> page = this.baseMapper.pageSgMesh(new Page<>(param.getPageNum(), param.getPageSize()), param);
         Set<Long> userIds = page.getRecords().stream().filter(v -> Objects.nonNull(v.getUserId())).map(ScenePlus::getUserId).collect(Collectors.toSet());
@@ -64,13 +54,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         sceneVOList.stream().forEach(v->{
             if(Objects.nonNull(v.getUserId()) && userNameMap.get(v.getUserId()) != null){
                 v.setUserName(userNameMap.get(v.getUserId()));
-            }
-            if(!roleIds.contains(5L)){
-                if(!v.getUserId().equals(user.getId())){
-                    v.setPermitSync(0);
-                }else{
-                    v.setPermitSync(1);
-                }
+                v.setPermitSync(CommonStatus.YES.code().intValue());
             }
         });
         PageInfo pageInfo = PageInfo.PageInfo(page);

src/main/java/com/fdkankan/jp/xspace/service/impl/SceneXspaceServiceImpl.java

@@ -17,6 +17,7 @@ import com.fdkankan.jp.xspace.common.rabbitmq.dto.SceneXspaceMqDTO;
 import com.fdkankan.jp.xspace.dto.XspacePageDTO;
 import com.fdkankan.jp.xspace.entity.ScenePlus;
 import com.fdkankan.jp.xspace.entity.SceneXspace;
+import com.fdkankan.jp.xspace.entity.SysUser;
 import com.fdkankan.jp.xspace.entity.User;
 import com.fdkankan.jp.xspace.mapper.ISceneXspaceMapper;
 import com.fdkankan.jp.xspace.service.IScenePlusService;
@@ -66,15 +67,7 @@ public class SceneXspaceServiceImpl extends ServiceImpl<ISceneXspaceMapper, Scen
     private FYunFileServiceInterface fYunFileService;
 
     @Override
-    public PageInfo pageXspace(XspacePageDTO param, User user) {
-        Set<Long> roleIds = userRoleService.getByUser(user);
-        if(!roleIds.contains(5L)){//平台管理员可以看到所有
-            if(roleIds.contains(6L)){//公司管理员可以看到同一公司下所有
-                param.setCompanyId(user.getCompanyId());
-            }else{//普通员工只能看到自己的
-                param.setUserId(user.getId());
-            }
-        }
+    public PageInfo pageXspace(XspacePageDTO param, SysUser user) {
         Page<XspaceVO> xspaceVOPage = this.baseMapper.pageXspace(new Page(param.getPageNum(), param.getPageSize()), param);
         xspaceVOPage.getRecords().stream().forEach(v->{
             v.setWebSite(String.format(webSiteFormat, v.getNum(), v.getSerial()));
@@ -83,28 +76,12 @@ public class SceneXspaceServiceImpl extends ServiceImpl<ISceneXspaceMapper, Scen
     }
 
     @Override
-    public Result delete(List<Long> ids, User user) {
+    public Result delete(List<Long> ids, SysUser user) {
 
         List<SceneXspace> sceneXspaces = this.listByIds(ids);
         if(CollUtil.isEmpty(sceneXspaces)){
             return Result.success();
         }
-        //校验数据
-        Set<Long> userIds = sceneXspaces.stream().map(x -> x.getUserId()).collect(Collectors.toSet());
-        Set<Long> roleIds = userRoleService.getByUser(user);
-        boolean notPermission = false;
-        if(!roleIds.contains(5L)){//平台管理员可以看到所有
-            if(roleIds.contains(6L)){//公司管理员可以看到同一公司下所有
-                List<User> users = userService.listByIds(userIds);
-                notPermission = users.stream().anyMatch(u -> !u.getCompanyId().equals(user.getCompanyId()));
-            }else{//普通员工只能删除自己的
-                notPermission = userIds.stream().anyMatch(id -> !id.equals(user.getId()));
-            }
-        }
-        if(notPermission){
-            return Result.failure(ResultCode.NOT_PERMISSION);
-        }
-
         sceneXspaces.stream().forEach(x->{
             x.setUpdater(user.getId());
             x.setRecStatus(RecStatus.DISABLE.code());
@@ -119,7 +96,7 @@ public class SceneXspaceServiceImpl extends ServiceImpl<ISceneXspaceMapper, Scen
     }
 
     @Override
-    public Result sync(List<String> nums, User user) {
+    public Result sync(List<String> nums, SysUser user) {
 
 //        List<String> canSyncList = nums;//实际需要同步的场景集合
 //        if(CollUtil.isNotEmpty(syncList)){
@@ -148,13 +125,13 @@ public class SceneXspaceServiceImpl extends ServiceImpl<ISceneXspaceMapper, Scen
         //平台管理员：能查看全部场景数据并且支持同步全部得数据 (平台管理员同步后的场景还是归属于之前这个场景的归属者)
         //公司管理员：仅能看到自己的场景并且同步自己的场景数据
         //公司员工：仅能看到自己的场景并且同步自己的场景数据
-        Set<Long> roleIds = userRoleService.getByUser(user);
-        if(!roleIds.contains(5L)){
-            List<String> notPermisionNums = scenePlusList.stream().filter(p->!p.getUserId().equals(user.getId())).map(p->p.getNum()).collect(Collectors.toList());
-            if(CollUtil.isNotEmpty(notPermisionNums)){
-                throw new BusinessException(ResultCode.NOT_PERMISSION.code(), JSON.toJSONString(notPermisionNums));
-            }
-        }
+//        Set<Long> roleIds = userRoleService.getByUser(user);
+//        if(!roleIds.contains(5L)){
+//            List<String> notPermisionNums = scenePlusList.stream().filter(p->!p.getUserId().equals(user.getId())).map(p->p.getNum()).collect(Collectors.toList());
+//            if(CollUtil.isNotEmpty(notPermisionNums)){
+//                throw new BusinessException(ResultCode.NOT_PERMISSION.code(), JSON.toJSONString(notPermisionNums));
+//            }
+//        }
 
 
         List<SceneXspace> sceneXspaceList = scenePlusList.stream().map(p -> {

src/main/java/com/fdkankan/jp/xspace/service/impl/SysUserServiceImpl.java

@@ -0,0 +1,29 @@
+package com.fdkankan.jp.xspace.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.jp.xspace.entity.SysUser;
+import com.fdkankan.jp.xspace.entity.User;
+import com.fdkankan.jp.xspace.mapper.ISysUserMapper;
+import com.fdkankan.jp.xspace.service.ISysUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2022-06-09
+ */
+@Service
+public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> implements ISysUserService {
+
+    @Override
+    public SysUser getByUserName(String managerPhone) {
+        LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysUser::getUserName,managerPhone);
+        return this.getOne(wrapper);
+    }
+
+}

src/main/java/com/fdkankan/jp/xspace/service/impl/UserServiceImpl.java

@@ -11,16 +11,11 @@ import com.fdkankan.jp.xspace.common.ResultCode;
 import com.fdkankan.jp.xspace.common.redis.RedisConstant;
 import com.fdkankan.jp.xspace.constant.XspaceErrorCode;
 import com.fdkankan.jp.xspace.dto.LoginDTO;
-import com.fdkankan.jp.xspace.entity.User;
-import com.fdkankan.jp.xspace.entity.UserPlatform;
-import com.fdkankan.jp.xspace.entity.UserRole;
+import com.fdkankan.jp.xspace.entity.*;
 import com.fdkankan.jp.xspace.common.exception.BusinessException;
-import com.fdkankan.jp.xspace.entity.XspaceUser;
+import com.fdkankan.jp.xspace.mapper.ISysUserMapper;
 import com.fdkankan.jp.xspace.mapper.IUserMapper;
-import com.fdkankan.jp.xspace.service.IUserPlatformService;
-import com.fdkankan.jp.xspace.service.IUserRoleService;
-import com.fdkankan.jp.xspace.service.IUserService;
-import com.fdkankan.jp.xspace.service.IXspaceUserService;
+import com.fdkankan.jp.xspace.service.*;
 import com.fdkankan.jp.xspace.vo.LoginVO;
 import com.fdkankan.jp.xspace.vo.UserVO;
 import com.fdkankan.redis.util.RedisUtil;
@@ -54,6 +49,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     private IXspaceUserService xspaceUserService;
     @Autowired
     private IUserPlatformService userPlatformService;
+    @Autowired
+    private ISysUserService sysUserService;
 
     @Override
     public User getByUserName(String managerPhone) {
@@ -67,20 +64,20 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         if (StringUtils.isEmpty(param.getPassword()) || StringUtils.isEmpty(param.getPhoneNum())){
             throw new BusinessException(ResultCode.PARAM_ERROR);
         }
-        String password = Base64Converter.decode(Base64Converter.subText(param.getPassword()));
-        String passwordCode = SecurityUtil.MD5(password);
-        User user = this.getByUserName(param.getPhoneNum());
+        String passwordMd5 = SecurityUtil.MD52(Base64Converter.decode(Base64Converter.subText(param.getPassword())));
+//        User user = this.getByUserName(param.getPhoneNum());
+        SysUser user = sysUserService.getByUserName(param.getPhoneNum());
         if(user == null){
             throw new BusinessException(ResultCode.USER_NOT_EXIST);
         }
-        if(!user.getPassword().equals(passwordCode)){
+        if(!user.getPassword().equals(passwordMd5)){
             throw new BusinessException(ResultCode.PASSWORD_ERROR);
         }
 
-        List<UserPlatform> xspases = userPlatformService.list(new LambdaQueryWrapper<UserPlatform>().eq(UserPlatform::getUserId, user.getId()).eq(UserPlatform::getPlatformKey, "xspase"));
-        if(CollUtil.isEmpty(xspases)){
-            throw new BusinessException(XspaceErrorCode.CODE_90001.code(), XspaceErrorCode.CODE_90001.message());
-        }
+//        List<UserPlatform> xspases = userPlatformService.list(new LambdaQueryWrapper<UserPlatform>().eq(UserPlatform::getUserId, user.getId()).eq(UserPlatform::getPlatformKey, "xspase"));
+//        if(CollUtil.isEmpty(xspases)){
+//            throw new BusinessException(XspaceErrorCode.CODE_90001.code(), XspaceErrorCode.CODE_90001.message());
+//        }
 
         String token = this.redisLogin(user.getUserName(), JSONObject.toJSONString(user),"user");
         UserVO userVo = getUserVo(user);
@@ -110,7 +107,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         return token;
     }
 
-    private UserVO getUserVo(User user){
+    private UserVO getUserVo(SysUser user){
         UserVO userVo = new UserVO();
         BeanUtils.copyProperties(user,userVo);
         List<UserRole> userRoles = userRoleService.getByUserId(userVo.getId());
@@ -121,8 +118,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Override
     public UserVO getUserInfo(String username) {
-        User user = this.getByUserName(username);
-        return getUserVo(user);
+        SysUser sysUser = sysUserService.getByUserName(username);
+        return getUserVo(sysUser);
     }
 
 }

src/main/java/com/fdkankan/jp/xspace/service/impl/XspaceUserServiceImpl.java

@@ -11,6 +11,7 @@ import com.fdkankan.jp.xspace.common.ResultCode;
 import com.fdkankan.jp.xspace.common.exception.BusinessException;
 import com.fdkankan.jp.xspace.dto.PageXspaceUserDTO;
 import com.fdkankan.jp.xspace.dto.XspaceUserDTO;
+import com.fdkankan.jp.xspace.entity.SysUser;
 import com.fdkankan.jp.xspace.entity.User;
 import com.fdkankan.jp.xspace.entity.XspaceUser;
 import com.fdkankan.jp.xspace.mapper.IXspaceUserMapper;
@@ -42,7 +43,7 @@ public class XspaceUserServiceImpl extends ServiceImpl<IXspaceUserMapper, Xspace
     }
 
     @Override
-    public Result pageUser(PageXspaceUserDTO param, User user) {
+    public Result pageUser(PageXspaceUserDTO param, SysUser user) {
         Page page = this.baseMapper.pageUser(new Page(param.getPageNum(), param.getPageSize()), param);
         return Result.success(PageInfo.PageInfo(page));
     }

src/main/resources/bootstrap-dev.yml

@@ -6,7 +6,7 @@ spring:
       server-addr: 120.24.144.164:8848
       config:
         file-extension: yaml
-        namespace: 4dkankan-jp-dev
+        namespace: 4dkankan-v4-dev
         shared-configs:
           - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP

src/main/resources/mapper/XspaceUserMapper.xml

@@ -3,12 +3,10 @@
 <mapper namespace="com.fdkankan.jp.xspace.mapper.IXspaceUserMapper">
 
     <select id="pageUser" parameterType="com.fdkankan.jp.xspace.dto.PageXspaceUserDTO" resultType="com.fdkankan.jp.xspace.vo.XspaceUserVO">
-        SELECT xu.`id`, c.`company_name`, u.`nick_name`,u.`user_name`, r.`role_name`,xu.`create_time`
+        SELECT xu.`id`, u.`nick_name`,u.`user_name`, r.`role_name`,xu.`create_time`
         FROM t_xspace_user xu
-                 LEFT JOIN t_user u ON xu.`user_id` = u.`id`
-                 LEFT JOIN t_company c ON u.`company_id` = c.`id`
-                 LEFT JOIN t_user_role ur ON u.`id` = ur.`user_id`
-                 LEFT JOIN t_role r ON  ur.`role_id` = r.`id`
+                 LEFT JOIN sys_user u ON xu.`user_id` = u.`id`
+                 LEFT JOIN sys_role r ON  u.`role_id` = r.`id`
         WHERE xu.rec_status = 'A'
         <if test="param.userName != null and param.userName != ''">
             and u.`user_name` LIKE concat('%', #{param.userName}, '%')