From 659c74e7aaf751cc10ac47b7e0939f235a17d873 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 06 九月 2025 10:12:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/cms/controller/CuttingToolController.java | 294 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 147 insertions(+), 147 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/controller/CuttingToolController.java b/src/main/java/org/jeecg/modules/cms/controller/CuttingToolController.java
index c7d07ce..d650056 100644
--- a/src/main/java/org/jeecg/modules/cms/controller/CuttingToolController.java
+++ b/src/main/java/org/jeecg/modules/cms/controller/CuttingToolController.java
@@ -40,145 +40,145 @@
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
- /**
+/**
* @Description: 鍒�鍏蜂俊鎭�
* @Author: jeecg-boot
- * @Date: 2025-07-28
+ * @Date: 2025-07-28
* @Version: V1.0
*/
-@Api(tags="鍒�鍏蜂俊鎭�")
+@Api(tags = "鍒�鍏蜂俊鎭�")
@RestController
@RequestMapping("/cms/cuttingTool")
@Slf4j
public class CuttingToolController extends JeecgController<CuttingTool, ICuttingToolService> {
- @Autowired
- private ICuttingToolService cuttingToolService;
+ @Autowired
+ private ICuttingToolService cuttingToolService;
- @Autowired
- private ICuttingPropertiesService cuttingPropertiesService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param cuttingTool
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "鍒�鍏蜂俊鎭�-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="鍒�鍏蜂俊鎭�-鍒嗛〉鍒楄〃鏌ヨ", notes="鍒�鍏蜂俊鎭�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<CuttingTool>> queryPageList(CuttingTool cuttingTool,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<CuttingTool> queryWrapper = QueryGenerator.initQueryWrapper(cuttingTool, req.getParameterMap());
- Page<CuttingTool> page = new Page<CuttingTool>(pageNo, pageSize);
- IPage<CuttingTool> pageList = cuttingToolService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param cuttingTool
- * @return
- */
- @AutoLog(value = "鍒�鍏蜂俊鎭�-娣诲姞")
- @ApiOperation(value="鍒�鍏蜂俊鎭�-娣诲姞", notes="鍒�鍏蜂俊鎭�-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_tool:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody CuttingTool cuttingTool) {
- cuttingToolService.save(cuttingTool);
- List<CuttingProperties> cuttingPropertiesList = cuttingTool.getCuttingPropertiesList();
- for (CuttingProperties cuttingProperties : cuttingPropertiesList) {
- cuttingProperties.setCuttingId(cuttingTool.getId());
- cuttingPropertiesService.save(cuttingProperties);
- }
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param cuttingTool
- * @return
- */
- @AutoLog(value = "鍒�鍏蜂俊鎭�-缂栬緫")
- @ApiOperation(value="鍒�鍏蜂俊鎭�-缂栬緫", notes="鍒�鍏蜂俊鎭�-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_tool:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody CuttingTool cuttingTool) {
- cuttingToolService.saveOrUpdate(cuttingTool);
- List<String> deletePropertiesIds = cuttingTool.getDeletePropertiesIds();
- if (deletePropertiesIds != null) {
- for (String deletePropertiesId : deletePropertiesIds) {
- cuttingPropertiesService.removeById(deletePropertiesId);
- }
- }
- List<CuttingProperties> cuttingPropertiesList = cuttingTool.getCuttingPropertiesList();
- for (CuttingProperties cuttingProperties : cuttingPropertiesList) {
- cuttingProperties.setCuttingId(cuttingTool.getId());
- cuttingPropertiesService.saveOrUpdate(cuttingProperties);
- }
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鍒�鍏蜂俊鎭�-閫氳繃id鍒犻櫎")
- @ApiOperation(value="鍒�鍏蜂俊鎭�-閫氳繃id鍒犻櫎", notes="鍒�鍏蜂俊鎭�-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_tool:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- cuttingToolService.removeById(id);
- cuttingPropertiesService.remove(new LambdaQueryWrapper<CuttingProperties>().eq(CuttingProperties::getCuttingId, id));
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鍒�鍏蜂俊鎭�-鎵归噺鍒犻櫎")
- @ApiOperation(value="鍒�鍏蜂俊鎭�-鎵归噺鍒犻櫎", notes="鍒�鍏蜂俊鎭�-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_tool:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.cuttingToolService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "鍒�鍏蜂俊鎭�-閫氳繃id鏌ヨ")
- @ApiOperation(value="鍒�鍏蜂俊鎭�-閫氳繃id鏌ヨ", notes="鍒�鍏蜂俊鎭�-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<CuttingTool> queryById(@RequestParam(name="id",required=true) String id) {
- CuttingTool cuttingTool = cuttingToolService.getById(id);
- if(cuttingTool==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(cuttingTool);
- }
+ @Autowired
+ private ICuttingPropertiesService cuttingPropertiesService;
/**
- * 瀵煎嚭excel
- *
- * @param request
- * @param cuttingTool
- */
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param cuttingTool
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "鍒�鍏蜂俊鎭�-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "鍒�鍏蜂俊鎭�-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍒�鍏蜂俊鎭�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<CuttingTool>> queryPageList(CuttingTool cuttingTool,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<CuttingTool> queryWrapper = QueryGenerator.initQueryWrapper(cuttingTool, req.getParameterMap());
+ Page<CuttingTool> page = new Page<CuttingTool>(pageNo, pageSize);
+ IPage<CuttingTool> pageList = cuttingToolService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param cuttingTool
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏蜂俊鎭�-娣诲姞")
+ @ApiOperation(value = "鍒�鍏蜂俊鎭�-娣诲姞", notes = "鍒�鍏蜂俊鎭�-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_tool:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody CuttingTool cuttingTool) {
+ cuttingToolService.save(cuttingTool);
+ List<CuttingProperties> cuttingPropertiesList = cuttingTool.getCuttingPropertiesList();
+ for (CuttingProperties cuttingProperties : cuttingPropertiesList) {
+ cuttingProperties.setCuttingId(cuttingTool.getId());
+ cuttingPropertiesService.save(cuttingProperties);
+ }
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param cuttingTool
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏蜂俊鎭�-缂栬緫")
+ @ApiOperation(value = "鍒�鍏蜂俊鎭�-缂栬緫", notes = "鍒�鍏蜂俊鎭�-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_tool:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody CuttingTool cuttingTool) {
+ cuttingToolService.saveOrUpdate(cuttingTool);
+ List<String> deletePropertiesIds = cuttingTool.getDeletePropertiesIds();
+ if (deletePropertiesIds != null) {
+ for (String deletePropertiesId : deletePropertiesIds) {
+ cuttingPropertiesService.removeById(deletePropertiesId);
+ }
+ }
+ List<CuttingProperties> cuttingPropertiesList = cuttingTool.getCuttingPropertiesList();
+ for (CuttingProperties cuttingProperties : cuttingPropertiesList) {
+ cuttingProperties.setCuttingId(cuttingTool.getId());
+ cuttingPropertiesService.saveOrUpdate(cuttingProperties);
+ }
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏蜂俊鎭�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "鍒�鍏蜂俊鎭�-閫氳繃id鍒犻櫎", notes = "鍒�鍏蜂俊鎭�-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_tool:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ cuttingToolService.removeById(id);
+ cuttingPropertiesService.remove(new LambdaQueryWrapper<CuttingProperties>().eq(CuttingProperties::getCuttingId, id));
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏蜂俊鎭�-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "鍒�鍏蜂俊鎭�-鎵归噺鍒犻櫎", notes = "鍒�鍏蜂俊鎭�-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_tool:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.cuttingToolService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "鍒�鍏蜂俊鎭�-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "鍒�鍏蜂俊鎭�-閫氳繃id鏌ヨ", notes = "鍒�鍏蜂俊鎭�-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<CuttingTool> queryById(@RequestParam(name = "id", required = true) String id) {
+ CuttingTool cuttingTool = cuttingToolService.getById(id);
+ if (cuttingTool == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(cuttingTool);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param cuttingTool
+ */
//@RequiresPermissions("org.jeecg.modules:cms_cutting_tool:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CuttingTool cuttingTool) {
@@ -186,30 +186,30 @@
}
/**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
//@RequiresPermissions("cms_cutting_tool:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, CuttingTool.class);
}
-
- @GetMapping(value = "/getCuttingToolList")
- public Result<?> getCuttingToolList(@RequestParam("pageNo") Integer pageNo,
- @RequestParam("pageSize") Integer pageSize,
- @RequestParam Map<String, Object> params) {
- IPage<Map<String, Object>> cuttingToolList = cuttingToolService.getCuttingToolList(pageNo, pageSize, params);
- for (Map<String, Object> record : cuttingToolList.getRecords()) {
- String cuttingId = (String) record.get("id");
- List<CuttingProperties> cuttingPropertiesList = cuttingPropertiesService.selectListByCuttingId(cuttingId);
- record.put("cuttingPropertiesList", cuttingPropertiesList);
- }
- return Result.ok(cuttingToolList);
- }
+ //閫夋嫨鍒�鍏风殑鎺ュ彛
+ @GetMapping(value = "/getCuttingToolList")
+ public Result<?> getCuttingToolList(@RequestParam("pageNo") Integer pageNo,
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> cuttingToolList = cuttingToolService.getCuttingToolList(pageNo, pageSize, params);
+ for (Map<String, Object> record : cuttingToolList.getRecords()) {
+ String cuttingId = (String) record.get("id");
+ List<CuttingProperties> cuttingPropertiesList = cuttingPropertiesService.selectListByCuttingId(cuttingId);
+ record.put("cuttingPropertiesList", cuttingPropertiesList);
+ }
+ return Result.ok(cuttingToolList);
+ }
}
--
Gitblit v1.9.3