This commit is contained in:
zhangchenbiao
2023-05-31 16:47:04 +08:00
parent b00a91d060
commit 5070f52076
19 changed files with 319 additions and 46 deletions

View File

@@ -30,6 +30,7 @@
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.6" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun.openservices:ons-client:1.8.8.3.Final" level="project" />
<orderEntry type="module" module-name="coolstore-partner-dao" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:3.0.2" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
@@ -62,7 +63,6 @@
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:2.0.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />
<orderEntry type="library" name="Maven: com.aliyun.openservices:ons-client:1.8.8.3.Final" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.0.19" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.12" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />

View File

@@ -72,11 +72,11 @@ public class Swagger2Config {
private List<Parameter> getParameters() {
List<Parameter> pars = new ArrayList<>();
pars.add(new ParameterBuilder().name("access_token").description("令牌").required(true)
pars.add(new ParameterBuilder().name("accessToken").description("令牌").required(true)
.modelRef(new ModelRef("string"))
.defaultValue("{{access_token}}")
.defaultValue("{{accessToken}}")
.parameterType("query").build());
pars.add(new ParameterBuilder().name("enterprise-id").required(true)
pars.add(new ParameterBuilder().name("enterpriseId").required(true)
.modelRef(new ModelRef("string"))
.defaultValue("45f92210375346858b6b6694967f44de")
.parameterType("path").build());

View File

@@ -25,7 +25,7 @@ public class DeskController {
@GetMapping(path = "/interviewSchedule")
@ApiOperation("面试日程信息 面试信息有限 不做分页")
public ResponseResult<InterviewScheduleInfoVO> interviewSchedule(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<InterviewScheduleInfoVO> interviewSchedule(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "selectedData",required = false) Date selectedData){
return ResponseResult.success();
@@ -34,7 +34,7 @@ public class DeskController {
@PostMapping(path = "/queryStageCount")
@ApiOperation("招商经理视角====各阶段待处理待跟进数量")
public ResponseResult<StageCountVO> queryStageCount(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<StageCountVO> queryStageCount(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody StageCountRequest stageCountRequest){
return ResponseResult.success();
@@ -43,7 +43,7 @@ public class DeskController {
@PostMapping(path = "/queryStageList")
@ApiOperation("招商经理视角====各阶段待数据列表")
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryStageList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryStageList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody StageCountRequest stageCountRequest){
return ResponseResult.success();
@@ -55,7 +55,7 @@ public class DeskController {
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<PartnerLineDetailVO> getPartnerLineDetail(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<PartnerLineDetailVO> getPartnerLineDetail(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestParam(value = "lineId",required = false)Long lineId){
@@ -65,7 +65,7 @@ public class DeskController {
@GetMapping(path = "/lastMonthCloseLine")
@ApiOperation("最近30天结束的线索")
public ResponseResult<PageInfo<PartnerLineInfoVO>> lastMonthCloseLine(@PathVariable(value = "enterprise-id", required = false) String enterpriseId){
public ResponseResult<PageInfo<PartnerLineInfoVO>> lastMonthCloseLine(@PathVariable(value = "enterpriseId", required = false) String enterpriseId){
return ResponseResult.success();
@@ -74,7 +74,7 @@ public class DeskController {
@PostMapping(path = "/allocationInvestmentManager")
@ApiOperation("分配招商经理/转让招商经理")
public ResponseResult<PageInfo<PartnerStageInfoVO>> allocationInvestmentManager(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<PageInfo<PartnerStageInfoVO>> allocationInvestmentManager(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody AllocationInvestmentManagerRequest allocationInvestmentManagerRequest){
return ResponseResult.success();
@@ -84,7 +84,7 @@ public class DeskController {
@PostMapping(path = "/queryPublicSeqLineList")
@ApiOperation("公海列表")
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryPublicSeaLineList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryPublicSeaLineList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody LineRequest LineRequest){
return ResponseResult.success();
@@ -95,7 +95,7 @@ public class DeskController {
@PostMapping(path = "/queryPrivateSeaLineList")
@ApiOperation("私海列表")
public ResponseResult<PageInfo<PrivateSeaLineListVo>> queryPrivateSeqLineList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<PageInfo<PrivateSeaLineListVo>> queryPrivateSeqLineList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){
return ResponseResult.success();
@@ -105,7 +105,7 @@ public class DeskController {
@PostMapping(path = "/queryBlackList")
@ApiOperation("黑名单列表")
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryBlackList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<PageInfo<PartnerStageInfoVO>> queryBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody LineRequest LineRequest){
return ResponseResult.success();
@@ -113,7 +113,7 @@ public class DeskController {
@PostMapping(path = "/removeBlackList")
public ResponseResult<Boolean> removeBlackList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<Boolean> removeBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody LineBlackListRequest lineBlackListRequest){
@@ -121,7 +121,7 @@ public class DeskController {
}
@PostMapping(path = "/joinBlackList")
public ResponseResult<Boolean> joinBlackList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<Boolean> joinBlackList(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody LineBlackListRequest lineBlackListRequest){
@@ -130,7 +130,7 @@ public class DeskController {
@PostMapping(path = "/closeFollow")
public ResponseResult<Boolean> closeFollow(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<Boolean> closeFollow(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody CloseFollowRequest closeFollowRequest){
@@ -139,7 +139,7 @@ public class DeskController {
@PostMapping(path = "/changeIntentInfo")
@ApiOperation("员工端变更C端用户意向信息")
public ResponseResult<Boolean> changeIntentInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<Boolean> changeIntentInfo(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody BaseUserInfoRequest baseUserInfoRequest){
return ResponseResult.success();
@@ -148,7 +148,7 @@ public class DeskController {
@PostMapping(path = "/addTags")
@ApiOperation("添加标签接口")
public ResponseResult<Boolean> addTags(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
public ResponseResult<Boolean> addTags(@PathVariable(value = "enterpriseId", required = false) String enterpriseId,
@RequestBody AddTagsRequest addTagsRequest){
return ResponseResult.success();

View File

@@ -21,7 +21,7 @@ import java.util.List;
* @date 2023-05-30 17:20
*/
@RestController
@RequestMapping({"/enterprises/{enterprise-id}/users"})
@RequestMapping({"/enterprises/{enterpriseId}/users"})
@Slf4j
public class EnterpriseUserController {
@@ -29,7 +29,7 @@ public class EnterpriseUserController {
public EnterpriseUserService enterpriseUserService;
@GetMapping(path = "/dept/userList")
public ResponseResult<PageInfo<EnterpriseUserPageVO>> getUserList(@PathVariable(value = "enterprise-id", required = true) String eid,
public ResponseResult<PageInfo<EnterpriseUserPageVO>> getUserList(@PathVariable(value = "enterpriseId", required = true) String eid,
@RequestParam(name = "user_name", required = false) String userName,
@RequestParam(name = "dept_id", required = false) String deptId,
@RequestParam(name = "role_id", required = false) Long roleId,

View File

@@ -43,8 +43,8 @@ mybatis.configuration.map-underscore-to-camel-case=true
isv.domain = https://abstore-isv.coolstore.cn
#rocketmq \u914D\u7F6E
rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2
rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig
rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-internal.aliyuncs.com:8080
rocketmq.accessKey=zK2oVEz4G1ts23d2
rocketmq.secretKey=0UstLCS0mh2ASgBh
rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04-vpc.cn-hangzhou.rmq.aliyuncs.com:8080
rocketmq.topic=simple_message
rocketmq.orderTopic=order_message