From 1941e9fc342b3a2cb6d32e9658ad46f29f50a5df Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 22 七月 2024 15:36:11 +0800
Subject: [PATCH] 代码提交

---
 server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 9 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 22c3422..4a534ad 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,17 +2,26 @@
 
 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;
+import com.doumee.core.model.PageWrap;
+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;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * Created by IntelliJ IDEA.
@@ -36,16 +45,48 @@
     @Autowired
     public ZbomCRMService zbomCRMService;
 
+    @Autowired
+    public NewsService newsService;
 
+    @Autowired
+    public GetZhongTaiDataService getZhongTaiDataService;
+
+
+    @LoginRequired
     @ApiOperation(value = "銆怌绔皬绋嬪簭銆戣幏鍙栭椤靛織璇磋淇洓涓ā鍧楃被鐩暟鎹�", notes = "鑾峰彇棣栭〉蹇楄瑁呬慨鍥涗釜妯″潡绫荤洰鏁版嵁锛岃儗鏅浘鏆傛椂鍐欐锛屽弬鑰僓I")
     @PostMapping("/getZSZXCatalogs")
     public ApiResponse<ZSZXCatalogResponse> getZSZXCatalogs() {
-        return  ApiResponse.success(zbomZhongTaiService.getZSZXCatalogs());
-    }
-    @ApiOperation(value = "銆愮灏忕▼搴忋�戣幏鍙栧鎴风鐞嗘巿鏉冭烦杞湴鍧�", notes = "鑾峰彇瀹㈡埛绠$悊鎺堟潈璺宠浆鍦板潃")
-    @PostMapping("/getCrmAuthUrl")
-    public ApiResponse<String> getCrmAuthUrl() {
-        return  ApiResponse.success(zbomCRMService.getCrmGoUrl(this.getLoginUserInfo().getIamUsername()));
+        return  ApiResponse.success(getZhongTaiDataService.getZSZXCatalogs(getMemberId()));
     }
 
+
+
+    @ApiOperation(value = "銆怋绔皬绋嬪簭銆戞瘡鏃ヤ笂鏂版暟鎹�")
+    @GetMapping("/getDailyUpdates")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "fileType", value = "闄勪欢绫诲瀷 0鍥剧墖 1瑙嗛", required = false)
+    })
+    public ApiResponse<DailyUpdatesResponse> getDailyUpdates(Integer fileType) {
+        return  ApiResponse.success(newsService.getDailyUpdatesResponse(fileType));
+    }
+
+
+    @ApiOperation("銆怋绔皬绋嬪簭銆� 鎺ㄥ箍鍜ㄨ鍒嗛〉")
+    @PostMapping("/newsPage")
+    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) {
+        return  ApiResponse.success(zbomCRMService.getCrmGoUrl(this.getLoginUserInfo().getIamUsername(),type));
+    }
 }

--
Gitblit v1.9.3