diff --git a/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar b/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar index c8c21699..7995e489 100644 Binary files a/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar and b/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar differ diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java index cffa7f1b..da3652aa 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java +++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java @@ -6,8 +6,6 @@ import com.actionsoft.apps.coe.pal.datamigration.aris.mapping.ModelMappingAPIMan import com.actionsoft.apps.coe.pal.datamigration.aris.model.*; import com.actionsoft.apps.coe.pal.datamigration.aris.util.ArisXmlUtil; import com.actionsoft.apps.coe.pal.datamigration.constant.Constant; -import com.actionsoft.apps.coe.pal.datamigration.log.cache.LogRealTimeCountCache; -import com.actionsoft.apps.coe.pal.datamigration.log.model.LogRealTimeCountModel; import com.actionsoft.apps.coe.pal.datamigration.util.LogUtil; import com.actionsoft.apps.coe.pal.datamigration.util.ProcessUtil; import com.actionsoft.apps.coe.pal.datamigration.util.ShapeUtil; @@ -29,6 +27,8 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel; import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyModel; import com.actionsoft.apps.coe.pal.pal.repository.model.impl.PALRepositoryModelImpl; import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil; +import com.actionsoft.apps.coe.pal.yili.log.datamigration.log.Cache.LogRealTimeCountCache; +import com.actionsoft.apps.coe.pal.yili.log.datamigration.log.Model.LogRealTimeCountModel; import com.actionsoft.bpms.server.UserContext; import com.actionsoft.bpms.util.UUIDGener; import com.actionsoft.bpms.util.UtilDate; diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportWeb.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportWeb.java index b5a1ca5a..94171e12 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportWeb.java +++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportWeb.java @@ -6,9 +6,7 @@ import com.actionsoft.apps.coe.pal.datamigration.aris.model.*; import com.actionsoft.apps.coe.pal.datamigration.aris.util.ArisXmlUtil; import com.actionsoft.apps.coe.pal.datamigration.aris.util.XMLUtil; import com.actionsoft.apps.coe.pal.datamigration.constant.Constant; -import com.actionsoft.apps.coe.pal.datamigration.log.cache.LogRealTimeCountCache; import com.actionsoft.apps.coe.pal.datamigration.log.model.LogModel; -import com.actionsoft.apps.coe.pal.datamigration.log.model.LogRealTimeCountModel; import com.actionsoft.apps.coe.pal.datamigration.util.LogUtil; import com.actionsoft.apps.coe.pal.datamigration.util.ProcessUtil; import com.actionsoft.apps.coe.pal.datamigration.util.ShapeUtil; @@ -18,6 +16,8 @@ import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; import com.actionsoft.apps.coe.pal.pal.repository.designer.CoeDesignerShapeAPIManager; import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel; +import com.actionsoft.apps.coe.pal.yili.log.datamigration.log.Cache.LogRealTimeCountCache; +import com.actionsoft.apps.coe.pal.yili.log.datamigration.log.Model.LogRealTimeCountModel; import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile; import com.actionsoft.bpms.commons.mvc.view.ActionWeb; import com.actionsoft.bpms.commons.mvc.view.ResponseObject; diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/log/cache/LogRealTimeCountCache.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/log/cache/LogRealTimeCountCache.java deleted file mode 100644 index b3ae7306..00000000 --- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/log/cache/LogRealTimeCountCache.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.actionsoft.apps.coe.pal.datamigration.log.cache; - -import com.actionsoft.apps.coe.pal.datamigration.log.model.LogRealTimeCountModel; -import com.actionsoft.apps.resource.plugin.profile.CachePluginProfile; -import com.actionsoft.bpms.commons.cache.Cache; -import com.actionsoft.bpms.commons.cache.CacheManager; - -/** - * 存储导入数据 - * @author sunlh - * - */ -public class LogRealTimeCountCache extends Cache{ - - public LogRealTimeCountCache(CachePluginProfile configuration) { - super(configuration); - } - - @Override - protected void load() { - } - - public static LogRealTimeCountCache getCache() { - return CacheManager.getCache(LogRealTimeCountCache.class); - } - -} diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/plugin/Plugins.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/plugin/Plugins.java index 61ee1fd4..9a1c9547 100755 --- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/plugin/Plugins.java +++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/plugin/Plugins.java @@ -1,7 +1,6 @@ package com.actionsoft.apps.coe.pal.datamigration.plugin; import com.actionsoft.apps.coe.pal.datamigration.aris.constant.ArisConstant; -import com.actionsoft.apps.coe.pal.datamigration.log.cache.LogRealTimeCountCache; import com.actionsoft.apps.coe.pal.datamigration.web.DataMigrationWeb; import com.actionsoft.apps.coe.pal.pal.repository.upfile.CoeFileProcessor; import com.actionsoft.apps.listener.PluginListener; @@ -23,9 +22,6 @@ public class Plugins implements PluginListener { public List register(AppContext context) { List list = new ArrayList(); - // 注册缓存 - list.add(new CachePluginProfile(LogRealTimeCountCache.class)); - list.add(new DCPluginProfile("migration", CoeFileProcessor.class.getName(), "存放数据迁移文件", false, false)); list.add(new DCPluginProfile(ArisConstant.REPOSITORY_NAME, CoeFileProcessor.class.getName(), "存在arisXML数据迁移日志", false, false)); diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/WordLogUtil.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/WordLogUtil.java index d79e8d21..ca5e2989 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/WordLogUtil.java +++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/WordLogUtil.java @@ -2,7 +2,6 @@ package com.actionsoft.apps.coe.pal.datamigration.util; import com.actionsoft.apps.coe.pal.datamigration.aris.constant.ArisConstant; import com.actionsoft.apps.coe.pal.datamigration.constant.Constant; -import com.actionsoft.apps.coe.pal.datamigration.log.cache.LogRealTimeCountCache; import com.actionsoft.apps.coe.pal.datamigration.log.dao.LogDao; import com.actionsoft.apps.coe.pal.datamigration.log.model.LogModel; import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile; diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index 99f8ef39..cf802bcc 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/plugin/Plugins.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/plugin/Plugins.java index f9e37732..c8bc646b 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/plugin/Plugins.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/plugin/Plugins.java @@ -19,6 +19,7 @@ import com.actionsoft.apps.coe.pal.pal.home.aslp.RegisterExtendsApp; import com.actionsoft.apps.coe.pal.pal.method.aslp.RegisterMethodApp; import com.actionsoft.apps.coe.pal.pal.repository.addons.RepositoryDiagramExistMark; import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.manager.DesignerShapeCopyCache; +import com.actionsoft.apps.coe.pal.yili.log.datamigration.log.Cache.LogRealTimeCountCache; import com.actionsoft.apps.listener.PluginListener; import com.actionsoft.apps.resource.AppContext; import com.actionsoft.apps.resource.plugin.profile.*; @@ -75,6 +76,7 @@ public class Plugins implements PluginListener { list.add(new CachePluginProfile(CoeDesignerImageCache.class)); list.add(new CachePluginProfile(DesignerShapeCopyCache.class)); list.add(new ACPluginProfile(new COETeamPortletAccm())); + list.add(new CachePluginProfile(LogRealTimeCountCache.class)); list.add(new AtFormulaPluginProfile("PAL应用", "@getDWCondition(*fieldName,*fieldValue)", GetDWConditionExpression.class.getName(), "获取DW中的自定义查询条件", "返回DW中自定义的查询条件")); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/yili/log/datamigration/log/Cache/LogRealTimeCountCache.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/yili/log/datamigration/log/Cache/LogRealTimeCountCache.java new file mode 100644 index 00000000..f0745924 --- /dev/null +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/yili/log/datamigration/log/Cache/LogRealTimeCountCache.java @@ -0,0 +1,31 @@ +package com.actionsoft.apps.coe.pal.yili.log.datamigration.log.Cache; + +import com.actionsoft.apps.coe.pal.constant.CoEConstant; +import com.actionsoft.apps.coe.pal.yili.log.datamigration.log.Model.LogRealTimeCountModel; +import com.actionsoft.apps.resource.plugin.profile.CachePluginProfile; +import com.actionsoft.bpms.commons.cache.Cache; +import com.actionsoft.bpms.commons.cache.CacheManager; +import com.actionsoft.bpms.util.ConsolePrinter; +import com.actionsoft.sdk.local.SDK; + +/** + * 存储导入数据 + * @author sunlh + * + */ +public class LogRealTimeCountCache extends Cache { + + public LogRealTimeCountCache(CachePluginProfile configuration) { + super(configuration); + } + + @Override + protected void load() { + ConsolePrinter.info("[" + SDK.getAppAPI().getAppContext(CoEConstant.APP_ID).getNameI18N() + "]Cache加载CoE数据迁移日志记录对象 [" + 0 + "个]"); + } + + public static LogRealTimeCountCache getCache() { + return CacheManager.getCache(LogRealTimeCountCache.class); + } + +} \ No newline at end of file diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/log/model/LogRealTimeCountModel.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/yili/log/datamigration/log/Model/LogRealTimeCountModel.java similarity index 96% rename from com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/log/model/LogRealTimeCountModel.java rename to com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/yili/log/datamigration/log/Model/LogRealTimeCountModel.java index d5bab425..8fcaf07e 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/log/model/LogRealTimeCountModel.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/yili/log/datamigration/log/Model/LogRealTimeCountModel.java @@ -1,8 +1,7 @@ -package com.actionsoft.apps.coe.pal.datamigration.log.model; +package com.actionsoft.apps.coe.pal.yili.log.datamigration.log.Model; import com.actionsoft.bpms.commons.mvc.model.ModelBean; - public class LogRealTimeCountModel extends ModelBean { private int totalCount;// 总共条数