From 2cdd27390521349c69348a56255ef754ef19d92c Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 12 六月 2024 17:16:00 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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 8dcf4a5..66269c8 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
@@ -5,6 +5,7 @@
import java.util.List;
import java.util.Map;
+import cn.hutool.core.util.ObjectUtil;
import com.javaweb.cms.util.CmsConstants;
import com.javaweb.common.core.domain.AjaxResult;
import com.javaweb.common.utils.Arith;
@@ -13,6 +14,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 +65,9 @@
@Autowired
private TubLogMapper tubLogMapper;
+
+ @Autowired
+ private ProjectCameraMapper projectCameraMapper;
private String getAdminIndex() {
@@ -122,7 +127,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 +140,7 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/totalProcess")
+ @GetMapping("/system/stat/totalProcess")
public AjaxResult totalProcess() {
AjaxResult ajaxResult = AjaxResult.success();
Hole hole = holeService.selectHoleTotalProcess();
@@ -149,14 +154,17 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/projectProcess")
+ @GetMapping("/system/stat/projectProcess")
public AjaxResult projectProcess() {
AjaxResult ajaxResult = AjaxResult.success();
List<Hole> holes = holeService.selectHoleProjectProcess();
Map<String, Double> holeMap = new HashMap<>();
for (Hole hole : holes) {
- Double val = Arith.div(hole.getFootageCpl(), hole.getFootage(), 2);
- val = Arith.round(val * 100, 2);
+ Double val =0.0d;
+ if(ObjectUtil.isNotEmpty(hole.getFootageCpl()) && ObjectUtil.isNotEmpty(hole.getFootage())) {
+ val = Arith.div(hole.getFootageCpl(), hole.getFootage(), 2);
+ val = Arith.round(val * 100, 2);
+ }
holeMap.put(hole.getProjectId(), val);
}
@@ -205,7 +213,7 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/indexDataCount")
+ @GetMapping("/system/stat/indexDataCount")
public AjaxResult indexDataCount() {
IndexVo result = new IndexVo();
//=============================鏌ヨ鍦哄湴鏁伴噺===============================
@@ -241,6 +249,8 @@
HoleMedia holeMedia = holeMediaService.selectHoleMediaNumber();
result.setFileCount(holeMedia.getNumber());
+ Integer cameraCount = projectCameraMapper.count();
+ result.setCameraCount(cameraCount);
return AjaxResult.success("鏌ヨ鎴愬姛",result);
}
@@ -249,7 +259,7 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/tubLogData")
+ @GetMapping("/system/stat/tubLogData")
public AjaxResult tubLogData() {
AjaxResult ajaxResult = new AjaxResult();
List<TubLog> tubLogs = tubLogMapper.countTubLogDate(null);
--
Gitblit v1.9.1