逻辑修改

src/main/java/com/ycwl/basic/controller/FileController.java

@@ -35,7 +35,7 @@ public class FileController {
     public ApiResponse<?> upload(@RequestParam(value = "file") MultipartFile file) throws IOException {
         String[] split = file.getOriginalFilename().split("\\.");
         String ext = split[split.length - 1];
-        String url = StorageFactory.use("assets").uploadFile(file, "web", UUID.randomUUID() + "." + ext);
+        String url = StorageFactory.use().uploadFile(file, "web", UUID.randomUUID() + "." + ext);
         return ApiResponse.success(url);
     }
 
@@ -43,7 +43,7 @@ public class FileController {
     @PostMapping("/delete")
     @IgnoreToken
     public ApiResponse<?> delete(@RequestParam(value = "fileName") String fileName) throws IOException {
-        boolean flag = StorageFactory.use("assets").deleteFile("web", fileName);
+        boolean flag = StorageFactory.use().deleteFile("web", fileName);
         return flag ? ApiResponse.success(BizCodeEnum.REQUEST_OK) : ApiResponse.fail(BizCodeEnum.FAIL.getMessage());
     }
 }

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

@@ -35,18 +35,7 @@ AppFaceController {
      */
     @ApiOperation("人脸照片上传")
     @PostMapping("/faceUPload")
-    public ApiResponse faceUPload(@RequestParam("file")MultipartFile file, @RequestParam("scenicId") Long scenicId) {
-
+    public ApiResponse faceUpload(@RequestParam("file")MultipartFile file, @RequestParam("scenicId") Long scenicId) {
         return faceService.faceUpload(file,scenicId);
     }
-
-    @ApiOperation("查询人脸照片信息")
-    @GetMapping("/getFaceData")
-    public ApiResponse<FaceRespVO> getFaceData() {
-        JwtInfo worker = JwtTokenUtil.getWorker();
-        return faceService.getFaceByMemberId(worker.getUserId());
-    }
-
-
-
 }

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

@@ -31,7 +31,7 @@ public interface TemplateMapper {
     int updateConfigById(TemplateConfigEntity templateConfigEntity);
     int deleteConfigByTemplateId(Long templateId);
     int deleteConfigById(Long id);
-    List<TemplateEntity> listByScenicId(Long scenicId);
+    List<TemplateEntity> listEnabledByScenicId(Long scenicId);
 
     List<ContentPageVO> listFor(@Param("scenicId") Long scenicId, @Param("faceId") Long faceId);
 }

src/main/java/com/ycwl/basic/model/pc/faceSample/resp/FaceSampleRespVO.java

@@ -21,16 +21,19 @@ public class FaceSampleRespVO {
      */
     @ApiModelProperty("景区ID")
     private Long scenicId;
+    private String scenicName;
     /**
      * 来源设备
      */
     @ApiModelProperty("来源设备")
     private Long deviceId;
+    private String deviceName;
     /**
      * 人脸照片
      */
     @ApiModelProperty("人脸照片")
     private String faceUrl;
+    private Float score;
     /**
      * 与样本匹配的ID，逗号隔开
      */