From f2f8241dd52ef12ec109f6f4f0f13042055338ac Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 14 二月 2025 14:55:56 +0800
Subject: [PATCH] 修改指派设备 修改设备结构树权限 优化查询 优化排序
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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..e2292a0 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
@@ -5,6 +5,7 @@
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;
@@ -16,6 +17,8 @@
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);
@@ -245,11 +248,28 @@
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("鍒犻櫎澶辫触锛�");
+ }
}
--
Gitblit v1.9.3