From cebffde4b5a33b5afba7efc28a07bdf0df59f603 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期四, 23 五月 2024 17:46:22 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 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..0cbe91d 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,14 @@
import java.util.List;
+import cn.hutool.core.math.MathUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.javaweb.common.utils.Arith;
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 +18,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
@@ -55,6 +55,12 @@
return getDataTable(list);
}
+ @GetMapping("/holelist")
+ @ResponseBody
+ public AjaxResult holelist(Hole hole) {
+ List<Hole> list = holeService.selectHoleList(hole);
+ return AjaxResult.success(list);
+ }
/**
* 瀵煎嚭閽诲瓟鍒楄〃
@@ -107,7 +113,15 @@
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(Hole hole) {
+ if(isNotNull(hole.getFootage()) && isNotNull(hole.getFootageCpl())){
+ Double rate = Arith.div(hole.getFootageCpl(),hole.getFootage(),2) ;
+ hole.setRate(rate);
+ }
return toAjax(holeService.updateHole(hole));
+ }
+
+ private boolean isNotNull(Double val){
+ return val !=null && val !=0.0D;
}
/**
@@ -121,4 +135,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