1, 访客短信接口修改

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/DmVisitorSmsConfigController.java

@@ -1,6 +1,7 @@
 package com.xueyi.system.staff.controller;
 
 import cn.hutool.core.date.LocalDateTimeUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -23,7 +24,9 @@ import com.xueyi.system.api.sms.feign.RemoteSmsService;
 import com.xueyi.system.api.staff.domain.po.DmStaffPo;
 import com.xueyi.system.digitalmans.mapper.DmDigitalmanExtMapper;
 import com.xueyi.system.digitalmans.mapper.DmDigitalmanMapper;
+import com.xueyi.system.staff.domain.dto.DmVisitorOperateLogDto;
 import com.xueyi.system.staff.domain.dto.DmVisitorSmsConfigDto;
+import com.xueyi.system.staff.domain.po.DmVisitorOperateLogPo;
 import com.xueyi.system.staff.domain.po.DmVisitorSmsConfigPo;
 import com.xueyi.system.staff.domain.query.DmVisitorSmsConfigQuery;
 import com.xueyi.system.staff.mapper.DmStaffMapper;
@@ -32,6 +35,7 @@ import com.xueyi.system.staff.mapper.DmVisitorSmsConfigMapper;
 import com.xueyi.system.staff.mapper.DmVisitorsMapper;
 import com.xueyi.system.staff.service.IDmVisitorSmsConfigService;
 import com.xueyi.system.staff.service.impl.DmVisitRecordsServiceImpl;
+import com.xueyi.system.staff.service.impl.DmVisitorOperateLogServiceImpl;
 import com.xueyi.system.staff.service.impl.DmVisitorSmsConfigServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -86,6 +90,9 @@ public class DmVisitorSmsConfigController extends BaseController<DmVisitorSmsCon
     @Autowired
     private DmStaffMapper staffMapper;
 
+    @Autowired
+    private DmVisitorOperateLogServiceImpl  visitorOperateLogService;
+
     /** 定义节点名称 */
     @Override
     protected String getNodeName() {
@@ -156,7 +163,7 @@ public class DmVisitorSmsConfigController extends BaseController<DmVisitorSmsCon
 
 
     @GetMapping("/send-sms")
-    public AjaxResult sendVisitorSms(@RequestParam("visitRecordId") Long visitRecordId) {
+    public AjaxResult sendVisitorSms(@RequestParam("visitRecordId") Long visitRecordId, @RequestParam(value = "staffId", required = false) Long staffId) {
         if (null != visitRecordId) {
             DmVisitRecordsPo po = visitRecordsMapper.selectById(visitRecordId);
             if (null != po && null != po.getVisitorId()) {
@@ -187,14 +194,20 @@ public class DmVisitorSmsConfigController extends BaseController<DmVisitorSmsCon
                         send.setPhone(visitorsPo.getPhone());
                         send.setTemplate(smsProperties.getVisitorTemplate());
                         send.setDataMap(json.toJSONString());
-                        smsService.sendSms(send);
+                        JSONObject result = smsService.sendSms(send);
+
+                        DmVisitorOperateLogDto visitorOperateLogPo = visitorOperateLogService.initData(po.getVisitorId(), staffId, DmVisitorOperateLogDto.BUSINESS_TYPE_OTHER, "sendSms", JSON.toJSONString(send), result.toJSONString());
+                        visitorOperateLogService.insert(visitorOperateLogPo);
                     }
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    AjaxResult.error("服务器错误"+e.getMessage()+"，无法发送短信");
+//                    e.printStackTrace();
                 }
+            } else {
+                AjaxResult.error("未找到对应邀约记录，无法发送短信");
             }
         }
-        return  AjaxResult.success();
+        return  AjaxResult.success("短信发送成功，请注意查收");
     }
 
     /**