提交

yq-admin/src/main/java/yq/web/controller/mine/MineFaceController.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -79,17 +80,9 @@ public class MineFaceController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:face:add')")
     @Log(title = "【人脸录入】", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody MineFace mineFace)
+    public AjaxResult add(@Validated @RequestBody MineFace mineFace)
     {
-        if(ObjectUtil.isNull(mineFace.getGroupId())){
+
-            throw new ServiceException("请选择分组！");
-        }
-        if(StrUtil.isEmpty(mineFace.getFaceUrl())){
-            throw new ServiceException("请上传人脸照片");
-        }
-        if(StrUtil.isEmpty(mineFace.getFaceName())){
-            throw new ServiceException("请填写名称");
-        }
         return toAjax(mineFaceService.insertMineFace(mineFace));
     }
 

yq-admin/src/main/java/yq/web/controller/mine/MineWarningController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -101,7 +102,7 @@ public class MineWarningController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:warning:add')")
     @Log(title = "【预警新增】", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody MineWarning mineWarning)
+    public AjaxResult add(@Validated @RequestBody MineWarning mineWarning)
     {
         return toAjax(mineWarningService.insertMineWarning(mineWarning));
     }

yq-system/src/main/java/yq/system/domain/MineFace.java

@@ -4,10 +4,14 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Range;
 import org.springframework.format.annotation.DateTimeFormat;
 import yq.common.annotation.Excel;
 import yq.common.core.domain.BaseEntity;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
 import java.util.Date;
 
 /**
@@ -23,28 +27,29 @@ public class MineFace
     /** $column.columnComment */
     private Long id;
 
-    /** 姓名 */
+    @NotBlank(message = "姓名不能为空")
     @Excel(name = "姓名")
     private String faceName;
 
     @Excel(name = "组名")
     private String mineGroupName;
-    /** 年龄 */
+
     @Excel(name = "年龄")
     private Long age;
 
-    /** 手机号 */
+
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
     @Excel(name = "手机号")
     private String facePhone;
 
-
+    @NotBlank(message = "人脸图片不能为空")
     @Excel(name = "图片", readConverterExp = "$column.readConverterExp()")
     private String faceUrl;
 
     @Excel(name = "备注")
     private String remark;
 
-
+    @Range(min = 0, max = 1, message = "是否允许上岗的值必须是 0 或 1")
     @Excel(name = "是否允许上岗 0：否 1：是")
     private Integer isWork;
 
@@ -52,7 +57,7 @@ public class MineFace
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date useTime;
-
+    @NotNull(message = "groupId不能为空")
     @Excel(name = "分组id")
     private Long groupId;
     @Excel(name = "创建时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")

yq-system/src/main/java/yq/system/domain/MineWarning.java

@@ -5,9 +5,13 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
+import org.hibernate.validator.constraints.Range;
 import org.springframework.format.annotation.DateTimeFormat;
 import yq.common.annotation.Excel;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -20,31 +24,42 @@ import java.util.Map;
 public class MineWarning  {
     private Long id;
 
-
+    @NotNull(message = "faceId不能为空")
     private Long faceId;
 
     @Excel(name = "姓名")
     private String faceName;
 
+    @NotNull(message = "groupId不能为空")
     private Long groupId;
 
     @Excel(name = "组名")
     private String mineGroupName;
 
     @Excel(name = "高压")
+    @NotNull(message = "高压不能为空")
     private Integer bpHigh;
+
+    @NotNull(message = "低压不能为空")
     @Excel(name = "低压")
     private Integer bpLow;
+    @NotNull(message = "呼吸频率不能为空")
     @Excel(name = "呼吸频率")
     private Integer br;
+    @NotNull(message = "心跳不能为空")
     @Excel(name = "心跳")
     private Integer hr;
+    @NotNull(message = "心跳变异率不能为空")
     @Excel(name = "心跳变异率")
     private Integer hrv;
+    @NotNull(message = "温度不能为空")
     @Excel(name = "温度")
     private Integer temperature;
+
+    @Range(min = 0, max = 1, message = "是否适合上岗的值必须是 0 或 1")
     @Excel(name = "是否适合上岗 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")

yq-system/src/main/java/yq/system/domain/vo/MineWarningVo.java

@@ -0,0 +1,54 @@
+package yq.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import yq.common.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * @auther yq
+ * @data 2025/1/8
+ */
+public class MineWarningVo {
+
+    private Long id;
+
+
+    private Long faceId;
+
+    @Excel(name = "姓名")
+    private String faceName;
+
+    @Excel(name = "年龄")
+    private Long age;
+
+    /** 手机号 */
+    @Excel(name = "手机号")
+    private String facePhone;
+
+
+    @Excel(name = "组名")
+    private String mineGroupName;
+
+    @Excel(name = "高压")
+    private Integer bpHigh;
+    @Excel(name = "低压")
+    private Integer bpLow;
+    @Excel(name = "心跳")
+    private Integer br;
+    @Excel(name = "呼吸频率")
+    private Integer hr;
+    @Excel(name = "心跳变异率")
+    private Integer hrv;
+    @Excel(name = "温度")
+    private Integer temperature;
+    @Excel(name = "是否允许上岗 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 createTime;
+
+
+}

yq-system/src/main/resources/mapper/system/MineWarningMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="yq.system.mapper.MineWarningMapper">
     
-    <resultMap type="MineWarning" id="MineWarningResult">
+    <resultMap type="mineWarningVo" id="MineWarningResult">
         <result property="id"    column="id"    />
         <result property="faceId"    column="face_id"    />
         <result property="bpHigh"    column="bp_high"    />
@@ -17,6 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="mineGroupName"    column="mine_group_name"    />
         <result property="faceName"    column="face_name"    />
+        <result property="facePhone"    column="face_phone"    />
+        <result property="age"    column="age"    />
     </resultMap>
 
     <sql id="selectMineWarningVo">
@@ -32,6 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mw.is_work,
             mw.create_time,
             mf.face_name,
+            mf.age,
+            mf.face_phone,
             mg.mine_group_name
         FROM
             mine_warning  mw