From 2a458dc6eecfa1666dbda476db5982835650fd12 Mon Sep 17 00:00:00 2001
From: yq183 <645046984@qq.com>
Date: Wed, 8 Jan 2025 11:36:20 +0800
Subject: [PATCH] 11

---
 .../java/yq/web/controller/mine/MineWarningController.java | 7 ++++---
 .../src/main/java/yq/system/mapper/MineWarningMapper.java  | 3 ++-
 .../main/java/yq/system/service/IMineWarningService.java   | 3 ++-
 .../yq/system/service/impl/MineWarningServiceImpl.java     | 3 ++-
 .../src/main/resources/mapper/system/MineWarningMapper.xml | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/yq-admin/src/main/java/yq/web/controller/mine/MineWarningController.java b/yq-admin/src/main/java/yq/web/controller/mine/MineWarningController.java
index 0ea8212..875a815 100644
--- a/yq-admin/src/main/java/yq/web/controller/mine/MineWarningController.java
+++ b/yq-admin/src/main/java/yq/web/controller/mine/MineWarningController.java
@@ -19,6 +19,7 @@ import yq.common.core.domain.AjaxResult;
 import yq.common.enums.BusinessType;
 import yq.system.domain.MineHealth;
 import yq.system.domain.MineWarning;
+import yq.system.domain.vo.MineWarningVo;
 import yq.system.service.IMineWarningService;
 import yq.common.utils.poi.ExcelUtil;
 import yq.common.core.page.TableDataInfo;
@@ -43,7 +44,7 @@ public class MineWarningController extends BaseController
     public TableDataInfo list(MineWarning mineWarning)
     {
         startPage();
-        List<MineWarning> list = mineWarningService.selectMineWarningList(mineWarning);
+        List<MineWarningVo> list = mineWarningService.selectMineWarningList(mineWarning);
         return getDataTable(list);
     }
 
@@ -66,8 +67,8 @@ public class MineWarningController extends BaseController
     @Log(title = "【预警导出】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, MineWarning mineWarning){
-        List<MineWarning> list = mineWarningService.selectMineWarningList(mineWarning);
-        ExcelUtil<MineWarning> util = new ExcelUtil<MineWarning>(MineWarning.class);
+        List<MineWarningVo> list = mineWarningService.selectMineWarningList(mineWarning);
+        ExcelUtil<MineWarningVo> util = new ExcelUtil<MineWarningVo>(MineWarningVo.class);
         util.exportExcel(response, list, "健康数据");
     }
 
diff --git a/yq-system/src/main/java/yq/system/mapper/MineWarningMapper.java b/yq-system/src/main/java/yq/system/mapper/MineWarningMapper.java
index ddc6afc..e938ab7 100644
--- a/yq-system/src/main/java/yq/system/mapper/MineWarningMapper.java
+++ b/yq-system/src/main/java/yq/system/mapper/MineWarningMapper.java
@@ -2,6 +2,7 @@ package yq.system.mapper;
 
 import java.util.List;
 import yq.system.domain.MineWarning;
+import yq.system.domain.vo.MineWarningVo;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -25,7 +26,7 @@ public interface MineWarningMapper
      * @param mineWarning 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<MineWarning> selectMineWarningList(MineWarning mineWarning);
+    public List<MineWarningVo> selectMineWarningList(MineWarning mineWarning);
 
     public List<MineWarning> selectMineWarningMedicalList(MineWarning mineWarning);
 
diff --git a/yq-system/src/main/java/yq/system/service/IMineWarningService.java b/yq-system/src/main/java/yq/system/service/IMineWarningService.java
index 4f9b7fc..e8ab0e7 100644
--- a/yq-system/src/main/java/yq/system/service/IMineWarningService.java
+++ b/yq-system/src/main/java/yq/system/service/IMineWarningService.java
@@ -2,6 +2,7 @@ package yq.system.service;
 
 import java.util.List;
 import yq.system.domain.MineWarning;
+import yq.system.domain.vo.MineWarningVo;
 
 /**
  * 【请填写功能名称】Service接口
@@ -25,7 +26,7 @@ public interface IMineWarningService
      * @param mineWarning 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<MineWarning> selectMineWarningList(MineWarning mineWarning);
+    public List<MineWarningVo> selectMineWarningList(MineWarning mineWarning);
     /**
      * 查询【请填写功能名称】列表
      *
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 734e677..3c93506 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
@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import yq.system.domain.MineFace;
 import yq.system.domain.MineWarning;
+import yq.system.domain.vo.MineWarningVo;
 import yq.system.mapper.MineFaceMapper;
 import yq.system.mapper.MineWarningMapper;
 import yq.system.service.IMineFaceService;
@@ -49,7 +50,7 @@ public class MineWarningServiceImpl implements IMineWarningService
      * @return 【请填写功能名称】
      */
     @Override
-    public List<MineWarning> selectMineWarningList(MineWarning mineWarning)
+    public List<MineWarningVo> selectMineWarningList(MineWarning mineWarning)
     {
         return mineWarningMapper.selectMineWarningList(mineWarning);
     }
diff --git a/yq-system/src/main/resources/mapper/system/MineWarningMapper.xml b/yq-system/src/main/resources/mapper/system/MineWarningMapper.xml
index 4da0ebc..9385578 100644
--- a/yq-system/src/main/resources/mapper/system/MineWarningMapper.xml
+++ b/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="mineWarningVo" id="MineWarningResult">
+    <resultMap type="MineWarningVo" id="MineWarningResult">
         <result property="id"    column="id"    />
         <result property="faceId"    column="face_id"    />
         <result property="bpHigh"    column="bp_high"    />