From 757bfa4a2865b3066e82a7e80bea1efd8bdcd72c Mon Sep 17 00:00:00 2001
From: lyh <liuyuanheng@xalxzn.com>
Date: 星期四, 20 二月 2025 15:03:27 +0800
Subject: [PATCH] 去除原有日志 默认新增管理员权限
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductPermissionService.java | 9 ++
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java | 12 ++-
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductPermission.java | 5 +
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java | 22 +----
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductPermissionServiceImpl.java | 76 ++++++++++++++++++
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java | 51 +-----------
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java | 23 +----
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java | 7 -
8 files changed, 115 insertions(+), 90 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductPermission.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductPermission.java
index 8ce10b7..4bd0d2d 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductPermission.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductPermission.java
@@ -14,6 +14,11 @@
@NoArgsConstructor
@TableName(value = "nc_product_permission")
public class ProductPermission {
+ public ProductPermission(String productId, String userId) {
+ this.productId = productId;
+ this.userId = userId;
+ }
+
@TableId(value = "id")
private String id;
@TableField(value = "product_id")
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductPermissionService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductPermissionService.java
index 2d0a17c..0d41db7 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductPermissionService.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductPermissionService.java
@@ -50,4 +50,13 @@
* @return
*/
List<ProductPermission> getByProductId(String productId);
+
+ /**
+ * 鏂板鏉冮檺鏁版嵁
+ * @param id
+ * @param userId
+ * @param type
+ * @return
+ */
+ boolean add(String id,String userId,String type);
}
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 ef7d501..58c024a 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
@@ -52,9 +52,9 @@
@Autowired
private IDocInfoService docInfoService;
@Autowired
- private INcLogInfoService iNcLogInfoService;
- @Autowired
private IDocRelativeService iDocRelativeService;
+ @Autowired
+ private IProductPermissionService productPermissionService;
@Override
@Transactional(rollbackFor = {Exception.class})
@@ -93,15 +93,6 @@
}
componentInfo.setComponentStatus(1);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(2);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("閮ㄤ欢鍚嶇О锛�"+componentInfo.getComponentName()+"锛岄儴浠朵唬鍙凤細"+componentInfo.getComponentCode());
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
boolean b = super.save(componentInfo);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
@@ -131,30 +122,11 @@
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
}
- ComponentPermission permission = new ComponentPermission();
- permission.setComponentId(componentInfo.getComponentId());
- permission.setUserId(userId);
- b = componentPermissionService.save(permission);
- if(!b)
- ExceptionCast.cast(CommonCode.FAIL);
+ b = productPermissionService.add(componentInfo.getComponentId(), userId,"2");
+ if (!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
+ }
//鍘婚櫎榛樿鏂板宸ュ簭锛岃浆涓烘墜鍔ㄦ坊鍔�
- /*/娣诲姞榛樿宸ュ簭
- ProcessStream processStream = new ProcessStream();
- processStream.setProductId(componentInfo.getProductId());
- processStream.setComponentId(componentInfo.getComponentId());
- processStream.setProcessCode("1");
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfogx = new NcLogInfo();
- //妯″潡
- ncLogInfogx.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfogx.setOperateType(2);
- //鏃ュ織鍐呭
- ncLogInfogx.setLogContent("閮ㄤ欢鍚嶇О锛�"+componentInfo.getComponentName()+"鐢熸垚榛樿宸ュ簭锛屽伐搴忓彿锛�"+processStream.getProcessCode());
- iNcLogInfoService.saveLogNcInfos(ncLogInfogx);
- b = processStreamService.save(processStream);
- if(!b)
- ExceptionCast.cast(CommonCode.FAIL);*/
//娣诲姞鏉冮檺
PermissionStream stream = new PermissionStream();
stream.setUserId(userId);
@@ -182,17 +154,6 @@
componentInfo.setComponentStatus(null);
componentInfo.setRankLevel(null);
componentInfo.setProductId(null);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(3);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("淇敼閮ㄤ欢鍚嶇О锛�"+productInfoMapper.selectById(en.getProductId()).getProductName()+"瀛愰泦閮ㄤ欢");
- //淇敼淇濆瓨澶囨敞
- ncLogInfo.setRemark(JSONObject.toJSONString(en));
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
boolean b = super.updateById(componentInfo);
if(!b)
return false;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
index a7b5a5e..8cee5f7 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
@@ -57,6 +57,8 @@
private INcLogInfoService iNcLogInfoService;
@Autowired
private IDocRelativeService iDocRelativeService;
+ @Autowired
+ private IProductPermissionService productPermissionService;
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean addPartsInfo(PartsInfo partsInfo) {
@@ -114,12 +116,10 @@
}
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
- PartsPermission permission = new PartsPermission();
- permission.setPartsId(partsInfo.getPartsId());
- permission.setUserId(userId);
- b = partsPermissionService.save(permission);
- if(!b)
- ExceptionCast.cast(CommonCode.FAIL);
+ b = productPermissionService.add(partsInfo.getPartsId(), userId,"3");
+ if (!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
+ }
//娣诲姞鐢ㄦ埛鏉冮檺
PermissionStream stream = new PermissionStream();
stream.setProductId(partsInfo.getProductId());
@@ -145,17 +145,6 @@
partsInfo.setPartsStatus(null);
partsInfo.setProductId(null);
partsInfo.setComponentId(null);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(3);
- //淇敼淇濆瓨澶囨敞
- ncLogInfo.setRemark(JSONObject.toJSONString(en));
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("淇敼閮ㄤ欢鍚嶇О锛�"+productInfoMapper.selectById(en.getProductId()).getProductName()+"瀛愰泦闆朵欢");
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
boolean b = super.updateById(partsInfo);
if(!b)
return false;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
index f266d1a..045fc53 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
@@ -47,8 +47,6 @@
@Lazy
private IDeviceInfoService deviceInfoService;
@Autowired
- private INcLogInfoService iNcLogInfoService;
- @Autowired
private IPermissionStreamService permissionStreamService;
@Autowired
private IProcessionDepartmentService processionDepartmentService;
@@ -58,6 +56,8 @@
private IDocRelativeService iDocRelativeService;
@Autowired
private IProcessStreamPermissionService processStreamPermissionService;
+ @Autowired
+ private IProductPermissionService productPermissionService;
@Override
@Transactional(rollbackFor = {Exception.class})
@@ -104,10 +104,10 @@
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
//娣诲姞鐢ㄦ埛鏉冮檺
- ProcessionPermission permission = new ProcessionPermission();
- permission.setProcessId(stream.getProcessId());
- permission.setUserId(userId);
- processStreamPermissionService.save(permission);
+ b = productPermissionService.add(stream.getProcessId(), userId,"5");
+ if (!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
+ }
//娣诲姞鏉冮檺楠岃瘉
PermissionStream permissionStream = new PermissionStream();
permissionStream.setUserId(userId);
@@ -136,16 +136,6 @@
stream.setPartsId(null);
stream.setProcessName(stream.getProcessName().toUpperCase());
stream.setProcessCode(null);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(3);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("宸ュ簭鍙凤細"+en.getProcessCode());
- ncLogInfo.setRemark(JSONObject.toJSONString(en));
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
boolean b = super.updateById(stream);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java
index f2fe6e9..0e8b19d 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java
@@ -60,8 +60,6 @@
@Autowired
private IWorkStepService workStepService;
@Autowired
- private INcLogInfoService iNcLogInfoService;
- @Autowired
private IWorkStepDepartmentService workStepDepartmentService;
@Autowired
private IProcessionDepartmentService processionDepartmentService;
@@ -96,10 +94,7 @@
if (!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
}
- ProductPermission permission = new ProductPermission();
- permission.setProductId(productInfo.getProductId());
- permission.setUserId(userId);
- b = productPermissionService.save(permission);
+ b = productPermissionService.add(productInfo.getProductId(), userId,"1");
if (!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductPermissionServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductPermissionServiceImpl.java
index 4d8b562..ad31cdc 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductPermissionServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductPermissionServiceImpl.java
@@ -3,12 +3,17 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.dnc.entity.ProductPermission;
+import org.jeecg.modules.dnc.entity.*;
+import org.jeecg.modules.dnc.exception.ExceptionCast;
import org.jeecg.modules.dnc.mapper.ProductPermissionMapper;
+import org.jeecg.modules.dnc.response.CommonCode;
+import org.jeecg.modules.dnc.service.*;
import org.jeecg.modules.dnc.ucenter.UserDepartExt;
import org.jeecg.modules.dnc.utils.ValidateUtil;
+import org.jeecg.modules.system.entity.DncDevicePermission;
import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.dnc.service.IProductPermissionService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -18,6 +23,16 @@
@Service
public class ProductPermissionServiceImpl extends ServiceImpl<ProductPermissionMapper, ProductPermission> implements IProductPermissionService {
+ @Autowired
+ private IComponentPermissionService componentPermissionService;
+ @Autowired
+ private IPartsPermissionService partsPermissionService;
+ @Autowired
+ private IProcessStreamPermissionService processStreamPermissionService;
+ @Autowired
+ private IWorkStepPermissionService workStepPermissionService;
+ @Autowired
+ private ISysUserService sysUserService;
@Override
public ProductPermission getByProductIdAndUserId(String productId, String userId) {
if(!ValidateUtil.validateString(productId) || !ValidateUtil.validateString(userId))
@@ -69,4 +84,61 @@
list = Collections.emptyList();
return list;
}
+
+ /**
+ * 鏂板鏉冮檺鏁版嵁
+ * @param id
+ * @param userId
+ * @param type
+ * @return
+ */
+ @Override
+ public boolean add(String id, String userId, String type) {
+ // 楠岃瘉鍙傛暟鏈夋晥鎬�
+ if (!ValidateUtil.validateString(userId) || !ValidateUtil.validateString(id) || !ValidateUtil.validateString(type)) {
+ return false;
+ }
+ // 鑾峰彇绠＄悊鍛樼敤鎴�
+ SysUser adminUser = sysUserService.getUserByName("admin");
+ try {
+ boolean isAdmin = userId.equals(adminUser.getId());
+ savePermission(id, userId, type);
+ if (!isAdmin) {
+ savePermission(id, adminUser.getId(), type);
+ }
+ return true;
+ } catch (Exception e) {
+ ExceptionCast.cast(CommonCode.INVALID_PARAM);
+ return false;
+ }
+ }
+
+ private void savePermission(String id, String userId, String type) {
+ switch (type) {
+ case "1":
+ // 缁勪欢鏉冮檺
+ super.save(new ProductPermission(id, userId));
+ break;
+ case "2":
+ // 閮ㄤ欢鏉冮檺
+ componentPermissionService.save(new ComponentPermission(id, userId));
+ break;
+ case "3":
+ // 闆朵欢鏉冮檺
+ partsPermissionService.save(new PartsPermission(id, userId));
+ break;
+ case "5":
+ // 宸ュ簭鏉冮檺
+ processStreamPermissionService.save(new ProcessionPermission(id, userId));
+ break;
+ case "6":
+ // 宸ュ簭姝ラ鏉冮檺
+ workStepPermissionService.save(new WorkStepPermission(id, userId));
+ break;
+ default:
+ // 澶勭悊鏈煡绫诲瀷
+ throw new IllegalArgumentException("Unknown permission type: " + type);
+ }
+ }
+
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
index 66e2f1a..cdbe6cf 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
@@ -52,6 +52,9 @@
@Autowired
private IDocRelativeService iDocRelativeService;
+ @Autowired
+ private IProductPermissionService productPermissionService;
+
@Override
public List<WorkStep> getByUserPerms(String userId) {
if(!ValidateUtil.validateString(userId))
@@ -110,10 +113,11 @@
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
//娣诲姞鐢ㄦ埛鏉冮檺
- WorkStepPermission workStepPermission = new WorkStepPermission();
- workStepPermission.setUserId(userId);
- workStepPermission.setStepId(workStep.getId());
- workStepPermissionService.save(workStepPermission);
+ //娣诲姞鐢ㄦ埛鏉冮檺
+ b = productPermissionService.add(workStep.getId(), userId,"6");
+ if (!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
+ }
//娣诲姞鏉冮檺楠岃瘉
PermissionStream permissionStream = new PermissionStream();
permissionStream.setUserId(userId);
--
Gitblit v1.9.3