yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pal 版本号字段修改后其他应用version获取与比较位置调整

Browse Source
This commit is contained in:
anhc 2022-06-30 17:27:19 +08:00
parent a6592dc0c0
commit 5eba0ce767
11 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar
View File

Binary file not shown.

3
com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/shape/CreateShapeExcel.java
View File

@ -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.cache.PALRepositoryCache;
import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel; 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.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.ss.util.CellRangeAddressList;
import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFCell;
@ -80,7 +81,7 @@ public class CreateShapeExcel {
pid = parentModel.getParentId(); 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()); result.put(key, model.getMethodId());
} }
} }

BIN
com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar
View File

Binary file not shown.

5
com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java
View File

@ -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.model.PALRepositoryShapeAttributeModel;
import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao; 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.repository.upfile.model.UpfileModel;
import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -107,7 +108,7 @@ public class ReportRepositoryCompare {
Collections.sort(versions, new Comparator<PALRepositoryModel>() { Collections.sort(versions, new Comparator<PALRepositoryModel>() {
@Override @Override
public int compare(PALRepositoryModel o1, PALRepositoryModel o2) { public int compare(PALRepositoryModel o1, PALRepositoryModel o2) {
return (int) (o2.getVersion() - o1.getVersion()); return VersionUtil.compareVersionNo(o1.getVersion(),o2.getVersion(),true);
} }
}); });
if (versions == null) { 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("日"); sb.append(UtilDate.yearFormat(date)).append("年").append(UtilDate.monthFormat(date)).append("月").append(UtilDate.dayFormat(date)).append("日");
object.put(REPOSITORY_NAME, model.getName()); 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_USER, SDK.getORGAPI().getUser(model.getModifyUser()) == null ? "" : SDK.getORGAPI().getUser(model.getModifyUser()).getUserName());
object.put(MODIFY_DATE, sb.toString()); object.put(MODIFY_DATE, sb.toString());
return object; return object;

BIN
com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar
View File

Binary file not shown.

21
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishClientWeb.java
View File

@ -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.coe.pal.pal.manage.publish.constant.PublishConst;
import com.actionsoft.apps.AppsConst; 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.client.dao.PublisherClientDao;
import com.actionsoft.apps.coe.pal.publisher.conf.PublisherConf; import com.actionsoft.apps.coe.pal.publisher.conf.PublisherConf;
import com.actionsoft.apps.coe.pal.publisher.constant.PublisherConstant; 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("pDesc", pModel.getPublishDesc());
object.put("id", model.getPalRepositoryId()); object.put("id", model.getPalRepositoryId());
object.put("name", repositoryModel.getName()); 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"); object.put("isPublish", repositoryModel.isPublish() ? "1" : "0");
String taskId = model.getTaskId(); String taskId = model.getTaskId();
object.put("taskId", taskId == null ? "" : taskId); object.put("taskId", taskId == null ? "" : taskId);
@ -2901,7 +2902,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk
} }
object2.put("id", model.getId()); object2.put("id", model.getId());
object2.put("name", model.getName()); 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("method", model.getMethodId());
object2.put("category", model.getMethodCategory()); object2.put("category", model.getMethodCategory());
@ -3070,7 +3071,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk
userName = UserCache.getModel(userId).getUserName(); userName = UserCache.getModel(userId).getUserName();
} }
object2.put("id", palModel.getId()); 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("user", userName);
object2.put("name", palModel.getName()); object2.put("name", palModel.getName());
object2.put("createDate", UtilDate.datetimeFormat(palModel.getCreateDate())); object2.put("createDate", UtilDate.datetimeFormat(palModel.getCreateDate()));
@ -3134,7 +3135,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk
String repositoryId = object.getString("repositoryId"); String repositoryId = object.getString("repositoryId");
PALRepositoryModel palModel = PALRepositoryCache.getCache().get(repositoryId); PALRepositoryModel palModel = PALRepositoryCache.getCache().get(repositoryId);
object2.put("id", palModel.getId()); object2.put("id", palModel.getId());
object2.put("version", "V" + palModel.getVersion() + ".0"); object2.put("version", VersionUtil.getVersionStrV(palModel.getVersion()));
String userName = ""; String userName = "";
if (UserCache.getModel(object.getString("userId")) != null) { if (UserCache.getModel(object.getString("userId")) != null) {
userName = UserCache.getModel(object.getString("userId")).getUserName(); userName = UserCache.getModel(object.getString("userId")).getUserName();
@ -3219,7 +3220,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk
for (PALRepositoryModel palModel : list) { for (PALRepositoryModel palModel : list) {
JSONObject object2 = new JSONObject(); JSONObject object2 = new JSONObject();
object2.put("id", palModel.getId()); object2.put("id", palModel.getId());
object2.put("version", "V" + palModel.getVersion() + ".0"); object2.put("version", VersionUtil.getVersionStrV(palModel.getVersion()));
String userName = ""; String userName = "";
String userId = palModel.getCreateUser(); String userId = palModel.getCreateUser();
if (!UtilString.isEmpty(userId) && UserCache.getModel(userId) != null) { if (!UtilString.isEmpty(userId) && UserCache.getModel(userId) != null) {
@ -3276,7 +3277,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk
String repositoryId = object.getString("repositoryId"); String repositoryId = object.getString("repositoryId");
PALRepositoryModel palModel = PALRepositoryCache.getCache().get(repositoryId); PALRepositoryModel palModel = PALRepositoryCache.getCache().get(repositoryId);
object2.put("id", palModel.getId()); object2.put("id", palModel.getId());
object2.put("version", "V" + palModel.getVersion() + ".0"); object2.put("version",VersionUtil.getVersionStrV(palModel.getVersion()));
String userName = ""; String userName = "";
if (UserCache.getModel(object.getString("userId")) != null) { if (UserCache.getModel(object.getString("userId")) != null) {
userName = UserCache.getModel(object.getString("userId")).getUserName(); userName = UserCache.getModel(object.getString("userId")).getUserName();
@ -3557,7 +3558,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("id", model.getId()); object.put("id", model.getId());
object.put("name", model.getName()); 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("hasFile", false);
object.put("method", model.getMethodId()); object.put("method", model.getMethodId());
object.put("category", model.getMethodCategory()); object.put("category", model.getMethodCategory());
@ -3669,7 +3670,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("id", model.getId()); object.put("id", model.getId());
object.put("name", model.getName()); 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("hasChild", false);
object.put("childData", new JSONArray()); object.put("childData", new JSONArray());
object.put("method", model.getMethodId()); object.put("method", model.getMethodId());
@ -3688,7 +3689,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk
JSONObject subObj = new JSONObject(); JSONObject subObj = new JSONObject();
subObj.put("id", subModel.getId()); subObj.put("id", subModel.getId());
subObj.put("name", subModel.getName()); 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("hasFile", false);
subObj.put("method", subModel.getMethodId()); subObj.put("method", subModel.getMethodId());
subObj.put("category", subModel.getMethodCategory()); subObj.put("category", subModel.getMethodCategory());
@ -4356,7 +4357,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("id", model.getId()); object.put("id", model.getId());
object.put("name", model.getName()); 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("hasFile", false);
object.put("method", model.getMethodId()); object.put("method", model.getMethodId());
object.put("category", model.getMethodCategory()); object.put("category", model.getMethodCategory());

2
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java
View File

@ -1270,7 +1270,7 @@ public class ProcessPublishWeb extends ActionWeb {
object.put("pDesc", pModel.getPublishDesc()); object.put("pDesc", pModel.getPublishDesc());
object.put("repositoryId", model.getPalRepositoryId()); object.put("repositoryId", model.getPalRepositoryId());
object.put("repositoryName", repositoryModel.getName()); 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"); object.put("isPublish", repositoryModel.isPublish() ? "1" : "0");
list.add(object); list.add(object);
} }

BIN
com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar
View File

Binary file not shown.

3
com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/ReportRepositoryCompare.java
View File

@ -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.model.PALRepositoryShapeAttributeModel;
import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao; 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.repository.upfile.model.UpfileModel;
import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -107,7 +108,7 @@ public class ReportRepositoryCompare {
Collections.sort(versions, new Comparator<PALRepositoryModel>() { Collections.sort(versions, new Comparator<PALRepositoryModel>() {
@Override @Override
public int compare(PALRepositoryModel o1, PALRepositoryModel o2) { public int compare(PALRepositoryModel o1, PALRepositoryModel o2) {
return (int) (o2.getVersion() - o1.getVersion()); return VersionUtil.compareVersionNo(o1.getVersion(),o2.getVersion(),true) ;
} }
}); });
if (versions == null) { if (versions == null) {

BIN
com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar
View File

Binary file not shown.

3
com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/ReportRepositoryCompare.java
View File

@ -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.model.PALRepositoryShapeAttributeModel;
import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao; 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.repository.upfile.model.UpfileModel;
import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -107,7 +108,7 @@ public class ReportRepositoryCompare {
Collections.sort(versions, new Comparator<PALRepositoryModel>() { Collections.sort(versions, new Comparator<PALRepositoryModel>() {
@Override @Override
public int compare(PALRepositoryModel o1, PALRepositoryModel o2) { public int compare(PALRepositoryModel o1, PALRepositoryModel o2) {
return (int) (o2.getVersion() - o1.getVersion()); return VersionUtil.compareVersionNo(o1.getVersion(),o2.getVersion(),true);
} }
}); });
if (versions == null) { if (versions == null) {