dkyChenJiang.git

			@@ -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,25 @@
			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 = Arith.div(hole2.getFootageCpl(), hole2.getFootage(), 2);
			return AjaxResult.success(process);

			}




			/**
			@@ -107,7 +130,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 +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);
			}

			}