Merge branch 'cc_20230520_partner' of http://gitlab.coolcollege.cn/hangzhou/java/coolstore-partner-manage into cc_20230520_partner
# Conflicts: # coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java # coolstore-partner-webb/src/main/resources/application-dev.properties
This commit is contained in:
@@ -0,0 +1,41 @@
|
||||
package com.cool.store.controller;
|
||||
|
||||
import com.cool.store.response.ResponseResult;
|
||||
import com.cool.store.service.HyPartnerClerkService;
|
||||
import com.cool.store.vo.PartnerClerkVO;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author suzhuhong
|
||||
* @Date 2023/6/15 11:13
|
||||
* @Version 1.0
|
||||
*/
|
||||
@RestController
|
||||
@Slf4j
|
||||
public class ClerkController {
|
||||
|
||||
@Resource
|
||||
HyPartnerClerkService hyPartnerClerkService;
|
||||
|
||||
|
||||
@GetMapping(path = "/queryPartnerClerkInfoList")
|
||||
@ApiOperation("根据线索ID 查询店员列表")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
|
||||
})
|
||||
public ResponseResult<List<PartnerClerkVO>> queryPartnerClerkInfoList(@RequestParam(value = "lineId",required = false)Long lineId){
|
||||
return ResponseResult.success(hyPartnerClerkService.getPartnerClerkList(lineId));
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -32,14 +32,16 @@ public class ContentController {
|
||||
|
||||
@PostMapping("/delete")
|
||||
@ApiOperation("删除动态")
|
||||
public void deleteContent(@RequestParam(value = "contentId") String contentId) {
|
||||
public ResponseResult deleteContent(@RequestParam(value = "contentId") String contentId) {
|
||||
contentService.deleteContent(contentId);
|
||||
return ResponseResult.success();
|
||||
}
|
||||
|
||||
@PostMapping("/modify")
|
||||
@ApiOperation("修改动态")
|
||||
public void updateContent(@RequestBody ContentUpdateDto dto) {
|
||||
public ResponseResult updateContent(@RequestBody ContentUpdateDto dto) {
|
||||
contentService.updateContent(dto);
|
||||
return ResponseResult.success();
|
||||
}
|
||||
|
||||
@PostMapping("/queryContentList")
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
package com.cool.store.controller;
|
||||
|
||||
import com.cool.store.context.CurrentUserHolder;
|
||||
import com.cool.store.dto.calendar.UserCalendarsEventDTO;
|
||||
import com.cool.store.enums.LineStatusEnum;
|
||||
import com.cool.store.exception.ApiException;
|
||||
import com.cool.store.http.ISVHttpRequest;
|
||||
import com.cool.store.request.*;
|
||||
import com.cool.store.response.ResponseResult;
|
||||
import com.cool.store.service.*;
|
||||
@@ -36,34 +40,55 @@ public class DeskController {
|
||||
@Resource
|
||||
HyPartnerBaseInfoService hyPartnerBaseInfoService;
|
||||
@Resource
|
||||
OpenAreaService openAreaService;
|
||||
private ISVHttpRequest isvHttpRequest;
|
||||
@Resource
|
||||
EnterpriseUserService enterpriseUserService;
|
||||
|
||||
|
||||
@GetMapping(path = "/interviewSchedule")
|
||||
@ApiOperation("面试日程信息 面试信息有限 不做分页")
|
||||
public ResponseResult<InterviewScheduleInfoVO> interviewSchedule(@RequestParam(value = "userId",required = false) String userId,
|
||||
@RequestParam(value = "selectedData",required = false) Date selectedData){
|
||||
public ResponseResult<InterviewScheduleInfoVO> interviewSchedule(@RequestParam(value = "selectedData",required = false) Date selectedData){
|
||||
|
||||
String userId = CurrentUserHolder.getUserId();
|
||||
return ResponseResult.success(deskService.interviewSchedule(userId,selectedData));
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(path = "/getInvestmentManagerList")
|
||||
@ApiOperation("招商经理")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "type", value = "allocation-招商经理 transfer", required = false),
|
||||
@ApiImplicitParam(name = "keyword", value = "keyword", required = false),
|
||||
})
|
||||
public ResponseResult<List<EnterpriseUserSingleInfoVO>> getInvestmentManagerList(String type,String keyword){
|
||||
return ResponseResult.success(enterpriseUserService.getInvestmentManagerList(type,CurrentUserHolder.getUserId(),keyword));
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(path = "/getUserCalendarsEvents")
|
||||
@ApiOperation("飞书日程信息")
|
||||
public ResponseResult<List<UserCalendarsEventDTO>> getUserCalendarsEvents(@RequestParam(value = "startTime",required = true) Long startTime,
|
||||
@RequestParam(value = "endTime",required = true) Long endTime) throws ApiException {
|
||||
|
||||
String userId = CurrentUserHolder.getUserId();
|
||||
return ResponseResult.success(isvHttpRequest.getUserCalendarsEvents(userId,startTime,endTime));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@GetMapping(path = "/queryStageCount")
|
||||
@ApiOperation("招商经理视角====各阶段待处理待跟进数量")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false),
|
||||
})
|
||||
public ResponseResult<StageCountVO> queryStageCount(@RequestParam(value = "type",required = false)String type){
|
||||
String userId = "";
|
||||
return ResponseResult.success(deskService.getStageCountByType(userId,type));
|
||||
return ResponseResult.success(deskService.getStageCountByType(CurrentUserHolder.getUserId(),type));
|
||||
}
|
||||
|
||||
@GetMapping(path = "/queryInterviewPlan")
|
||||
@ApiOperation("是否有面试与临期线索")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "userId", value = "招商经理ID", required = false),
|
||||
})
|
||||
public ResponseResult<InterviewPlanVO> queryInterviewPlanVO(@RequestParam(value = "userId",required = false)String userId){
|
||||
public ResponseResult<InterviewPlanVO> queryInterviewPlanVO(){
|
||||
String userId = CurrentUserHolder.getUserId();
|
||||
return ResponseResult.success(deskService.getInterviewPlan(userId));
|
||||
}
|
||||
|
||||
@@ -78,7 +103,7 @@ public class DeskController {
|
||||
public ResponseResult<PageInfo<PartnerIntentApplyInfoVO>> queryIntentApplyList(@RequestParam(value = "type",required = false)String type,
|
||||
@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
|
||||
@RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){
|
||||
String userId = "";
|
||||
String userId = CurrentUserHolder.getUserId();
|
||||
return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyList(userId,type,pageSize,pageNumber));
|
||||
}
|
||||
|
||||
@@ -88,7 +113,7 @@ public class DeskController {
|
||||
public ResponseResult<PageInfo<PartnerInterviewInfoVO>> querySubscribeInterviewTimeList(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
|
||||
@RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){
|
||||
|
||||
String userId = "";
|
||||
String userId = CurrentUserHolder.getUserId();
|
||||
return ResponseResult.success(hyPartnerInterviewPlanService.getPartnerInterviewInfoList(userId,pageSize,pageNumber));
|
||||
}
|
||||
|
||||
@@ -100,7 +125,7 @@ public class DeskController {
|
||||
public ResponseResult<PageInfo<PartnerInterviewInfoVO>> queryQualifiedInterviewList(@RequestParam(value = "type",required = false)String type,
|
||||
@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
|
||||
@RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){
|
||||
String userId = "";
|
||||
String userId = CurrentUserHolder.getUserId();
|
||||
return ResponseResult.success(hyPartnerInterviewPlanService.getQualifiedInterviewList(userId,type,pageSize,pageNumber));
|
||||
}
|
||||
|
||||
@@ -120,8 +145,8 @@ public class DeskController {
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
|
||||
})
|
||||
public ResponseResult<PartnerIntentApplyInfoVO> getPartnerIntentInfo(@RequestParam(value = "lineId",required = false)Long lineId){
|
||||
return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyInfo(lineId));
|
||||
public ResponseResult<PartnerIntentInfoVO> getPartnerIntentInfo(@RequestParam(value = "lineId",required = false)Long lineId){
|
||||
return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyDetail(lineId));
|
||||
}
|
||||
|
||||
|
||||
@@ -158,7 +183,7 @@ public class DeskController {
|
||||
public ResponseResult<PageInfo<PartnerLineInfoVO>> lastMonthCloseLine(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
|
||||
@RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){
|
||||
|
||||
String userId = "";
|
||||
String userId = CurrentUserHolder.getUserId();
|
||||
return ResponseResult.success(hyPartnerLineInfoService.lastMonthCloseLine(userId,pageSize,pageNumber));
|
||||
}
|
||||
|
||||
@@ -178,7 +203,6 @@ public class DeskController {
|
||||
}
|
||||
|
||||
|
||||
|
||||
@PostMapping(path = "/queryPublicSeqLineList")
|
||||
@ApiOperation("公海列表")
|
||||
public ResponseResult<PageInfo<PublicSeaLineListVo>> queryPublicSeaLineList(@RequestBody LineRequest LineRequest){
|
||||
@@ -187,8 +211,6 @@ public class DeskController {
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@PostMapping(path = "/queryPrivateSeaLineList")
|
||||
@ApiOperation("私海列表")
|
||||
public ResponseResult<PageInfo<PrivateSeaLineListVo>> queryPrivateSeqLineList(@RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){
|
||||
@@ -196,8 +218,6 @@ public class DeskController {
|
||||
return ResponseResult.success();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@PostMapping(path = "/queryBlackList")
|
||||
@ApiOperation("黑名单列表")
|
||||
public ResponseResult<PageInfo<BlackListVO>> queryBlackList(@RequestBody LineRequest LineRequest){
|
||||
@@ -224,9 +244,7 @@ public class DeskController {
|
||||
@PostMapping(path = "/closeOrPassFollow")
|
||||
@ApiOperation("意向申请审核 结束跟进/通过流程")
|
||||
public ResponseResult<Boolean> closeOrPassFollow(@RequestBody CloseFollowRequest closeFollowRequest){
|
||||
|
||||
String userId = "";
|
||||
return ResponseResult.success(hyPartnerLineInfoService.closeOrPassFollow(userId,closeFollowRequest));
|
||||
return ResponseResult.success(hyPartnerLineInfoService.closeOrPassFollow(CurrentUserHolder.getUserId(),closeFollowRequest));
|
||||
}
|
||||
|
||||
@PostMapping(path = "/changeIntentInfo")
|
||||
@@ -242,56 +260,4 @@ public class DeskController {
|
||||
return ResponseResult.success(hyPartnerBaseInfoService.addTags(addTagsRequest));
|
||||
}
|
||||
|
||||
|
||||
// TODO: 2023/6/13 添加根据线索查询店员接口列表接口
|
||||
// @GetMapping(path = "/queryPartnerIntentApplyInfo")
|
||||
// @ApiOperation("查看意向审核信息")
|
||||
// @ApiImplicitParams({
|
||||
// @ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
|
||||
// })
|
||||
// public ResponseResult<PartnerSummaryInfoVO> queryPartnerIntentApplyInfo(@RequestParam(value = "lineId",required = false)Long lineId){
|
||||
//
|
||||
// return ResponseResult.success();
|
||||
// }
|
||||
|
||||
|
||||
|
||||
@GetMapping(path = "/getOpenAreaTree")
|
||||
@ApiOperation("开放城市树-搜索城市")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "keyWord", value = "搜索关键字", required = false)
|
||||
})
|
||||
public ResponseResult<List<OpenAreaTreeVO>> getOpenAreaTree(@RequestParam(value = "keyWord",required = false)String keyWord){
|
||||
|
||||
return ResponseResult.success(openAreaService.queryByKeyword(keyWord,Boolean.TRUE));
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(path = "/getOpenAreaList")
|
||||
@ApiOperation("开放城市树-子列表")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "parentId", value = "父区域名称", required = false),
|
||||
@ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false)
|
||||
})
|
||||
public ResponseResult<List<OpenAreaVO>> getOpenAreaList(@RequestParam(value = "parentId",required = false)Long parentId,
|
||||
@RequestParam(value = "type",required = false)String type){
|
||||
return ResponseResult.success(openAreaService.getChildrenList(type,parentId));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@PostMapping(path = "/changeOpenAreaStatus")
|
||||
@ApiOperation("变更开放区域状态")
|
||||
public ResponseResult<Boolean> changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){
|
||||
|
||||
String userId = "";
|
||||
return ResponseResult.success(openAreaService.batchUpdate( userId, openAreaRequest));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package com.cool.store.controller;
|
||||
|
||||
import com.cool.store.dto.partner.EnterInterviewDto;
|
||||
import com.cool.store.request.*;
|
||||
import com.cool.store.response.ResponseResult;
|
||||
import com.cool.store.service.InterviewService;
|
||||
import com.cool.store.vo.EnterInterviewVO;
|
||||
import com.cool.store.vo.interview.InterviewVO;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
@@ -65,6 +67,10 @@ public class InterviewController {
|
||||
return ResponseResult.success();
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/enter")
|
||||
@ApiOperation("进入面试间")
|
||||
public ResponseResult<EnterInterviewVO> enterInterviewRoom(@RequestBody EnterInterviewDto dto) {
|
||||
return ResponseResult.success(interviewService.enterInterviewRoom(dto));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
package com.cool.store.controller;
|
||||
|
||||
import com.cool.store.context.CurrentUserHolder;
|
||||
import com.cool.store.request.OpenAreaRequest;
|
||||
import com.cool.store.response.ResponseResult;
|
||||
import com.cool.store.service.OpenAreaService;
|
||||
import com.cool.store.vo.OpenAreaTreeVO;
|
||||
import com.cool.store.vo.OpenAreaVO;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author suzhuhong
|
||||
* @Date 2023/6/15 9:49
|
||||
* @Version 1.0
|
||||
*/
|
||||
@RestController
|
||||
public class OpenAreaController {
|
||||
|
||||
@Resource
|
||||
OpenAreaService openAreaService;
|
||||
|
||||
@GetMapping(path = "/getOpenAreaTree")
|
||||
@ApiOperation("开放城市树-搜索城市 到第二节点")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false)
|
||||
})
|
||||
public ResponseResult<List<OpenAreaTreeVO>> getOpenAreaTree(@RequestParam(value = "keyword",required = false)String keyword){
|
||||
return ResponseResult.success(openAreaService.queryByKeyword(keyword,Boolean.TRUE));
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(path = "/getAllOpenAreaTree")
|
||||
@ApiOperation("开放城市树-所有节点")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false)
|
||||
})
|
||||
public ResponseResult<List<OpenAreaTreeVO>> getAllOpenAreaTree(@RequestParam(value = "keyword",required = false)String keyword){
|
||||
return ResponseResult.success(openAreaService.queryAllOpenAreaByKeyword(keyword,Boolean.FALSE));
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(path = "/getOpenAreaList")
|
||||
@ApiOperation("开放城市树-子列表")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "parentId", value = "父区域名称", required = false),
|
||||
@ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false)
|
||||
})
|
||||
public ResponseResult<List<OpenAreaVO>> getOpenAreaList(@RequestParam(value = "parentId",required = false)Long parentId,
|
||||
@RequestParam(value = "type",required = false)String type){
|
||||
return ResponseResult.success(openAreaService.getChildrenList(type,parentId));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@PostMapping(path = "/changeOpenAreaStatus")
|
||||
@ApiOperation("变更开放区域状态")
|
||||
public ResponseResult<Boolean> changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){
|
||||
String userId = CurrentUserHolder.getUserId();
|
||||
return ResponseResult.success(openAreaService.batchUpdate( userId, openAreaRequest));
|
||||
}
|
||||
}
|
||||
@@ -2,11 +2,16 @@ package com.cool.store.controller;
|
||||
|
||||
import com.cool.store.response.ResponseResult;
|
||||
import com.cool.store.service.RegionService;
|
||||
import com.cool.store.service.ZoneService;
|
||||
import com.cool.store.vo.region.RegionBaseInfoVO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
@@ -28,6 +33,8 @@ public class RegionController {
|
||||
|
||||
@Resource
|
||||
private RegionService regionService;
|
||||
@Resource
|
||||
ZoneService zoneService;
|
||||
|
||||
@GetMapping("/getRegionList")
|
||||
public ResponseResult<List<RegionBaseInfoVO>> getRegionBaseInfoList(){
|
||||
@@ -36,4 +43,13 @@ public class RegionController {
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("查询所有被绑定战区的组织机构")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "type", value = "intent-意向区域 development 开发区域", required = false)
|
||||
})
|
||||
@GetMapping("/queryAllBingZoneRegionList")
|
||||
public ResponseResult<List<String>> queryAllBingZoneRegionList(@RequestParam(value = "type",required = false)String type){
|
||||
return ResponseResult.success(zoneService.queryAllBingZoneRegionList(type));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,26 +1,29 @@
|
||||
package com.cool.store.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.cool.store.dao.EnterpriseUserDAO;
|
||||
import com.cool.store.dto.calendar.CreateCalendarEventDTO;
|
||||
import com.cool.store.dto.calendar.DeleteCalendarEventDTO;
|
||||
import com.cool.store.dto.calendar.UpdateCalendarEventDTO;
|
||||
import com.cool.store.dto.calendar.UserCalendarsEventDTO;
|
||||
import com.cool.store.dto.partner.DescribePhoneNumberDTO;
|
||||
import com.cool.store.dto.response.ResultDTO;
|
||||
import com.cool.store.entity.HyOpenAreaInfoDO;
|
||||
|
||||
import com.cool.store.entity.EnterpriseUserDO;
|
||||
import com.cool.store.enums.RocketMqTagEnum;
|
||||
import com.cool.store.enums.ErrorCodeEnum;
|
||||
import com.cool.store.exception.ApiException;
|
||||
import com.cool.store.exception.ServiceException;
|
||||
import com.cool.store.mapper.HyOpenAreaInfoMapper;
|
||||
import com.cool.store.http.ISVHttpRequest;
|
||||
import com.cool.store.mq.producer.SimpleMessageService;
|
||||
import com.cool.store.request.AllocationInvestmentManagerRequest;
|
||||
import com.cool.store.request.City;
|
||||
import com.cool.store.request.TestRequest;
|
||||
import com.cool.store.response.ResponseResult;
|
||||
import com.cool.store.service.AliyunService;
|
||||
import com.cool.store.service.EnterpriseSyncService;
|
||||
import com.cool.store.service.EnterpriseUserService;
|
||||
import com.cool.store.utils.UUIDUtils;
|
||||
import com.cool.store.vo.cuser.IdentityCardInfoVO;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@@ -43,9 +46,13 @@ public class TestController {
|
||||
@Resource
|
||||
private ISVHttpRequest isvHttpRequest;
|
||||
@Resource
|
||||
HyOpenAreaInfoMapper hyOpenAreaInfoMapper;
|
||||
private HyOpenAreaInfoMapper hyOpenAreaInfoMapper;
|
||||
@Resource
|
||||
private EnterpriseSyncService enterpriseSyncService;
|
||||
@Resource
|
||||
private EnterpriseUserDAO enterpriseUserDAO;
|
||||
@Resource
|
||||
private AliyunService aliyunService;
|
||||
|
||||
@PostMapping("/post")
|
||||
public ResponseResult<Boolean> get(@RequestBody List<TestRequest> testRequestList){
|
||||
@@ -186,4 +193,22 @@ public class TestController {
|
||||
return ResultDTO.successResult(isvHttpRequest.deleteUserCalendarEvent(param));
|
||||
}
|
||||
|
||||
@GetMapping("/user/getUserCalendarsEvents")
|
||||
public ResultDTO<List<UserCalendarsEventDTO>> getUserCalendarsEvents(@RequestParam("userId") String userId, @RequestParam("startTime") long startTime,
|
||||
@RequestParam("endTime") long endTime) throws ApiException {
|
||||
log.info("getUserCalendarsEvents : corpId:{}, appType:{}, userId:{}, startTime:{}, endTime:{}", userId, startTime, endTime);
|
||||
return ResultDTO.successResult(isvHttpRequest.getUserCalendarsEvents(userId, startTime, endTime));
|
||||
}
|
||||
|
||||
@GetMapping(path = "/getIdentityCardInfo")
|
||||
@ApiOperation("根据身份证正面解析获取数据")
|
||||
public ResponseResult<IdentityCardInfoVO> getIdentityCardInfo(@RequestParam(value = "faceImageUrl")String faceImageUrl){
|
||||
try {
|
||||
IdentityCardInfoVO identityCardInfo = aliyunService.getIdentityCardInfo(faceImageUrl);
|
||||
return ResponseResult.success(identityCardInfo);
|
||||
} catch (Exception e) {
|
||||
throw new ServiceException(ErrorCodeEnum.IDENTITY_CARD_PARSE_FAIL);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.cool.store.context.CurrentUserHolder;
|
||||
import com.cool.store.request.IntentAreaSettingRequest;
|
||||
import com.cool.store.response.ResponseResult;
|
||||
import com.cool.store.service.ZoneService;
|
||||
import com.cool.store.vo.ZoneCheckVO;
|
||||
import com.cool.store.vo.ZoneVO;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
@@ -13,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author suzhuhong
|
||||
@@ -32,6 +34,12 @@ public class ZoneController {
|
||||
return ResponseResult.success(zoneService.addZone( CurrentUserHolder.getUserId(),intentAreaSettingRequest));
|
||||
}
|
||||
|
||||
@PostMapping(path = "/checkZone")
|
||||
@ApiOperation("校验战区")
|
||||
public ResponseResult<List<ZoneCheckVO>> checkZone(@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){
|
||||
return ResponseResult.success(zoneService.checkZone(intentAreaSettingRequest));
|
||||
}
|
||||
|
||||
@PostMapping(path = "/updateZone")
|
||||
@ApiOperation("编辑意向战区/开发战区")
|
||||
public ResponseResult<Boolean> updateZone(@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){
|
||||
|
||||
@@ -56,6 +56,11 @@ cdn.url=https://testhsaypic.coolstore.cn
|
||||
trtc.sdkAppId=1400811820
|
||||
trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
|
||||
|
||||
weixin.appId=wx6f984e535e571818
|
||||
weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
|
||||
|
||||
signKey=77fea013c3a6459685b83c21a2fc3411
|
||||
|
||||
#xxljob配置
|
||||
xxl.job.admin.addresses = http://10.7.53.224:10001/xxl-job-admin
|
||||
xxl.job.executor.appname = ${spring.application.name}
|
||||
|
||||
@@ -53,6 +53,11 @@ corp.id = 171cddee76471740
|
||||
trtc.sdkAppId=1400811820
|
||||
trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
|
||||
|
||||
weixin.appId=wx6f984e535e571818
|
||||
weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
|
||||
|
||||
signKey=77fea013c3a6459685b83c21a2fc3411
|
||||
|
||||
#八佰流程配置
|
||||
hs.mdm.baseUrl=http://172.35.37.52:8080
|
||||
|
||||
|
||||
@@ -51,4 +51,9 @@ corp.id = 171cddee76471740
|
||||
|
||||
#TRTC
|
||||
trtc.sdkAppId=1400811820
|
||||
trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
|
||||
trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
|
||||
|
||||
weixin.appId=wx6f984e535e571818
|
||||
weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
|
||||
|
||||
signKey=d851f2a9ac90474abecdc2fbb148d4d7
|
||||
@@ -36,7 +36,7 @@ customize_sub_table_size=10
|
||||
mybatis.configuration.call-setters-on-nulls=true
|
||||
mybatis.configuration.map-underscore-to-camel-case=true
|
||||
|
||||
isv.domain = http://localhost:31100
|
||||
isv.domain = http://localhost:31100/isv
|
||||
|
||||
#rocketmq \u914D\u7F6E
|
||||
rocketmq.accessKey=zK2oVEz4G1ts23d2
|
||||
@@ -59,6 +59,11 @@ cdn.url=https://testhsaypic.coolstore.cn
|
||||
trtc.sdkAppId=1400811820
|
||||
trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
|
||||
|
||||
weixin.appId=wx6f984e535e571818
|
||||
weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
|
||||
|
||||
signKey=77fea013c3a6459685b83c21a2fc3411
|
||||
|
||||
xxl.job.admin.addresses =
|
||||
xxl.job.executor.appname = ${spring.application.name}
|
||||
xxl.job.executor.ip =
|
||||
|
||||
@@ -51,4 +51,9 @@ corp.id = 171cddee76471740
|
||||
|
||||
#TRTC
|
||||
trtc.sdkAppId=1400811820
|
||||
trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
|
||||
trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
|
||||
|
||||
weixin.appId=wx6f984e535e571818
|
||||
weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
|
||||
|
||||
signKey=d851f2a9ac90474abecdc2fbb148d4d7
|
||||
@@ -51,4 +51,9 @@ corp.id = 171cddee76471740
|
||||
|
||||
#TRTC
|
||||
trtc.sdkAppId=1400811820
|
||||
trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
|
||||
trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
|
||||
|
||||
weixin.appId=wx6f984e535e571818
|
||||
weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
|
||||
|
||||
signKey=d851f2a9ac90474abecdc2fbb148d4d7
|
||||
@@ -51,4 +51,9 @@ corp.id = 171cddee76471740
|
||||
|
||||
#TRTC
|
||||
trtc.sdkAppId=1400811820
|
||||
trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
|
||||
trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
|
||||
|
||||
weixin.appId=wx6f984e535e571818
|
||||
weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
|
||||
|
||||
signKey=77fea013c3a6459685b83c21a2fc3411
|
||||
@@ -41,7 +41,7 @@
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<logger name="com.cool.store.mapper" level="DEBUG" additivity="true" />
|
||||
<logger name="com.cool.store.mapper" level="DEBUG" additivity="true" />
|
||||
<!--灰度、线上、预防 不输出到console-->
|
||||
<springProfile name="hd,online,pre">
|
||||
<root level="info">
|
||||
|
||||
Reference in New Issue
Block a user