From 6d44fa56ae000ecc3b34c681e16d721789c1f49e Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 25 六月 2025 11:56:22 +0800
Subject: [PATCH] 优化分配权限代码
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/CutterController.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 96 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..d8af84d 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
@@ -1,5 +1,7 @@
package org.jeecg.modules.dnc.controller;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -9,6 +11,11 @@
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;
+import java.util.List;
@Slf4j
@Api(tags = "鍒�鍏蜂俊鎭�")
@@ -16,17 +23,38 @@
@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);
+ }
+
+ /**
+ * 鏌ヨ鍒�鍏稬ist
+ * @param cutter
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏蜂俊鎭�-鏌ヨ鍒�鍏稬ist")
+ @ApiOperation(value = "鍒�鍏蜂俊鎭�-鏌ヨ鍒�鍏稬ist", notes = "鍒�鍏蜂俊鎭�-鏌ヨ鍒�鍏稬ist")
+ @GetMapping("/getList")
+ public Result<?> getList( Cutter cutter){
+ QueryWrapper<Cutter> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq(StrUtil.isNotEmpty(cutter.getDocId()),"doc_id",cutter.getDocId());
+ queryWrapper.like(StrUtil.isNotEmpty(cutter.getCutterName()),"cutter_name",cutter.getCutterName());
+ queryWrapper.like(StrUtil.isNotEmpty(cutter.getCutterType()),"cutter_type",cutter.getCutterType());
+ queryWrapper.like(StrUtil.isNotEmpty(cutter.getCutterSpacing()),"cutter_spacing",cutter.getCutterSpacing());
+ queryWrapper.orderByDesc("create_time");
+ List<Cutter> list = service.list(queryWrapper);
+ return Result.OK(list);
+ }
/**
* 鏂板鍒�鍏蜂俊鎭�
@@ -37,7 +65,7 @@
@ApiOperation(value = "鍒�鍏蜂俊鎭�-鏂板鍒�鍏蜂俊鎭�", notes = "鍒�鍏蜂俊鎭�-鏂板鍒�鍏蜂俊鎭�")
@PostMapping("/add")
public Result<?> add(@RequestBody Cutter cutter){
- return Result.OK(service.add(cutter));
+ return service.add(cutter);
}
/**
@@ -49,7 +77,7 @@
@ApiOperation(value = "鍒�鍏蜂俊鎭�-缂栬緫鍒�鍏蜂俊鎭�", notes = "鍒�鍏蜂俊鎭�-缂栬緫鍒�鍏蜂俊鎭�")
@PutMapping("/edit")
public Result<?> edit(@RequestBody Cutter cutter){
- return Result.OK(service.edit(cutter));
+ return service.edit(cutter);
}
/**
@@ -60,8 +88,61 @@
@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);
+ }
+
+ /**
+ * 鎻愬彇鍒�鍏�
+ * @param docId 鏂囨。Id
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏蜂俊鎭�-鎻愬彇鍒�鍏�")
+ @ApiOperation(value = "鍒�鍏蜂俊鎭�-鎻愬彇鍒�鍏�", notes = "鍒�鍏蜂俊鎭�-鎻愬彇鍒�鍏�")
+ @GetMapping("/extractCutterInfo/{docId}/{attributionType}/{attributionId}")
+ public Result<?> extractCutterInfo(@PathVariable("docId") String docId
+ ,@PathVariable("attributionType") Integer attributionType
+ ,@PathVariable("attributionId") String attributionId) {
+ return service.extractAndSaveFromContent(docId,attributionId,attributionType);
+ }
+
+ /**
+ * 鍙戦�佸垁鍏风郴缁�
+ * @param docId 鏂囨。Id
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏蜂俊鎭�-鍙戦�佸垁鍏风郴缁�")
+ @ApiOperation(value = "鍒�鍏蜂俊鎭�-鍙戦�佸垁鍏风郴缁�", notes = "鍒�鍏蜂俊鎭�-鍙戦�佸垁鍏风郴缁�")
+ @GetMapping("/sendCutterInfo/{docId}/{attributionType}/{attributionId}")
+ public Result<?> sendCutterInfo(@PathVariable("docId") String docId
+ ,@PathVariable("attributionType") Integer attributionType
+ ,@PathVariable("attributionId") String attributionId) {
+ return service.sendToCutterSystem(docId,attributionId,attributionType);
+ }
}
--
Gitblit v1.9.3