修改记录历史消息 log_object_name 的问题

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -718,7 +718,14 @@ public class BmsEventOrderService {
                 log.setOrderId(order.getId());
                 log.setLogType(LogTypeEnum.WX.getValue());
                 log.setLogObjectId(order.getMemberId());
-                log.setLogObjectName(careMemberInfo.getNickname());
+                String name = careMemberInfo.getPhone();
+                if (StrUtil.isNotEmpty(careMemberInfo.getName())){
+                    name = careMemberInfo.getName();
+                }else if (StrUtil.isNotEmpty(careMemberInfo.getNickname())){
+                    name = careMemberInfo.getNickname();
+                }
+
+                log.setLogObjectName(name);
                 log.setLogResult(content+"微信通知");
                 log.setOpUserRole(UserRoleEnum.SYSTEM.getValue());
                 log.setCreateTime(DateUtil.date());

src/main/java/com/care/common/service/impl/CareEventOrderServiceImpl.java

@@ -187,7 +187,14 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                     log.setOrderId(order.getId());
                     log.setLogType(LogTypeEnum.WX.getValue());
                     log.setLogObjectId(order.getMemberId());
-                    log.setLogObjectName(careMemberInfo.getNickname());
+                    String name = careMemberInfo.getPhone();
+                    if (StrUtil.isNotEmpty(careMemberInfo.getName())){
+                        name = careMemberInfo.getName();
+                    }else if (StrUtil.isNotEmpty(careMemberInfo.getNickname())){
+                        name = careMemberInfo.getNickname();
+                    }
+
+                    log.setLogObjectName(name);
                     log.setLogResult("微信通知");
                     log.setOpUserRole(UserRoleEnum.SYSTEM.getValue());
                     log.setCreateTime(DateUtil.date());
@@ -465,7 +472,7 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
         CareEventOrder  orderDb =  new CareEventOrder();
         orderDb.setId(order.getId());
         this.saveHisOrder(order, orderDb,true);
-        cancelEventSMSNotic(order);
+        cancelEventSMSNotice(order);
         cancelEventWXNotice(order);
         //cancelEventVoiceNotic(order);
         return true;
@@ -497,7 +504,14 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                     log.setOrderId(order.getId());
                     log.setLogType(LogTypeEnum.WX.getValue());
                     log.setLogObjectId(order.getMemberId());
-                    log.setLogObjectName(careMemberInfo.getNickname());
+                    String name = careMemberInfo.getPhone();
+                    if (StrUtil.isNotEmpty(careMemberInfo.getName())){
+                        name = careMemberInfo.getName();
+                    }else if (StrUtil.isNotEmpty(careMemberInfo.getNickname())){
+                        name = careMemberInfo.getNickname();
+                    }
+
+                    log.setLogObjectName(name);
                     log.setLogResult("事件取消微信通知");
                     log.setOpUserRole(UserRoleEnum.SYSTEM.getValue());
                     log.setCreateTime(DateUtil.date());
@@ -514,7 +528,7 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
      * 取消事件，短信通知
      * @param order
      */
-    private void cancelEventSMSNotic(CareEventOrder order){
+    private void cancelEventSMSNotice(CareEventOrder order){
         try{
             Object switchSms = redisUtil.get(RedisKeyConstant.SWITCH_SMS);
             if (switchSms != null){

src/main/java/com/care/common/service/impl/VoiceSendServiceImpl.java

@@ -44,7 +44,6 @@ public class VoiceSendServiceImpl implements VoiceSendService {
                     noticeVoiceSdkAppId,
                     _noticeTemplateId,
                     phone,_p);
-            System.out.println("sendStatus.getCallId() == " +  sendStatus.getCallId());
             if (sendStatus != null && sendStatus.getCallId() != null){
                 return true;
             }else{
@@ -66,7 +65,6 @@ public class VoiceSendServiceImpl implements VoiceSendService {
                     noticeVoiceSdkAppId,
                     _noticeTemplateId,
                     phone,_p);
-            System.out.println("sendStatus.getCallId() == " +  sendStatus.getCallId());
             if (sendStatus != null && sendStatus.getCallId() != null){
                 return true;
             }else{

src/main/java/com/care/mqtt/service/MqttMsgService.java

@@ -164,12 +164,15 @@ public class MqttMsgService {
                 } else if ("StayTooLong".equals(type)) {
                     order.setOrderType(OrderTypeEnum.JIU_ZHI.getValue());
                 }
+
                 order.setTid(careMqttMsg.getTid());
 
                 //判断房屋是否有未完成的告警事件,区分类型和人
                 QueryWrapper<CareEventOrder> queryWrapper2 = new QueryWrapper<>();
                 queryWrapper2.lambda().eq(CareEventOrder::getDevId, careDevice.getId())
                         .eq(CareEventOrder::getOrderType,order.getOrderType())
+                        .eq(CareEventOrder::getOrgId,careDevice.getOrgId())
+                        .eq(CareEventOrder::getStationId,careDevice.getStationId())
                         .eq(CareEventOrder::getTid,order.getTid())
                         .and(
                         wrapper -> wrapper.eq(CareEventOrder::getStatus, OrderStatusEnum.TODO.getValue())