From 1930b4e59d60c015ffa7bfee92e4bc227b90dcb3 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 28 五月 2025 15:41:41 +0800
Subject: [PATCH] 1.Dnc产品结构树检索nc文件 2.新增批次功能 3.新增审签查询流程 4.修改刀具系统查询
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java | 79 ++++++++++++++++++++++++++++++++-------
1 files changed, 65 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java
index 674fc8c..09e695b 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java
@@ -1,21 +1,24 @@
package org.jeecg.modules.dnc.controller;
-import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.dnc.entity.DocInfo;
import org.jeecg.modules.dnc.entity.ProductInfo;
+import org.jeecg.modules.dnc.request.TreeInfoRequest;
import org.jeecg.modules.dnc.response.CommonCode;
import org.jeecg.modules.dnc.response.CommonGenericTree;
import org.jeecg.modules.dnc.response.QueryListResponseResult;
import org.jeecg.modules.dnc.response.ResponseResult;
import org.jeecg.modules.dnc.service.IProductInfoService;
-import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.dnc.ucenter.UserDepartExt;
+import org.jeecg.modules.dnc.utils.ValidateUtil;
+import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -59,7 +62,7 @@
public QueryListResponseResult<CommonGenericTree> loadProductTree() {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
- if(!StrUtil.isEmpty(userId))
+ if(!ValidateUtil.validateString(userId))
return new QueryListResponseResult<>(CommonCode.SUCCESS, Collections.emptyList());
List<CommonGenericTree> list = productInfoService.loadProductTree(userId);
if(list == null)
@@ -73,7 +76,7 @@
public QueryListResponseResult<CommonGenericTree> loadBaseTree() {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
- if(!StrUtil.isEmpty(userId))
+ if(!ValidateUtil.validateString(userId))
return new QueryListResponseResult<>(CommonCode.SUCCESS, Collections.emptyList());
List<CommonGenericTree> list = productInfoService.loadBaseTree(userId);
if(list == null)
@@ -87,7 +90,7 @@
public QueryListResponseResult<CommonGenericTree> loadTree(@PathVariable("nodeType") Integer nodeType, @PathVariable("paramId") String paramId) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
- if(!StrUtil.isEmpty(userId))
+ if(!ValidateUtil.validateString(userId))
return new QueryListResponseResult<>(CommonCode.SUCCESS, Collections.emptyList());
List<CommonGenericTree> list = productInfoService.loadTree(userId, nodeType, paramId);
if(list == null)
@@ -141,8 +144,8 @@
@AutoLog(value = "浜у搧琛�-鑾峰彇宸插垎閰嶇殑閮ㄩ棬")
@ApiOperation(value = "浜у搧琛�-鑾峰彇宸插垎閰嶇殑閮ㄩ棬", notes = "浜у搧琛�-鑾峰彇宸插垎閰嶇殑閮ㄩ棬")
@GetMapping("/get/perm/depart/{nodeType}/{paramId}")
- public QueryListResponseResult<Department> getDepartPermsList(@PathVariable("nodeType") Integer nodeType, @PathVariable("paramId") String paramId) {
- List<Department> list = productInfoService.getDepartPermsList(nodeType, paramId);
+ public QueryListResponseResult<MdcProduction> getDepartPermsList(@PathVariable("nodeType") Integer nodeType, @PathVariable("paramId") String paramId) {
+ List<MdcProduction> list = productInfoService.getDepartPermsList(nodeType, paramId);
if(list == null)
list = Collections.emptyList();
return new QueryListResponseResult(CommonCode.SUCCESS, list);
@@ -151,8 +154,8 @@
@AutoLog(value = "浜у搧琛�-鑾峰彇鏈垎閰嶇殑閮ㄩ棬")
@ApiOperation(value = "浜у搧琛�-鑾峰彇鏈垎閰嶇殑閮ㄩ棬", notes = "浜у搧琛�-鑾峰彇鏈垎閰嶇殑閮ㄩ棬")
@GetMapping("/get/non/perm/depart/{nodeType}/{paramId}")
- public QueryListResponseResult<Department> getDepartNonPermsList(@PathVariable("nodeType") Integer nodeType, @PathVariable("paramId") String paramId) {
- List<Department> list = productInfoService.getDepartNonPermsList(nodeType, paramId);
+ public QueryListResponseResult<MdcProduction> getDepartNonPermsList(@PathVariable("nodeType") Integer nodeType, @PathVariable("paramId") String paramId) {
+ List<MdcProduction> list = productInfoService.getDepartNonPermsList(nodeType, paramId);
if(list == null)
list = Collections.emptyList();
return new QueryListResponseResult(CommonCode.SUCCESS, list);
@@ -170,7 +173,7 @@
@ApiOperation(value = "浜у搧琛�-鎸囨淳浜у搧鏍戣妭鐐圭殑鐢ㄦ埛鏉冮檺", notes = "浜у搧琛�-鎸囨淳浜у搧鏍戣妭鐐圭殑鐢ㄦ埛鏉冮檺")
@PostMapping("/assign/add/user/{nodeType}/{paramId}/{relativeFlag}")
public ResponseResult assignAddUser(@PathVariable("nodeType") Integer nodeType, @PathVariable("paramId") String paramId, @PathVariable("relativeFlag") Integer relativeFlag, @RequestBody String[] userIds) {
- boolean b = productInfoService.assignAddUser(nodeType, paramId, relativeFlag, userIds);
+ boolean b = productInfoService.assignAddUserAll(nodeType, paramId, relativeFlag, userIds);
if(b) {
return new ResponseResult(CommonCode.SUCCESS);
}
@@ -189,7 +192,7 @@
@ApiOperation(value = "浜у搧琛�-绉婚櫎浜у搧鏍戣妭鐐圭殑鐢ㄦ埛鏉冮檺", notes = "浜у搧琛�-绉婚櫎浜у搧鏍戣妭鐐圭殑鐢ㄦ埛鏉冮檺")
@PostMapping("/assign/remove/user/{nodeType}/{paramId}/{relativeFlag}")
public ResponseResult assignRemoveUser(@PathVariable("nodeType") Integer nodeType, @PathVariable("paramId") String paramId, @PathVariable("relativeFlag") Integer relativeFlag, @RequestBody String[] userIds) {
- boolean b = productInfoService.assignRemoveUser(nodeType, paramId, relativeFlag, userIds);
+ boolean b = productInfoService.assignRemoveUserAll(nodeType, paramId, relativeFlag, userIds);
if(b) {
return new ResponseResult(CommonCode.SUCCESS);
}
@@ -208,7 +211,7 @@
@ApiOperation(value = "浜у搧琛�-鎸囨淳浜у搧鏍戣妭鐐圭殑閮ㄩ棬鏉冮檺", notes = "浜у搧琛�-鎸囨淳浜у搧鏍戣妭鐐圭殑閮ㄩ棬鏉冮檺")
@PostMapping("/assign/add/department/{nodeType}/{paramId}/{relativeFlag}")
public ResponseResult assignAddDepartment(@PathVariable("nodeType") Integer nodeType, @PathVariable("paramId") String paramId, @PathVariable("relativeFlag") Integer relativeFlag, @RequestBody String[] departmentIds) {
- boolean b = productInfoService.assignAddDepartment(nodeType, paramId, relativeFlag, departmentIds);
+ boolean b = productInfoService.assignAddDepartmentAll(nodeType, paramId, relativeFlag, departmentIds);
if(b) {
return new ResponseResult(CommonCode.SUCCESS);
}
@@ -227,7 +230,7 @@
@ApiOperation(value = "浜у搧琛�-绉婚櫎浜у搧鏍戣妭鐐圭殑閮ㄩ棬鏉冮檺", notes = "浜у搧琛�-绉婚櫎浜у搧鏍戣妭鐐圭殑閮ㄩ棬鏉冮檺")
@PostMapping("/assign/remove/department/{nodeType}/{paramId}/{relativeFlag}")
public ResponseResult assignRemoveDepartment(@PathVariable("nodeType") Integer nodeType, @PathVariable("paramId") String paramId, @PathVariable("relativeFlag") Integer relativeFlag, @RequestBody String[] departmentIds) {
- boolean b = productInfoService.assignRemoveDepartment(nodeType, paramId, relativeFlag, departmentIds);
+ boolean b = productInfoService.assignRemoveDepartmentAll(nodeType, paramId, relativeFlag, departmentIds);
if(b) {
return new ResponseResult(CommonCode.SUCCESS);
}
@@ -245,11 +248,59 @@
public QueryListResponseResult<CommonGenericTree> searchProductTree(String queryParam) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
- if(!StrUtil.isEmpty(userId))
+ if(!ValidateUtil.validateString(userId))
return new QueryListResponseResult<>(CommonCode.SUCCESS, Collections.emptyList());
List<CommonGenericTree> list = productInfoService.searchProductTree(userId, queryParam);
if(list == null)
list = Collections.emptyList();
return new QueryListResponseResult<>(CommonCode.SUCCESS, list);
}
+
+ /**
+ * 浜у搧缁撴瀯鏍�-閫氳繃绫诲瀷灏辫鍒犻櫎
+ * @param id
+ * @param type
+ * @return
+ */
+ @AutoLog(value = "浜у搧缁撴瀯鏍�-閫氳繃绫诲瀷灏辫鍒犻櫎")
+ @ApiOperation(value = "浜у搧缁撴瀯鏍�-閫氳繃绫诲瀷灏辫鍒犻櫎", notes = "浜у搧缁撴瀯鏍�-閫氳繃绫诲瀷灏辫鍒犻櫎")
+ @DeleteMapping("/delete/{id}/{type}")
+ public Result<?> deleteProductTreeByType(@PathVariable("id") String id, @PathVariable("type") Integer type) {
+ boolean b =productInfoService.deleteProductTree(id, type);
+ if (b){
+ return Result.ok("鍒犻櫎鎴愬姛锛�");
+ }
+ return Result.error("鍒犻櫎澶辫触锛�");
+ }
+
+ /**
+ * 閫氳繃闆朵欢鍙枫�佹潗璐ㄧ瓑鏌ヨ瀵瑰簲鐢靛瓙鏍锋澘
+ * @param treeInfoRequest
+ * @return
+ */
+ @AutoLog(value = "闆朵欢淇℃伅琛�-閫氳繃闆朵欢鍙枫�佹潗璐ㄧ瓑鏌ヨ瀵瑰簲鐢靛瓙鏍锋澘")
+ @ApiOperation(value = "闆朵欢淇℃伅琛�-閫氳繃闆朵欢鍙枫�佹潗璐ㄧ瓑鏌ヨ瀵瑰簲鐢靛瓙鏍锋澘", notes = "闆朵欢淇℃伅琛�-閫氳繃闆朵欢鍙枫�佹潗璐ㄧ瓑鏌ヨ瀵瑰簲鐢靛瓙鏍锋澘")
+ @GetMapping("/query")
+ public Result<?> queryPartsInfo(TreeInfoRequest treeInfoRequest) {
+ List<DocInfo> list = productInfoService.getByTreeOtherFileInfo(treeInfoRequest);
+ if (list == null)
+ list = Collections.emptyList();
+ return Result.ok(list);
+ }
+
+ /**
+ * 閫氳繃浠ｅ彿銆佸悕绉般�佹潗璐ㄧ瓑鏌ヨ瀵瑰簲NC鏂囦欢
+ * @param treeInfoRequest
+ * @return
+ */
+ @AutoLog(value = "闆朵欢淇℃伅琛�-閫氳繃浠ｅ彿銆佸悕绉般�佹潗璐ㄧ瓑鏌ヨ瀵瑰簲NC鏂囦欢")
+ @ApiOperation(value = "闆朵欢淇℃伅琛�-閫氳繃浠ｅ彿銆佸悕绉般�佹潗璐ㄧ瓑鏌ヨ瀵瑰簲NC鏂囦欢", notes = "闆朵欢淇℃伅琛�-閫氳繃浠ｅ彿銆佸悕绉般�佹潗璐ㄧ瓑鏌ヨ瀵瑰簲NC鏂囦欢")
+ @GetMapping("/query/nc")
+ public Result<?> queryOtherFileInfo(TreeInfoRequest treeInfoRequest) {
+ List<DocInfo> list = productInfoService.getByTreeNcFileInfo(treeInfoRequest);
+ if (list == null)
+ list = Collections.emptyList();
+ return Result.ok(list);
+ }
+
}
--
Gitblit v1.9.3