提交

yq-admin/src/main/java/yq/web/controller/mine/MineFaceController.java

@@ -94,7 +94,7 @@ public class MineFaceController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated @RequestBody MineFace mineFace) throws IOException {
         if(StrUtil.isNotEmpty(mineFace.getFaceUrl())){
-            String faceUrl =  mineFace.getFaceUrl();
+            String faceUrl = serverConfig.getUrl()+ mineFace.getFaceUrl();
             URL url = new URL(faceUrl);
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
             connection.setRequestMethod("GET");
@@ -116,7 +116,7 @@ public class MineFaceController extends BaseController
     public AjaxResult edit(@RequestBody MineFace mineFace) throws IOException {
         MineFace face = mineFaceService.selectMineFaceById(mineFace.getId());
         if(StrUtil.isNotEmpty(mineFace.getFaceUrl())&& !ObjectUtil.equals(mineFace.getFaceUrl(),face.getFaceUrl())){
-            String faceUrl =  mineFace.getFaceUrl();
+            String faceUrl =  serverConfig.getUrl()+mineFace.getFaceUrl();
             URL url = new URL(faceUrl);
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
             connection.setRequestMethod("GET");
@@ -129,6 +129,19 @@ public class MineFaceController extends BaseController
         return toAjax(mineFaceService.updateMineFace(mineFace));
     }
 
+    /**
+     * 修改【初始健康值】
+     */
+    @PreAuthorize("@ss.hasPermi('system:face:edit')")
+    @Log(title = "【初始健康值】", businessType = BusinessType.UPDATE)
+    @PostMapping("/editFace")
+    public AjaxResult editFace(@RequestBody MineFace mineFace){
+
+        return toAjax(mineFaceService.updateByMineFace(mineFace));
+    }
+
+
+
     /**
      * 删除【请填写功能名称】
      */

yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java

@@ -84,7 +84,7 @@ public class NoLogin {
                 }
             }
         }
-        return AjaxResult.success("人员未录入！");
+        return AjaxResult.error("人员未录入！");
     }
 
     @PostMapping("/saveMineWarning")

yq-system/src/main/java/yq/system/domain/MineFace.java

@@ -77,6 +77,24 @@ public class MineFace
 
     private String deptIdStr;
 
-
+    @Excel(name = "高压")
+    @NotNull(message = "高压不能为空")
+    private Integer bpHigh;
+
+    @NotNull(message = "低压不能为空")
+    @Excel(name = "低压")
+    private Integer bpLow;
+    @NotNull(message = "呼吸频率不能为空")
+    @Excel(name = "呼吸频率")
+    private Integer br;
+    @NotNull(message = "心跳不能为空")
+    @Excel(name = "心跳")
+    private Integer hr;
+    @NotNull(message = "心跳变异率不能为空")
+    @Excel(name = "心跳变异率")
+    private Integer hrv;
+    @NotNull(message = "温度不能为空")
+    @Excel(name = "温度")
+    private double temperature;
 
 }

yq-system/src/main/java/yq/system/mapper/MineFaceMapper.java

@@ -45,6 +45,8 @@ public interface MineFaceMapper
      */
     public int updateMineFace(MineFace mineFace);
 
+
+    public int updateByMineFace(MineFace mineFace);
     /**
      * 删除【请填写功能名称】
      * 

yq-system/src/main/java/yq/system/service/IMineFaceService.java

@@ -50,6 +50,7 @@ public interface IMineFaceService
      */
     public int updateMineFace(MineFace mineFace);
 
+    public int updateByMineFace(MineFace mineFace);
     /**
      * 批量删除【请填写功能名称】
      * 

yq-system/src/main/java/yq/system/service/impl/MineFaceServiceImpl.java

@@ -81,6 +81,11 @@ public class MineFaceServiceImpl implements IMineFaceService
         return mineFaceMapper.updateMineFace(mineFace);
     }
 
+    @Override
+    public int updateByMineFace(MineFace mineFace)
+    {
+        return mineFaceMapper.updateByMineFace(mineFace);
+    }
     /**
      * 批量删除【请填写功能名称】
      * 

yq-system/src/main/java/yq/system/service/impl/MineWarningServiceImpl.java

@@ -95,7 +95,7 @@ public class MineWarningServiceImpl implements IMineWarningService
         mineWarning.setCreateTime(DateUtils.getNowDate());
         mineWarningMapper.insertMineWarning(mineWarning);
         List<MineWarning> mineWarnings = mineWarningMapper.selectMineWarningListOne(mineWarning);
-        if(mineWarnings.size() >=2){
+        if(!mineWarnings.isEmpty()&&mineWarnings.size() >=2){
             MineFace mineFace=new MineFace();
             mineFace.setId(mineWarning.getFaceId());
             mineFace.setIsWork(0);

yq-system/src/main/resources/mapper/system/MineFaceMapper.xml

@@ -18,11 +18,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="useTime"    column="use_time"    />
         <result property="faceByte"    column="face_byte"    />
+        <result property="bpHigh"    column="bp_high"    />
+        <result property="bpLow"    column="bp_low"    />
+        <result property="br"    column="br"    />
+        <result property="hr"    column="hr"    />
+        <result property="hrv"    column="hrv"    />
+        <result property="temperature"    column="temperature"    />
     </resultMap>
 
     <sql id="selectMineFaceVo">
         select mf.id, mf.face_name, mf.birth_date, FLOOR(TIMESTAMPDIFF(MONTH,mf.birth_date , SYSDATE()) / 12) AS age, mf.face_phone, mf.face_url,
-               mf.is_work, mf.remark, mf.create_time,mf.use_time,mf.dept_id,d.dept_name
+               mf.is_work, mf.remark, mf.create_time,mf.use_time,mf.dept_id,d.dept_name,
+               mf.bp_high,
+               mf.bp_low,
+               mf.br,
+               mf.hr,
+               mf.hrv,
+               mf.temperature
         from mine_face mf
         inner join sys_dept d on mf.dept_id = d.dept_id
     </sql>
@@ -108,6 +120,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateByMineFace" parameterType="MineFace">
+        update mine_face
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="bpHigh != null">bp_high = #{bpHigh},</if>
+            <if test="bpLow != null">bp_low = #{bpLow},</if>
+            <if test="br != null">br = #{br},</if>
+            <if test="hr != null">hr = #{hr},</if>
+            <if test="hrv != null">hrv = #{hrv},</if>
+            <if test="temperature != null">temperature = #{temperature},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+
     <delete id="deleteMineFaceById" parameterType="Long">
         delete from mine_face where id = #{id}
     </delete>

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

@@ -124,12 +124,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectMineWarningListOne" parameterType="MineWarning" resultMap="MineWarningResult">
-        <include refid="selectMineWarningList"/>
-        <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 mw.create_time > DATE_SUB( now(), INTERVAL 1 HOUR )</if>
-        </where>
+        SELECT
+        mw.id,
+        mw.bp_high,
+        mw.bp_low,
+        mw.face_id,
+        mw.br,
+        mw.hr,
+        mw.hrv,
+        mw.temperature,
+        mw.is_work,
+        mw.create_time,
+        mw.face_id
+        FROM
+        mine_warning  mw
+        where mw.is_work = 0
+        <if test="faceId != null "> and mw.face_id = #{faceId}</if>
+        <if test="createTime != null"> and mw.create_time > DATE_SUB( now(), INTERVAL 1 HOUR )</if>
         ORDER BY mw.create_time DESC
         LIMIT 0,2
     </select>
@@ -210,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN mine_warning mw ON mw.face_id = mf.id
         <if test="search ==  '今日' "> AND DATE(mw.create_time) = CURDATE() </if>
         <if test="search == '7天' "> AND mw.create_time >= CURDATE() - INTERVAL 7 DAY  -- 过去7天内的打卡记录 </if>
-        <if test="search == '30天' "> AND DATE(mw.create_time) = CURDATE() - INTERVAL 1 MONTH </if>
+        <if test="search == '30天' "> AND DATE(mw.create_time) >= CURDATE() - INTERVAL 1 MONTH </if>
 
         GROUP BY
         d.dept_id
@@ -257,7 +268,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="search ==  '今日' "> AND DATE(mw.create_time) = CURDATE() </if>
             <if test="search == '7天' "> AND mw.create_time >= CURDATE() - INTERVAL 7 DAY  -- 过去7天内的打卡记录 </if>
-            <if test="search == '30天' "> AND DATE(mw.create_time) = CURDATE() - INTERVAL 1 MONTH </if>
+            <if test="search == '30天' "> AND DATE(mw.create_time) >= CURDATE() - INTERVAL 1 MONTH </if>
         </where>
         GROUP BY
         mw.face_id  -- 按员工分组，统计每个员工的打卡次数