Pārlūkot izejas kodu

add visitor config interface

tags/v0.8.5^2
yk pirms 2 gadiem
vecāks
revīzija
64fa8209b5
3 mainītis faili ar 31 papildinājumiem un 1 dzēšanām
  1. +3
    -0
      xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/staff/feign/RemoteVisitorService.java
  2. +7
    -0
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorApiController.java
  3. +21
    -1
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorInnerApiController.java

+ 3
- 0
xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/staff/feign/RemoteVisitorService.java Parādīt failu

@@ -29,6 +29,9 @@ public interface RemoteVisitorService {
public JSONObject newVisit(@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);

@GetMapping(value = "/visit/inner-api/list")
public JSONObject visitList(@RequestParam(value = "empId") Long empId,
@RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);


+ 7
- 0
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorApiController.java Parādīt failu

@@ -74,6 +74,13 @@ public class DmVisitorApiController extends BaseApiController {
return visitorService.newVisit(commonDto, vo.getTenantId(), vo.getSourceSlave(), SecurityConstants.INNER);
}

@GetMapping(value = "sms-config/{devId}")
@ResponseBody
public JSONObject smsConfig(@PathVariable("devId") String devId){
DeviceTenantSourceMergeVo vo = super.getDeviceTenantSourceMergeVo(devId);
return visitorService.smsConfig(vo.getTenantId(), vo.getSourceSlave(), SecurityConstants.INNER);
}

@GetMapping(value = "send-sms/{type}/{devId}")
@ResponseBody
public JSONObject sendSms(@PathVariable("type") Integer type, @PathVariable("devId") String devId){


+ 21
- 1
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorInnerApiController.java Parādīt failu

@@ -15,12 +15,16 @@ import com.xueyi.system.api.dict.domain.dto.SysDictDataDto;
import com.xueyi.system.api.dict.domain.po.SysDictDataPo;
import com.xueyi.system.api.digitalmans.domain.dto.DmVisitRecordsDto;
import com.xueyi.system.api.digitalmans.domain.dto.DmVisitorsDto;
import com.xueyi.system.api.digitalmans.domain.po.DmDigitalmanExtPo;
import com.xueyi.system.api.digitalmans.domain.po.DmDigitalmanPo;
import com.xueyi.system.api.digitalmans.domain.po.DmVisitRecordsPo;
import com.xueyi.system.api.digitalmans.domain.po.DmVisitorsPo;
import com.xueyi.system.api.sms.domain.vo.SmsReqEntity;
import com.xueyi.system.api.sms.feign.RemoteSmsService;
import com.xueyi.system.api.staff.domain.dto.DmVisitCommonDto;
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.meeting.constant.VisitRecordStatus;
import com.xueyi.system.receiver.domain.po.DmTenantReceiverPo;
import com.xueyi.system.receiver.mapper.DmTenantReceiverMapper;
@@ -64,6 +68,11 @@ public class DmVisitorInnerApiController extends BaseApiController {
@Autowired
private DmVisitorsMapper dmVisitorsMapper;

@Autowired
private DmDigitalmanMapper digitalmanMapper;

@Autowired
private DmDigitalmanExtMapper digitalmanExtMapper;

@Autowired
private DmVisitRecordsConverter recordsConverter;
@@ -160,9 +169,11 @@ public class DmVisitorInnerApiController extends BaseApiController {

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, commonDto.getDevId()).last(SqlConstants.LIMIT_ONE)).getManCode());

json.put("code", code);
json.put("nickName", commonDto.getVisitorName());
json.put("robotName", smsProperties.getRobotName());
json.put("robotName", dmDigitalmanPo.getName());
json.put("dateTime", commonDto.getVisitDate());
json.put("companyName", dmVisitorSmsConfigPo.getCompanyName());
json.put("companyAddr", dmVisitorSmsConfigPo.getCompanyAddress());
@@ -189,6 +200,15 @@ public class DmVisitorInnerApiController extends BaseApiController {
return outputSuccess().toJSON();
}

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

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

return outputSuccess(dmVisitorSmsConfigPo).toJSON();
}

@InnerAuth
@GetMapping(value = "list")
public com.alibaba.fastjson2.JSONObject visitList(@RequestParam(value = "empId") Long empId){


Notiek ielāde…
Atcelt
Saglabāt