Ver a proveniência

add smsConfig interface RobotName

tags/v0.9.0test
yk há 2 anos
ascendente
cometimento
dd5ef50e20
4 ficheiros alterados com 21 adições e 7 eliminações
  1. +1
    -1
      xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/staff/feign/RemoteVisitorService.java
  2. +1
    -1
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorApiController.java
  3. +5
    -1
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorInnerApiController.java
  4. +14
    -4
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/domain/po/DmVisitorSmsConfigPo.java

+ 1
- 1
xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/staff/feign/RemoteVisitorService.java Ver ficheiro

@@ -34,7 +34,7 @@ public interface RemoteVisitorService {
public JSONObject delVisit(@RequestBody DmVisitCommonDto commonDto,
@RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@GetMapping(value = "/visit/inner-api/sms-config")
public JSONObject smsConfig(@RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
public JSONObject smsConfig(@RequestParam(value = "devId") String devId, @RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

@GetMapping(value = "/visit/inner-api/list")
public JSONObject visitList(@RequestParam(value = "empId") Long empId,


+ 1
- 1
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorApiController.java Ver ficheiro

@@ -86,7 +86,7 @@ public class DmVisitorApiController extends BaseApiController {
@ResponseBody
public JSONObject smsConfig(@PathVariable("devId") String devId){
DeviceTenantSourceMergeVo vo = super.getDeviceTenantSourceMergeVo(devId);
return visitorService.smsConfig(vo.getTenantId(), vo.getSourceSlave(), SecurityConstants.INNER);
return visitorService.smsConfig(devId, vo.getTenantId(), vo.getSourceSlave(), SecurityConstants.INNER);
}

@GetMapping(value = "send-sms/{type}/{devId}")


+ 5
- 1
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorInnerApiController.java Ver ficheiro

@@ -229,10 +229,14 @@ public class DmVisitorInnerApiController extends BaseApiController {

@InnerAuth
@GetMapping(value = "sms-config")
public com.alibaba.fastjson2.JSONObject smsConfig(){
public com.alibaba.fastjson2.JSONObject smsConfig(@RequestParam(value = "devId") String devId){

DmVisitorSmsConfigPo dmVisitorSmsConfigPo = visitorSmsConfigMapper.selectOne(Wrappers.<DmVisitorSmsConfigPo>query().lambda().last(SqlConstants.LIMIT_ONE));

DmDigitalmanPo dmDigitalmanPo = digitalmanMapper.selectByCode(digitalmanExtMapper.selectOne(Wrappers.<DmDigitalmanExtPo>query().lambda().eq(DmDigitalmanExtPo::getDeviceId, devId).last(SqlConstants.LIMIT_ONE)).getManCode());

dmVisitorSmsConfigPo.setRobotName(dmDigitalmanPo.getName());

return outputSuccess(dmVisitorSmsConfigPo).toJSON();
}



+ 14
- 4
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/domain/po/DmVisitorSmsConfigPo.java Ver ficheiro

@@ -1,15 +1,22 @@
package com.xueyi.system.staff.domain.po;

import com.xueyi.common.core.web.tenant.base.TBaseEntity;
import com.xueyi.system.staff.domain.dto.DmVisitorSmsConfigDto;
import com.xueyi.common.core.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xueyi.common.core.annotation.Excel;
import com.xueyi.common.core.web.tenant.base.TBaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serial;

import static com.xueyi.common.core.constant.basic.EntityConstants.*;
import static com.xueyi.common.core.constant.basic.EntityConstants.CREATE_BY;
import static com.xueyi.common.core.constant.basic.EntityConstants.CREATE_TIME;
import static com.xueyi.common.core.constant.basic.EntityConstants.DEL_FLAG;
import static com.xueyi.common.core.constant.basic.EntityConstants.NAME;
import static com.xueyi.common.core.constant.basic.EntityConstants.REMARK;
import static com.xueyi.common.core.constant.basic.EntityConstants.SORT;
import static com.xueyi.common.core.constant.basic.EntityConstants.STATUS;
import static com.xueyi.common.core.constant.basic.EntityConstants.UPDATE_BY;
import static com.xueyi.common.core.constant.basic.EntityConstants.UPDATE_TIME;

/**
* 租户访客接待短信模板配置 持久化对象
@@ -36,4 +43,7 @@ public class DmVisitorSmsConfigPo extends TBaseEntity {
@Excel(name = "")
protected String parkPrompt;


protected String robotName;

}

Carregando…
Cancelar
Guardar