瀏覽代碼

feat(task): 三个健康打卡Controller挂钩任务回写(一次性完成+每日进度累计)

iwt 1 周之前
父節點
當前提交
e81e05beec

+ 16 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/HealthExerciseController.java

@@ -6,15 +6,21 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.etotem.cfc.common.Result;
 import com.etotem.cfc.entity.HealthExerciseRecord;
+import com.etotem.cfc.entity.Task;
+import com.etotem.cfc.entity.FamilyMember;
 import com.etotem.cfc.entity.User;
 import com.etotem.cfc.mapper.HealthExerciseRecordMapper;
+import com.etotem.cfc.mapper.TaskMapper;
+import com.etotem.cfc.mapper.FamilyMemberMapper;
 import com.etotem.cfc.mapper.UserMapper;
 import com.etotem.cfc.service.WechatService;
+import com.etotem.cfc.service.TaskService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import com.etotem.cfc.util.ParamUtils;
+import lombok.extern.slf4j.Slf4j;
 
 import javax.annotation.Resource;
 import java.util.Calendar;
@@ -23,6 +29,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+@Slf4j
 @Tag(name = "运动打卡")
 @RestController
 @RequestMapping("/api/health/exercise")
@@ -31,6 +38,15 @@ public class HealthExerciseController {
     @Resource
     private HealthExerciseRecordMapper healthExerciseRecordMapper;
 
+    @Resource
+    private TaskService taskService;
+
+    @Resource
+    private TaskMapper taskMapper;
+
+    @Resource
+    private FamilyMemberMapper familyMemberMapper;
+
     @Resource
     private UserMapper userMapper;
 

+ 10 - 6
cfc-backend/src/main/java/com/etotem/cfc/controller/HealthMealController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.etotem.cfc.common.Result;
 import com.etotem.cfc.entity.HealthMealRecord;
 import com.etotem.cfc.entity.FoodRecommendIndex;
-import com.etotem.cfc.entity.FamilyMember;
 import com.etotem.cfc.entity.Task;
 import com.etotem.cfc.entity.FamilyMember;
 import com.etotem.cfc.mapper.HealthMealRecordMapper;
@@ -14,14 +13,19 @@ import com.etotem.cfc.mapper.FamilyMemberMapper;
 import com.etotem.cfc.service.PointsService;
 import com.etotem.cfc.service.TaskService;
 import com.etotem.cfc.service.ProfileComputeService;
-import com.etotem.cfc.service.PointsService;
-import com.etotem.cfc.service.TaskService;
-import com.etotem.cfc.util.ParamUtils;
-import lombok.extern.slf4j.Slf4j;
-import com.etotem.cfc.service.ProfileComputeService;
 import com.etotem.cfc.util.ParamUtils;
 import lombok.extern.slf4j.Slf4j;
 
+import javax.annotation.Resource;
+import java.sql.Date;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
 @Slf4j
 @Tag(name = "饮食打卡")
 @RestController