From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java |  677 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 677 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java
new file mode 100644
index 0000000..c259364
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java
@@ -0,0 +1,677 @@
+package org.jeecg.modules.tms.controller;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.Arrays;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.tms.entity.*;
+import org.jeecg.modules.tms.entity.vo.*;
+import org.jeecg.modules.tms.service.*;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: tms_base_tools
+ * @Author: jeecg-boot
+ * @Date:   2025-05-09
+ * @Version: V1.0
+ */
+@Api(tags="tms_base_tools")
+@RestController
+@RequestMapping("/tms/baseTools")
+@Slf4j
+public class BaseToolsController extends JeecgController<BaseTools, IBaseToolsService> {
+	@Autowired
+	private IBaseToolsService baseToolsService;
+
+	 @Autowired
+	 private IToolsConfigPropertyService toolsConfigPropertyService;
+
+	 @Autowired
+	 private IParaHoleToolsService paraHoleToolsService;
+
+	 @Autowired
+	 private IParaThreadingToolService paraThreadingToolService;
+
+	 @Autowired
+	 private IParaTurningToolsService paraTurningToolsService;
+
+	 @Autowired
+	 private IParaMillToolService paraMillToolService;
+
+	 @Autowired
+	 private IParaCommonToolService paraCommonToolService;
+
+	 @Autowired
+	 private IParaBladeService paraBladeService;
+	
+	/**
+	 * 鍒嗛〉鍒楄〃鏌ヨ
+	 *
+	 * @param baseTools
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	@ApiOperation(value="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ", notes="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	@GetMapping(value = "/list")
+	public Result<IPage<BaseTools>> queryPageList(BaseTools baseTools,
+														 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														 HttpServletRequest req) {
+		QueryWrapper<BaseTools> queryWrapper = QueryGenerator.initQueryWrapper(baseTools, req.getParameterMap());
+		Page<BaseTools> page = new Page<BaseTools>(pageNo, pageSize);
+		IPage<BaseTools> pageList = baseToolsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+
+	 /**
+	  * 鏍规嵁鍒嗙被閫夋嫨宸ュ叿
+	  *
+	  * @param baseTools
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 @ApiOperation(value="鏍规嵁鍒嗙被閫夋嫨宸ュ叿", notes="鏍规嵁鍒嗙被閫夋嫨宸ュ叿")
+	 @GetMapping(value = "/queryToolByClassifyId")
+	 public Result<?> queryToolByClassifyId(BaseTools baseTools,
+													 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													 HttpServletRequest req) {
+		 Map<String, String[]> parameterMap = req.getParameterMap();
+		 String[] classifyIds = parameterMap.get("classifyId");
+		 if (classifyIds != null && classifyIds.length > 0) {
+			 if("1".equals(classifyIds[0])){
+				 Page<ParaCommonToolVo> page = new Page<ParaCommonToolVo>(pageNo, pageSize);
+				 IPage<ParaCommonToolVo> pageList = baseToolsService.paraCommonToolList(page, parameterMap);
+				 return Result.OK(pageList);
+			 }else if("2".equals(classifyIds[0])){
+				 Page<ParaHolesToolsVo> page = new Page<ParaHolesToolsVo>(pageNo, pageSize);
+				 IPage<ParaHolesToolsVo> pageList = baseToolsService.paraHolesToolsList(page, parameterMap);
+				 return Result.OK(pageList);
+			 }else if("3".equals(classifyIds[0])){
+				 Page<ParaThreadingToolVo> page = new Page<ParaThreadingToolVo>(pageNo, pageSize);
+				 IPage<ParaThreadingToolVo> pageList = baseToolsService.paraThreadingToolList(page, parameterMap);
+				 return Result.OK(pageList);
+			 }else if("4".equals(classifyIds[0])){
+				 Page<ParaMillToolVo> page = new Page<ParaMillToolVo>(pageNo, pageSize);
+				 IPage<ParaMillToolVo> pageList = baseToolsService.paraMillToolList(page, parameterMap);
+				 return Result.OK(pageList);
+			 }else if("5".equals(classifyIds[0])){
+				 Page<ParaTurningToolsVo> page = new Page<ParaTurningToolsVo>(pageNo, pageSize);
+				 IPage<ParaTurningToolsVo> pageList = baseToolsService.paraTurningToolsList(page, parameterMap);
+				 return Result.OK(pageList);
+			 }else if("6".equals(classifyIds[0])){
+				 Page<ParaBladeVo> page = new Page<ParaBladeVo>(pageNo, pageSize);
+				 IPage<ParaBladeVo> pageList = baseToolsService.paraBladeList(page, parameterMap);
+				 return Result.OK(pageList);
+			 }else {
+				 return Result.error("璇烽�夋嫨宸ュ叿鍒嗙被");
+			 }
+		 }else {
+			 return Result.error("璇烽�夋嫨宸ュ叿鍒嗙被");
+		 }
+	 }
+
+	 /**
+	  * 鍒嗛〉鍒楄〃鏌ヨ
+	  *
+	  * @param baseTools
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	 @ApiOperation(value="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ", notes="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	 @GetMapping(value = "/paraHolesToolsList")
+	 public Result<IPage<ParaHolesToolsVo>> paraHolesToolsList(BaseTools baseTools,
+														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														  HttpServletRequest req) {
+		 Map<String, String[]> parameterMap = req.getParameterMap();
+		 Page<ParaHolesToolsVo> page = new Page<ParaHolesToolsVo>(pageNo, pageSize);
+		 IPage<ParaHolesToolsVo> pageList = baseToolsService.paraHolesToolsList(page, parameterMap);
+		 return Result.OK(pageList);
+	 }
+
+	 /**
+	  * 鍒嗛〉鍒楄〃鏌ヨ
+	  *
+	  * @param baseTools
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	 @ApiOperation(value="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ", notes="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	 @GetMapping(value = "/paraCommonToolList")
+	 public Result<IPage<ParaCommonToolVo>> paraCommonToolList(BaseTools baseTools,
+																  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																  HttpServletRequest req) {
+		 Map<String, String[]> parameterMap = req.getParameterMap();
+		 Page<ParaCommonToolVo> page = new Page<ParaCommonToolVo>(pageNo, pageSize);
+		 IPage<ParaCommonToolVo> pageList = baseToolsService.paraCommonToolList(page, parameterMap);
+		 return Result.OK(pageList);
+	 }
+
+	 /**
+	  * 鍒嗛〉鍒楄〃鏌ヨ
+	  *
+	  * @param baseTools
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	 @ApiOperation(value="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ", notes="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	 @GetMapping(value = "/paraThreadingToolList")
+	 public Result<IPage<ParaThreadingToolVo>> paraThreadingToolList(BaseTools baseTools,
+														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														  HttpServletRequest req) {
+		 Map<String, String[]> parameterMap = req.getParameterMap();
+		 Page<ParaThreadingToolVo> page = new Page<ParaThreadingToolVo>(pageNo, pageSize);
+		 IPage<ParaThreadingToolVo> pageList = baseToolsService.paraThreadingToolList(page, parameterMap);
+		 return Result.OK(pageList);
+	 }
+
+	 /**
+	  * 鍒嗛〉鍒楄〃鏌ヨ
+	  *
+	  * @param baseTools
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	 @ApiOperation(value="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ", notes="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	 @GetMapping(value = "/paraMillToolList")
+	 public Result<IPage<ParaMillToolVo>> paraMillToolList(BaseTools baseTools,
+														   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														   HttpServletRequest req) {
+		 Map<String, String[]> parameterMap = req.getParameterMap();
+		 Page<ParaMillToolVo> page = new Page<ParaMillToolVo>(pageNo, pageSize);
+		 IPage<ParaMillToolVo> pageList = baseToolsService.paraMillToolList(page, parameterMap);
+		 return Result.OK(pageList);
+	 }
+
+	 /**
+	  * 鍒嗛〉鍒楄〃鏌ヨ
+	  *
+	  * @param baseTools
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	 @ApiOperation(value="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ", notes="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	 @GetMapping(value = "/paraTurningToolsList")
+	 public Result<IPage<ParaTurningToolsVo>> paraTurningToolsList(BaseTools baseTools,
+																   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																   HttpServletRequest req) {
+		 Map<String, String[]> parameterMap = req.getParameterMap();
+		 Page<ParaTurningToolsVo> page = new Page<ParaTurningToolsVo>(pageNo, pageSize);
+		 IPage<ParaTurningToolsVo> pageList = baseToolsService.paraTurningToolsList(page, parameterMap);
+		 return Result.OK(pageList);
+	 }
+
+	 /**
+	  * 鍒嗛〉鍒楄〃鏌ヨ
+	  *
+	  * @param baseTools
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	 @ApiOperation(value="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ", notes="tms_base_tools-鍒嗛〉鍒楄〃鏌ヨ")
+	 @GetMapping(value = "/paraBladeList")
+	 public Result<IPage<ParaBladeVo>> paraBladeList(BaseTools baseTools,
+													 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													 HttpServletRequest req) {
+		 Map<String, String[]> parameterMap = req.getParameterMap();
+		 Page<ParaBladeVo> page = new Page<ParaBladeVo>(pageNo, pageSize);
+		 IPage<ParaBladeVo> pageList = baseToolsService.paraBladeList(page, parameterMap);
+		 return Result.OK(pageList);
+	 }
+	
+	/**
+	 *   娣诲姞
+	 *
+	 * @param jSONObject
+	 * @return
+	 */
+	@AutoLog(value = "tms_base_tools-娣诲姞")
+	@ApiOperation(value="tms_base_tools-娣诲姞", notes="tms_base_tools-娣诲姞")
+	//@RequiresPermissions("org.jeecg.modules:tms_base_tools:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody JSONObject jSONObject) {
+		BaseTools baseTools = jSONObject.toJavaObject(BaseTools.class);
+		String paramaTableName = jSONObject.getString("paraTypeFlag");
+		ToolsConfigProperty toolsConfigProperty = jSONObject.toJavaObject(ToolsConfigProperty.class);
+		ParaHoleTools paraHoleTools = jSONObject.toJavaObject(ParaHoleTools.class);
+		ParaCommonTool paraCommonTool = jSONObject.toJavaObject(ParaCommonTool.class);
+		ParaThreadingTool paraThreadingTool = jSONObject.toJavaObject(ParaThreadingTool.class);
+		ParaTurningTools paraTurningTools = jSONObject.toJavaObject(ParaTurningTools.class);
+		ParaMillTool paraMillTool = jSONObject.toJavaObject(ParaMillTool.class);
+		ParaBlade paraBlade = jSONObject.toJavaObject(ParaBlade.class);
+		baseTools.setParamaTableName(paramaTableName);
+		if(baseToolsService.save(baseTools)){
+			toolsConfigProperty.setToolCode(baseTools.getId());
+			toolsConfigPropertyService.save(toolsConfigProperty);
+			if("1".equals(paramaTableName)){
+				paraCommonTool.setToolCode(baseTools.getId());
+				paraCommonToolService.save(paraCommonTool);
+			}else if("2".equals(paramaTableName)){
+				paraHoleTools.setToolCode(baseTools.getId());
+				paraHoleToolsService.save(paraHoleTools);
+			}else if("3".equals(paramaTableName)){
+				paraThreadingTool.setToolCode(baseTools.getId());
+				paraThreadingToolService.save(paraThreadingTool);
+			}else if("4".equals(paramaTableName)){
+				paraMillTool.setToolCode(baseTools.getId());
+				paraMillToolService.save(paraMillTool);
+			}else if("5".equals(paramaTableName)){
+				paraTurningTools.setToolCode(baseTools.getId());
+				paraTurningToolsService.save(paraTurningTools);
+			}else if("6".equals(paramaTableName)){
+				paraBlade.setToolCode(baseTools.getId());
+				paraBladeService.save(paraBlade);
+			}
+		}
+		return Result.OK("娣诲姞鎴愬姛锛�");
+	}
+	
+	/**
+	 *  缂栬緫
+	 *
+	 * @param jSONObject
+	 * @return
+	 */
+	@AutoLog(value = "tms_base_tools-缂栬緫")
+	@ApiOperation(value="tms_base_tools-缂栬緫", notes="tms_base_tools-缂栬緫")
+	//@RequiresPermissions("org.jeecg.modules:tms_base_tools:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody JSONObject jSONObject) {
+		BaseTools baseTools = jSONObject.toJavaObject(BaseTools.class);
+		ToolsConfigProperty toolsConfigProperty = jSONObject.toJavaObject(ToolsConfigProperty.class);
+		ParaHoleTools paraHoleTools = jSONObject.toJavaObject(ParaHoleTools.class);
+		ParaCommonTool paraCommonTool = jSONObject.toJavaObject(ParaCommonTool.class);
+		ParaThreadingTool paraThreadingTool = jSONObject.toJavaObject(ParaThreadingTool.class);
+		ParaTurningTools paraTurningTools = jSONObject.toJavaObject(ParaTurningTools.class);
+		ParaMillTool paraMillTool = jSONObject.toJavaObject(ParaMillTool.class);
+		ParaBlade paraBlade = jSONObject.toJavaObject(ParaBlade.class);
+		if(baseToolsService.updateById(baseTools)){
+			ToolsConfigProperty toolsConfigProperty1 = toolsConfigPropertyService.lambdaQuery().eq(ToolsConfigProperty::getToolCode,baseTools.getId()).one();
+			if(toolsConfigProperty1 != null){
+				toolsConfigProperty.setId(toolsConfigProperty1.getId());
+				toolsConfigProperty.setToolCode(baseTools.getId());
+				toolsConfigPropertyService.updateById(toolsConfigProperty);
+			}else {
+				toolsConfigProperty.setToolCode(baseTools.getId());
+				toolsConfigPropertyService.save(toolsConfigProperty);
+			}
+			if("1".equals(baseTools.getParamaTableName())){
+				ParaCommonTool paraCommonTool1 = paraCommonToolService.lambdaQuery().eq(ParaCommonTool::getToolCode,baseTools.getId()).one();
+				if(paraCommonTool1 != null){
+					paraCommonTool.setId(paraCommonTool1.getId());
+					paraCommonTool.setToolCode(baseTools.getId());
+					paraCommonToolService.updateById(paraCommonTool);
+				}else {
+					paraCommonTool.setToolCode(baseTools.getId());
+					paraCommonToolService.save(paraCommonTool);
+				}
+			}else if("2".equals(baseTools.getParamaTableName())){
+				ParaHoleTools paraHoleTools1 = paraHoleToolsService.lambdaQuery().eq(ParaHoleTools::getToolCode,baseTools.getId()).one();
+				if(paraHoleTools1 != null){
+					paraHoleTools.setId(paraHoleTools1.getId());
+					paraHoleTools.setToolCode(baseTools.getId());
+					paraHoleToolsService.updateById(paraHoleTools);
+				}else {
+					paraHoleTools.setToolCode(baseTools.getId());
+					paraHoleToolsService.save(paraHoleTools);
+				}
+			}else if("3".equals(baseTools.getParamaTableName())){
+				ParaThreadingTool paraThreadingTool1 = paraThreadingToolService.lambdaQuery().eq(ParaThreadingTool::getToolCode,baseTools.getId()).one();
+				if(paraThreadingTool1 != null){
+					paraThreadingTool.setId(paraThreadingTool1.getId());
+					paraThreadingTool.setToolCode(baseTools.getId());
+					paraThreadingToolService.updateById(paraThreadingTool);
+				}else {
+					paraThreadingTool.setToolCode(baseTools.getId());
+					paraThreadingToolService.save(paraThreadingTool);
+				}
+			}else if("4".equals(baseTools.getParamaTableName())){
+				ParaMillTool paraMillTool1 = paraMillToolService.lambdaQuery().eq(ParaMillTool::getToolCode,baseTools.getId()).one();
+				if(paraMillTool1 != null){
+					paraMillTool.setId(paraMillTool1.getId());
+					paraMillTool.setToolCode(baseTools.getId());
+					paraMillToolService.updateById(paraMillTool);
+				}else {
+					paraMillTool.setToolCode(baseTools.getId());
+					paraMillToolService.save(paraMillTool);
+				}
+			}else if("5".equals(baseTools.getParamaTableName())){
+				ParaTurningTools paraTurningTools1 = paraTurningToolsService.lambdaQuery().eq(ParaTurningTools::getToolCode,baseTools.getId()).one();
+				if(paraTurningTools1 != null){
+					paraTurningTools.setId(paraTurningTools1.getId());
+					paraTurningTools.setToolCode(baseTools.getId());
+					paraTurningToolsService.updateById(paraTurningTools);
+				}else {
+					paraTurningTools.setToolCode(baseTools.getId());
+					paraTurningToolsService.save(paraTurningTools);
+				}
+			}else if("6".equals(baseTools.getParamaTableName())){
+				ParaBlade paraBlade1 = paraBladeService.lambdaQuery().eq(ParaBlade::getToolCode,baseTools.getId()).one();
+				if(paraBlade1 != null){
+					paraBlade.setId(paraBlade1.getId());
+					paraBlade.setToolCode(baseTools.getId());
+					paraBladeService.updateById(paraBlade);
+				}else {
+					paraBlade.setToolCode(baseTools.getId());
+					paraBladeService.save(paraBlade);
+				}
+			}
+		}
+		return Result.OK("缂栬緫鎴愬姛!");
+	}
+	
+	/**
+	 *   閫氳繃id鍒犻櫎
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "tms_base_tools-閫氳繃id鍒犻櫎")
+	@ApiOperation(value="tms_base_tools-閫氳繃id鍒犻櫎", notes="tms_base_tools-閫氳繃id鍒犻櫎")
+	//@RequiresPermissions("org.jeecg.modules:tms_base_tools:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		baseToolsService.removeById(id);
+		BaseTools baseTools = baseToolsService.getById(id);
+		ToolsConfigProperty toolsConfigProperty = toolsConfigPropertyService.lambdaQuery().eq(ToolsConfigProperty::getToolCode,baseTools.getId()).one();
+		if(toolsConfigProperty != null){
+			toolsConfigPropertyService.removeById(toolsConfigProperty.getId());
+		}
+		if("1".equals(baseTools.getParamaTableName())){
+			ParaCommonTool paraCommonTool = paraCommonToolService.lambdaQuery().eq(ParaCommonTool::getToolCode,baseTools.getId()).one();
+			if(paraCommonTool != null){
+				paraCommonToolService.removeById(paraCommonTool.getId());
+			}
+		}else if("2".equals(baseTools.getParamaTableName())){
+			ParaHoleTools paraHoleTools = paraHoleToolsService.lambdaQuery().eq(ParaHoleTools::getToolCode,baseTools.getId()).one();
+			if(paraHoleTools != null){
+				paraHoleToolsService.removeById(paraHoleTools.getId());
+			}
+		}else if("3".equals(baseTools.getParamaTableName())){
+			ParaThreadingTool paraThreadingTool = paraThreadingToolService.lambdaQuery().eq(ParaThreadingTool::getToolCode,baseTools.getId()).one();
+			if(paraThreadingTool != null){
+				paraThreadingToolService.removeById(paraThreadingTool.getId());
+			}
+		}else if("4".equals(baseTools.getParamaTableName())){
+			ParaMillTool paraMillTool = paraMillToolService.lambdaQuery().eq(ParaMillTool::getToolCode,baseTools.getId()).one();
+			if(paraMillTool != null){
+				paraMillToolService.removeById(paraMillTool.getId());
+			}
+		}else if("5".equals(baseTools.getParamaTableName())){
+			ParaTurningTools paraTurningTools = paraTurningToolsService.lambdaQuery().eq(ParaTurningTools::getToolCode,baseTools.getId()).one();
+			if(paraTurningTools != null){
+				paraTurningToolsService.removeById(paraTurningTools.getId());
+			}
+		}else if("6".equals(baseTools.getParamaTableName())){
+			ParaBlade paraBlade = paraBladeService.lambdaQuery().eq(ParaBlade::getToolCode,baseTools.getId()).one();
+			if(paraBlade != null){
+				paraBladeService.removeById(paraBlade.getId());
+			}
+		}
+		return Result.OK("鍒犻櫎鎴愬姛!");
+	}
+	
+	/**
+	 *  鎵归噺鍒犻櫎
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "tms_base_tools-鎵归噺鍒犻櫎")
+	@ApiOperation(value="tms_base_tools-鎵归噺鍒犻櫎", notes="tms_base_tools-鎵归噺鍒犻櫎")
+	//@RequiresPermissions("org.jeecg.modules:tms_base_tools:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.baseToolsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+	}
+	
+	/**
+	 * 閫氳繃id鏌ヨ
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "tms_base_tools-閫氳繃id鏌ヨ")
+	@ApiOperation(value="tms_base_tools-閫氳繃id鏌ヨ", notes="tms_base_tools-閫氳繃id鏌ヨ")
+	@GetMapping(value = "/queryById")
+	public Result<BaseTools> queryById(@RequestParam(name="id",required=true) String id) {
+		BaseTools baseTools = baseToolsService.getById(id);
+		if(baseTools==null) {
+			return Result.error("鏈壘鍒板搴旀暟鎹�");
+		}
+		return Result.OK(baseTools);
+	}
+
+    /**
+    * 瀵煎嚭excel
+    *
+    * @param request
+    * @param baseTools
+    */
+    //@RequiresPermissions("org.jeecg.modules:tms_base_tools:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BaseTools baseTools) {
+        return super.exportXls(request, baseTools, BaseTools.class, "tms_base_tools");
+    }
+
+    /**
+      * 閫氳繃excel瀵煎叆鏁版嵁
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("tms_base_tools:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BaseTools.class);
+    }
+
+	 /**
+	  * 閫氳繃宸ュ叿id鏌ヨ
+	  *
+	  * @param toolCode
+	  * @return
+	  */
+	 @GetMapping(value = "/queryByToolCode")
+	 public Result<?> queryByToolCode(@RequestParam(name="toolCode",required=true) String toolCode,@RequestParam(name="paraTypeFlag",required=true) String paraTypeFlag) {
+		 if("1".equals(paraTypeFlag)){
+			 ParaCommonTool paraCommonTool = paraCommonToolService.lambdaQuery().eq(ParaCommonTool::getToolCode,toolCode).one();
+			 return Result.OK(paraCommonTool);
+		 }else if("2".equals(paraTypeFlag)){
+			 ParaHoleTools paraHoleTools = paraHoleToolsService.lambdaQuery().eq(ParaHoleTools::getToolCode,toolCode).one();
+			 return Result.OK(paraHoleTools);
+		 }else if("3".equals(paraTypeFlag)){
+			 ParaThreadingTool paraThreadingTool = paraThreadingToolService.lambdaQuery().eq(ParaThreadingTool::getToolCode,toolCode).one();
+			 return Result.OK(paraThreadingTool);
+		 }else if("4".equals(paraTypeFlag)){
+			 ParaMillTool paraMillTool = paraMillToolService.lambdaQuery().eq(ParaMillTool::getToolCode,toolCode).one();
+			 return Result.OK(paraMillTool);
+		 }else if("5".equals(paraTypeFlag)){
+			 ParaTurningTools paraTurningTools = paraTurningToolsService.lambdaQuery().eq(ParaTurningTools::getToolCode,toolCode).one();
+			 return Result.OK(paraTurningTools);
+		 }else if("6".equals(paraTypeFlag)){
+			ParaBlade paraBlade = paraBladeService.lambdaQuery().eq(ParaBlade::getToolCode,toolCode).one();
+			 return Result.OK(paraBlade);
+		 }else {
+			 return Result.OK("");
+		 }
+	 }
+	 @GetMapping("/listWithLedgerAndConfig")
+	 public Result<IPage<StocktakingPoundVo>> listWithLedgerAndConfig(
+			 StocktakingPoundVo stocktakingPoundVo,
+			 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+			 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+			 HttpServletRequest req) {
+
+		 // 浣跨敤 QueryGenerator 鏋勫缓 QueryWrapper
+		 QueryWrapper<StocktakingPoundVo> queryWrapper = QueryGenerator.initQueryWrapper(stocktakingPoundVo, req.getParameterMap());
+
+		 Page<StocktakingPoundVo> page = new Page<>(pageNo, pageSize);
+		 IPage<StocktakingPoundVo> resultPage = baseToolsService.pageWithLedgerAndConfig(page, queryWrapper);
+		 return Result.OK(resultPage);
+	 }
+
+
+
+	 @GetMapping("/listWithSharpedAndConfig")
+	 public Result<IPage<SharpeeningVo>> listWithSharpedAndConfig(
+			 SharpeeningVo sharpeeningVo,
+			 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+			 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+			 HttpServletRequest req) {
+
+		 // 浣跨敤 QueryGenerator 鏋勫缓 QueryWrapper
+		 QueryWrapper<SharpeeningVo> queryWrapper = QueryGenerator.initQueryWrapper(sharpeeningVo, req.getParameterMap());
+
+		 Page<SharpeeningVo> page = new Page<>(pageNo, pageSize);
+		 IPage<SharpeeningVo> resultPage = baseToolsService.pageWithSharpedAndConfig(page, queryWrapper);
+		 return Result.OK(resultPage);
+	 }
+
+
+	 /**
+	  * 瀵煎叆妯℃澘涓嬭浇
+	  *
+	  */
+	 @RequestMapping(value = "/loadTemplate")
+	 public void loadTemplate(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+		 Map<String,String[]> req = request.getParameterMap();
+		 String paraTypeFlag = "";
+		 if(req.get("paraTypeFlag") != null){
+			 paraTypeFlag = req.get("paraTypeFlag")[0];
+		 }
+		 if("1".equals(paraTypeFlag)){
+			 Workbook workbook = WorkbookFactory.create(new File("D:\\opt\\upFiles\\鍒�鍏蜂俊鎭鍏ユā鏉�-閫氱敤鍙傛暟.xlsx"));
+			 //瀵煎嚭Workbook
+			 //璁剧疆鍝嶅簲澶�
+			 String fileName = "鍒�鍏蜂俊鎭鍏ユā鏉�-閫氱敤鍙傛暟.xlsx";
+			 // 瀵规枃浠跺悕杩涜URL缂栫爜锛岄槻姝腑鏂囦贡鐮�
+			 String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+			 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+			 response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + encodedFileName);
+			 // 灏哤orkbook鍐欏叆鍝嶅簲杈撳嚭娴�
+			 try { // try-with-resources鑷姩鍏抽棴璧勬簮
+				 workbook.write(response.getOutputStream());
+				 response.flushBuffer();
+			 } catch (IOException e) {
+				 // 寮傚父澶勭悊锛堝璁板綍鏃ュ織锛�
+				 throw new IOException("涓嬭浇妯℃澘澶辫触", e);
+			 }
+		 }else if("2".equals(paraTypeFlag)){
+			 Workbook workbook = WorkbookFactory.create(new File("D:\\opt\\upFiles\\鍒�鍏蜂俊鎭鍏ユā鏉�-瀛斿姞宸ュ伐鍏�.xlsx"));
+			 String fileName = "鍒�鍏蜂俊鎭鍏ユā鏉�-瀛斿姞宸ュ伐鍏�.xlsx";
+			 String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+			 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+			 response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + encodedFileName);
+			 try {
+				 workbook.write(response.getOutputStream());
+				 response.flushBuffer();
+			 } catch (IOException e) {
+				 throw new IOException("涓嬭浇妯℃澘澶辫触", e);
+			 }
+		 }else if("3".equals(paraTypeFlag)){
+			 Workbook workbook = WorkbookFactory.create(new File("D:\\opt\\upFiles\\鍒�鍏蜂俊鎭鍏ユā鏉�-铻虹汗宸ュ叿.xlsx"));
+			 String fileName = "鍒�鍏蜂俊鎭鍏ユā鏉�-铻虹汗宸ュ叿.xlsx";
+			 String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+			 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+			 response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + encodedFileName);
+			 try {
+				 workbook.write(response.getOutputStream());
+				 response.flushBuffer();
+			 } catch (IOException e) {
+				 throw new IOException("涓嬭浇妯℃澘澶辫触", e);
+			 }
+		 }else if("4".equals(paraTypeFlag)){
+			 Workbook workbook = WorkbookFactory.create(new File("D:\\opt\\upFiles\\鍒�鍏蜂俊鎭鍏ユā鏉�-閾e墛宸ュ叿.xlsx"));
+			 String fileName = "鍒�鍏蜂俊鎭鍏ユā鏉�-閾e墛宸ュ叿.xlsx";
+			 String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+			 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+			 response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + encodedFileName);
+			 try {
+				 workbook.write(response.getOutputStream());
+				 response.flushBuffer();
+			 } catch (IOException e) {
+				 throw new IOException("涓嬭浇妯℃澘澶辫触", e);
+			 }
+		 }else if("5".equals(paraTypeFlag)){
+			 Workbook workbook = WorkbookFactory.create(new File("D:\\opt\\upFiles\\鍒�鍏蜂俊鎭鍏ユā鏉�-杞﹀墛宸ュ叿.xlsx"));
+			 String fileName = "鍒�鍏蜂俊鎭鍏ユā鏉�-杞﹀墛宸ュ叿.xlsx";
+			 String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+			 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+			 response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + encodedFileName);
+			 try {
+				 workbook.write(response.getOutputStream());
+				 response.flushBuffer();
+			 } catch (IOException e) {
+				 throw new IOException("涓嬭浇妯℃澘澶辫触", e);
+			 }
+		 }else if("6".equals(paraTypeFlag)){
+			 Workbook workbook = WorkbookFactory.create(new File("D:\\opt\\upFiles\\鍒�鍏蜂俊鎭鍏ユā鏉�-鍒�鐗�.xlsx"));
+			 String fileName = "鍒�鍏蜂俊鎭鍏ユā鏉�-鍒�鐗�.xlsx";
+			 String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+			 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+			 response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + encodedFileName);
+			 try {
+				 workbook.write(response.getOutputStream());
+				 response.flushBuffer();
+			 } catch (IOException e) {
+				 throw new IOException("涓嬭浇妯℃澘澶辫触", e);
+			 }
+		 }
+
+	 }
+}

--
Gitblit v1.9.3