修改用户逻辑

src/main/java/com/fdkankan/openApi/controller/www/SceneController.java

@@ -1,17 +1,19 @@
 package com.fdkankan.openApi.controller.www;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.fdkankan.openApi.common.PageInfo;
-import com.fdkankan.openApi.entity.system.User;
 import com.fdkankan.openApi.entity.www.ScenePlus;
 import com.fdkankan.openApi.entity.www.ScenePlusExt;
+import com.fdkankan.openApi.entity.www.FdkkUser;
 import com.fdkankan.openApi.service.laser.SceneService;
-import com.fdkankan.openApi.service.system.IUserService;
+import com.fdkankan.openApi.service.www.IFdkkUserService;
 import com.fdkankan.openApi.service.www.IScenePlusExtService;
 import com.fdkankan.openApi.service.www.IScenePlusService;
 import com.fdkankan.openApi.vo.www.SceneVO;
 import com.fdkankan.web.response.ResultData;
 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;
@@ -25,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-02-15
  */
 @RestController
-@RequestMapping("/openApi/scene")
+@RequestMapping("/scene")
 public class SceneController {
 
 
@@ -33,7 +35,7 @@ public class SceneController {
     private IScenePlusService scenePlusService;
 
     @Autowired
-    private IUserService userService;
+    private IFdkkUserService userService;
 
     @Autowired
     private IScenePlusExtService scenePlusExtService;
@@ -45,9 +47,10 @@ public class SceneController {
      * 根据用户名获取场景列表
      * @return
      */
-    @RequestMapping("/getScenesByUsername")
+    @SaIgnore
+    @PostMapping("/getScenesByUsername")
     public ResultData getScenesByUsername(@RequestBody SceneVO sceneVO) {
-        User user = userService.findByUserName(sceneVO.getUserName());
+        FdkkUser user = userService.findByUserName(sceneVO.getUserName());
         PageInfo pageInfo = scenePlusService.getScenesByUserId(user.getId(),sceneVO.getPageNum(),sceneVO.getPageSize());
         return ResultData.ok(pageInfo);
     }

src/main/java/com/fdkankan/openApi/entity/www/FdkkUser.java

@@ -0,0 +1,30 @@
+package com.fdkankan.openApi.entity.www;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+/**
+ * @author Xiewj
+ * @date 2022/12/19
+ */
+@Data
+@TableName("t_user")
+public class FdkkUser{
+   @TableId(value = "id", type = IdType.AUTO)
+   private Integer id;
+
+   /**
+    * 账号
+    */
+   @TableField("user_name")
+   private String userName;
+
+   @TableField("head")
+   private String head;
+
+   @TableField("rec_status")
+   @TableLogic(value = "A",delval = "I")
+   private String recStatus;
+
+
+}

src/main/java/com/fdkankan/openApi/mapper/www/IFdkkUserMapper.java

@@ -0,0 +1,20 @@
+package com.fdkankan.openApi.mapper.www;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.openApi.entity.www.FdkkUser;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023年2月10日14:38:33
+ */
+@Mapper
+@Component("IFdkkUserMapper")
+public interface IFdkkUserMapper extends BaseMapper<FdkkUser> {
+
+}

src/main/java/com/fdkankan/openApi/service/www/IFdkkUserService.java

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

src/main/java/com/fdkankan/openApi/service/www/impl/FdkkUserServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fdkankan.openApi.service.www.impl;
+
+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.www.FdkkUser;
+import com.fdkankan.openApi.mapper.www.IFdkkUserMapper;
+import com.fdkankan.openApi.service.www.IFdkkUserService;
+import com.fdkankan.openApi.util.JwtUtil;
+import org.springframework.stereotype.Service;
+
+@DS("www")
+@Service
+public class FdkkUserServiceImpl extends ServiceImpl<IFdkkUserMapper, FdkkUser> implements IFdkkUserService {
+
+    @Override
+    public FdkkUser findByUserName(String userName) {
+        LambdaQueryWrapper<FdkkUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(FdkkUser::getUserName, userName);
+        FdkkUser one = this.getOne(wrapper);
+        if (ObjectUtil.isNotNull(one)) {
+            return one;
+        } else {
+            FdkkUser u = new FdkkUser();
+            u.setUserName(userName);
+            boolean save = save(u);
+            return u;
+        }
+    }
+
+    @Override
+    public FdkkUser findByUserName(String userName, Integer fdkkId, String head) {
+        LambdaQueryWrapper<FdkkUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(FdkkUser::getUserName, userName);
+        FdkkUser one = this.getOne(wrapper);
+        if (ObjectUtil.isNotNull(one)) {
+            if (ObjectUtil.isNull(one.getHead())) {
+                one.setHead(head);
+                updateById(one);
+            }
+            return one;
+        } else {
+            FdkkUser u = new FdkkUser();
+            u.setUserName(userName);
+            u.setId(fdkkId);
+            boolean save = save(u);
+            return u;
+        }
+    }
+
+    @Override
+    public FdkkUser findByTokenCovUserName(String token) {
+        String userName = JwtUtil.getUserName(token);
+        return findByUserName(userName);
+    }
+}