From c7d99f5e11c4cf0667f67b8170e1c585db2e2016 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 08 二月 2025 15:34:15 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkDeskCloutController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkDeskCloutController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkDeskCloutController.java
index 008e05e..e7c3479 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkDeskCloutController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkDeskCloutController.java
@@ -12,10 +12,12 @@
import com.doumee.dao.business.model.YwQuickModel;
import com.doumee.dao.business.vo.MonthDataResponse;
import com.doumee.dao.business.vo.WorkDeskDataResponse;
+import com.doumee.dao.system.model.Notices;
import com.doumee.service.business.WorkbenchesService;
import com.doumee.service.business.YwPatrolTaskRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -41,8 +43,15 @@
return ApiResponse.success(workbenchesService.getYwQuickList(getLoginUser(token)));
}
+ @ApiOperation("鑾峰彇榛樿蹇嵎鑿滃崟妯″潡淇℃伅")
+ @GetMapping("/getDefaultYwQuickList")
+ public ApiResponse<List<YwQuickModel>> getDefaultYwQuickList() {
+ return ApiResponse.success(workbenchesService.getYwQuickList(null));
+ }
+
+
@ApiOperation("鏇存柊蹇嵎妯″潡鏁版嵁")
- @GetMapping("/updMyYwQuickModel")
+ @PostMapping("/updMyYwQuickModel")
public ApiResponse updMyYwQuickModel(@RequestBody List<Integer> idList,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
workbenchesService.updMyYwQuickModel(idList,getLoginUser(token));
return ApiResponse.success("鎿嶄綔鎴愬姛");
@@ -60,6 +69,10 @@
return ApiResponse.success(workbenchesService.workDeskData(getLoginUser(token)));
}
-
+ @ApiOperation("H5-鎴戠殑寰呭姙")
+ @PostMapping("/myNoticesH5")
+ public ApiResponse<PageData<Notices>> myNoticesH5 (@RequestBody PageWrap<Notices> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(workbenchesService.getMyNotices(pageWrap,getLoginUser(token)));
+ }
}
--
Gitblit v1.9.3