袁强 5 months ago
parent
commit
2a458dc6ee
  1. 7
      yq-admin/src/main/java/yq/web/controller/mine/MineWarningController.java
  2. 3
      yq-system/src/main/java/yq/system/mapper/MineWarningMapper.java
  3. 3
      yq-system/src/main/java/yq/system/service/IMineWarningService.java
  4. 3
      yq-system/src/main/java/yq/system/service/impl/MineWarningServiceImpl.java
  5. 2
      yq-system/src/main/resources/mapper/system/MineWarningMapper.xml

7
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, "健康数据");
}

3
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);

3
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);
/**
* 查询请填写功能名称列表
*

3
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);
}

2
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" />

Loading…
Cancel
Save