计算是否佩戴和是否本人佩戴修改

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

@@ -563,15 +563,17 @@ public class ZdryApiServiceImpl implements ZdryApiService {
             for(Users data:listImei){
 
                 QueryWrapper<DbpMessage> wrapper1 = new QueryWrapper<>();
-                wrapper1.ge("gxsj",thirtyLater);
+                wrapper1.ge("time_begin",thirtyLater);
                 wrapper1.eq("sb_imei",data.getSbImei());
-                DbpMessage dbpMessage = zdryDbpMessageMapper.selectOne(wrapper1);
+                wrapper1.orderByDesc(true, "time_begin");
+                List<DbpMessage> dbpMessageList = zdryDbpMessageMapper.selectList(wrapper1);
 
                 QueryWrapper<HeartrateMessage> wrapper2 = new QueryWrapper<>();
                 wrapper2.ge("gxsj",thirtyLater);
                 wrapper2.eq("sb_imei",data.getSbImei());
-                HeartrateMessage heartrateMessage = zdryHeartrateMessageMapper.selectOne(wrapper2);
-                if(null != dbpMessage && null != heartrateMessage){
+                wrapper2.orderByDesc(true, "time_begin");
+                List<HeartrateMessage> heartrateMessageList = zdryHeartrateMessageMapper.selectList(wrapper2);
+                if(dbpMessageList.size()>0 && heartrateMessageList.size()>0){
 
                     // 查询对应用户
                     QueryWrapper<Users> wrapper3 = new QueryWrapper<>();
@@ -584,8 +586,8 @@ public class ZdryApiServiceImpl implements ZdryApiService {
                     usersMapper.updateById(users);
 
                     // 根据血压和心率  是否在用户设定的范围内判定是否本人佩戴
-                    if(dbpMessage.getSbp()<data.getSbpH()&&dbpMessage.getDbp()>data.getDbpL()
-                    &&data.getThesholdHeartrateL()<heartrateMessage.getHeartrate()&&heartrateMessage.getHeartrate()<data.getThesholdHeartrateH()){
+                    if(dbpMessageList.get(0).getSbp()<data.getSbpH()&&dbpMessageList.get(0).getDbp()>data.getDbpL()
+                    &&data.getThesholdHeartrateL()<heartrateMessageList.get(0).getHeartrate()&&heartrateMessageList.get(0).getHeartrate()<data.getThesholdHeartrateH()){
 
                         // 查询对应用户
                         QueryWrapper<Users> wrapper4 = new QueryWrapper<>();