架构视图代码提交
This commit is contained in:
parent
6fac2f6cd1
commit
cbf1438d34
Binary file not shown.
@ -1178,7 +1178,6 @@ public class DataViewService extends ActionWeb {
|
||||
// TODO: handle exception
|
||||
}
|
||||
|
||||
System.err.println("查询部门视图===>" + fileListMap.size());
|
||||
fileRowMaps = fileHandleRowMaps;
|
||||
long endTime = System.currentTimeMillis();
|
||||
if (null != fileRowMaps && fileRowMaps.size() > 0) {
|
||||
@ -1240,7 +1239,7 @@ public class DataViewService extends ActionWeb {
|
||||
// reFileRowMap);
|
||||
}
|
||||
fileRowMaps = fileHandleRowMaps;
|
||||
// System.err.println("=======fileRowMaps========="+fileRowMaps);
|
||||
System.err.println("=======fileRowMaps========="+fileRowMaps);
|
||||
// 遍历选择的结果
|
||||
List<Map> fileMaps = new ArrayList<>();
|
||||
List<RowMap> frameRowMaps = new ArrayList<>();
|
||||
@ -1409,6 +1408,7 @@ public class DataViewService extends ActionWeb {
|
||||
} finally {
|
||||
// System.err.println("====执行完毕====>");
|
||||
}
|
||||
System.out.println("ro================="+ro.toString());
|
||||
return ro.toString();
|
||||
|
||||
}
|
||||
|
||||
@ -1,7 +1,12 @@
|
||||
package com.awspaas.user.apps.yili.reportform.service;
|
||||
|
||||
import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
|
||||
import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepositoryPropertyDao;
|
||||
import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache;
|
||||
import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.DesignerShapeRelationModel;
|
||||
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.system.util.StringUtil;
|
||||
import com.actionsoft.bpms.commons.database.RowMap;
|
||||
import com.actionsoft.bpms.commons.htmlframework.HtmlPageTemplate;
|
||||
import com.actionsoft.bpms.commons.login.constant.LoginConst;
|
||||
@ -11,9 +16,11 @@ import com.actionsoft.bpms.server.RequestParams;
|
||||
import com.actionsoft.bpms.server.SSOUtil;
|
||||
import com.actionsoft.bpms.server.UserContext;
|
||||
import com.actionsoft.bpms.util.DBSql;
|
||||
import com.actionsoft.bpms.util.UtilString;
|
||||
import com.actionsoft.sdk.local.SDK;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.awspaas.user.apps.yili.reportform.util.TreeUtil;
|
||||
|
||||
import java.sql.Connection;
|
||||
@ -151,8 +158,17 @@ public class ToPageService extends ActionWeb {
|
||||
fileMap.put("nodeType", nodeType);
|
||||
fileMaps.add(fileMap);
|
||||
//List<RowMap> fileRowMaps = DBSql.getMaps("SELECT FILEID,PUBDEPT,PLPARENTID,PLMETHODID,POLICYTYPE,FILESTATE,VIEWCOUNT FROM BO_EU_PAL_FILE1 WHERE PLMETHODID='process.epc' OR PLMETHODID='process.flowchart' OR PLMETHODID='control.policy' OR PLMETHODID='data.form'");
|
||||
List<RowMap> fileRowMaps = DBSql.getMaps("SELECT FILEID,PLPARENTID,PLNAME,PLMETHODID,SUPPORTFILE,PUBDEPT,PUBDATETIME,PLORDERINDEX,PLLEVEL,POLICYTYPE FROM BO_EU_PAL_FILE1 WHERE PLPARENTID=? AND FILESTATE='1' AND (PLMETHODID='process.epc' OR PLMETHODID='process.flowchart' OR PLMETHODID='control.policy') ORDER BY TO_NUMBER(PLLEVEL) ASC, TO_NUMBER(PLORDERINDEX) ASC", sqlParams);
|
||||
System.out.println("========fileRowMaps1========>"+fileRowMaps.size());
|
||||
|
||||
//List<RowMap> fileRowMaps = DBSql.getMaps("SELECT FILEID,PLPARENTID,PLNAME,PLMETHODID,SUPPORTFILE,PUBDEPT,PUBDATETIME,PLORDERINDEX,PLLEVEL,POLICYTYPE FROM BO_EU_PAL_FILE1 WHERE PLPARENTID=? AND FILESTATE='1' AND (PLMETHODID='process.epc' OR PLMETHODID='process.flowchart' OR PLMETHODID='control.policy') ORDER BY TO_NUMBER(PLLEVEL) ASC, TO_NUMBER(PLORDERINDEX) ASC", sqlParams);
|
||||
|
||||
//List<RowMap> fileRowMaps = DBSql.getMaps("SELECT ID AS FILEID,PLPARENTID,PLNAME,PLMETHODID,PLVERSIONID,PLORDERINDEX,PLLEVEL,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLPARENTID=? AND ISPUBLISH = 1 AND ISSTOP =0 AND EXT5 = '1' AND (PLMETHODID='process.epc' OR PLMETHODID='control.policy' OR PLMETHODID='process.flowchart') ORDER BY TO_NUMBER(PLLEVEL) ASC, TO_NUMBER(PLORDERINDEX) ASC", sqlParams);
|
||||
|
||||
List<RowMap> fileRowMaps = DBSql.getMaps("SELECT ID AS FILEID,PLPARENTID,PLNAME,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLPARENTID=? AND ISPUBLISH = 1 AND ISSTOP =0 AND EXT5 = '1' AND (PLMETHODID='process.epc' OR PLMETHODID='control.policy' OR PLMETHODID='process.flowchart') ORDER BY TO_NUMBER(PLLEVEL) ASC, TO_NUMBER(PLORDERINDEX) ASC", sqlParams);
|
||||
|
||||
|
||||
|
||||
|
||||
System.out.println("fileRowMaps============" + fileRowMaps);
|
||||
ArrayList<RowMap> fileHandleRowMaps = new ArrayList<>();
|
||||
Map<String, Object> reFileMap = new HashMap<>();
|
||||
RowMap reFileRowMap = new RowMap(reFileMap);
|
||||
@ -160,27 +176,47 @@ public class ToPageService extends ActionWeb {
|
||||
fileHandleRowMaps = new ArrayList<>();
|
||||
for (RowMap fileRowMap : fileRowMaps) {
|
||||
String FILEID = fileRowMap.getString("FILEID");
|
||||
String SUPPORTFILE = fileRowMap.getString("SUPPORTFILE");
|
||||
String PUBDEPT = fileRowMap.getString("PUBDEPT");
|
||||
Integer PLLEVEL = fileRowMap.getInt("PLLEVEL");
|
||||
if (null!=SUPPORTFILE && !SUPPORTFILE.equals("")) {
|
||||
String[] reFileIDs = SUPPORTFILE.split(" ");
|
||||
for (String reFileID : reFileIDs) {
|
||||
PALRepositoryModel reFileModel = PALRepositoryCache.getCache().get(reFileID);
|
||||
PALRepositoryPropertyDao repositoryPropertyDao = new PALRepositoryPropertyDao();
|
||||
List<PALRepositoryPropertyModel> oldPropertyList = repositoryPropertyDao.getPropertysByPlid(FILEID, "");
|
||||
if (oldPropertyList != null && oldPropertyList.size() > 0) {
|
||||
for (PALRepositoryPropertyModel propertyModel : oldPropertyList) {
|
||||
|
||||
//查询支持文件
|
||||
if (propertyModel.getPropertyId().equals("support_files")) {
|
||||
String propertyValue = propertyModel.getPropertyValue();
|
||||
if (UtilString.isNotEmpty(propertyValue)) {
|
||||
System.out.println("酷酷酷酷酷酷酷酷1");
|
||||
String relationFileId = JSONObject.parseObject(propertyModel.getPropertyValue()).getString("relationFileId");
|
||||
if(UtilString.isNotEmpty(relationFileId)){
|
||||
PALRepositoryModel reFileModel = PALRepositoryCache.getCache().get(relationFileId);
|
||||
String PLMETHODID = reFileModel.getMethodId();
|
||||
if (PLMETHODID.equals("data.form")) {
|
||||
reFileMap = new HashMap<>();
|
||||
reFileMap.put("FILEID", reFileID);
|
||||
reFileMap.put("FILEID", relationFileId);
|
||||
reFileMap.put("PLNAME", reFileModel.getName());
|
||||
reFileMap.put("PLPARENTID", FILEID);
|
||||
reFileMap.put("PLMETHODID", PLMETHODID);
|
||||
reFileMap.put("PUBDEPT", PUBDEPT);
|
||||
System.out.println("111111111");
|
||||
|
||||
PALRepositoryPropertyDao dao = new PALRepositoryPropertyDao();
|
||||
List<PALRepositoryPropertyModel> propertys = dao.getPropertysByPlid(FILEID, null);
|
||||
for (PALRepositoryPropertyModel property : propertys) {
|
||||
String id = property.getPropertyId();
|
||||
if (id.equals("Issuing_department")) {
|
||||
reFileMap.put("PUBDEPT", property.getPropertyValue());
|
||||
}
|
||||
}
|
||||
reFileMap.put("PLLEVEL", (PLLEVEL + 1));
|
||||
reFileMap.put("PLORDERINDEX", reFileModel.getOrderIndex());
|
||||
reFileRowMap = new RowMap(reFileMap);
|
||||
fileHandleRowMaps.add(reFileRowMap);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
fileRowMaps.addAll(fileHandleRowMaps);
|
||||
@ -293,4 +329,5 @@ public class ToPageService extends ActionWeb {
|
||||
|
||||
return ro.toString();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -82,7 +82,7 @@ public class GetNodesUtil {
|
||||
sqlParams = new Object[]{fileID};
|
||||
RowMap parentFile = DBSql.getMap("SELECT FRAMEID,FRAMENAME,FRAMELEVEL,FRAMEPARENTID,FRAMEORDERINDEX FROM BO_EU_PAL_FRAME WHERE FRAMEID=?", sqlParams);
|
||||
if (null!=parentFile && !parentFile.isEmpty()) {
|
||||
if (parentFile.getInt("FRAMELEVEL")<=3) {
|
||||
if (parentFile.getInt("FRAMELEVEL")<=4) {
|
||||
fileIDMaps.add(parentFile);
|
||||
if (parentFile.getInt("FRAMELEVEL")>1) {
|
||||
fileID = parentFile.getString("FRAMEPARENTID");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user