From 680028df90e18299ea72d242a28a3ddcd9a0441c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 24 七月 2024 13:45:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java index 964a8ee..d367c4a 100644 --- a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java +++ b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java @@ -2,6 +2,8 @@ import com.doumee.biz.zbom.ZbomCRMService; import com.doumee.biz.zbom.ZbomZhongTaiService; +import com.doumee.config.annotation.LoginRequired; +import com.doumee.config.annotation.UserLoginRequired; import com.doumee.core.annotation.trace.Trace; import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageData; @@ -9,6 +11,7 @@ import com.doumee.dao.business.model.News; import com.doumee.dao.web.response.DailyUpdatesResponse; import com.doumee.dao.web.response.ZSZXCatalogResponse; +import com.doumee.service.business.GetZhongTaiDataService; import com.doumee.service.business.NewsService; import com.doumee.service.business.SmsEmailService; import io.swagger.annotations.Api; @@ -45,18 +48,28 @@ @Autowired public NewsService newsService; + @Autowired + public GetZhongTaiDataService getZhongTaiDataService; + + @UserLoginRequired + @LoginRequired @ApiOperation(value = "銆怌绔皬绋嬪簭銆戣幏鍙栭椤靛織璇磋淇洓涓ā鍧楃被鐩暟鎹�", notes = "鑾峰彇棣栭〉蹇楄瑁呬慨鍥涗釜妯″潡绫荤洰鏁版嵁锛岃儗鏅浘鏆傛椂鍐欐锛屽弬鑰僓I") @PostMapping("/getZSZXCatalogs") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) + }) public ApiResponse<ZSZXCatalogResponse> getZSZXCatalogs() { - return ApiResponse.success(zbomZhongTaiService.getZSZXCatalogs()); + return ApiResponse.success(getZhongTaiDataService.getZSZXCatalogs(getMemberId(),getUserType())); } + @UserLoginRequired @ApiOperation(value = "銆怋绔皬绋嬪簭銆戞瘡鏃ヤ笂鏂版暟鎹�") @GetMapping("/getDailyUpdates") @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "fileType", value = "闄勪欢绫诲瀷 0鍥剧墖 1瑙嗛", required = false) }) public ApiResponse<DailyUpdatesResponse> getDailyUpdates(Integer fileType) { @@ -64,17 +77,23 @@ } + @UserLoginRequired @ApiOperation("銆怋绔皬绋嬪簭銆� 鎺ㄥ箍鍜ㄨ鍒嗛〉") @PostMapping("/newsPage") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + }) public ApiResponse<PageData<News>> newsPage (@RequestBody PageWrap<News> pageWrap) { return ApiResponse.success(newsService.findPage(pageWrap)); } + @UserLoginRequired @ApiOperation(value = "鑾峰彇瀹㈡埛绠$悊鎺堟潈-鍒楄〃璺宠浆鍦板潃", notes = "鑾峰彇瀹㈡埛绠$悊鎺堟潈璺宠浆鍦板潃") @GetMapping("/getCrmAuthUrl") @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "绫诲瀷 0瀹㈡埛鍒楄〃 1璺宠浆鏂板鎰忓悜瀹㈡埛", required = true) }) public ApiResponse<String> getCrmAuthUrl(@RequestParam Integer type) { -- Gitblit v1.9.3