Browse Source

用户人脸识别记录

fanxp 1 year ago
parent
commit
8affa83eaa

+ 21 - 0
src/main/java/com/xjrsoft/module/personnel/controller/FaceIdentifyRecordsController.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.personnel.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
@@ -13,7 +14,9 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.personnel.dto.FaceIdentifyRecordsPageDto;
+import com.xjrsoft.module.personnel.dto.FaceIdentifyRecordsPageUserDto;
 import com.xjrsoft.module.personnel.entity.FaceIdentifyRecords;
+import com.xjrsoft.module.personnel.entity.FaceManagement;
 import com.xjrsoft.module.personnel.service.IFaceIdentifyRecordsService;
 import com.xjrsoft.module.personnel.vo.FaceIdentifyRecordsVo;
 import com.xjrsoft.module.system.entity.Log;
@@ -57,4 +60,22 @@ public class FaceIdentifyRecordsController {
         PageOutput<FaceIdentifyRecordsVo> pageOutput = ConventPage.getPageOutput(page, FaceIdentifyRecordsVo.class);
         return R.ok(pageOutput);
     }
+
+    @GetMapping(value = "/user/page")
+    @ApiOperation(value = "用户人脸识别记录(分页)")
+    public R userPage(@Valid FaceIdentifyRecordsPageUserDto dto) {
+        if (dto.getUserId() == null) {
+            dto.setUserId(StpUtil.getLoginIdAsLong());
+        }
+        MPJLambdaWrapper<FaceIdentifyRecords> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .innerJoin(FaceManagement.class,FaceManagement::getFaceCode,FaceIdentifyRecords::getFaceCode)
+                .eq(FaceManagement::getUserId,dto.getUserId())
+                .select(FaceIdentifyRecords.class, x -> VoToColumnUtil.fieldsToColumns(FaceIdentifyRecordsVo.class).contains(x.getProperty()))
+                .orderByDesc(FaceIdentifyRecords::getVerifyTime);
+
+        IPage<FaceIdentifyRecords> page = faceIdentifyRecordsService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<FaceIdentifyRecordsVo> pageOutput = ConventPage.getPageOutput(page, FaceIdentifyRecordsVo.class);
+        return R.ok(pageOutput);
+    }
 }

+ 15 - 0
src/main/java/com/xjrsoft/module/personnel/dto/FaceIdentifyRecordsPageUserDto.java

@@ -0,0 +1,15 @@
+package com.xjrsoft.module.personnel.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FaceIdentifyRecordsPageUserDto extends PageInput {
+
+    /**
+     * 用户编号(如果不传,默认当前用户)
+     */
+    @ApiModelProperty("用户编号(如果不传,默认当前用户)")
+    private Long userId;
+}