From 3f1889e77f861a8284770c85bdd83204f6863f39 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 28 五月 2024 18:07:43 +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 | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 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 a4207da..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
@@ -8,12 +8,13 @@
import com.javaweb.cms.util.CmsConstants;
import com.javaweb.common.core.domain.AjaxResult;
import com.javaweb.common.utils.Arith;
-import com.javaweb.common.utils.StringUtils;
import com.javaweb.geo.domain.Hole;
import com.javaweb.geo.domain.HoleMedia;
import com.javaweb.geo.domain.Project;
+import com.javaweb.geo.domain.TubLog;
import com.javaweb.geo.enums.RecordType;
-import com.javaweb.geo.mapper.HoleMapper;
+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.IProjectService;
@@ -60,6 +61,13 @@
@Autowired
private IHoleMediaService holeMediaService;
+
+ @Autowired
+ private TubLogMapper tubLogMapper;
+
+ @Autowired
+ private ProjectCameraMapper projectCameraMapper;
+
private String getAdminIndex() {
return configService.selectConfigByKey(CmsConstants.KEY_ADMIN_INDEX);
@@ -118,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());
@@ -131,7 +139,7 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/totalProcess")
+ @GetMapping("/system/stat/totalProcess")
public AjaxResult totalProcess() {
AjaxResult ajaxResult = AjaxResult.success();
Hole hole = holeService.selectHoleTotalProcess();
@@ -145,7 +153,7 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/projectProcess")
+ @GetMapping("/system/stat/projectProcess")
public AjaxResult projectProcess() {
AjaxResult ajaxResult = AjaxResult.success();
List<Hole> holes = holeService.selectHoleProjectProcess();
@@ -164,13 +172,29 @@
String ids = projects.get(i).getIds();
Double val = holeMap.get(ids);
vo = new ProjectProcessVO();
+
+ vo.setIds(projects.get(i).getIds());
vo.setRanking(i + 1);
- vo.setStation(projects.get(i).getCode());
+ vo.setStation(projects.get(i).getFullName());
vo.setValue(val);
+ vo.setLng(projects.get(i).getLng());
+ vo.setLat(projects.get(i).getLat());
+
+
if (val == null) {
vo.setValue(0.0d);
}
- vo.setStatus(projects.get(i).getStatus());
+ String []statusName ={"鍗忚皟涓�","寰呭紑宸�","杩涜涓�"};
+ String status = projects.get(i).getStatus();
+ if(status.equals("0")){
+ vo.setStatus(statusName[0]);
+ }else if(status.equals("1")){
+ vo.setStatus(statusName[1]);
+ }else if(status.equals("2")){
+ vo.setStatus(statusName[2]);
+ }else{
+ vo.setStatus("鏈煡");
+ }
vos.add(vo);
}
}
@@ -185,7 +209,7 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/indexDataCount")
+ @GetMapping("/system/stat/indexDataCount")
public AjaxResult indexDataCount() {
IndexVo result = new IndexVo();
//=============================鏌ヨ鍦哄湴鏁伴噺===============================
@@ -221,8 +245,22 @@
HoleMedia holeMedia = holeMediaService.selectHoleMediaNumber();
result.setFileCount(holeMedia.getNumber());
+ Integer cameraCount = projectCameraMapper.count();
+ result.setCameraCount(cameraCount);
return AjaxResult.success("鏌ヨ鎴愬姛",result);
}
+ /**
+ * 缁熻鏉愭枡鐨勬秷鑰�
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/system/stat/tubLogData")
+ public AjaxResult tubLogData() {
+ AjaxResult ajaxResult = new AjaxResult();
+ List<TubLog> tubLogs = tubLogMapper.countTubLogDate(null);
+ ajaxResult.put("tubLogs",tubLogs);
+ return ajaxResult;
+ }
}
--
Gitblit v1.9.1