From c6f79f5720c5d4a700b8b759a93393559409fd1c Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期一, 20 五月 2024 15:11:58 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java | 78 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 4 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 ec7023d..e8b3d7a 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
@@ -1,6 +1,7 @@
package com.javaweb.web.controller.system;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -8,6 +9,11 @@
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.Project;
+import com.javaweb.geo.mapper.HoleMapper;
+import com.javaweb.geo.service.IProjectService;
+import com.javaweb.geo.vo.ProjectProcessVO;
import com.javaweb.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -40,6 +46,12 @@
@Autowired
private ISysConfigService configService;
+
+ @Autowired
+ private IProjectService projectService;
+
+ @Autowired
+ private HoleMapper holeMapper;
private String getAdminIndex(){
return configService.selectConfigByKey(CmsConstants.KEY_ADMIN_INDEX);
@@ -98,9 +110,67 @@
return "main";
}
-
- private Double getValue(int a,int b) {
-
- return Arith.div((double)a*100, (double)b, 4);
+
+ // 绯荤粺浠嬬粛
+ @ResponseBody
+ @GetMapping("/system/project")
+ public AjaxResult project()
+ {
+ AjaxResult ajaxResult = AjaxResult.success();
+ List<Project> projects = projectService.selectProjectList(new Project());
+ ajaxResult.put("projects",projects);
+ return ajaxResult;
}
+ /**
+ * 鎬昏繘搴�
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/system/totalProcess")
+ public AjaxResult totalProcess()
+ {
+ AjaxResult ajaxResult = AjaxResult.success();
+ Hole hole = holeMapper.selectHoleTotalProcess();
+ Double data = Arith.div(hole.getFootageCpl(),hole.getFootage(),2) ;
+ ajaxResult.put("pointerData",data);
+ return ajaxResult;
+ }
+
+ /**
+ * 鍦哄湴杩涘害
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/system/projectProcess")
+ public AjaxResult projectProcess()
+ {
+ AjaxResult ajaxResult = AjaxResult.success();
+ List<Hole> holes = holeMapper.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);
+ holeMap.put(hole.getProjectId(),val) ;
+ }
+
+ List<Project> projects = projectService.selectProjectList(new Project());
+ List<ProjectProcessVO> vos = new ArrayList<>();
+ for(int i = 0 ; i<projects.size();i++ ){
+ String ids= projects.get(i).getIds();
+ Double val = holeMap.get(ids);
+ ProjectProcessVO vo = new ProjectProcessVO();
+ vo.setRanking(i + 1);
+ vo.setStation(projects.get(i).getCode());
+ vo.setValue(val);
+ if(val==null){
+ vo.setValue(0.0d);
+ }
+ vos.add(vo);
+ }
+
+ ajaxResult.put("projectData",vos);
+ return ajaxResult;
+ }
+
+
}
--
Gitblit v1.9.1