From 280001d476b92bf2d14052518e6f69bee9dee43d Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期四, 18 七月 2024 16:13:15 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 1861efe..be620f2 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
@@ -17,10 +17,8 @@
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;
-import com.javaweb.geo.service.IProjectCameraService;
-import com.javaweb.geo.service.IProjectService;
+import com.javaweb.geo.service.*;
+import com.javaweb.geo.vo.DrillDateVo;
import com.javaweb.geo.vo.IndexVo;
import com.javaweb.geo.vo.ProjectProcessVO;
import com.javaweb.system.service.ISysConfigService;
@@ -77,6 +75,9 @@
@Autowired
private IProjectCameraService cameraService;
+
+ @Autowired
+ private IHoleLogService holeLogService;
private String getAdminIndex() {
@@ -141,6 +142,8 @@
public String main(ModelMap mmap) {
mmap.put("version", Global.getVersion());
+ String loginname = ShiroUtils.getLoginName();
+ mmap.put("loginuser",loginname);
return "main";
}
@@ -163,7 +166,7 @@
public AjaxResult totalProcess() {
AjaxResult ajaxResult = AjaxResult.success();
Hole hole = holeService.selectHoleTotalProcess();
- Double data = Arith.div(hole.getFootageCpl(), hole.getFootage(), 2);
+ Double data = Arith.div(hole.getFootageCpl(), hole.getFootage(), 4);
ajaxResult.put("pointerData", data);
return ajaxResult;
}
@@ -376,4 +379,17 @@
return prefix + "/player2";
}
+ /**
+ * 缁熻鏈�杩�10澶╄繘灏洪噺
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/system/stat/sumHoleLog")
+ public AjaxResult sumHoleLog() {
+ AjaxResult ajaxResult = AjaxResult.success();
+ List<DrillDateVo> drillDateList = holeLogService.SUMHoleLog();
+ ajaxResult.put("drillDateList",drillDateList);
+ return ajaxResult;
+ }
+
}
--
Gitblit v1.9.1