From 6b5f508bcd94d3f3d6484075c69d918fae226788 Mon Sep 17 00:00:00 2001 From: cuijian <cuijian@xalxzn.com> Date: 星期四, 15 五月 2025 16:23:53 +0800 Subject: [PATCH] 工具信息及参数功能 --- lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java | 372 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 346 insertions(+), 26 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 index 1ab22a0..022303c 100644 --- 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 @@ -1,37 +1,26 @@ package org.jeecg.modules.tms.controller; import java.util.Arrays; -import java.util.List; import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; 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.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.tms.entity.BaseTools; -import org.jeecg.modules.tms.service.IBaseToolsService; +import org.jeecg.modules.tms.entity.*; +import org.jeecg.modules.tms.entity.vo.*; +import org.jeecg.modules.tms.service.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; 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.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; @@ -49,6 +38,27 @@ 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; /** * 鍒嗛〉鍒楄〃鏌ヨ @@ -63,42 +73,285 @@ @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) { + @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 + */ + //@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 baseTools + * @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 BaseTools baseTools) { - baseToolsService.save(baseTools); + 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 baseTools + * @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 BaseTools baseTools) { - baseToolsService.updateById(baseTools); + 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("缂栬緫鎴愬姛!"); } @@ -114,6 +367,42 @@ @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("鍒犻櫎鎴愬姛!"); } @@ -174,4 +463,35 @@ 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(""); + } + } + } -- Gitblit v1.9.3