From 9810dbc02ee7424dc537339bf52a8f4188bda36e Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Fri, 17 Mar 2023 17:19:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=80=9A=E8=A1=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectWorkerApiController.java | 15 ++---- .../worker/entity/bo/WorkerAttendanceBo.java | 19 ++++++++ .../worker/entity/dto/GetPassRecordDto.java | 24 ++++++++++ .../worker/mapper/WorkerAttendanceMapper.java | 4 ++ .../mapper/xml/WorkerAttendanceMapper.xml | 48 +++++++++++++++---- .../service/IWorkerAttendanceService.java | 3 ++ .../impl/WorkerAttendanceServiceImpl.java | 37 ++++++++++++++ 7 files changed, 128 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/worker/entity/bo/WorkerAttendanceBo.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/worker/entity/dto/GetPassRecordDto.java diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java index 241388616..7d30e283f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java @@ -10,6 +10,7 @@ import com.zhgd.xmgl.base.WorkerVo; import com.zhgd.xmgl.modules.basicdata.service.UploadFileService; import com.zhgd.xmgl.modules.project.service.IProjectEnterpriseService; import com.zhgd.xmgl.modules.worker.entity.*; +import com.zhgd.xmgl.modules.worker.entity.dto.GetPassRecordDto; import com.zhgd.xmgl.modules.worker.entity.dto.ModGroupDto; import com.zhgd.xmgl.modules.worker.service.*; import io.swagger.annotations.Api; @@ -342,18 +343,8 @@ public class ProjectWorkerApiController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @PostMapping(value = "/getPassRecord") - public Map getPassRecord(@RequestBody Map map) { - Map resultMap = new HashMap<>(); - try { - resultMap.put("data", ""); - resultMap.put("msg", "操作成功"); - resultMap.put("status", "1"); - } catch (Exception e) { - e.printStackTrace(); - resultMap.put("msg", "操作失败"); - resultMap.put("status", "0"); - } - return resultMap; + public Map getPassRecord(@RequestBody GetPassRecordDto dto) { + return workerAttendanceService.getPassRecord(dto); } @ApiOperation(value = " 变更人员证书", notes = "变更人员证书", httpMethod = "POST") diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/bo/WorkerAttendanceBo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/bo/WorkerAttendanceBo.java new file mode 100644 index 000000000..861256dc4 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/bo/WorkerAttendanceBo.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.worker.entity.bo; + +import lombok.Data; + +@Data +public class WorkerAttendanceBo { + /*passTime 通行时间 string + direction 通行方向 int 1:进 2出 + passType 通行方式 int 1：IC卡；2：人脸识别；3：指纹识别；5：二维码；6：蓝牙 + devCode 通行设备编码 string + faceUrl 人脸通行抓拍照片http地址 string + idCard 通行人员身份证号码 string;*/ + private String passTime; + private int direction; + private int passType; + private String devCode; + private String faceUrl; + private String idCard; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/dto/GetPassRecordDto.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/dto/GetPassRecordDto.java new file mode 100644 index 000000000..17509a2d7 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/dto/GetPassRecordDto.java @@ -0,0 +1,24 @@ +package com.zhgd.xmgl.modules.worker.entity.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class GetPassRecordDto { + /* +projectCode 项目编码 String 是 +idCard 人员身份证号 String 否 +startTime 通行开始时间 String 是 格式：2020-03-10 00:00:00 +endTime 通行结束时间 String 是 格式：2020-03-10 23:59:59 （按项目获取通行记录，通行时间只能在一天之内） +pageIndex 当前页 int 是 默认1 +pageSize 每页大小 int 是 默认500 + */ + @NotBlank(message = "projectCode不能为空") + private String projectCode; + private String idCard; + private String startTime; + private String endTime; + private Integer pageIndex; + private Integer pageSize; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java index d23420cf2..edd746b25 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java @@ -5,6 +5,8 @@ import java.util.Map; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.worker.entity.bo.WorkerAttendanceBo; +import com.zhgd.xmgl.modules.worker.entity.dto.GetPassRecordDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.worker.entity.WorkerAttendance; @@ -76,4 +78,6 @@ public interface WorkerAttendanceMapper extends BaseMapper { List selectDayAttendanceWorkerInfoList(Map map); EntityMap selectTodayAttendanceWorkerCount(@Param("projectSn")String projectSn ); + + Page getPassRecord(@Param("q") GetPassRecordDto dto, Page page); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml index 8ca62b042..2e7bdeeac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml @@ -605,15 +605,43 @@ + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java index b7d443e68..0cbaeef69 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.worker.entity.WorkerAttendance; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.worker.entity.dto.GetPassRecordDto; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -63,4 +64,6 @@ public interface IWorkerAttendanceService extends IService { List> selectTenDaysWorkerAttendanceCountList(Map map); void ufaceHikCallbackUrl(Map map); + + Map getPassRecord(GetPassRecordDto dto); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java index 51329c2d3..5b8c6655d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java @@ -17,6 +17,8 @@ import com.zhgd.xmgl.modules.basicdata.service.UploadFileService; import com.zhgd.xmgl.modules.project.entity.ProjectUfaceConfig; import com.zhgd.xmgl.modules.project.mapper.ProjectUfaceConfigMapper; import com.zhgd.xmgl.modules.worker.entity.*; +import com.zhgd.xmgl.modules.worker.entity.bo.WorkerAttendanceBo; +import com.zhgd.xmgl.modules.worker.entity.dto.GetPassRecordDto; import com.zhgd.xmgl.modules.worker.mapper.*; import com.zhgd.xmgl.modules.worker.service.IWorkerAttendanceService; import com.zhgd.xmgl.modules.worker.service.IWorkerMonthAttendanceStatisticsService; @@ -900,6 +902,41 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl getPassRecord(GetPassRecordDto dto) { + /* +projectCode 项目编码 String 是 +idCard 人员身份证号 String 否 +startTime 通行开始时间 String 是 格式：2020-03-10 00:00:00 +endTime 通行结束时间 String 是 格式：2020-03-10 23:59:59 （按项目获取通行记录，通行时间只能在一天之内） +pageIndex 当前页 int 是 默认1 +pageSize 每页大小 int 是 默认500 + +passTime 通行时间 string +direction 通行方向 int 1:进 2出 +passType 通行方式 int 1：IC卡；2：人脸识别；3：指纹识别；5：二维码；6：蓝牙 +devCode 通行设备编码 string +faceUrl 人脸通行抓拍照片http地址 string +idCard 通行人员身份证号码 string +msg 错误信息 String +status 状态码 String 1表示成功；其余表示失败 + */ + Page page = new Page(dto.getPageIndex(), dto.getPageSize()); + IPage list = workerAttendanceMapper.getPassRecord(dto, page); + Map resultMap = new HashMap<>(); + try { + resultMap.put("data", list.getRecords()); + resultMap.put("total", list.getTotal()); + resultMap.put("msg", "操作成功"); + resultMap.put("status", "1"); + } catch (Exception e) { + log.error("err：", e); + resultMap.put("msg", "操作失败"); + resultMap.put("status", "0"); + } + return resultMap; + } + public WorkerInfo getWorkerInfoByImage(String personImage, String projectSn) { WorkerInfo info = null;