From 5606efe6f2778ad09d8b35280d6360cfe8f34d91 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 03 七月 2024 16:19:28 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
index 6ae2f30..fc7ad29 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
@@ -2,15 +2,15 @@
import java.util.List;
+import cn.hutool.core.math.MathUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.javaweb.common.utils.Arith;
+import com.javaweb.geo.mapper.HoleMapper;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import com.javaweb.common.annotation.Log;
import com.javaweb.common.enums.BusinessType;
import com.javaweb.geo.domain.Hole;
@@ -19,6 +19,7 @@
import com.javaweb.common.core.domain.AjaxResult;
import com.javaweb.common.utils.poi.ExcelUtil;
import com.javaweb.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
/**
* 閽诲瓟Controller
@@ -34,6 +35,9 @@
@Autowired
private IHoleService holeService;
+
+ @Autowired
+ private HoleMapper holeMapper;
@RequiresPermissions("geo:hole:view")
@GetMapping()
@@ -54,6 +58,28 @@
List<Hole> list = holeService.selectHoleList(hole);
return getDataTable(list);
}
+
+ @GetMapping("/holelist")
+ @ResponseBody
+ public AjaxResult holelist(Hole hole) {
+ List<Hole> list = holeService.selectHoleList(hole);
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/holeProcess")
+ @ResponseBody
+ public AjaxResult holeProcess(Hole hole) {
+
+ Hole hole2 = holeMapper.selectProjectProcess(hole.getProjectId());
+ Double process =0.0d;
+ if(ObjectUtil.isNotEmpty(hole2.getFootageCpl()) && ObjectUtil.isNotEmpty(hole2.getFootage())) {
+ process = Arith.div(hole2.getFootageCpl(), hole2.getFootage(), 2);
+ }
+ return AjaxResult.success(process);
+
+ }
+
+
/**
@@ -107,8 +133,13 @@
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(Hole hole) {
+ if(ObjectUtil.isNotEmpty(hole.getFootage()) && ObjectUtil.isNotEmpty(hole.getFootageCpl())){
+ Double rate = Arith.div(hole.getFootageCpl(),hole.getFootage(),2) ;
+ hole.setRate(rate);
+ }
return toAjax(holeService.updateHole(hole));
}
+
/**
* 鍒犻櫎閽诲瓟
@@ -121,4 +152,16 @@
return toAjax(holeService.deleteHoleByIds(ids));
}
+ /**
+ * 瀵煎叆閽诲瓟
+ */
+ @RequiresPermissions("geo:hole:import")
+ @Log(title = "瀵煎叆閽诲瓟")
+ @PostMapping( "/importHole/{projectId}")
+ @ResponseBody
+ public AjaxResult importHole(@PathVariable("projectId") String projectId, @RequestParam("file") MultipartFile file, boolean updateSupport){
+ String message = holeService.importHole(projectId,file,updateSupport);
+ return AjaxResult.success(message);
+ }
+
}
--
Gitblit v1.9.1