From 9a8d9ef43c70fe6d70b494f49b19e5ca6ef01d4b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 14 三月 2025 17:52:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/CutterController.java | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/CutterController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/CutterController.java
index d1a3a2b..186190a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/CutterController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/CutterController.java
@@ -9,6 +9,10 @@
import org.jeecg.modules.dnc.entity.Cutter;
import org.jeecg.modules.dnc.service.ICutterService;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
@Slf4j
@Api(tags = "鍒�鍏蜂俊鎭�")
@@ -16,17 +20,19 @@
@RequestMapping("/nc/cutter")
public class CutterController extends JeecgController<Cutter, ICutterService> {
-// /**
-// * 鏍规嵁涓氬姟id鏌ヨ鍒�鍏峰垪琛�
-// * @param businessId
-// * @param pageNo
-// * @param pageSize
-// * @return
-// */
-// @GetMapping("/getByBusinessId")
-// public Result<?> getByBusinessId(String businessId,Integer pageNo,Integer pageSize){
-// return Result.OK(service.getByBusinessId(businessId,pageNo,pageSize));
-// }
+ /**
+ * 鏌ヨ鍒�鍏峰垪琛�
+ * @param cutter
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏蜂俊鎭�-鏌ヨ鍒�鍏峰垪琛�")
+ @ApiOperation(value = "鍒�鍏蜂俊鎭�-鏌ヨ鍒�鍏峰垪琛�", notes = "鍒�鍏蜂俊鎭�-鏌ヨ鍒�鍏峰垪琛�")
+ @GetMapping("/getByBusinessId")
+ public Result<?> getByBusinessId( Cutter cutter,Integer pageNo,Integer pageSize){
+ return service.query(cutter,pageNo,pageSize);
+ }
/**
* 鏂板鍒�鍏蜂俊鎭�
@@ -37,7 +43,7 @@
@ApiOperation(value = "鍒�鍏蜂俊鎭�-鏂板鍒�鍏蜂俊鎭�", notes = "鍒�鍏蜂俊鎭�-鏂板鍒�鍏蜂俊鎭�")
@PostMapping("/add")
public Result<?> add(@RequestBody Cutter cutter){
- return Result.OK(service.add(cutter));
+ return service.add(cutter);
}
/**
@@ -49,7 +55,7 @@
@ApiOperation(value = "鍒�鍏蜂俊鎭�-缂栬緫鍒�鍏蜂俊鎭�", notes = "鍒�鍏蜂俊鎭�-缂栬緫鍒�鍏蜂俊鎭�")
@PutMapping("/edit")
public Result<?> edit(@RequestBody Cutter cutter){
- return Result.OK(service.edit(cutter));
+ return service.edit(cutter);
}
/**
@@ -60,8 +66,33 @@
@AutoLog(value = "鍒�鍏蜂俊鎭�-鏍规嵁id鍒犻櫎鍒�鍏蜂俊鎭�")
@ApiOperation(value = "鍒�鍏蜂俊鎭�-鏍规嵁id鍒犻櫎鍒�鍏蜂俊鎭�", notes = "鍒�鍏蜂俊鎭�-鏍规嵁id鍒犻櫎鍒�鍏蜂俊鎭�")
@DeleteMapping("/delete")
- public Result<?> delete(@RequestBody String id){
- return Result.OK(service.delete(id));
+ public Result<?> delete(String id){
+ return service.delete(id);
}
+ /**
+ * 瀵煎嚭excel
+ * @param request
+ * @param cutter
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏蜂俊鎭�-瀵煎嚭excel")
+ @ApiOperation(value = "鍒�鍏蜂俊鎭�-瀵煎嚭excel", notes = "鍒�鍏蜂俊鎭�-瀵煎嚭excel")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, Cutter cutter) {
+ return super.exportXls(request, cutter, Cutter.class, "鍒�鍏蜂俊鎭�");
+ }
+
+ /**
+ * 瀵煎叆excel
+ * @param request
+ * @param response
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏蜂俊鎭�-瀵煎叆excel")
+ @ApiOperation(value = "鍒�鍏蜂俊鎭�-瀵煎叆excel", notes = "鍒�鍏蜂俊鎭�-瀵煎叆excel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, Cutter.class);
+ }
}
--
Gitblit v1.9.3