心率和血压自动测量设定15分钟

serviceapi/zdryapi/src/main/java/com/founder/zdryapi/controller/ZdryApiController.java

 package com.founder.zdryapi.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.founder.commonutils.ZdryApiEntity.Device;
 import com.founder.commonutils.publicEntity.MapRestResult;
-import com.founder.commonutils.publicEntity.ResultCode;
-import com.founder.commonutils.zdryEntity.Users;
 import com.founder.zdryapi.service.ZdryApiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

serviceapi/zdryapi/src/main/java/com/founder/zdryapi/controller/ZdryPushDataController.java

@@ -76,10 +76,10 @@ public class ZdryPushDataController {
                                 @RequestParam(value = "time_begin") String time_begin,
                                 @ApiParam(name = "heartrate", value = "心率", required = true)
                                 @RequestParam(value = "heartrate") int heartrate,
-                                @ApiParam(name = "theshold_heartrate_h", value = "心率阈值上限", required = true)
-                                @RequestParam(value = "theshold_heartrate_h") int theshold_heartrate_h,
-                                @ApiParam(name = "theshold_heartrate_l", value = "心率阈值下限", required = true)
-                                @RequestParam(value = "theshold_heartrate_l") int theshold_heartrate_l
+                                @ApiParam(name = "theshold_heartrate_h", value = "心率阈值上限")
+                                @RequestParam(required = false)  int theshold_heartrate_h,
+                                @ApiParam(name = "theshold_heartrate_l", value = "心率阈值下限")
+                                @RequestParam(required = false)  int theshold_heartrate_l
     ) {
         zdryPushDataService.heartrateMessage(imei,time_begin,heartrate,theshold_heartrate_h,theshold_heartrate_l);
     }

serviceapi/zdryapi/src/main/java/com/founder/zdryapi/service/impl/ZdryApiServiceImpl.java

@@ -173,6 +173,7 @@ public class ZdryApiServiceImpl implements ZdryApiService {
             json.put("pedometer_enable",deviceParam.getPedometer_enable());
             json.put("sleep_enable",deviceParam.getSleep_enable());
             json.put("track_enable",deviceParam.getTrack_enable());
+            json.put("frequency_heartrate","15");// 心率、血压、血氧上报频率 单位分钟
             HttpEntity<JSONObject> params = new HttpEntity<>(json, headers);
             String resultString = restTemplate.postForEntity(zdryUrl+updateSbxxUrl+deviceParam.getSbImei()+"/4g/edit/", params, String.class).getBody();
             JSONObject result = JSONObject.parseObject(resultString);
@@ -575,6 +576,7 @@ public class ZdryApiServiceImpl implements ZdryApiService {
                     // 查询对应用户
                     QueryWrapper<Users> wrapper3 = new QueryWrapper<>();
                     wrapper3.eq("sb_imei",data.getSbImei());
+                    wrapper3.eq("xxsc_pdbz","0");
                     Users users = usersMapper.selectOne(wrapper3);
 
                     // 根棍gk_users  是否佩戴
@@ -588,6 +590,7 @@ public class ZdryApiServiceImpl implements ZdryApiService {
                         // 查询对应用户
                         QueryWrapper<Users> wrapper4 = new QueryWrapper<>();
                         wrapper4.eq("sb_imei",data.getSbImei());
+                        wrapper4.eq("xxsc_pdbz","0");
                         Users users4 = usersMapper.selectOne(wrapper4);
 
                         // 根棍gk_users  是否本人佩戴  1是  0否
@@ -597,6 +600,7 @@ public class ZdryApiServiceImpl implements ZdryApiService {
                         // 查询对应用户
                         QueryWrapper<Users> wrapper4 = new QueryWrapper<>();
                         wrapper4.eq("sb_imei",data.getSbImei());
+                        wrapper4.eq("xxsc_pdbz","0");
                         Users users4 = usersMapper.selectOne(wrapper4);
 
                         // 根棍gk_users  是否本人佩戴  1是  0否
@@ -607,9 +611,11 @@ public class ZdryApiServiceImpl implements ZdryApiService {
                     // 查询对应用户
                     QueryWrapper<Users> wrapper3 = new QueryWrapper<>();
                     wrapper3.eq("sb_imei",data.getSbImei());
+                    wrapper3.eq("xxsc_pdbz","0");
                     Users users = usersMapper.selectOne(wrapper3);
 
-                    // 根棍gk_users  是否佩戴  1佩戴  0未佩戴
+                    // 根棍gk_users  是否佩戴  1佩戴  0未佩戴  是否本人佩戴  1是  0否
+                    users.setIsmeWearFlag(0);
                     users.setWearFlag(0);
                     usersMapper.updateById(users);
                 }