签到需求相关接口

pom.xml

@@ -72,6 +72,12 @@
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-spring-boot-starter</artifactId>
 			<version>4.0.0</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>javassist</artifactId>
+					<groupId>org.javassist</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.github.qcloudsms</groupId>

src/main/java/com/sqx/modules/app/controller/app/AppUserSignController.java

@@ -0,0 +1,51 @@
+package com.sqx.modules.app.controller.app;
+
+import cn.hutool.core.convert.Convert;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.userSign.dto.UserSignDTO;
+import com.sqx.modules.userSign.service.UserSignRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author tankaikai
+ * @since 2024-12-19 15:23
+ */
+
+@Slf4j
+@RestController
+@Api(value = "用户签到", tags = {"用户签到"})
+@RequestMapping(value = "/app/userSignRecord")
+public class AppUserSignController {
+
+    @Autowired
+    private UserSignRecordService userSignRecordService;
+
+    /**
+     * 获取用户连续签到数据
+     */
+    @GetMapping("/getUserSignData")
+    @ApiOperation("获取用户连续签到数据")
+    public Result getUserSignData(HttpServletRequest request) {
+        long userId = Convert.toLong(request.getAttribute("userId"));
+        UserSignDTO data = userSignRecordService.getUserSignData(userId);
+        return Result.success().put("data", data);
+    }
+
+    /**
+     * 获取连续签到奖励配置
+     */
+    @GetMapping("/getUserSignAwardConfig")
+    @ApiOperation(value = "获取连续签到奖励配置", notes = "如：[7,7] = 连续签到7天奖励7元")
+    public Result getUserSignAwardConfig() {
+        String[] data = userSignRecordService.getUserSignAwardConfig();
+        return Result.success().put("data", data);
+    }
+}

src/main/java/com/sqx/modules/userSign/controller/UserSignRecordController.java

@@ -3,7 +3,6 @@ package com.sqx.modules.userSign.controller;
 
 import com.sqx.common.utils.Result;
 import com.sqx.modules.sys.controller.AbstractController;
-import com.sqx.modules.userSign.dto.UserSignDTO;
 import com.sqx.modules.userSign.service.UserSignRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -30,8 +29,8 @@ public class UserSignRecordController extends AbstractController {
     @GetMapping("/getUserSignData")
     @ApiOperation("获取用户连续签到数据")
     public Result getUserSignData() {
-        UserSignDTO data = userSignRecordService.getUserSignData();
+        //UserSignDTO data = userSignRecordService.getUserSignData();
-        return Result.success().put("data", data);
+        return Result.success().put("data", null);
     }
 
     /**

src/main/java/com/sqx/modules/userSign/service/UserSignRecordService.java

@@ -6,7 +6,7 @@ import com.sqx.modules.userSign.entity.UserSignRecord;
 
 public interface UserSignRecordService extends IService<UserSignRecord> {
 
-    UserSignDTO getUserSignData();
+    UserSignDTO getUserSignData(long userId);
 
     String[] getUserSignAwardConfig();
 

src/main/java/com/sqx/modules/userSign/service/impl/UserSignRecordServiceImpl.java

@@ -7,15 +7,15 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.common.exception.SqxException;
+import com.sqx.modules.app.dao.UserDao;
+import com.sqx.modules.app.entity.UserEntity;
 import com.sqx.modules.common.dao.CommonInfoDao;
 import com.sqx.modules.common.entity.CommonInfo;
-import com.sqx.modules.sys.entity.SysUserEntity;
 import com.sqx.modules.userSign.dao.UserSignRecordDao;
 import com.sqx.modules.userSign.dto.UserSignDTO;
 import com.sqx.modules.userSign.dto.UserSignRecordDTO;
 import com.sqx.modules.userSign.entity.UserSignRecord;
 import com.sqx.modules.userSign.service.UserSignRecordService;
-import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,13 +35,16 @@ public class UserSignRecordServiceImpl extends ServiceImpl<UserSignRecordDao, Us
     @Autowired
     private CommonInfoDao commonInfoDao;
 
+    @Autowired
+    private UserDao userDao;
+
     @Override
-    public UserSignDTO getUserSignData() {
+    public UserSignDTO getUserSignData(long userId) {
-        SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
+        UserEntity currentUser = userDao.selectById(userId);
         UserSignDTO dto = new UserSignDTO();
         dto.setUserId(currentUser.getUserId());
-        dto.setUsername(currentUser.getUsername());
+        dto.setUsername(currentUser.getUserName());
-        dto.setMobile(currentUser.getMobile());
+        dto.setMobile(currentUser.getPhone());
         dto.setSignDays(0);
         dto.setEnable(1);
         CommonInfo config = commonInfoDao.findOne(918);