From b42b180f5c2bc89e494b2274d8d454a4bd6dbf9c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 21 三月 2025 17:27:59 +0800
Subject: [PATCH] art: 系统管理-用户管理-添加选择设备，并根据是否有设备管理模块功能区分加载 哪个模块的设备倏
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
index 4dffb5e..2c31d2c 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
@@ -24,10 +24,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
@Service
public class ComponentInfoSeServiceImpl extends ServiceImpl<ComponentInfoMapper, ComponentInfo> implements IComponentInfoService {
@@ -121,15 +118,22 @@
ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
}
//娣诲姞缁撴瀯鏍�
- ProductMix productMix = new ProductMix(Long.parseLong(componentInfo.getComponentId()),Long.parseLong(productInfo.getProductId())
- ,componentInfo.getComponentName(),componentInfo.getComponentCode(),"2");
+ ProductMix productMix=null;
+ if (componentInfo.getParentId() != null) {
+ //瀛愰儴浠�
+ productMix = new ProductMix(Long.parseLong(componentInfo.getComponentId()),Long.parseLong(componentInfo.getParentId())
+ ,componentInfo.getComponentName(),componentInfo.getComponentCode(),2,new Date());
+ }else {
+ productMix = new ProductMix(Long.parseLong(componentInfo.getComponentId()),Long.parseLong(productInfo.getProductId())
+ ,componentInfo.getComponentName(),componentInfo.getComponentCode(),2,new Date());
+ }
productMixService.save(productMix);
//娣诲姞鏉冮檺
PermissionStreamNew stream = new PermissionStreamNew();
stream.setUserId(userId);
stream.setBusinessId(componentInfo.getComponentId());
stream.setBusinessType("2");
- return permissionStreamNewService.save(stream);
+ return permissionStreamNewService.addPermissionStreamNew(stream);
}
@Override
@@ -152,6 +156,11 @@
componentInfo.setRankLevel(null);
componentInfo.setProductId(null);
boolean b = super.updateById(componentInfo);
+ //鍚屾淇敼缁撴瀯鏍�
+ ProductMix productMix = productMixService.getById(Long.parseLong(id));
+ productMix.setName(componentInfo.getComponentName());
+ productMix.setCode(componentInfo.getComponentCode());
+ productMixService.updateById(productMix);
if(!b)
return false;
ComponentPermission permission = componentPermissionService.getByComponentIdAndUserId(id, userId);
--
Gitblit v1.9.3