From dcfd61dbb5cc8bf8eda7a710b2f9f07de4902ec7 Mon Sep 17 00:00:00 2001
From: suerwei <18810552194@163.com>
Date: 星期三, 12 六月 2024 11:38:16 +0800
Subject: [PATCH] 钻孔类型，钻孔状态
---
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java b/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
index 865861d..b141511 100644
--- a/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
+++ b/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
@@ -13,6 +13,7 @@
import com.javaweb.geo.domain.Project;
import com.javaweb.geo.domain.TubLog;
import com.javaweb.geo.enums.RecordType;
+import com.javaweb.geo.mapper.ProjectCameraMapper;
import com.javaweb.geo.mapper.TubLogMapper;
import com.javaweb.geo.service.IHoleMediaService;
import com.javaweb.geo.service.IHoleService;
@@ -63,6 +64,9 @@
@Autowired
private TubLogMapper tubLogMapper;
+
+ @Autowired
+ private ProjectCameraMapper projectCameraMapper;
private String getAdminIndex() {
@@ -122,7 +126,7 @@
// 绯荤粺浠嬬粛
@ResponseBody
- @GetMapping("/system/project")
+ @GetMapping("/system/stat/project")
public AjaxResult project() {
AjaxResult ajaxResult = AjaxResult.success();
List<Project> projects = projectService.selectProjectList(new Project());
@@ -135,7 +139,7 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/totalProcess")
+ @GetMapping("/system/stat/totalProcess")
public AjaxResult totalProcess() {
AjaxResult ajaxResult = AjaxResult.success();
Hole hole = holeService.selectHoleTotalProcess();
@@ -149,7 +153,7 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/projectProcess")
+ @GetMapping("/system/stat/projectProcess")
public AjaxResult projectProcess() {
AjaxResult ajaxResult = AjaxResult.success();
List<Hole> holes = holeService.selectHoleProjectProcess();
@@ -205,7 +209,7 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/indexDataCount")
+ @GetMapping("/system/stat/indexDataCount")
public AjaxResult indexDataCount() {
IndexVo result = new IndexVo();
//=============================鏌ヨ鍦哄湴鏁伴噺===============================
@@ -241,6 +245,8 @@
HoleMedia holeMedia = holeMediaService.selectHoleMediaNumber();
result.setFileCount(holeMedia.getNumber());
+ Integer cameraCount = projectCameraMapper.count();
+ result.setCameraCount(cameraCount);
return AjaxResult.success("鏌ヨ鎴愬姛",result);
}
@@ -249,10 +255,10 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/tubLogData")
+ @GetMapping("/system/stat/tubLogData")
public AjaxResult tubLogData() {
AjaxResult ajaxResult = new AjaxResult();
- List<TubLog> tubLogs = tubLogMapper.countTubLogDate();
+ List<TubLog> tubLogs = tubLogMapper.countTubLogDate(null);
ajaxResult.put("tubLogs",tubLogs);
return ajaxResult;
}
--
Gitblit v1.9.1