|
@ -176,7 +176,7 @@ public class IotAnalyzerController extends EnvelopRestEndpoint {
|
|
|
Map res = new HashMap();
|
|
Map res = new HashMap();
|
|
|
IotDeviceBaiyiDO iotDeviceBaiyiDO=new IotDeviceBaiyiDO();
|
|
IotDeviceBaiyiDO iotDeviceBaiyiDO=new IotDeviceBaiyiDO();
|
|
|
iotDeviceBaiyiDO.setImei(imei);
|
|
iotDeviceBaiyiDO.setImei(imei);
|
|
|
iotDeviceBaiyiDO.setType(5);
|
|
|
|
|
|
|
iotDeviceBaiyiDO.setType(1);
|
|
|
iotDeviceBaiyiDO.setTimeBegin(time_begin);
|
|
iotDeviceBaiyiDO.setTimeBegin(time_begin);
|
|
|
iotDeviceBaiyiDO.setValue1(heartrate);
|
|
iotDeviceBaiyiDO.setValue1(heartrate);
|
|
|
iotDeviceBaiyiDO.setValue2(theshold_heartrate_h);
|
|
iotDeviceBaiyiDO.setValue2(theshold_heartrate_h);
|
|
@ -216,7 +216,7 @@ public class IotAnalyzerController extends EnvelopRestEndpoint {
|
|
|
IotDeviceBaiyiDO iotDeviceBaiyiDO=new IotDeviceBaiyiDO();
|
|
IotDeviceBaiyiDO iotDeviceBaiyiDO=new IotDeviceBaiyiDO();
|
|
|
iotDeviceBaiyiDO.setImei(imei);
|
|
iotDeviceBaiyiDO.setImei(imei);
|
|
|
iotDeviceBaiyiDO.setTimeBegin(time_begin);
|
|
iotDeviceBaiyiDO.setTimeBegin(time_begin);
|
|
|
iotDeviceBaiyiDO.setType(1);
|
|
|
|
|
|
|
iotDeviceBaiyiDO.setType(2);
|
|
|
iotDeviceBaiyiDO.setValue1(dbp);
|
|
iotDeviceBaiyiDO.setValue1(dbp);
|
|
|
iotDeviceBaiyiDO.setValue2(dbp_l);
|
|
iotDeviceBaiyiDO.setValue2(dbp_l);
|
|
|
iotDeviceBaiyiDO.setValue3(sbp);
|
|
iotDeviceBaiyiDO.setValue3(sbp);
|
|
@ -253,9 +253,9 @@ public class IotAnalyzerController extends EnvelopRestEndpoint {
|
|
|
res.put("desc", iotDeviceBaiyiDO.getImei() + "体征数据异常（小于正常值）。");
|
|
res.put("desc", iotDeviceBaiyiDO.getImei() + "体征数据异常（小于正常值）。");
|
|
|
return objectMapper.writeValueAsString(res);
|
|
return objectMapper.writeValueAsString(res);
|
|
|
} else {
|
|
} else {
|
|
|
if (1 == iotDeviceBaiyiDO.getType()) {
|
|
|
|
|
|
|
if (2 == iotDeviceBaiyiDO.getType()) {
|
|
|
//血压测量数据
|
|
//血压测量数据
|
|
|
data.put("data", iotDeviceBaiyiDO.getValue1() + "," + iotDeviceBaiyiDO.getValue3());
|
|
|
|
|
|
|
data.put("data", iotDeviceBaiyiDO.getValue3() + "," + iotDeviceBaiyiDO.getValue1());
|
|
|
//单位
|
|
//单位
|
|
|
data.put("unit", "mmHg");
|
|
data.put("unit", "mmHg");
|
|
|
} else {
|
|
} else {
|
|
@ -271,6 +271,7 @@ public class IotAnalyzerController extends EnvelopRestEndpoint {
|
|
|
data.put("deviceSn", iotDeviceBaiyiDO.getImei());
|
|
data.put("deviceSn", iotDeviceBaiyiDO.getImei());
|
|
|
//设备类型1:血压 5:心率
|
|
//设备类型1:血压 5:心率
|
|
|
data.put("deviceType", "4");
|
|
data.put("deviceType", "4");
|
|
|
|
|
data.put("measurementType",iotDeviceBaiyiDO.getType());
|
|
|
//厂商代码
|
|
//厂商代码
|
|
|
data.put("manufacturerCode", "baiyi");
|
|
data.put("manufacturerCode", "baiyi");
|
|
|
//厂商名称
|
|
//厂商名称
|
