添加日志

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

@@ -507,6 +507,7 @@ public class BmsEventOrderService {
         log.setLogResult("完成工单");
         log.setOpUserRole(UserRoleEnum.SEAT.getValue());
         log.setCreateTime(DateUtil.date());
+        log.setRelationTypeDesc(UserRoleEnum.getCodeToName(loginUser.getRole()));
         this.careEventOrderHandleHisService.save(log);
         this.bigScreenService.pushRtEventFlag(order.getOrgId(), order.getStationId(), orderId.toString(), "bigscreenRefresh");
     }
@@ -678,7 +679,7 @@ public class BmsEventOrderService {
             log.setOrderId(order.getId());
             log.setLogType(LogTypeEnum.SMS.getValue());
             log.setLogObjectId(order.getMemberId());
-            log.setLogObjectName(careMemberInfo.getName());
+            log.setLogObjectName(careMemberInfo.getNickname());
             log.setLogResult(content+"短信通知");
             log.setOpUserRole(UserRoleEnum.SEAT.getValue());
             log.setCreateTime(DateUtil.date());
@@ -717,7 +718,7 @@ public class BmsEventOrderService {
                 log.setOrderId(order.getId());
                 log.setLogType(LogTypeEnum.WX.getValue());
                 log.setLogObjectId(order.getMemberId());
-                log.setLogObjectName(careMemberInfo.getName());
+                log.setLogObjectName(careMemberInfo.getNickname());
                 log.setLogResult(content+"微信通知");
                 log.setOpUserRole(UserRoleEnum.SYSTEM.getValue());
                 log.setCreateTime(DateUtil.date());

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

@@ -322,10 +322,10 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                         boolean voiceResult = false;
                         String[] params = null;
                         if (OrderTypeEnum.JIU_ZHI.getValue().equals(order.getOrderType())){
-                            params = new String[]{DateUtil.format(order.getCreateTime(),"yyyy年MM月dd日HH时mm分ss秒"),"久滞",house.getName()};
+                            params = new String[]{DateUtil.format(order.getCreateTime(),"MM月dd日HH时mm分"),"久滞",house.getName()};
                             voiceResult = voiceSendService.sendVoiceHappen(item.getPhone(),params);
                         }else if(OrderTypeEnum.DIE_DAO.getValue().equals(order.getOrderType())){
-                            params = new String[]{DateUtil.format(order.getCreateTime(),"yyyy年MM月dd日HH时mm分ss秒"),"跌倒",house.getName()};
+                            params = new String[]{DateUtil.format(order.getCreateTime(),"MM月dd日HH时mm分"),"跌倒",house.getName()};
                             voiceResult = voiceSendService.sendVoiceHappen(item.getPhone(),params);
                         }
                         if (voiceResult){
@@ -608,10 +608,10 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                         boolean voiceResult = false;
                         String[] params = null;
                         if (OrderTypeEnum.JIU_ZHI.getValue().equals(order.getOrderType())){
-                            params = new String[]{DateUtil.format(order.getCreateTime(),"yyyy年MM月dd日HH时mm分ss秒"),"久滞",house.getName()};
+                            params = new String[]{DateUtil.format(order.getCreateTime(),"MM月dd日HH时mm分ss秒"),"久滞",house.getName()};
                             voiceResult = voiceSendService.sendVoiceCancel(item.getContactPhone(),params);
                         }else if(OrderTypeEnum.DIE_DAO.getValue().equals(order.getOrderType())){
-                            params = new String[]{DateUtil.format(order.getCreateTime(),"yyyy年MM月dd日HH时mm分ss秒"),"跌倒",house.getName()};
+                            params = new String[]{DateUtil.format(order.getCreateTime(),"MM月dd日HH时mm分ss秒"),"跌倒",house.getName()};
                             voiceResult = voiceSendService.sendVoiceCancel(item.getContactPhone(),params);
                         }
                         if (voiceResult){
@@ -636,10 +636,10 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                         boolean voiceResult = false;
                         String[] params = null;
                         if (OrderTypeEnum.JIU_ZHI.getValue().equals(order.getOrderType())){
-                            params = new String[]{DateUtil.format(order.getCreateTime(),"yyyy年MM月dd日HH时mm分ss秒"),"久滞",house.getName()};
+                            params = new String[]{DateUtil.format(order.getCreateTime(),"MM月dd日HH时mm分"),"久滞",house.getName()};
                             voiceResult = voiceSendService.sendVoiceCancel(item.getPhone(),params);
                         }else if(OrderTypeEnum.DIE_DAO.getValue().equals(order.getOrderType())){
-                            params = new String[]{DateUtil.format(order.getCreateTime(),"yyyy年MM月dd日HH时mm分ss秒"),"跌倒",house.getName()};
+                            params = new String[]{DateUtil.format(order.getCreateTime(),"MM月dd日HH时mm分"),"跌倒",house.getName()};
                             voiceResult = voiceSendService.sendVoiceCancel(item.getPhone(),params);
                         }
                         if (voiceResult){

src/main/java/com/care/common/util/SmsUtil.java

@@ -9,12 +9,14 @@ import com.tencentcloudapi.sms.v20210111.SmsClient;
 import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest;
 import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
 import com.tencentcloudapi.sms.v20210111.models.SendStatus;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @Author: lilt
  * @Date: 2021/6/5
  * @Desc:
  */
+@Slf4j
 public class SmsUtil {
 
     public static SendStatus sendSms(String endpoint,
@@ -55,10 +57,10 @@ public class SmsUtil {
             req.setTemplateParamSet(templateParam);
 
             SendSmsResponse resp = client.SendSms(req);
-            System.out.println(JSONUtil.toJsonStr(resp));
+            log.info("短信发送：{},{}",phoneNumber,JSONUtil.toJsonStr(resp));
             sendStatus = resp.getSendStatusSet()[0];
         } catch (TencentCloudSDKException e) {
-            System.out.println(e.toString());
+            log.info("短信发送失败：{},{}",phoneNumber,e);
         }
         return sendStatus;
     }
@@ -66,7 +68,7 @@ public class SmsUtil {
     public static void main(String[] args) {
         String SecretId = "AKIDkKfkbCX0HJ4YkgMlunPkpdBSVHo43mEQ";
                 String SecretKey = "wb08zZrRkmY3IGyPZS4PUIp66pHUQ6Vd";
-                String phoneNumber = "18010375763";
+                String phoneNumber = "17896089601";
                 String SmsSdkAppId = "1400531694";
                 String signName ="熵行科技";
                 String templateId ="1097265";