From d4328b5fac8a01d685a3068f097668132095807d Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 29 五月 2025 22:28:45 +0800
Subject: [PATCH] 工具管理-修改DNC刀具查询接口，满足多参数查询需求
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsToDncController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsToDncController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsToDncController.java
index f0597cc..9bc6c00 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsToDncController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsToDncController.java
@@ -6,6 +6,7 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.tms.entity.ToolsClassify;
+import org.jeecg.modules.tms.entity.dto.ToolQueryParamDto;
import org.jeecg.modules.tms.entity.vo.ParaHolesToolsVo;
import org.jeecg.modules.tms.entity.vo.ParaMillToolVo;
import org.jeecg.modules.tms.entity.vo.ParaTurningToolsVo;
@@ -36,12 +37,13 @@
/**
* 閫氳繃宸ュ叿绠�绉�/鐩村緞鍙傛暟鏌ヨ鍏蜂綋宸ュ叿鍙傛暟淇℃伅(缁橠NC鎻愪緵鎺ュ彛)锛屽弬鏁扮ず渚嬶細3E锛�3涓哄伐鍏风洿寰勫弬鏁般�丒涓哄姞宸ヤ腑蹇冨垁鍏风畝绉帮級
- * @param param
+ * @param queryParam
* @return
*/
@ApiOperation(value = "閫氳繃宸ュ叿绠�绉�/鐩村緞鍙傛暟鏌ヨ鍏蜂綋宸ュ叿鍙傛暟淇℃伅(缁橠NC鎻愪緵鎺ュ彛)", notes = "閫氳繃宸ュ叿绠�绉�/鐩村緞鍙傛暟鏌ヨ鍏蜂綋宸ュ叿鍙傛暟淇℃伅(缁橠NC鎻愪緵鎺ュ彛)")
@GetMapping("/queryToolByParam")
- public Result<?> queryToolByParam(@RequestParam("param") String param){
+ public Result<?> queryToolByParam(@RequestParam("param") ToolQueryParamDto queryParam){
+ String param = queryParam.getParam();
// 姝ｅ垯琛ㄨ揪寮忥細鍓嶅崐閮ㄥ垎涓烘暟瀛楋紙鏀寔灏忔暟锛夛紝鍚庡崐閮ㄥ垎涓哄ぇ鍐欐垨灏忓啓瀛楁瘝
String regex = "^([\\d.]+)([A-Za-z]+)$";
Pattern pattern = Pattern.compile(regex);
@@ -59,19 +61,21 @@
List<Object> toolList = CollectionUtil.newArrayList();
for (ToolsClassify classify : classifyList) {
String paraTypeFlag = classify.getParaTypeFlag();
+ queryParam.setClassifyId(classify.getId());
+ queryParam.setDiameter(diameter);
ToolParaType toolParaType = ToolParaType.fromValue(paraTypeFlag);
if (toolParaType != null) {
switch (toolParaType) {
case HOLE:
- List<ParaHolesToolsVo> paraHoleToolsList = paraHoleToolsService.selectByClassifyAndDiameter(classify.getId(), diameter);
+ List<ParaHolesToolsVo> paraHoleToolsList = paraHoleToolsService.selectByClassifyAndDiameter(queryParam);
toolList.addAll(paraHoleToolsList);
break;
case MILL:
- List<ParaMillToolVo> paraMillToolList = paraMillToolService.selectByClassifyAndDiameter(classify.getId(), diameter);
+ List<ParaMillToolVo> paraMillToolList = paraMillToolService.selectByClassifyAndDiameter(queryParam);
toolList.addAll(paraMillToolList);
break;
case TURNING:
- List<ParaTurningToolsVo> paraTurningToolsList = paraTurningToolsService.selectByClassifyAndDiameter(classify.getId(), diameter);
+ List<ParaTurningToolsVo> paraTurningToolsList = paraTurningToolsService.selectByClassifyAndDiameter(queryParam);
toolList.addAll(paraTurningToolsList);
break;
default:
--
Gitblit v1.9.3