Browse Source

狗强1

mine
吴远 5 months ago
parent
commit
f08828355b
  1. 4
      yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java
  2. 2
      yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java
  3. 2
      yq-system/src/main/java/yq/system/domain/MineWarning.java
  4. 4
      yq-system/src/main/resources/mapper/system/MineWarningMapper.xml

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

2
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() {

2
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:是")

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

@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="faceId != null "> and mw.face_id = #{faceId}</if>
<if test="isWork != null "> and mw.is_work = #{isWork}</if>
<if test="createTime != null and createTime != ''"> and mw.create_time > DATE_SUB( #{createTime}, INTERVAL 1 HOUR )</if>
<if test="createTime != null"> and mw.create_time > DATE_SUB( now(), INTERVAL 1 HOUR )</if>
</where>
ORDER BY mw.create_time DESC
LIMIT 0,2
@ -189,6 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="bpHigh != null">bp_high,</if>
<if test="bpLow != null">bp_low,</if>
<if test="faceId != null">face_id,</if>
<if test="br != null">br,</if>
<if test="hr != null">hr,</if>
<if test="hrv != null">hrv,</if>
@ -199,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="bpHigh != null">#{bpHigh},</if>
<if test="bpLow != null">#{bpLow},</if>
<if test="faceId != null">#{faceId},</if>
<if test="br != null">#{br},</if>
<if test="hr != null">#{hr},</if>
<if test="hrv != null">#{hrv},</if>

Loading…
Cancel
Save