Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,15 @@
+package com.ycwl.basic.controller.mobile;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/6 10:18
+ */
+@RestController
+@RequestMapping("/api/mobile/scenic/v1")
+@Api(tags = "设备相关接口")
+public class AppDeviceController {
+}

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

@@ -1,11 +1,14 @@
 package com.ycwl.basic.controller.mobile;
 
+import com.ycwl.basic.service.pc.FaceService;
 import com.ycwl.basic.utils.ApiResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * @Author：longbinbin
@@ -17,19 +20,17 @@ import org.springframework.web.bind.annotation.RestController;
 public class
 AppFaceController {
 
+    @Autowired
+    private FaceService faceService;
 
-    @ApiOperation("人脸有效性校验")
-    @PostMapping("/checkFaceValidity")
-    public ApiResponse checkFaceValidity() {
-        //TODO 人脸有效性校验逻辑
-        return ApiResponse.success("");
+    @ApiOperation("人脸照片上传")
+    @PostMapping("/faceUPload")
+    public ApiResponse faceUPload(MultipartFile file) {
+        //1、上传人脸照片
+        //2、人脸照片有效性校验
+        //3、校验失败，删除，提示重新上传
+        //4、校验成功，保存用户人脸信息，将访问人脸照片访问地址响应给前端
+
+        return faceService.faceUPload(file);
     }
-
-    @ApiOperation("人脸上传")
-    @PostMapping("/saveFace")
-    public ApiResponse saveFace() {
-        //TODO 保存人脸逻辑
-        return ApiResponse.success("");
-    }
-
 }

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

@@ -1,8 +1,17 @@
 package com.ycwl.basic.controller.mobile;
 
+import com.github.pagehelper.PageInfo;
+import com.ycwl.basic.model.mobile.scenic.ScenicAppVO;
+import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO;
+import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
+import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
+import com.ycwl.basic.service.mobile.AppScenicService;
+import com.ycwl.basic.service.pc.ScenicService;
+import com.ycwl.basic.utils.ApiResponse;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Author：longbinbin
@@ -13,5 +22,25 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "景区相关接口")
 public class AppScenicController {
 
+    @Autowired
+    private AppScenicService appScenicService;
+
+    @ApiOperation("分页查询景区列表")
+    @PostMapping("/page")
+    public ApiResponse<PageInfo<ScenicAppVO>> pageQuery(@RequestBody ScenicReqQuery scenicReqQuery){
+        return appScenicService.pageQuery(scenicReqQuery);
+    }
+    @ApiOperation("根据id查询景区详情")
+    @GetMapping("getDetails/{id}")
+    public ApiResponse<ScenicRespVO> getDetails(@PathVariable Long id){
+        return appScenicService.getDetails(id);
+    }
+
+    @ApiOperation("查询景区设备总数和拍到用户的机位数量")
+    @GetMapping("/deviceCountByScenicId/{scenicId}")
+    public ApiResponse<ScenicDeviceCountVO> deviceCountByScenicId(@PathVariable Long scenicId){
+        return appScenicService.deviceCountByScenicId(scenicId);
+    }
+
 
 }