From 78fdbc4f404f836743eff9eeccd14dc7a8710814 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Mon, 13 Jan 2025 15:55:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mine/MineFaceController.java | 2 +- .../main/java/yq/system/domain/MineFace.java | 20 ++++++++++++------- .../java/yq/system/domain/MineHealth.java | 11 +++++----- .../service/impl/MineWarningServiceImpl.java | 1 - .../mapper/system/MineFaceMapper.xml | 13 ++++++------ .../mapper/system/MineHealthMapper.xml | 2 +- .../mapper/system/MineWarningMapper.xml | 4 ++-- 7 files changed, 29 insertions(+), 24 deletions(-) diff --git a/yq-admin/src/main/java/yq/web/controller/mine/MineFaceController.java b/yq-admin/src/main/java/yq/web/controller/mine/MineFaceController.java index 28b65c7..db388cf 100644 --- a/yq-admin/src/main/java/yq/web/controller/mine/MineFaceController.java +++ b/yq-admin/src/main/java/yq/web/controller/mine/MineFaceController.java @@ -73,7 +73,7 @@ public class MineFaceController extends BaseController { List list = mineFaceService.selectMineFaceList(mineFace); ExcelUtil util = new ExcelUtil(MineFace.class); - util.exportExcel(response, list, "【人脸列表】数据"); + util.exportExcel(response, list, "【人员列表】数据"); } /** diff --git a/yq-system/src/main/java/yq/system/domain/MineFace.java b/yq-system/src/main/java/yq/system/domain/MineFace.java index fe393c2..3d52807 100644 --- a/yq-system/src/main/java/yq/system/domain/MineFace.java +++ b/yq-system/src/main/java/yq/system/domain/MineFace.java @@ -10,6 +10,7 @@ import yq.common.annotation.Excel; import yq.common.core.domain.BaseEntity; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import java.util.Date; @@ -27,11 +28,20 @@ public class MineFace /** $column.columnComment */ private Long id; + /** 组名 */ + @Excel(name = "所属部门") + private String deptName; + @NotBlank(message = "姓名不能为空") @Excel(name = "姓名") private String faceName; + @Excel(name = "出生年月") + @NotBlank(message = "出生年月不能为空") + @Pattern(regexp = "/^\\d{4}-\\d{2}-\\d{2}$/", message = "出生年月格式不对（2000-01-01）") + private String birthDate; + @Excel(name = "年龄") private Long age; @@ -41,21 +51,19 @@ public class MineFace private String facePhone; @NotBlank(message = "人脸图片不能为空") - @Excel(name = "图片", readConverterExp = "$column.readConverterExp()") + @Excel(name = "图片", cellType= Excel.ColumnType.IMAGE, type = Excel.Type.IMPORT) private String faceUrl; @Excel(name = "备注") private String remark; @Range(min = 0, max = 1, message = "是否允许上岗的值必须是 0 或 1") - @Excel(name = "是否允许上岗 0：否 1：是") + @Excel(name = "是否允许上岗 ",readConverterExp = "0=否,1=是") private Integer isWork; - @Excel(name = "禁止时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date useTime; - @Excel(name = "分组id") private Long groupId; @Excel(name = "创建时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @@ -69,8 +77,6 @@ public class MineFace private String deptIdStr; - /** 组名 */ - @Excel(name = "所属部门") - private String deptName; + } diff --git a/yq-system/src/main/java/yq/system/domain/MineHealth.java b/yq-system/src/main/java/yq/system/domain/MineHealth.java index aa7ba6e..2ba969d 100644 --- a/yq-system/src/main/java/yq/system/domain/MineHealth.java +++ b/yq-system/src/main/java/yq/system/domain/MineHealth.java @@ -19,20 +19,21 @@ public class MineHealth { private Long faceId; - + /** 组名 */ + @Excel(name = "所属部门") + private String deptName; @Excel(name = "姓名") private String faceName; @Excel(name = "年龄") private Long age; + /** 手机号 */ @Excel(name = "手机号") private String facePhone; - - @Excel(name = "高压") private Integer bpHigh; @Excel(name = "低压") @@ -60,9 +61,7 @@ public class MineHealth { private Long deptId; - /** 组名 */ - @Excel(name = "所属部门") - private String deptName; + diff --git a/yq-system/src/main/java/yq/system/service/impl/MineWarningServiceImpl.java b/yq-system/src/main/java/yq/system/service/impl/MineWarningServiceImpl.java index 75ed23b..57db5cd 100644 --- a/yq-system/src/main/java/yq/system/service/impl/MineWarningServiceImpl.java +++ b/yq-system/src/main/java/yq/system/service/impl/MineWarningServiceImpl.java @@ -101,7 +101,6 @@ public class MineWarningServiceImpl implements IMineWarningService mineFace.setIsWork(0); mineFace.setUseTime(DateUtils.getNowDate()); mineFaceService.updateMineFace(mineFace); - throw new ServiceException("检测异常，禁止上岗"); } return 1; } diff --git a/yq-system/src/main/resources/mapper/system/MineFaceMapper.xml b/yq-system/src/main/resources/mapper/system/MineFaceMapper.xml index a5b668a..5702a06 100644 --- a/yq-system/src/main/resources/mapper/system/MineFaceMapper.xml +++ b/yq-system/src/main/resources/mapper/system/MineFaceMapper.xml @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select mf.id, mf.face_name, mf.age, mf.face_phone, mf.face_url, + select mf.id, mf.face_name, mf.birth_date, FLOOR(TIMESTAMPDIFF(MONTH,mf.birth_date , SYSDATE()) / 12) AS age, mf.face_phone, mf.face_url, mf.is_work, mf.remark, mf.create_time,mf.use_time,mf.dept_id,d.dept_name from mine_face mf inner join sys_dept d on mf.dept_id = d.dept_id @@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mf.is_work = #{isWork} and d.dept_id in (#{deptIdStr}) - order by mf.face_name + order by d.dept_name desc