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

Merge remote-tracking branch 'origin/apps_dev' into apps_dev

Browse Source
This commit is contained in:
Mr-wang 2023-12-11 12:10:23 +08:00
commit 9dc8fb7a68
6 changed files with 57 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -2500,7 +2500,7 @@ public class ProcessPublishWeb extends ActionWeb {
String name = parseObject.getString("name");
if (!"流程制度".equals(name)) {
String versionId = parseObject.getString("versionId");
String sql = "SELECT PLNAME FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLVERSIONID = '" + versionId + "' and ISPUBLISH = '0' and ISSTOP = '0' order by plver ";
String sql = "SELECT PLNAME FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLVERSIONID = '" + versionId + "' and ISPUBLISH = '0' and ISSTOP = '0' order by plver desc ";
String newName = DBSql.getString(sql);
parseObject.replace("name", newName);
parseObject.replace("isParent", "false");

86
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java
View File

@ -134,67 +134,83 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int
if(onemodel!=null) {
boolean isUse = onemodel.isUse();
boolean publish = onemodel.isPublish();
//如果状态是未发布
if (isUse == true && publish == false) {
String versionId=onemodel.getVersionId();
//如果支持文件有多个版本，其中有已发布的版本，应校验通过
Boolean isPublish = false;
List<PALRepositoryModel> models = PALRepositoryCache.getByVersionId(versionId);
if (models != null && models.size() > 0) {
for(PALRepositoryModel oneModel:models){
if(oneModel.isPublish()==true){
isPublish=true;
}
}
}
if(isPublish==false){
//如果当前是使用中但是状态是未发布进行校验判断
if (isUse == true && publish == false) {
fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId());
RowMap publishNrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_N T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.PUBLISHFILEID=T2.ID WHERE T1.BINDID=? AND T1.PUBLISHFILEID=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[i]);
RowMap publishNrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_N T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.PUBLISHFILEID=T2.ID WHERE T1.BINDID=? AND T1.PUBLISHFILEID=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[i]);
RowMap publishCrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_C T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.CHANGEDFILEIDNEW=T2.ID WHERE T1.BINDID=? AND T1.CHANGEDFILEIDNEW=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[i]);
RowMap publishCrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_C T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.CHANGEDFILEIDNEW=T2.ID WHERE T1.BINDID=? AND T1.CHANGEDFILEIDNEW=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[i]);
if (publishNrowMap == null && publishCrowMap == null) {
sb.append("模型名称:").append(model.getName()).append("关联文件模型名称：").append(onemodel.getName()).append("需进行选择发布！").append("</br>");
}
//如果当前不是使用中查找使用中版本
}else if(isUse==false && publish==true){
if (publishNrowMap == null && publishCrowMap == null) {
sb.append("模型名称:").append(model.getName()).append("关联文件模型名称：").append(onemodel.getName()).append("需进行选择发布！").append("</br>");
}
//如果当前不是使用中查找使用中版本
}/*else if(isUse==false && publish==true){
List<PALRepositoryModel> versions = PALRepositoryCache.getByVersionId(model.getVersionId());
if(versions.size()>0) {
for(int k=0;k<versions.size();k++) {
List<PALRepositoryModel> versions = PALRepositoryCache.getByVersionId(model.getVersionId());
if(versions.size()>0) {
for(int k=0;k<versions.size();k++) {
boolean isUseV=versions.get(k).isUse();
boolean isPublishV=versions.get(k).isPublish();
boolean isUseV=versions.get(k).isUse();
boolean isPublishV=versions.get(k).isPublish();
if(isUseV==true && isPublishV==false) {
if(isUseV==true && isPublishV==false) {
fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId());
fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId());
RowMap publishCrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_C T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.CHANGEDFILEIDNEW=T2.ID WHERE T1.BINDID=? AND T1.CHANGEDFILEIDNEW=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[0]);
RowMap publishCrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_C T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.CHANGEDFILEIDNEW=T2.ID WHERE T1.BINDID=? AND T1.CHANGEDFILEIDNEW=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[0]);
RowMap publishNrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_N T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.PUBLISHFILEID=T2.ID WHERE T1.BINDID=? AND T1.PUBLISHFILEID=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[0]);
RowMap publishNrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_N T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.PUBLISHFILEID=T2.ID WHERE T1.BINDID=? AND T1.PUBLISHFILEID=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[0]);
if (publishNrowMap == null && publishCrowMap == null) {
sb.append("模型名称:").append(model.getName()).append("关联文件模型名称：").append(onemodel.getName()).append("需进行选择发布！").append("</br>");
if (publishNrowMap == null && publishCrowMap == null) {
sb.append("模型名称:").append(model.getName()).append("关联文件模型名称：").append(onemodel.getName()).append("需进行选择发布！").append("</br>");
}
}
}
}
}
}else if(isUse==false && publish==false) {
//如果不是使用中，发布状态是未发布进行判断校验
}*/else if(isUse==false && publish==false) {
List<PALRepositoryModel> versions = PALRepositoryCache.getByVersionId(model.getVersionId());
if(versions.size()>0) {
for(int k=0;k<versions.size();k++) {
List<PALRepositoryModel> versions = PALRepositoryCache.getByVersionId(model.getVersionId());
if(versions.size()>0) {
for(int k=0;k<versions.size();k++) {
boolean isUseV=versions.get(k).isUse();
boolean isPublishV=versions.get(k).isPublish();
boolean isUseV=versions.get(k).isUse();
boolean isPublishV=versions.get(k).isPublish();
if(isUseV==true && isPublishV==false) {
if(isUseV==true && isPublishV==false) {
fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId());
RowMap publishCrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_C T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.CHANGEDFILEIDNEW=T2.ID WHERE T1.BINDID=? AND T1.CHANGEDFILEIDNEW=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[0]);
fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId());
RowMap publishCrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_C T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.CHANGEDFILEIDNEW=T2.ID WHERE T1.BINDID=? AND T1.CHANGEDFILEIDNEW=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[0]);
RowMap publishNrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_N T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.PUBLISHFILEID=T2.ID WHERE T1.BINDID=? AND T1.PUBLISHFILEID=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[0]);
RowMap publishNrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_N T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.PUBLISHFILEID=T2.ID WHERE T1.BINDID=? AND T1.PUBLISHFILEID=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[0]);
if (publishNrowMap == null && publishCrowMap == null) {
sb.append("模型名称:").append(model.getName()).append("关联文件模型名称：").append(onemodel.getName()).append("需进行选择发布！").append("</br>");
if (publishNrowMap == null && publishCrowMap == null) {
sb.append("模型名称:").append(model.getName()).append("关联文件模型名称：").append(onemodel.getName()).append("需进行选择发布！").append("</br>");
}
}
}
}
}
}
}
if(onemodel.getMethodId().equals("data.form")){
fileElements = CoeDesignerUtil.getShapeMessageJson4(splitRelationFileId[i]);

4
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java
View File

@ -770,7 +770,7 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute
jsonObject.put("abstract", dcContext);//信息摘要
jsonObject.put("title", dcContext.getFileName().substring(0,dcContext.getFileName().indexOf(".")));//信息标题
coontest.add(jsonObject);
//createIndexesByContent(processExecutionContext,coontest);
createIndexesByContent(processExecutionContext,coontest);
}
}
@ -818,7 +818,7 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute
jsonObject.put("abstract", dcContexts);//信息摘要
jsonObject.put("title", dcContexts.getFileName().substring(0,dcContexts.getFileName().indexOf(".")));//信息标题
coontest.add(jsonObject);
//createIndexesByContent(processExecutionContext,coontest);
createIndexesByContent(processExecutionContext,coontest);
}
}

BIN
com.awspaas.user.apps.yili.integration/lib/com.awspaas.user.apps.yili.integration.jar
View File

Binary file not shown.

6
com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oauth/TaskController.java
View File

@ -315,7 +315,7 @@ public class TaskController {
jsonObject.put("link",
SDK.getPortalAPI().getPortalUrl()
+ "/r/w?cmd=com.actionsoft.apps.coe.pal.publisher_publish_file_open&uuid="
+ Row_maps_is_not_publish.getString("id") + "&sid=" + sid);
+ Row_maps_is_not_publish.getString("id") + "&sid=" + sid+"&taskId="+id);
jsonObject.put("size", "");
// jsonObject.put("id", num);
jsonObject.put("taskId", id);
@ -435,7 +435,7 @@ public class TaskController {
jsonObject.put("link",
SDK.getPortalAPI().getPortalUrl()
+ "/r/w?cmd=com.actionsoft.apps.coe.pal.publisher_publish_file_open&uuid="
+ Row_maps_is_not_publish.getString("id") + "&sid=" + sid);
+ Row_maps_is_not_publish.getString("id") + "&sid=" + sid+"&taskId="+id);
jsonObject.put("size", "");
jsonObject.put("id", bo.getString("STOPFILEID"));
jsonObject.put("taskId", id);
@ -553,7 +553,7 @@ public class TaskController {
jsonObject.put("link",
SDK.getPortalAPI().getPortalUrl()
+ "/r/w?cmd=com.actionsoft.apps.coe.pal.publisher_publish_file_open&uuid="
+ Row_maps_is_not_publish.getString("id") + "&sid=" + sid);
+ Row_maps_is_not_publish.getString("id") + "&sid=" + sid+"&taskId="+id);
jsonObject.put("size", "");
jsonObject.put("id", bo.get("CHANGEDFILEIDNEW"));
jsonObject.put("taskId", id);