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 70dbd91..a161870 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 @@ -84,11 +84,11 @@ public class NoLogin { } } } - return AjaxResult.error("未识别出人员"); + return AjaxResult.error("人员未录入!"); } @PostMapping("/saveMineWarning") - public AjaxResult saveMineWarning(MineWarning mineWarning) throws IOException { + public AjaxResult saveMineWarning(@RequestBody MineWarning mineWarning) throws IOException { return AjaxResult.success(mineWarningService.insertMineWarning(mineWarning)); } diff --git a/yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java b/yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java index 0b68ef9..c6ae6af 100644 --- a/yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java +++ b/yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java @@ -42,7 +42,7 @@ public class FaceEnginUtil { @Value(value = "${arcsoft.faceEngine}") - private static String faceEngineUrl = "D:\\yq\\arcsoft_lib\\LINUX64"; + private static String faceEngineUrl = "E:\\arcsoft_lib\\LINUX64"; public static FaceEngine init() { 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 bfca439..c0c178e 100644 --- a/yq-system/src/main/java/yq/system/domain/MineWarning.java +++ b/yq-system/src/main/java/yq/system/domain/MineWarning.java @@ -46,7 +46,7 @@ public class MineWarning { private Integer hrv; @NotNull(message = "温度不能为空") @Excel(name = "温度") - private Integer temperature; + private double temperature; @Range(min = 0, max = 1, message = "是否适合上岗的值必须是 0 或 1") @Excel(name = "是否适合上岗 0:否 1:是") diff --git a/yq-system/src/main/resources/mapper/system/MineWarningMapper.xml b/yq-system/src/main/resources/mapper/system/MineWarningMapper.xml index fb05fad..f0afb73 100644 --- a/yq-system/src/main/resources/mapper/system/MineWarningMapper.xml +++ b/yq-system/src/main/resources/mapper/system/MineWarningMapper.xml @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mw.face_id = #{faceId} and mw.is_work = #{isWork} - and mw.create_time > DATE_SUB( #{createTime}, INTERVAL 1 HOUR ) + and mw.create_time > DATE_SUB( now(), INTERVAL 1 HOUR ) ORDER BY mw.create_time DESC LIMIT 0,2 @@ -189,6 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bp_high, bp_low, + face_id, br, hr, hrv, @@ -199,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{bpHigh}, #{bpLow}, + #{faceId}, #{br}, #{hr}, #{hrv},