From 39f561130fdd53bdc385e4cae9595e0db0f76c66 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 18 七月 2024 17:04:01 +0800
Subject: [PATCH] 代码提交
---
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
index 5a0eac0..7548ae8 100644
--- a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -4,6 +4,10 @@
import com.doumee.biz.zbom.model.crm.CrmCustomerListRequest;
import com.doumee.biz.zbom.model.crm.response.CRMBaseResponse;
import com.doumee.biz.zbom.model.crm.response.CRMCustomerListResponse;
+import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
+import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
+import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
+import com.doumee.biz.zbom.model.zhongtai.response.*;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.config.annotation.UserLoginRequired;
import com.doumee.core.annotation.trace.Trace;
@@ -56,6 +60,9 @@
@Autowired
public GetCrmDataService getCrmDataService;
+ @Autowired
+ private GetZhongTaiDataService getZhongTaiDataService;
+
@ApiOperation(value = "灏忕▼搴忕櫥闄�", notes = "鍛樺伐绔皬绋嬪簭")
@GetMapping("/loginByWx")
@ApiImplicitParams({
@@ -98,7 +105,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
})
public ApiResponse bindingOpenid(@RequestParam String code) {
- usersService.bindingOpenid(code,getMemberId());
+ usersService.bindingOpenid(code,getUserId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -109,7 +116,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse getUserDetail() {
- usersService.usersDetailById(getMemberId());
+ usersService.usersDetailById(getUserId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -120,7 +127,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse editUsers(@RequestBody EditUsersRequest editUsersRequest) {
- editUsersRequest.setUserId(getMemberId());
+ editUsersRequest.setUserId(getUserId());
usersService.editUserInfo(editUsersRequest);
return ApiResponse.success("鏇存柊鎴愬姛");
}
@@ -176,9 +183,30 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse<CRMBaseResponse<List<CRMCustomerListResponse>>> getCustomerList(@RequestBody CrmCustomerListRequest crmCustomerListRequest) {
- crmCustomerListRequest.setUserId(getMemberId());
+ crmCustomerListRequest.setUserId(getUserId());
return ApiResponse.success(getCrmDataService.getCrmCustomerList(crmCustomerListRequest));
}
-
-
+
+ @UserLoginRequired
+ @ApiOperation(value = "鍒嗙被鏁版嵁 - 涓彴", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/getCatalogList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<ZTCatalogInfoResponse>> getCatalogList (@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
+ List<ZTCatalogInfoResponse> ztCatalogInfoResponseList = getZhongTaiDataService.getCatalogList(ztCatalogListRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponseList);
+ }
+
+ @UserLoginRequired
+ @ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/getCataLogTagList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<ZTTagInfoResponse>> getCataLogTagList(@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
+ List<ZTTagInfoResponse> ztTagInfoResponseList = getZhongTaiDataService.getCataLogTagList(ztCatalogListRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList);
+ }
+
}
--
Gitblit v1.9.3