From 9166b7b4bdb84bfe499078dd68add5c3e462411f Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期一, 27 五月 2024 18:09: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 | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 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 c46a855..95c76b1 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
@@ -12,8 +12,10 @@
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.TubLogMapper;
import com.javaweb.geo.service.IHoleMediaService;
import com.javaweb.geo.service.IHoleService;
import com.javaweb.geo.service.IProjectService;
@@ -60,6 +62,10 @@
@Autowired
private IHoleMediaService holeMediaService;
+
+ @Autowired
+ private TubLogMapper tubLogMapper;
+
private String getAdminIndex() {
return configService.selectConfigByKey(CmsConstants.KEY_ADMIN_INDEX);
@@ -164,13 +170,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);
}
}
@@ -188,9 +210,6 @@
@GetMapping("/system/indexDataCount")
public AjaxResult indexDataCount() {
IndexVo result = new IndexVo();
- result.setProjectStatus0(0);
- result.setProjectStatus0(0);
- result.setProjectStatus0(0);
//=============================鏌ヨ鍦哄湴鏁伴噺===============================
List<Project> projectList = projectService.selectProjectCountByStatus();
if (!ObjectUtils.isEmpty(projectList)) {
@@ -199,12 +218,21 @@
result.setProjectStatus0(item.getStatusNumber());
}
if (RecordType.projectStatus1.getId().equals(item.getStatus())) {
- result.setProjectStatus0(item.getStatusNumber());
+ result.setProjectStatus1(item.getStatusNumber());
}
if (RecordType.projectStatus2.getId().equals(item.getStatus())) {
- result.setProjectStatus0(item.getStatusNumber());
+ result.setProjectStatus2(item.getStatusNumber());
}
}
+ }
+ if (ObjectUtils.isEmpty(result.getProjectStatus0())) {
+ result.setProjectStatus0(0);
+ }
+ if (ObjectUtils.isEmpty(result.getProjectStatus1())) {
+ result.setProjectStatus1(0);
+ }
+ if (ObjectUtils.isEmpty(result.getProjectStatus2())) {
+ result.setProjectStatus2(0);
}
//=============================鏌ヨ杩涘昂===============================
Hole hole = holeService.selectHoleTotalProcess();
@@ -218,5 +246,17 @@
return AjaxResult.success("鏌ヨ鎴愬姛",result);
}
+ /**
+ * 缁熻鏉愭枡鐨勬秷鑰�
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/system/tubLogData")
+ public AjaxResult tubLogData() {
+ AjaxResult ajaxResult = new AjaxResult();
+ List<TubLog> tubLogs = tubLogMapper.countTubLogDate();
+ ajaxResult.put("tubLogs",tubLogs);
+ return ajaxResult;
+ }
}
--
Gitblit v1.9.1