查询景区信息和机位接口实现

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

@@ -2,16 +2,15 @@ package com.ycwl.basic.service.impl.pc;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.ycwl.basic.constant.BaseContextHandler;
 import com.ycwl.basic.exception.BaseException;
 import com.ycwl.basic.mapper.pc.FaceMapper;
+import com.ycwl.basic.model.jwt.JwtInfo;
 import com.ycwl.basic.model.pc.face.entity.FaceEntity;
 import com.ycwl.basic.model.pc.face.req.FaceReqQuery;
 import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
 import com.ycwl.basic.service.pc.FaceService;
-import com.ycwl.basic.utils.ApiResponse;
-import com.ycwl.basic.utils.DateUtils;
-import com.ycwl.basic.utils.SnowFlakeUtil;
-import com.ycwl.basic.utils.oss.OssUtil;
+import com.ycwl.basic.utils.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -92,7 +91,7 @@ public class FaceServiceImpl implements FaceService {
     @Override
     public ApiResponse faceUPload(MultipartFile file) {
         //TODO 获取用户信息
-        String userId="1";
+        String userId = BaseContextHandler.getUserId();
         //1、上传人脸照片
         String facaeUrl = uploadFileALiOss(file, userId);
         //TODO 2、人脸照片有效性校验
@@ -104,13 +103,20 @@ public class FaceServiceImpl implements FaceService {
             //校验成功，保存用户人脸信息，将访问人脸照片访问地址响应给前端
 
             FaceEntity faceEntity = new FaceEntity();
+            faceEntity.setId(SnowFlakeUtil.getLongId());
+            faceEntity.setMemberId(Long.parseLong(userId));
+            faceEntity.setFaceUrl(facaeUrl);
+//            faceEntity.setScore();
+//            faceEntity.setMatchSampleIds();
+//            faceEntity.setFirstMatchRate();
+//            faceEntity.setMatchResult();
             //TODO 人脸数据存库
             faceMapper.add(faceEntity);
 
             return ApiResponse.success(facaeUrl);
         }else {
             //校验失败，删除，提示重新上传
-
+            ossUtil.deleteFile(facaeUrl);
 
             throw new BaseException("人脸照片校验失败，请重新上传");
         }
@@ -147,6 +153,6 @@ public class FaceServiceImpl implements FaceService {
             log.error("文件上传失败！", e);
             return null;
         }
-        return ossUtil.uploadFile(inputStream,filePath,fileName) ;
+        return ossUtil.uploadFile(inputStream,filePath+fileName) ;
     }
 }