支持默认获取人脸

src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java

@@ -65,6 +65,11 @@ public class AppGoodsController {
         JwtInfo worker = JwtTokenUtil.getWorker();
         return goodsService.getAllTaskStatus(worker.getUserId(),faceId);
     }
+    @GetMapping("/getTaskStatus/")
+    public ApiResponse<Integer> getAllTaskStatus() {
+        JwtInfo worker = JwtTokenUtil.getWorker();
+        return goodsService.getAllTaskStatus(worker.getUserId());
+    }
 
     /**
      * 查询用户当前景区的具体模版视频合成任务状态

src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java

@@ -49,6 +49,12 @@ public class AppScenicController {
         return appScenicService.deviceCountByScenicId(scenicId);
     }
 
+    @ApiOperation("景区视频源素材列表")
+    @GetMapping("/contentList/")
+    public ApiResponse<List<ContentPageVO>> contentList() {
+        return appScenicService.contentListUseDefaultFace();
+    }
+
     @ApiOperation("景区视频源素材列表")
     @GetMapping("/contentList/{faceId}")
     public ApiResponse<List<ContentPageVO>> contentList(@PathVariable Long faceId) {

src/main/java/com/ycwl/basic/mapper/FaceMapper.java

@@ -26,4 +26,6 @@ public interface FaceMapper {
     FaceRespVO getByMemberId(@Param("userId") Long userId, @Param("scenicId") Long scenicId);
 
     int finishedJourney(Long faceId);
+
+    FaceRespVO findLastFaceByUserId(String userId);
 }

src/main/java/com/ycwl/basic/mapper/TemplateMapper.java

@@ -1,8 +1,5 @@
 package com.ycwl.basic.mapper;
 
-import com.ycwl.basic.model.pc.task.entity.TaskEntity;
-import com.ycwl.basic.model.pc.task.req.TaskReqQuery;
-import com.ycwl.basic.model.pc.task.resp.TaskRespVO;
 import com.ycwl.basic.model.pc.template.entity.TemplateConfigEntity;
 import com.ycwl.basic.model.pc.template.entity.TemplateEntity;
 import com.ycwl.basic.model.pc.template.req.TemplateReqQuery;

src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java

@@ -218,4 +218,10 @@ public class AppScenicServiceImpl implements AppScenicService {
         scenicLoginRespVO.setToken(token);
         return ApiResponse.success(scenicLoginRespVO);
     }
+
+    @Override
+    public ApiResponse<List<ContentPageVO>> contentListUseDefaultFace() {
+        FaceRespVO lastFaceByUserId = faceMapper.findLastFaceByUserId(BaseContextHandler.getUserId());
+        return contentList(lastFaceByUserId.getId());
+    }
 }

src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java

@@ -4,6 +4,7 @@ import com.ycwl.basic.mapper.*;
 import com.ycwl.basic.model.jwt.JwtInfo;
 import com.ycwl.basic.model.mobile.goods.*;
 import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO;
+import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
 import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
 import com.ycwl.basic.model.pc.source.req.SourceReqQuery;
 import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
@@ -38,6 +39,8 @@ public class GoodsServiceImpl implements GoodsService {
      private TaskMapper taskMapper;
      @Autowired
      private DeviceMapper deviceMapper;
+    @Autowired
+    private FaceMapper faceMapper;
 
     public ApiResponse<List<GoodsPageVO>> goodsList(GoodsReqQuery query) {
          JwtInfo worker = JwtTokenUtil.getWorker();
@@ -222,6 +225,12 @@ public class GoodsServiceImpl implements GoodsService {
         }
     }
 
+    @Override
+    public ApiResponse<Integer> getAllTaskStatus(Long userId) {
+        FaceRespVO lastFaceByUserId = faceMapper.findLastFaceByUserId(String.valueOf(userId));
+        return getAllTaskStatus(userId,lastFaceByUserId.getId());
+    }
+
     @Override
     public ApiResponse<Integer> getTemplateTaskStatus(Long userId, Long templateId) {
         TaskReqQuery taskReqQuery = new TaskReqQuery();

src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java

@@ -1,6 +1,5 @@
 package com.ycwl.basic.service.impl.pc;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ycwl.basic.enums.StatisticEnum;

src/main/java/com/ycwl/basic/service/mobile/AppScenicService.java

@@ -43,4 +43,6 @@ public interface AppScenicService {
     ApiResponse<List<ContentPageVO>> contentList(Long scenicId);
 
     ApiResponse<ScenicLoginRespVO> login(ScenicLoginReq scenicLoginReq) throws Exception;
+
+    ApiResponse<List<ContentPageVO>> contentListUseDefaultFace();
 }

src/main/java/com/ycwl/basic/service/mobile/GoodsService.java

@@ -46,7 +46,8 @@ public interface GoodsService {
      * @param userId
      * @return
      */
-    ApiResponse<Integer> getAllTaskStatus(Long userId ,Long scenicId);
+    ApiResponse<Integer> getAllTaskStatus(Long userId ,Long faceId);
+    ApiResponse<Integer> getAllTaskStatus(Long userId);
 
     ApiResponse<Integer> getTemplateTaskStatus(Long userId, Long templateId);
 }

src/main/java/com/ycwl/basic/service/task/TaskFaceService.java

@@ -1,6 +1,5 @@
 package com.ycwl.basic.service.task;
 
-import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
 import com.ycwl.basic.model.task.resp.AddFaceRespVo;
 import com.ycwl.basic.model.task.resp.SearchFaceRespVo;
 

src/main/resources/mapper/FaceMapper.xml

@@ -86,4 +86,11 @@
         from face
         where scenic_id = #{scenicId} and finished_journey != 1
     </select>
+    <select id="findLastFaceByUserId" resultType="com.ycwl.basic.model.pc.face.resp.FaceRespVO">
+        select id, scenic_id, member_id, face_url,score, match_sample_ids, first_match_rate, match_result, create_at, update_at
+        from face
+        where member_id = #{userId}
+        order by create_at desc
+        limit 1
+    </select>
 </mapper>