Browse Source

添加绑定用户接口,仅供测试阶段使用

dsx 2 năm trước cách đây
mục cha
commit
a35b1dbb02

+ 29 - 4
src/main/java/com/fdkankan/openApi/controller/TestController.java

@@ -2,13 +2,18 @@ package com.fdkankan.openApi.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaIgnore;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.openApi.component.LocalOverCache;
 import com.fdkankan.openApi.component.ValidateApi;
 import com.fdkankan.openApi.entity.laser.SceneEntity;
-import com.fdkankan.openApi.entity.system.User;
+import com.fdkankan.openApi.entity.system.UserAuthInfo;
+import com.fdkankan.openApi.entity.system.Users;
+import com.fdkankan.openApi.entity.www.User;
 import com.fdkankan.openApi.service.laser.SceneService;
 import com.fdkankan.openApi.service.system.IUserAuthService;
-import com.fdkankan.openApi.service.system.IUserService;
+import com.fdkankan.openApi.service.system.IUsersService;
+import com.fdkankan.openApi.service.www.IUserService;
+import com.fdkankan.openApi.util.TokenUtil;
 import com.fdkankan.web.controller.BaseController;
 import com.fdkankan.web.response.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,19 +34,22 @@ public class TestController extends BaseController {
     private SceneService sceneService;
 
     @Autowired
-    private IUserService userService;
+    private IUsersService usersService;
     @Autowired
     private IUserAuthService userAuthService;
 
     @Autowired
     private LocalOverCache localOverCache;
+    @Autowired
+    private IUserService userService;
+
 
     @GetMapping("/test")
     @SaIgnore
     @ValidateApi(method = "test:test", counting = false)
     public ResultData test() {
         SceneEntity bySceneCode = sceneService.findBySceneCode("SS-t-yotkjVf55A");
-        User byUserName = userService.findByUserName("18666186515");
+        Users byUsersName = usersService.findByUserName("18666186515");
         return ResultData.ok("ok");
     }
 
@@ -52,4 +60,21 @@ public class TestController extends BaseController {
         userAuthService.updateCallCounts(appKey, count);
         return ResultData.ok("ok");
     }
+
+    @GetMapping("/bindUser")
+    @SaIgnore
+    public ResultData test(Integer userId, String userName) {
+
+        Users users = new Users();
+        users.setId(userId);
+        users.setUserName(userName);
+        usersService.save(users);
+
+        UserAuthInfo userAuthInfo = new UserAuthInfo();
+        userAuthInfo.setUserId(userId);
+        userAuthInfo.setAppKey(TokenUtil.createToken());
+        userAuthService.save(userAuthInfo);
+
+        return ResultData.ok(userAuthInfo.getAppKey());
+    }
 }

+ 21 - 0
src/main/java/com/fdkankan/openApi/controller/www/UserController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.openApi.controller.www;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 用户信息表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-27
+ */
+@RestController
+@RequestMapping("/openApi/user")
+public class UserController {
+
+}
+

+ 1 - 1
src/main/java/com/fdkankan/openApi/entity/system/User.java

@@ -12,7 +12,7 @@ import lombok.Data;
  */
 @Data
 @TableName("t_users")
-public class User extends SystemBaseEntity {
+public class Users extends SystemBaseEntity {
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
 

+ 156 - 0
src/main/java/com/fdkankan/openApi/entity/www/User.java

@@ -0,0 +1,156 @@
+package com.fdkankan.openApi.entity.www;
+
+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-03-27
+ */
+@Getter
+@Setter
+@TableName("t_user")
+public class User implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 头像对应的链接地址
+     */
+    @TableField("head")
+    private String head;
+
+    /**
+     * 用户密码
+     */
+    @TableField("password")
+    private String password;
+
+    /**
+     * 用户邮箱
+     */
+    @TableField("email")
+    private String email;
+
+    /**
+     * 注册时间
+     */
+    @TableField("register_time")
+    private Date registerTime;
+
+    /**
+     * 用户名
+     */
+    @TableField("user_name")
+    private String userName;
+
+    /**
+     * 昵称
+     */
+    @TableField("nick_name")
+    private String nickName;
+
+    /**
+     * 0表示禁言(bbs)
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 0表示拒绝通知,1表示接受通知
+     */
+    @TableField("is_notice")
+    private Integer isNotice;
+
+    /**
+     * 机构名称
+     */
+    @TableField("organization_name")
+    private String organizationName;
+
+    /**
+     * 主页链接
+     */
+    @TableField("main_page")
+    private String mainPage;
+
+    /**
+     * 所在国家,默认是86
+     */
+    @TableField("country")
+    private String country;
+
+    /**
+     * 所在省份
+     */
+    @TableField("province")
+    private String province;
+
+    /**
+     * 所在城市
+     */
+    @TableField("city")
+    private String city;
+
+    /**
+     * 可下载场景总数
+     */
+    @TableField("download_num_total")
+    private Integer downloadNumTotal;
+
+    /**
+     * 已下载场景总数
+     */
+    @TableField("download_num")
+    private Integer downloadNum;
+
+    /**
+     * 创建时间
+     */
+    @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;
+
+    @TableField("sys_user_id")
+    private Integer sysUserId;
+
+    /**
+     * 深时场景下载总次数
+     */
+    @TableField("ss_download_num_total")
+    private Integer ssDownloadNumTotal;
+
+    /**
+     * 深时场景已下载次数
+     */
+    @TableField("ss_download_num")
+    private Integer ssDownloadNum;
+
+
+}

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

@@ -21,7 +21,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"openApi", getTables(new String[]{
-                "t_scene_plus","t_scene_plus_ext","t_scene_edit_info","t_scene_edit_info_ext","t_scene_edit_controls",
+                "t_user",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

+ 3 - 3
src/main/java/com/fdkankan/openApi/mapper/system/IUserMapper.java

@@ -1,7 +1,7 @@
 package com.fdkankan.openApi.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.openApi.entity.system.User;
+import com.fdkankan.openApi.entity.system.Users;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
  * @since 2023年2月10日14:38:33
  */
 @Mapper
-@Component("IUserMapper")
-public interface IUserMapper extends BaseMapper<User> {
+@Component("IUsersMapper")
+public interface IUsersMapper extends BaseMapper<Users> {
 
 }

+ 18 - 0
src/main/java/com/fdkankan/openApi/mapper/www/IUserMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.openApi.mapper.www;
+
+import com.fdkankan.openApi.entity.www.User;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户信息表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-27
+ */
+@Mapper
+public interface IUserMapper extends BaseMapper<User> {
+
+}

+ 0 - 21
src/main/java/com/fdkankan/openApi/service/system/IUserService.java

@@ -1,21 +0,0 @@
-package com.fdkankan.openApi.service.system;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.openApi.entity.system.User;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 
- * @since  2022年12月19日09:44:17
- */
-public interface IUserService extends IService<User> {
-
-    User findByUserName(String userName);
-    User findByUserName(String userName,Integer fdkkId,String head);
-    User findByTokenCovUserName(String token);
-
-}

+ 20 - 0
src/main/java/com/fdkankan/openApi/service/system/IUsersService.java

@@ -0,0 +1,20 @@
+package com.fdkankan.openApi.service.system;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.openApi.entity.system.Users;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since  2022年12月19日09:44:17
+ */
+public interface IUsersService extends IService<Users> {
+
+    Users findByUserName(String userName);
+    Users findByUserName(String userName, Integer fdkkId, String head);
+    Users findByTokenCovUserName(String token);
+
+}

+ 15 - 15
src/main/java/com/fdkankan/openApi/service/system/impl/UserServiceImpl.java

@@ -4,25 +4,25 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.openApi.entity.system.User;
-import com.fdkankan.openApi.mapper.system.IUserMapper;
-import com.fdkankan.openApi.service.system.IUserService;
+import com.fdkankan.openApi.entity.system.Users;
+import com.fdkankan.openApi.mapper.system.IUsersMapper;
+import com.fdkankan.openApi.service.system.IUsersService;
 import com.fdkankan.openApi.util.JwtUtil;
 import org.springframework.stereotype.Service;
 
 @DS("system")
 @Service
-public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements IUserService {
+public class UsersServiceImpl extends ServiceImpl<IUsersMapper, Users> implements IUsersService {
 
     @Override
-    public User findByUserName(String userName) {
-        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(User::getUserName, userName);
-        User one = this.getOne(wrapper);
+    public Users findByUserName(String userName) {
+        LambdaQueryWrapper<Users> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Users::getUserName, userName);
+        Users one = this.getOne(wrapper);
         if (ObjectUtil.isNotNull(one)) {
             return one;
         } else {
-            User u = new User();
+            Users u = new Users();
             u.setUserName(userName);
             boolean save = save(u);
             return u;
@@ -30,10 +30,10 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     }
 
     @Override
-    public User findByUserName(String userName, Integer fdkkId, String head) {
-        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(User::getUserName, userName);
-        User one = this.getOne(wrapper);
+    public Users findByUserName(String userName, Integer fdkkId, String head) {
+        LambdaQueryWrapper<Users> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Users::getUserName, userName);
+        Users one = this.getOne(wrapper);
         if (ObjectUtil.isNotNull(one)) {
             if (ObjectUtil.isNull(one.getHead())) {
                 one.setHead(head);
@@ -41,7 +41,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             }
             return one;
         } else {
-            User u = new User();
+            Users u = new Users();
             u.setUserName(userName);
             u.setId(fdkkId);
             boolean save = save(u);
@@ -50,7 +50,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     }
 
     @Override
-    public User findByTokenCovUserName(String token) {
+    public Users findByTokenCovUserName(String token) {
         String userName = JwtUtil.getUserName(token);
         return findByUserName(userName);
     }

+ 16 - 0
src/main/java/com/fdkankan/openApi/service/www/IUserService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.openApi.service.www;
+
+import com.fdkankan.openApi.entity.www.User;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户信息表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-27
+ */
+public interface IUserService extends IService<User> {
+
+}

+ 22 - 0
src/main/java/com/fdkankan/openApi/service/www/impl/UserServiceImpl.java

@@ -0,0 +1,22 @@
+package com.fdkankan.openApi.service.www.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fdkankan.openApi.entity.www.User;
+import com.fdkankan.openApi.mapper.www.IUserMapper;
+import com.fdkankan.openApi.service.www.IUserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户信息表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-27
+ */
+@DS("www")
+@Service
+public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements IUserService {
+
+}

+ 5 - 0
src/main/resources/mapper/www/UserMapper.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.openApi.mapper.www.IUserMapper">
+
+</mapper>