From 4bac61c3fb3420caf48397d741f7f02c22f0fe08 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 23 六月 2025 13:23:54 +0800
Subject: [PATCH] 工控网 新增设备结构树指派产品结构树功能 新增定型后续操作 增加解析涉密网传输解析，增加封装定型后nc文件与程序加工确认表
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java
index 98dc0d9..3ddf601 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java
@@ -8,6 +8,7 @@
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.mapper.*;
import org.jeecg.modules.dnc.service.*;
+import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.ISysUserService;
import org.slf4j.Logger;
@@ -287,20 +288,22 @@
private void savePermissionStreamNewList(List<PermissionStreamNew> permissionStreamNewList) {
for (PermissionStreamNew permissionStreamNew : permissionStreamNewList) {
- if (permissionStreamNew.getUserId() != null) {
- String id=sysUserService.getUserByName(permissionStreamNew.getUserId()).getId();
- if (id!=null){
- permissionStreamNew.setUserId(id);
+ if (permissionStreamNewMapper.selectById(permissionStreamNew.getId()) == null) {
+ if (permissionStreamNew.getUserId() != null) {
+ String id=sysUserService.getUserByName(permissionStreamNew.getUserId()).getId();
+ if (id!=null){
+ permissionStreamNew.setUserId(id);
+ }
}
- }
- if (permissionStreamNew.getDepartId() != null) {
- String id=mdcProductionService.findByOrgCode(permissionStreamNew.getDepartId()).getId();
- if (id!=null){
- permissionStreamNew.setDepartId(id);
+ if (permissionStreamNew.getDepartId() != null) {
+ MdcProduction mdcProduction=mdcProductionService.findByOrgCode(permissionStreamNew.getDepartId());
+ if (mdcProduction!=null){
+ permissionStreamNew.setDepartId(mdcProduction.getId());
+ }
}
+ permissionStreamNewMapper.insert(permissionStreamNew);
+ logger.debug("鏉冮檺宸蹭繚瀛�: {}", permissionStreamNew.getId());
}
- permissionStreamNewMapper.insert(permissionStreamNew);
- logger.debug("鏉冮檺宸蹭繚瀛�: {}", permissionStreamNew.getId());
}
//鍒嗘壒娣诲姞浜у搧銆侀儴浠躲�侀浂浠躲�佸伐鑹鸿绋嬨�佸伐搴忋�佸伐姝ユ潈闄�
permissionStreamNewList.forEach(item -> {
@@ -447,6 +450,7 @@
private void saveGuideCardBatch(GuideCardBatch guideCardBatch) {
if (guideCardBatchMapper.selectById(guideCardBatch.getId()) == null) {
+ guideCardBatch.setFlowStatus("1");
guideCardBatchMapper.insert(guideCardBatch);
logger.debug("鍒�鐗囨壒娆″凡淇濆瓨: {}", guideCardBatch.getId());
} else {
--
Gitblit v1.9.3