From 4b397a21eb979617f4fe9ff9fc1edb7a1be72900 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:45:29 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java
index e6accdd..038a3cf 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java
@@ -5,7 +5,7 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
-import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.producedivision.entity.MdmDept;
import org.springblade.mdm.basesetting.producedivision.service.MdmDeptService;
@@ -43,7 +43,7 @@
service.accept(ids);
return R.success();
}catch(Exception e) {
- log.error("鎺ュ彈鏂囦欢寮傚父",e);
+ log.error("鎺ュ彈閫変腑鏂囦欢寮傚父",e);
return R.fail(e.getMessage());
}
}
@@ -55,7 +55,7 @@
service.acceptAll();
return R.success();
}catch(Exception e) {
- log.error("鎺ュ彈鏂囦欢寮傚父",e);
+ log.error("鎺ュ彈鍏ㄩ儴鏂囦欢寮傚父",e);
return R.fail(e.getMessage());
}
}
@@ -81,14 +81,13 @@
@Operation(summary = "鏈哄簥鏂囦欢TEMP鐩綍鍒嗛〉鏌ヨ", description = "鍑荤┛鏂囦欢鍒嗛〉鏌ヨ锛屾煡璇㈢洰褰曚腑鐨勬枃浠讹紝杩樹笉绠楁椂鏈哄簥鍥炰紶鏂囦欢")
@GetMapping("/file-page-for-acceept")
public R<IPage<MachineFile>> filePageForAccept(MachineBackFileQueryVO query) {
- List<Long> deptIds = new ArrayList<>();
if("workshop".equals(query.getNodeType()) || "seg".equals(query.getNodeType())) {
//鑺傜偣涓鸿溅闂淬�佸伐娈�
MdmDept dept = mdmDeptService.getById(query.getNodeId());
String idStr = dept.getAncestors()+","+dept.getId();
List<MdmDept> depts = mdmDeptService.lambdaQuery().likeRight(MdmDept::getParentId, query.getNodeId()).list();
- deptIds.addAll(depts.stream().map(MdmDept::getId).toList());
+ List<Long> deptIds = new ArrayList<>(depts.stream().map(MdmDept::getId).toList());
deptIds.add(dept.getId());
//+鏈溅闂�
//Func.toStrList(",",idStr)
--
Gitblit v1.9.3