From 6475887b80945b8e42454a7af634ce957bee2a57 Mon Sep 17 00:00:00 2001
From: yq183 <645046984@qq.com>
Date: Wed, 8 Jan 2025 18:12:01 +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

---
 .../yq/web/controller/nologin/NoLogin.java    |  5 ++++
 .../java/yq/system/domain/MineWarning.java    | 30 +++++++++----------
 .../service/impl/MineWarningServiceImpl.java  |  1 -
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java b/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java
index 9f39028..70dbd91 100644
--- a/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java
+++ b/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java
@@ -2,6 +2,7 @@ package yq.web.controller.nologin;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -18,6 +19,7 @@ import yq.common.core.domain.entity.SysTicket;
 import yq.common.core.domain.vo.SysDeviceVo;
 import yq.common.enums.BusinessType;
 import yq.common.exception.ServiceException;
+import yq.common.utils.DateUtils;
 import yq.common.utils.EzvizUtil;
 import yq.common.utils.FaceEnginUtil;
 import yq.system.domain.MineFace;
@@ -55,6 +57,8 @@ public class NoLogin {
     private ISysTicketService ticketService;
     @Autowired
     private IMineWarningService mineWarningService;
+
+
     @Autowired
     private IMineFaceService mineFaceService;
     private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -85,6 +89,7 @@ public class NoLogin {
 
     @PostMapping("/saveMineWarning")
     public AjaxResult saveMineWarning(MineWarning mineWarning) throws IOException {
+
         return AjaxResult.success(mineWarningService.insertMineWarning(mineWarning));
     }
 
diff --git a/yq-system/src/main/java/yq/system/domain/MineWarning.java b/yq-system/src/main/java/yq/system/domain/MineWarning.java
index 31e6c0e..bfca439 100644
--- a/yq-system/src/main/java/yq/system/domain/MineWarning.java
+++ b/yq-system/src/main/java/yq/system/domain/MineWarning.java
@@ -27,21 +27,6 @@ public class MineWarning  {
     @NotNull(message = "faceId不能为空")
     private Long faceId;
 
-    @Excel(name = "姓名")
-    private String faceName;
-
-    @Excel(name = "年龄")
-    private Long age;
-
-    /** 手机号 */
-    @Excel(name = "手机号")
-    private String facePhone;
-
-    @NotNull(message = "groupId不能为空")
-    private Long groupId;
-
-    @Excel(name = "组名")
-    private String mineGroupName;
 
     @Excel(name = "高压")
     @NotNull(message = "高压不能为空")
@@ -77,4 +62,19 @@ public class MineWarning  {
     private Map<String, Object> params = new HashMap<>();
 
 
+    @Excel(name = "姓名")
+    private String faceName;
+
+    @Excel(name = "年龄")
+    private Long age;
+
+    /** 手机号 */
+    @Excel(name = "手机号")
+    private String facePhone;
+
+    @NotNull(message = "groupId不能为空")
+    private Long groupId;
+
+    @Excel(name = "组名")
+    private String mineGroupName;
 }
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 9644224..dd1262e 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
@@ -69,7 +69,6 @@ public class MineWarningServiceImpl implements IMineWarningService
     @Override
     public int insertMineWarning(MineWarning mineWarning)
     {
-
         mineWarning.setCreateTime(DateUtils.getNowDate());
         mineWarningMapper.insertMineWarning(mineWarning);
         List<MineWarning> mineWarnings = mineWarningMapper.selectMineWarningListOne(mineWarning);