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 a79c96ce..50101ad2 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/shape/CreateShapeExcel.java b/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/shape/CreateShapeExcel.java index 7552a155..07d717ee 100644 --- a/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/shape/CreateShapeExcel.java +++ b/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/shape/CreateShapeExcel.java @@ -13,6 +13,7 @@ import java.util.TreeMap; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel; +import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.xssf.usermodel.XSSFCell; @@ -80,7 +81,7 @@ public class CreateShapeExcel { pid = parentModel.getParentId(); } } - String key = sBuilder.append("-").append(model.getName()).append("-").append("V").append(model.getVersion()).append(".0").toString(); + String key = sBuilder.append("-").append(model.getName()).append("-").append(VersionUtil.getVersionStrV(model.getVersion())).toString(); result.put(key, model.getMethodId()); } } diff --git a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar index 39c8333b..45bd0967 100644 Binary files a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar and b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar differ diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java index 642b0ee0..c9453674 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java @@ -28,6 +28,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyMod import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryShapeAttributeModel; import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao; import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel; +import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; @@ -107,7 +108,7 @@ public class ReportRepositoryCompare { Collections.sort(versions, new Comparator() { @Override public int compare(PALRepositoryModel o1, PALRepositoryModel o2) { - return (int) (o2.getVersion() - o1.getVersion()); + return VersionUtil.compareVersionNo(o1.getVersion(),o2.getVersion(),true); } }); if (versions == null) { @@ -169,7 +170,7 @@ public class ReportRepositoryCompare { sb.append(UtilDate.yearFormat(date)).append("年").append(UtilDate.monthFormat(date)).append("月").append(UtilDate.dayFormat(date)).append("日"); object.put(REPOSITORY_NAME, model.getName()); - object.put(VERSION, "V" + model.getVersion() + ".0"); + object.put(VERSION, VersionUtil.getVersionStrV(model.getVersion())); object.put(MODIFY_USER, SDK.getORGAPI().getUser(model.getModifyUser()) == null ? "" : SDK.getORGAPI().getUser(model.getModifyUser()).getUserName()); object.put(MODIFY_DATE, sb.toString()); return object; diff --git a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar index 3672c45d..7f19e122 100644 Binary files a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar and b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar differ diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishClientWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishClientWeb.java index 6bb4e8f1..f4786d29 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishClientWeb.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishClientWeb.java @@ -21,6 +21,7 @@ import com.actionsoft.apps.coe.pal.log.CoEOpLogConst; import com.actionsoft.apps.coe.pal.pal.manage.publish.constant.PublishConst; import com.actionsoft.apps.AppsConst; +import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil; import com.actionsoft.apps.coe.pal.publisher.client.dao.PublisherClientDao; import com.actionsoft.apps.coe.pal.publisher.conf.PublisherConf; import com.actionsoft.apps.coe.pal.publisher.constant.PublisherConstant; @@ -1682,7 +1683,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk object.put("pDesc", pModel.getPublishDesc()); object.put("id", model.getPalRepositoryId()); object.put("name", repositoryModel.getName()); - object.put("version", repositoryModel.getVersion() + ".0"); + object.put("version", VersionUtil.getVersionStr(repositoryModel.getVersion())); object.put("isPublish", repositoryModel.isPublish() ? "1" : "0"); String taskId = model.getTaskId(); object.put("taskId", taskId == null ? "" : taskId); @@ -2901,7 +2902,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk } object2.put("id", model.getId()); object2.put("name", model.getName()); - object2.put("version", "V" + model.getVersion() + ".0"); + object2.put("version", VersionUtil.getVersionStrV(model.getVersion())); object2.put("method", model.getMethodId()); object2.put("category", model.getMethodCategory()); @@ -3070,7 +3071,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk userName = UserCache.getModel(userId).getUserName(); } object2.put("id", palModel.getId()); - object2.put("version", "V" + palModel.getVersion() + ".0"); + object2.put("version", VersionUtil.getVersionStrV(palModel.getVersion())); object2.put("user", userName); object2.put("name", palModel.getName()); object2.put("createDate", UtilDate.datetimeFormat(palModel.getCreateDate())); @@ -3134,7 +3135,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk String repositoryId = object.getString("repositoryId"); PALRepositoryModel palModel = PALRepositoryCache.getCache().get(repositoryId); object2.put("id", palModel.getId()); - object2.put("version", "V" + palModel.getVersion() + ".0"); + object2.put("version", VersionUtil.getVersionStrV(palModel.getVersion())); String userName = ""; if (UserCache.getModel(object.getString("userId")) != null) { userName = UserCache.getModel(object.getString("userId")).getUserName(); @@ -3219,7 +3220,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk for (PALRepositoryModel palModel : list) { JSONObject object2 = new JSONObject(); object2.put("id", palModel.getId()); - object2.put("version", "V" + palModel.getVersion() + ".0"); + object2.put("version", VersionUtil.getVersionStrV(palModel.getVersion())); String userName = ""; String userId = palModel.getCreateUser(); if (!UtilString.isEmpty(userId) && UserCache.getModel(userId) != null) { @@ -3276,7 +3277,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk String repositoryId = object.getString("repositoryId"); PALRepositoryModel palModel = PALRepositoryCache.getCache().get(repositoryId); object2.put("id", palModel.getId()); - object2.put("version", "V" + palModel.getVersion() + ".0"); + object2.put("version",VersionUtil.getVersionStrV(palModel.getVersion())); String userName = ""; if (UserCache.getModel(object.getString("userId")) != null) { userName = UserCache.getModel(object.getString("userId")).getUserName(); @@ -3557,7 +3558,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk JSONObject object = new JSONObject(); object.put("id", model.getId()); object.put("name", model.getName()); - object.put("version", "V" + model.getVersion() + ".0"); + object.put("version",VersionUtil.getVersionStrV(model.getVersion())); object.put("hasFile", false); object.put("method", model.getMethodId()); object.put("category", model.getMethodCategory()); @@ -3669,7 +3670,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk JSONObject object = new JSONObject(); object.put("id", model.getId()); object.put("name", model.getName()); - object.put("version", "V" + model.getVersion() + ".0"); + object.put("version", VersionUtil.getVersionStrV(model.getVersion())); object.put("hasChild", false); object.put("childData", new JSONArray()); object.put("method", model.getMethodId()); @@ -3688,7 +3689,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk JSONObject subObj = new JSONObject(); subObj.put("id", subModel.getId()); subObj.put("name", subModel.getName()); - subObj.put("version", "V" + subModel.getVersion() + ".0"); + subObj.put("version",VersionUtil.getVersionStrV(subModel.getVersion())); subObj.put("hasFile", false); subObj.put("method", subModel.getMethodId()); subObj.put("category", subModel.getMethodCategory()); @@ -4356,7 +4357,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk JSONObject object = new JSONObject(); object.put("id", model.getId()); object.put("name", model.getName()); - object.put("version", "V" + model.getVersion() + ".0"); + object.put("version", VersionUtil.getVersionStrV(model.getVersion())); object.put("hasFile", false); object.put("method", model.getMethodId()); object.put("category", model.getMethodCategory()); diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java index 6bf7515c..70cc9d68 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java @@ -1270,7 +1270,7 @@ public class ProcessPublishWeb extends ActionWeb { object.put("pDesc", pModel.getPublishDesc()); object.put("repositoryId", model.getPalRepositoryId()); object.put("repositoryName", repositoryModel.getName()); - object.put("repositoryVersion", repositoryModel.getVersion() + ".0"); + object.put("repositoryVersion", VersionUtil.getVersionStr(repositoryModel.getVersion())); object.put("isPublish", repositoryModel.isPublish() ? "1" : "0"); list.add(object); } diff --git a/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar b/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar index 2907ca21..b809a49d 100644 Binary files a/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar and b/com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar differ diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/ReportRepositoryCompare.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/ReportRepositoryCompare.java index 4764c7e3..e0d6f266 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/ReportRepositoryCompare.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/ReportRepositoryCompare.java @@ -28,6 +28,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyMod import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryShapeAttributeModel; import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao; import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel; +import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; @@ -107,7 +108,7 @@ public class ReportRepositoryCompare { Collections.sort(versions, new Comparator() { @Override public int compare(PALRepositoryModel o1, PALRepositoryModel o2) { - return (int) (o2.getVersion() - o1.getVersion()); + return VersionUtil.compareVersionNo(o1.getVersion(),o2.getVersion(),true) ; } }); if (versions == null) { 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 484db613..b5082814 100644 Binary files a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar and b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar differ diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/ReportRepositoryCompare.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/ReportRepositoryCompare.java index 6dd15261..dfdae6ea 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/ReportRepositoryCompare.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/ReportRepositoryCompare.java @@ -28,6 +28,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyMod import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryShapeAttributeModel; import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao; import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel; +import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; @@ -107,7 +108,7 @@ public class ReportRepositoryCompare { Collections.sort(versions, new Comparator() { @Override public int compare(PALRepositoryModel o1, PALRepositoryModel o2) { - return (int) (o2.getVersion() - o1.getVersion()); + return VersionUtil.compareVersionNo(o1.getVersion(),o2.getVersion(),true); } }); if (versions == null) {