From 8722d2bb39c6c0697647e77a879d14b28d3ef0f5 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期五, 17 五月 2024 19:16:36 +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 |   57 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 31 insertions(+), 26 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 f8fdd70..307390f 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
@@ -1,15 +1,12 @@
 package com.javaweb.geo.controller;
 
 import java.util.List;
+
 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;
@@ -18,17 +15,18 @@
 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
- * 
+ *
  * @author zmk
  * @date 2022-10-20
  */
 @Controller
 @RequestMapping("/geo/hole")
-public class HoleController extends BaseController
-{
+public class HoleController extends BaseController {
+
     private String prefix = "geo/hole";
 
     @Autowired
@@ -36,11 +34,11 @@
 
     @RequiresPermissions("geo:hole:view")
     @GetMapping()
-    public String hole(String id,ModelMap mmap)
-    {
-    	mmap.put("projectId", id);
+    public String hole(String id, ModelMap mmap) {
+        mmap.put("projectId", id);
         return prefix + "/hole";
     }
+
 
     /**
      * 鏌ヨ閽诲瓟鍒楄〃
@@ -48,12 +46,12 @@
     @RequiresPermissions("geo:hole:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(Hole hole)
-    {
+    public TableDataInfo list(Hole hole) {
         startPage();
         List<Hole> list = holeService.selectHoleList(hole);
         return getDataTable(list);
     }
+
 
     /**
      * 瀵煎嚭閽诲瓟鍒楄〃
@@ -62,8 +60,7 @@
     @Log(title = "閽诲瓟", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(Hole hole)
-    {
+    public AjaxResult export(Hole hole) {
         List<Hole> list = holeService.selectHoleList(hole);
         ExcelUtil<Hole> util = new ExcelUtil<Hole>(Hole.class);
         return util.exportExcel(list, "hole");
@@ -73,8 +70,8 @@
      * 鏂板閽诲瓟
      */
     @GetMapping("/add")
-    public String add()
-    {
+    public String add(String projectId, ModelMap mmap) {
+        mmap.put("projectId", projectId);
         return prefix + "/add";
     }
 
@@ -85,8 +82,7 @@
     @Log(title = "閽诲瓟", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(Hole hole)
-    {
+    public AjaxResult addSave(Hole hole) {
         return toAjax(holeService.insertHole(hole));
     }
 
@@ -94,8 +90,7 @@
      * 淇敼閽诲瓟
      */
     @GetMapping("/edit/{ids}")
-    public String edit(@PathVariable("ids") String ids, ModelMap mmap)
-    {
+    public String edit(@PathVariable("ids") String ids, ModelMap mmap) {
         Hole hole = holeService.selectHoleById(ids);
         mmap.put("hole", hole);
         return prefix + "/edit";
@@ -108,8 +103,7 @@
     @Log(title = "閽诲瓟", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(Hole hole)
-    {
+    public AjaxResult editSave(Hole hole) {
         return toAjax(holeService.updateHole(hole));
     }
 
@@ -118,11 +112,22 @@
      */
     @RequiresPermissions("geo:hole:remove")
     @Log(title = "閽诲瓟", businessType = BusinessType.DELETE)
-    @PostMapping( "/remove")
+    @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(String ids)
-    {
+    public AjaxResult remove(String ids) {
         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