From 8b1b3e7daf1a5be8f0c20686f1794629ca06c546 Mon Sep 17 00:00:00 2001 From: zhaol <15900249928@163.com> Date: Tue, 12 Nov 2024 17:44:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=BA=A6=E6=89=8B=E5=86=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9E=B6=E6=9E=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...om.awspaas.user.apps.coe.pal.output.zd.jar | Bin 80166 -> 80590 bytes .../apps/coe/pal/output/zd/Plugins.java | 2 +- .../pal/output/zd/report1/Report1Gener.java | 10 +++++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar index 85d6b8bee9a477a305a0b254cfc8a89735512602..74cbd76381815eab8b7737615f747014da11c24e 100644 GIT binary patch delta 11292 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 OeSB`2S8UJK1o}TjOvZ%( delta 10894 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 S1ORyR=VAXtT>H}t0Q^5T+?sO$ diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/Plugins.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/Plugins.java index 0481bbb6..39f60941 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/Plugins.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/Plugins.java @@ -36,7 +36,7 @@ public class Plugins implements PluginListener { params1.put("targetMethodType", "");// 建模方法中的图元,为空表示只选择文件,不选择图元;为"-"表示所有类型图元 params1.put("relationMethodScope", "-");// 如果设置-,表示不需要用户选择关联范围,向导页被忽略*/ // 建模大类、建模方法,多个用逗号隔开,如果为空表示全部 org.normal - params1.put("targetMethodScope", "control.policy,process.scheme,engineering.standard"); + params1.put("targetMethodScope", "control.policy,process.scheme,engineering.standard,process.framework"); // 建模方法中的图元,为空表示只选择文件,不选择图元;为"-"表示所有类型图元 params1.put("targetMethodType", ""); // 如果设置-,表示不需要用户选择关联范围,向导页被忽略 diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java index b5d841fd..8c9fbc0a 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java @@ -91,7 +91,7 @@ public class Report1Gener { break; } } - PALRepositoryModel repositoryModel = PALRepositoryCache.getCache().get(jsonObj.get("targetFileId").toString()); + String tempName; if(PALRepositoryCache.getCache().get(targetFileId).getMethodId().equals("process.scheme")){ tempName = "方案-手册1.xml"; @@ -110,6 +110,7 @@ public class Report1Gener { log.info("end"); // xml转换成word格式 OutputWordUtil.xml2Word(log, dcContext.getPath()); + // } } finally { // isRunning = false; @@ -134,6 +135,13 @@ public class Report1Gener { if (repositoryId == null || "".equals(repositoryId)) { continue; } + + PALRepositoryModel repositoryModel1 = PALRepositoryCache.getCache().get(repositoryId); + if(repositoryModel1.getMethodId().equals("process.framework")){ + continue; + } + + PALRepositoryModel model = PALRepositoryQueryAPIManager.getInstance().queryPalRepositoryModelByPalId(repositoryId); if (model != null) { //获取文件扩展属性