fix: 签到一行返回601

guzijian
1 parent 4db44e6f
Showing 3 changed files with 50 additions and 18 deletions
ruoyi-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/FaceUpdateReqVo.java
@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
  
 import com.ruoyi.common.exception.file.FileUploadException;
+import com.ruoyi.pojo.request.FaceUpdateReqVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -29,15 +30,14 @@ import com.ruoyi.common.core.page.TableDataInfo;
  
 /**
  * 签到Controller
- * 
+ *
  * @author guzijian
  * @date 2023-07-05
  */
 @RestController
 @RequestMapping("/in/in")
 @Api(tags = "签到管理")
-public class SignInController extends BaseController
-{
+public class SignInController extends BaseController {
     @Autowired
     private ISignInService signInService;
  
@@ -47,8 +47,7 @@ public class SignInController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('in:in:list')")
     @GetMapping("/list")
     @ApiOperation("查询签到列表")
-    public TableDataInfo list(SignIn signIn)
-    {
+    public TableDataInfo list(SignIn signIn) {
         startPage();
         List<SignIn> list = signInService.selectSignInList(signIn);
         return getDataTable(list);
@@ -61,21 +60,28 @@ public class SignInController extends BaseController
     @Log(title = "签到", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation("导出签到列表")
-    public void export(HttpServletResponse response, SignIn signIn)
-    {
+    public void export(HttpServletResponse response, SignIn signIn) {
         List<SignIn> list = signInService.selectSignInList(signIn);
         ExcelUtil<SignIn> util = new ExcelUtil<SignIn>(SignIn.class);
         util.exportExcel(response, list, "签到数据");
     }
  
     /**
+     *  人脸数据更新接口
+     */
+    @PostMapping("/update/face")
+    public AjaxResult updateFaceByJob(FaceUpdateReqVo vo){
+        // TODO 人脸数据更新接口
+        return AjaxResult.success("签到成功");
+    }
+
+    /**
      * 获取签到详细信息
      */
 //    @PreAuthorize("@ss.hasPermi('in:in:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取签到详细信息")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(signInService.selectSignInById(id));
     }
  
@@ -86,13 +92,14 @@ public class SignInController extends BaseController
     @Log(title = "签到", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增签到（通过后台管理页面）")
-    public AjaxResult add(@ApiParam @RequestBody SignIn signIn)
-    {
+    public AjaxResult add(@ApiParam @RequestBody SignIn signIn) {
         return signInService.insertSignIn(signIn);
     }
  
+
     /**
      * 新增签到
+     *
      * @param signIn
      * @return
      * @throws FileUploadException
@@ -110,8 +117,7 @@ public class SignInController extends BaseController
     @Log(title = "签到", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation("修改签到")
-    public AjaxResult edit(@RequestBody SignIn signIn)
-    {
+    public AjaxResult edit(@RequestBody SignIn signIn) {
         return toAjax(signInService.updateSignIn(signIn));
     }
  
@@ -120,10 +126,9 @@ public class SignInController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('in:in:remove')")
     @Log(title = "签到", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
     @ApiOperation("删除签到")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(signInService.deleteSignInByIds(ids));
     }
 }
@@ -194,7 +194,7 @@ public class SignInServiceImpl implements ISignInService {
                 return result;
             }
         }
-        return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo) : AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark(), vo);
+        return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo) : AjaxResult.warn(SIGN_IN_ERROR + signIn.getRemark(), vo);
     }
  
     private SignInResponseVo getSignInResponseVo(SignIn signIn, Equipment equipment) {
@@ -219,7 +219,7 @@ public class SignInServiceImpl implements ISignInService {
         }
         if (SIGN_IN_ERROR_COUNT.compareTo(count) <= 0) {
             // TODO
-            return AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark() + "，酒精测试不通过" + count + "次请更换车辆驾驶员", vo);
+            return AjaxResult.warn(SIGN_IN_ERROR + signIn.getRemark() + "，酒精测试不通过" + count + "次请更换车辆驾驶员", vo);
         }
         return null;
     }
+package com.ruoyi.pojo.request;
+
+import lombok.Data;
+
+/**
+ * 人脸更新数据
+ * @author 20412
+ */
+@Data
+public class FaceUpdateReqVo {
+    /**
+     * 工号
+     */
+    String jobCode;
+    /**
+     * 图片base64
+     */
+    String imageBase64;
+    /**
+     * 姓名
+     */
+    String name;
+    /**
+     * 工种
+     */
+    String posts;
+}