From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
index 2955bc4..01a7327 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
@@ -2,7 +2,9 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
+import com.doumee.service.business.VisitsService;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.third.BoardService;
@@ -30,6 +32,9 @@
@Autowired
private BoardService boardService;
+ @Autowired
+ private VisitsService visitsService;
+
@LoginNoRequired
@ApiOperation("涓績鏁版嵁")
@GetMapping("/centerData")
@@ -39,11 +44,16 @@
}
+ /**
+ *
+ * @param type 0/null = 褰撳ぉ锛�1=褰撴湀锛�2=褰撳勾
+ * @return
+ */
@LoginNoRequired
@ApiOperation("鎶ヨ淇℃伅")
@GetMapping("/alarmData")
- public ApiResponse<AlarmDataVO> alarmDataSumByCate() {
- AlarmDataVO alarmDataVO = boardService.alarmDataSumByCate();
+ public ApiResponse<AlarmDataVO> alarmDataSumByCate(Integer type) {
+ AlarmDataVO alarmDataVO = boardService.alarmDataSumByCate(type);
return ApiResponse.success(alarmDataVO);
}
@LoginNoRequired
@@ -88,6 +98,13 @@
return ApiResponse.success(list);
}
+ @LoginNoRequired
+ @ApiOperation("瀹炴椂鍦ㄥ満浜哄憳鍒嗗竷")
+ @GetMapping("/inParkUser")
+ public ApiResponse<PCWorkPlatformDataVO> inParkUser() {
+ PCWorkPlatformDataVO pcWorkPlatformDataVO = visitsService.getPcWorkPlatformData(Constants.ONE,null);
+ return ApiResponse.success(pcWorkPlatformDataVO);
+ }
}
--
Gitblit v1.9.3