Browse Source

增加获取访客默认接待者的接口

tags/v0.8.5^2
yk 2 years ago
parent
commit
8d85dae734
4 changed files with 37 additions and 2 deletions
  1. +5
    -0
      xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/staff/feign/RemoteVisitorService.java
  2. +12
    -0
      xueyi-modules/xueyi-message/src/main/java/com/xueyi/message/handler/MqttTopicHandle.java
  3. +8
    -0
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorApiController.java
  4. +12
    -2
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorInnerApiController.java

+ 5
- 0
xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/staff/feign/RemoteVisitorService.java View File

@@ -45,4 +45,9 @@ public interface RemoteVisitorService {

@PostMapping(value = "/visit/inner-api/send-sms")
public JSONObject sendSms(@RequestParam(value = "type") Integer type, @RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);


@GetMapping(value = "/visit/inner-api/sms-users")
public JSONObject smsUserConfig(@RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

}

+ 12
- 0
xueyi-modules/xueyi-message/src/main/java/com/xueyi/message/handler/MqttTopicHandle.java View File

@@ -36,4 +36,16 @@ public class MqttTopicHandle {
public void setup(Message message){
log.info("down="+message.getPayload());
}

@MqttTopic("/digital_man/heart_beat")
public void heartbeat(Message message){
//TODO. heartbeat mqtt 处理逻辑
System.err.println("rev heartbeat mqtt msg:"+message.getPayload().toString());
}

@MqttTopic("/digital_man/heart_beat")
public void logUpload(Message message){
//TODO. 预警上报 mqtt 处理逻辑
System.err.println("rev logUpload mqtt msg:"+message.getPayload().toString());
}
}

+ 8
- 0
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorApiController.java View File

@@ -97,4 +97,12 @@ public class DmVisitorApiController extends BaseApiController {
return visitorService.sendSms(type, vo.getTenantId(), vo.getSourceSlave(), SecurityConstants.INNER);
}

@GetMapping(value = "get-sms-users/{devId}")
@ResponseBody
public JSONObject smsUserConfig(@PathVariable("devId") String devId){
DeviceTenantSourceMergeVo vo = super.getDeviceTenantSourceMergeVo(devId);

return visitorService.smsUserConfig(vo.getTenantId(), vo.getSourceSlave(), SecurityConstants.INNER);
}

}

+ 12
- 2
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorInnerApiController.java View File

@@ -1,6 +1,7 @@
package com.xueyi.system.staff.controller.api;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -85,6 +86,9 @@ public class DmVisitorInnerApiController extends BaseApiController {
@Autowired
DmVisitRecordsServiceImpl visitRecordsService;

@Autowired
DmTenantReceiverMapper receiverMapper;

@InnerAuth
@PostMapping(value = "confirm-visitor")
public com.alibaba.fastjson2.JSONObject queryVisit(String visitorName/*, Long empId*/){
@@ -294,8 +298,6 @@ public class DmVisitorInnerApiController extends BaseApiController {
return outputSuccess(json).toJSON();
}

@Autowired
private DmTenantReceiverMapper receiverMapper;

@Autowired
private SmsProperties smsProperties;
@@ -335,4 +337,12 @@ public class DmVisitorInnerApiController extends BaseApiController {
return AjaxResult.success().toJson();
}


@InnerAuth
@GetMapping(value = "sms-users")
public com.alibaba.fastjson2.JSONObject smsUsers(){

List<DmTenantReceiverPo> dmTenantReceiverPo = receiverMapper.selectList(new LambdaQueryWrapper<>());
return outputSuccess(dmTenantReceiverPo).toJSON();
}
}

Loading…
Cancel
Save