diff --git a/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar b/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar index 50101ad2..da91cd3f 100644 Binary files a/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar and b/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar differ diff --git a/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ProcessUtil.java b/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ProcessUtil.java index e17b0e7b..cb4fe205 100644 --- a/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ProcessUtil.java +++ b/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ProcessUtil.java @@ -43,6 +43,36 @@ public class ProcessUtil { } list.add(I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId())); } + List methodControlModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("control"); + Map map2 = new HashMap(); + for (int i = 0; i < size; i++) { + map2.put(listApps.get(i).getId(), listApps.get(i).getRuntimeState()); + } + for (int i = 0, methodSize = methodControlModels.size(); i < methodSize; i++) { + PALMethodModel palMethodModel = methodControlModels.get(i); + String appId = palMethodModel.getId(); + if (map2.containsKey("com.actionsoft.apps.coe.method." + appId)) { + String methodId1 = map2.get("com.actionsoft.apps.coe.method." + appId); + if (methodId1.equals(AppsConst.RUNTIME_STATE_STOPPED) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED) || methodId1.equals(AppsConst.RUNTIME_STATE_READY) || methodId1.equals(AppsConst.RUNTIME_STATE_STARTING) || methodId1.equals(AppsConst.RUNTIME_STATE_STOPPING) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLED) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLING) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED)) + continue; + } + list.add(I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId())); + } + List methodDataModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("data"); + Map map3 = new HashMap(); + for (int i = 0; i < size; i++) { + map3.put(listApps.get(i).getId(), listApps.get(i).getRuntimeState()); + } + for (int i = 0, methodSize = methodDataModels.size(); i < methodSize; i++) { + PALMethodModel palMethodModel = methodDataModels.get(i); + String appId = palMethodModel.getId(); + if (map3.containsKey("com.actionsoft.apps.coe.method." + appId)) { + String methodId1 = map3.get("com.actionsoft.apps.coe.method." + appId); + if (methodId1.equals(AppsConst.RUNTIME_STATE_STOPPED) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED) || methodId1.equals(AppsConst.RUNTIME_STATE_READY) || methodId1.equals(AppsConst.RUNTIME_STATE_STARTING) || methodId1.equals(AppsConst.RUNTIME_STATE_STOPPING) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLED) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLING) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED)) + continue; + } + list.add(I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId())); + } return list; } @@ -96,6 +126,36 @@ public class ProcessUtil { } result.put(I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()), palMethodModel.getId()); } + List methodControlModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("control"); + Map map2 = new HashMap(); + for (int i = 0; i < size; i++) { + map2.put(listApps.get(i).getId(), listApps.get(i).getRuntimeState()); + } + for (int i = 0, methodSize = methodControlModels.size(); i < methodSize; i++) { + PALMethodModel palMethodModel = methodControlModels.get(i); + String appId = palMethodModel.getId(); + if (map2.containsKey("com.actionsoft.apps.coe.method." + appId)) { + String methodId1 = map2.get("com.actionsoft.apps.coe.method." + appId); + if (methodId1.equals(AppsConst.RUNTIME_STATE_STOPPED) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED) || methodId1.equals(AppsConst.RUNTIME_STATE_READY) || methodId1.equals(AppsConst.RUNTIME_STATE_STARTING) || methodId1.equals(AppsConst.RUNTIME_STATE_STOPPING) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLED) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLING) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED)) + continue; + } + result.put(I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()), palMethodModel.getId()); + } + List methodDataModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("data"); + Map map3 = new HashMap(); + for (int i = 0; i < size; i++) { + map3.put(listApps.get(i).getId(), listApps.get(i).getRuntimeState()); + } + for (int i = 0, methodSize = methodDataModels.size(); i < methodSize; i++) { + PALMethodModel palMethodModel = methodDataModels.get(i); + String appId = palMethodModel.getId(); + if (map3.containsKey("com.actionsoft.apps.coe.method." + appId)) { + String methodId1 = map3.get("com.actionsoft.apps.coe.method." + appId); + if (methodId1.equals(AppsConst.RUNTIME_STATE_STOPPED) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED) || methodId1.equals(AppsConst.RUNTIME_STATE_READY) || methodId1.equals(AppsConst.RUNTIME_STATE_STARTING) || methodId1.equals(AppsConst.RUNTIME_STATE_STOPPING) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLED) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLING) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED)) + continue; + } + result.put(I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()), palMethodModel.getId()); + } return result; }