Commit 1566d251db100959b5c8b7c9ee1be39cc559e1b5
1 parent
60f20ca2
fix: 新增注册反馈接口
Showing
3 changed files
with
15 additions
and
7 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
| @@ -3,8 +3,8 @@ package com.ruoyi.driver.controller; | @@ -3,8 +3,8 @@ package com.ruoyi.driver.controller; | ||
| 3 | import java.util.List; | 3 | import java.util.List; |
| 4 | import javax.servlet.http.HttpServletResponse; | 4 | import javax.servlet.http.HttpServletResponse; |
| 5 | 5 | ||
| 6 | +import com.ruoyi.pojo.request.FaceRegistrationFeedbackVo; | ||
| 6 | import io.swagger.annotations.Api; | 7 | import io.swagger.annotations.Api; |
| 7 | -import io.swagger.annotations.ApiModelProperty; | ||
| 8 | import io.swagger.annotations.ApiOperation; | 8 | import io.swagger.annotations.ApiOperation; |
| 9 | import io.swagger.annotations.ApiParam; | 9 | import io.swagger.annotations.ApiParam; |
| 10 | import org.springframework.beans.factory.annotation.Autowired; | 10 | import org.springframework.beans.factory.annotation.Autowired; |
| @@ -169,9 +169,9 @@ public class DriverController extends BaseController { | @@ -169,9 +169,9 @@ public class DriverController extends BaseController { | ||
| 169 | * 人脸注册状态 | 169 | * 人脸注册状态 |
| 170 | */ | 170 | */ |
| 171 | @ApiOperation("注册反馈") | 171 | @ApiOperation("注册反馈") |
| 172 | - @GetMapping("/faceSignIn") | ||
| 173 | - public AjaxResult faceRegistrationFeedback(@RequestParam("deviceId") String deviceId,@RequestParam("jobCode")List<String> jobCode){ | ||
| 174 | - return driverService.faceRegistrationFeedback(deviceId,jobCode); | 172 | + @PostMapping("/faceSignIn") |
| 173 | + public AjaxResult faceRegistrationFeedback(@RequestBody FaceRegistrationFeedbackVo vo) { | ||
| 174 | + return driverService.faceRegistrationFeedback(vo.getDeviceId(),vo.getJobCodes()); | ||
| 175 | } | 175 | } |
| 176 | 176 | ||
| 177 | } | 177 | } |
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/FaceRegistrationFeedbackVo.java
0 → 100644
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
| @@ -78,9 +78,6 @@ public class ThreadJobService { | @@ -78,9 +78,6 @@ public class ThreadJobService { | ||
| 78 | } | 78 | } |
| 79 | @Async | 79 | @Async |
| 80 | public void asyncUpdateDriver(String deviceId, List<String> jobCodes){ | 80 | public void asyncUpdateDriver(String deviceId, List<String> jobCodes){ |
| 81 | - // 获取员工信息 | ||
| 82 | - // 加锁 | ||
| 83 | - // 同步锁实现 | ||
| 84 | Integer result = driverMapper.insertDriverFace(deviceId, jobCodes); | 81 | Integer result = driverMapper.insertDriverFace(deviceId, jobCodes); |
| 85 | log.info("注册设备与员工关联完毕:{}",result); | 82 | log.info("注册设备与员工关联完毕:{}",result); |
| 86 | } | 83 | } |