From 10da858abb73d90c019334d0920bfdec98a442cf Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 12 May 2025 14:28:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/pojo/models/EdFileInfo.java       |  6 ++++++
 .../service/serviceimpl/EdFileInfoServiceImpl.java    |  7 +++++--
 .../industry/software/common/util/AESUtils.java       | 11 ++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
index a7c22ed..5fa8365 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
@@ -120,6 +120,12 @@ public class EdFileInfo extends BaseModel {
     @TableField(value = "permanent_deleted")
     private Boolean permanentDeleted;
 
+    /**
+     * 模板编码
+     */
+    @TableField(value = "template_code")
+    private String templateCode;
+
     public void newInit() {
         String newFileDbId = IdWorker.getSnowFlakeIdString();
         String fileTime = EleCommonUtil.getNowTimeStr();
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index d694639..4a627b4 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -1521,8 +1521,11 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         try {
             // 创建工程
             String prjId = updateImportPrj2Db(file);
-            // 层级沿用
-            commonService.follow("100001", prjId, DataOwnEnum.SYS_PRJ.code);
+            // 层级沿用，先这样写，后续根据需求扩展
+            EdFileInfo prj = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class)
+                    .eq(EdFileInfo::getTemplateCode, "bhdcfzrjzt")
+                    .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code));
+            commonService.follow(prj.getId(), prjId, DataOwnEnum.SYS_PRJ.code);
             // 工程发布
             commonService.publish(prjId, DataOwnEnum.SYS_PRJ.code);
             // 将文件存入到数据库和文件系统
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java
index 0327284..bb235f4 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java
@@ -85,15 +85,8 @@ public class AESUtils {
             Cipher cipher = Cipher.getInstance("AES/ECB/PKCS7Padding");
             cipher.init(Cipher.DECRYPT_MODE, secretKeySpec);
             return new String(cipher.doFinal(Base64.decode(enc)));
-        } catch (NoSuchPaddingException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalBlockSizeException e) {
-            throw new RuntimeException(e);
-        } catch (NoSuchAlgorithmException e) {
-            throw new RuntimeException(e);
-        } catch (BadPaddingException e) {
-            throw new RuntimeException(e);
-        } catch (InvalidKeyException e) {
+        } catch (NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException | BadPaddingException |
+                 InvalidKeyException e) {
             throw new RuntimeException(e);
         }
     }