From 28e168f05d3eb48223e69064188c6fce786442d4 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 22 五月 2024 12:02:38 +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 | 146 +++++++++++++++++++++++++++++++++---------------
1 files changed, 100 insertions(+), 46 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 e8b3d7a..65725e7 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
@@ -10,14 +10,20 @@
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.enums.RecordType;
import com.javaweb.geo.mapper.HoleMapper;
+import com.javaweb.geo.service.IHoleMediaService;
+import com.javaweb.geo.service.IHoleService;
import com.javaweb.geo.service.IProjectService;
+import com.javaweb.geo.vo.IndexVo;
import com.javaweb.geo.vo.ProjectProcessVO;
import com.javaweb.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import com.javaweb.common.config.Global;
import com.javaweb.common.core.controller.BaseController;
@@ -35,12 +41,11 @@
/**
* 棣栭〉 涓氬姟澶勭悊
- *
+ *
* @author ruoyi
*/
@Controller
-public class SysIndexController extends BaseController
-{
+public class SysIndexController extends BaseController {
@Autowired
private ISysMenuService menuService;
@@ -51,9 +56,12 @@
private IProjectService projectService;
@Autowired
- private HoleMapper holeMapper;
+ private IHoleService holeService;
- private String getAdminIndex(){
+ @Autowired
+ private IHoleMediaService holeMediaService;
+
+ private String getAdminIndex() {
return configService.selectConfigByKey(CmsConstants.KEY_ADMIN_INDEX);
}
@@ -64,8 +72,7 @@
// 绯荤粺棣栭〉
@GetMapping("/index")
- public String index(ModelMap mmap)
- {
+ public String index(ModelMap mmap) {
// 鍙栬韩浠戒俊鎭�
SysUser user = ShiroUtils.getSysUser();
// 鏍规嵁鐢ㄦ埛id鍙栧嚭鑿滃崟
@@ -76,9 +83,9 @@
mmap.put("demoEnabled", Global.isDemoEnabled());
String indePage = this.getAdminIndex();
- if(CmsConstants.ADMIN_INDEX_TOP_MENU.equals(indePage)){
+ if (CmsConstants.ADMIN_INDEX_TOP_MENU.equals(indePage)) {
return CmsConstants.ADMIN_INDEX_TOP_MENU; // index_topMenu
- }else{
+ } else {
return "index";
}
}
@@ -86,53 +93,50 @@
// 绯荤粺棣栭〉椤堕儴鑿滃崟
@PostMapping("/index/getMenu")
@ResponseBody
- public AjaxResult getMenu(HttpServletRequest request)
- {
+ public AjaxResult getMenu(HttpServletRequest request) {
// 鍙栬韩浠戒俊鎭�
SysUser user = ShiroUtils.getSysUser();
// 鏍规嵁鐢ㄦ埛id鍙栧嚭鑿滃崟
List<SysMenu> menus = menuService.selectMenusByUser(user);
return AjaxResult.success(menus);
}
+
// 鍒囨崲涓婚
@GetMapping("/system/switchSkin")
- public String switchSkin(ModelMap mmap)
- {
+ public String switchSkin(ModelMap mmap) {
return "skin";
}
// 绯荤粺浠嬬粛
@GetMapping("/system/main")
- public String main(ModelMap mmap)
- {
+ public String main(ModelMap mmap) {
mmap.put("version", Global.getVersion());
-
+
return "main";
}
// 绯荤粺浠嬬粛
@ResponseBody
@GetMapping("/system/project")
- public AjaxResult project()
- {
+ public AjaxResult project() {
AjaxResult ajaxResult = AjaxResult.success();
List<Project> projects = projectService.selectProjectList(new Project());
- ajaxResult.put("projects",projects);
+ ajaxResult.put("projects", projects);
return ajaxResult;
}
+
/**
* 鎬昏繘搴�
* @return
*/
@ResponseBody
@GetMapping("/system/totalProcess")
- public AjaxResult 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);
+ Hole hole = holeService.selectHoleTotalProcess();
+ Double data = Arith.div(hole.getFootageCpl(), hole.getFootage(), 2);
+ ajaxResult.put("pointerData", data);
return ajaxResult;
}
@@ -142,35 +146,85 @@
*/
@ResponseBody
@GetMapping("/system/projectProcess")
- public AjaxResult 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<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);
+ 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);
+ List<ProjectProcessVO> vos = new ArrayList<>();
+ ProjectProcessVO vo;
+ if (!ObjectUtils.isEmpty(projects)) {
+ for (int i = 0; i < projects.size(); i++) {
+ String ids = projects.get(i).getIds();
+ Double val = holeMap.get(ids);
+ vo = new ProjectProcessVO();
+ vo.setRanking(i + 1);
+ vo.setStation(projects.get(i).getCode());
+ vo.setValue(val);
+ if (val == null) {
+ vo.setValue(0.0d);
+ }
+ vo.setStatus(projects.get(i).getStatus());
+ vos.add(vo);
}
- vos.add(vo);
}
-
- ajaxResult.put("projectData",vos);
+ ajaxResult.put("projectData", vos);
return ajaxResult;
}
-
+
+
+ /**
+ * 鏁伴噺缁熻
+ *
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/system/indexVo")
+ public AjaxResult projectProcess2() {
+ IndexVo result = new IndexVo();
+
+ //=============================鏌ヨ鍦哄湴鏁伴噺===============================
+ List<Project> projectList = projectService.selectProjectCountByStatus();
+ if (!ObjectUtils.isEmpty(projectList)) {
+ for (Project item : projectList) {
+ if (RecordType.projectStatus0.getId().equals(item.getStatus())) {
+ result.setProjectStatus0(item.getStatusNumber());
+ }
+ if (RecordType.projectStatus1.getId().equals(item.getStatus())) {
+ result.setProjectStatus0(item.getStatusNumber());
+ }
+ if (RecordType.projectStatus2.getId().equals(item.getStatus())) {
+ result.setProjectStatus0(item.getStatusNumber());
+ }
+ }
+ }
+ if (ObjectUtils.isEmpty(result.getProjectStatus1())) {
+ result.setProjectStatus0(0);
+ }
+ if (ObjectUtils.isEmpty(result.getProjectStatus2())) {
+ result.setProjectStatus0(0);
+ }
+ if (ObjectUtils.isEmpty(result.getProjectStatus2())) {
+ result.setProjectStatus0(0);
+ }
+
+ //=============================鏌ヨ杩涘昂===============================
+ Hole hole = holeService.selectHoleTotalProcess();
+ result.setFootageCplCount(hole.getFootageCpl());
+ result.setFootageCount(hole.getFootage());
+
+ //=============================鏌ヨ璧勬枡===============================
+ HoleMedia holeMedia = holeMediaService.selectHoleMediaNumber();
+ result.setFileCount(holeMedia.getNumber());
+
+ return AjaxResult.success("鏌ヨ鎴愬姛",result);
+ }
+
}
--
Gitblit v1.9.1