From 52b9d92b488aa1cdccbefe405571b7e9c600578b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 09 六月 2025 14:24:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 132 ++++++++++++++++++++++----------------------
1 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 58fba3f..ab2452d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -527,74 +527,74 @@
// 鍒嗙被
Long tagId;
// 涓�绾у垎绫�
- if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
- Tag priTag = tagService.selectOne(new EntityWrapper<Tag>().eq("name", matParam.getGroupCode()));
- if (priTag == null) {
- Tag top = tagService.getTop();
- NodeUtils nodeUtils = new NodeUtils();
- nodeUtils.executePath(top.getId());
- priTag = new Tag(
- null, // 缂栧彿
- matParam.getGroupCode(), // 鍚嶇О
- top.getId(), // 鐖剁骇
- top.getName(), // 鐖剁骇鍚嶇О
- nodeUtils.path.toString(), // 鍏宠仈璺緞
- nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
- 0, // 绫诲瀷
- null, // 璐熻矗浜�
- null, // 鍥剧墖
- null, // 绠�瑕佹弿杩�
- null, // 鏁伴噺
- 2, // 绛夌骇
- null, // 鎺掑簭
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- null, // 娣诲姞浜哄憳
- now, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- null // 澶囨敞
- );
- if (tagMapper.insert(priTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- }
- // 浜岀骇鍒嗙被
- Tag secTag = tagService.selectByName(matParam.getGroupName(), 3);
- if (secTag == null) {
- NodeUtils nodeUtils = new NodeUtils();
- nodeUtils.executePath(priTag.getId());
- secTag = new Tag(
- null, // 缂栧彿
- matParam.getGroupName(), // 鍚嶇О
- priTag.getId(), // 鐖剁骇
- priTag.getName(), // 鐖剁骇鍚嶇О
- nodeUtils.path.toString(), // 鍏宠仈璺緞
- nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
- 0, // 绫诲瀷
- null, // 璐熻矗浜�
- null, // 鍥剧墖
- null, // 绠�瑕佹弿杩�
- null, // 鏁伴噺
- 3, // 绛夌骇
- null, // 鎺掑簭
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- null, // 娣诲姞浜哄憳
- now, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- null // 澶囨敞
- );
- if (tagMapper.insert(secTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- }
- tagId = secTag.getId();
- } else {
- tagId = tagService.getTop().getId();
- }
+// if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
+// Tag priTag = tagService.selectOne(new EntityWrapper<Tag>().eq("name", matParam.getGroupCode()));
+// if (priTag == null) {
+// Tag top = tagService.getTop();
+// NodeUtils nodeUtils = new NodeUtils();
+// nodeUtils.executePath(top.getId());
+// priTag = new Tag(
+// null, // 缂栧彿
+// matParam.getGroupCode(), // 鍚嶇О
+// top.getId(), // 鐖剁骇
+// top.getName(), // 鐖剁骇鍚嶇О
+// nodeUtils.path.toString(), // 鍏宠仈璺緞
+// nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+// 0, // 绫诲瀷
+// null, // 璐熻矗浜�
+// null, // 鍥剧墖
+// null, // 绠�瑕佹弿杩�
+// null, // 鏁伴噺
+// 2, // 绛夌骇
+// null, // 鎺掑簭
+// 1, // 鐘舵��
+// now, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// now, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+// if (tagMapper.insert(priTag) == 0) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+// }
+// // 浜岀骇鍒嗙被
+// Tag secTag = tagService.selectByName(matParam.getGroupName(), 3);
+// if (secTag == null) {
+// NodeUtils nodeUtils = new NodeUtils();
+// nodeUtils.executePath(priTag.getId());
+// secTag = new Tag(
+// null, // 缂栧彿
+// matParam.getGroupName(), // 鍚嶇О
+// priTag.getId(), // 鐖剁骇
+// priTag.getName(), // 鐖剁骇鍚嶇О
+// nodeUtils.path.toString(), // 鍏宠仈璺緞
+// nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+// 0, // 绫诲瀷
+// null, // 璐熻矗浜�
+// null, // 鍥剧墖
+// null, // 绠�瑕佹弿杩�
+// null, // 鏁伴噺
+// 3, // 绛夌骇
+// null, // 鎺掑簭
+// 1, // 鐘舵��
+// now, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// now, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+// if (tagMapper.insert(secTag) == 0) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+// }
+// tagId = secTag.getId();
+// } else {
+// tagId = tagService.getTop().getId();
+// }
mat.sync(matParam);
- mat.setTagId(tagId);
+ mat.setTagId(Long.parseLong(matParam.getGroupCode()));
mat.setStatus(1);
mat.setCreateTime(now);
mat.setUpdateTime(now);
--
Gitblit v1.9.1