From 6e02e23c0547f86a9941b313d22de4eb066652b9 Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Wed, 29 Jun 2022 23:14:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E6=95=B0=E6=8D=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/DesignerRelationShapeWeb.java | 29 ++-- .../pal/repository/job/SynchronousOrgJob.java | 151 ++++++++++-------- 2 files changed, 100 insertions(+), 80 deletions(-) diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java index fef8545b..092f5b0c 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java @@ -760,24 +760,27 @@ public class DesignerRelationShapeWeb extends ActionWeb { //JSONObject jsonObject = JSONObject.parseObject(json); JSONArray jsonArr_new= new JSONArray(); JSONArray objects=JSONArray.parseArray(treeJson); - if (objects!=null) { - for (int i=0;i idRelationMap = new HashMap<>(); //先执行新建操作产生plid PALRepository coeProcessLevel = CoeProcessLevelDaoFacotory.createCoeProcessLevel(); - String parentId = "org"; - String parentVersionId = ""; - int level = 1; - if (parentId.length() < 36) {// 父节点是大类 - parentVersionId = parentId; - } else { - PALRepositoryModel parentModel = PALRepositoryCache.getCache().get(parentId); - parentVersionId = parentModel.getVersionId(); - level = parentModel.getLevel() + 1; - } - String plRid1 = UUIDGener.getUUID(); String id1 = UUIDGener.getUUID(); - orgdepartmentList = DBSql.getMaps("select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT limit 20"); Timestamp nowTime = new Timestamp(System.currentTimeMillis()); - PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, "6f4e292c-1b90-4dd2-8c20-7da159cb20a5", "内蒙古伊利实业集团股份有限公司", "", 1, "org", "org", true, 1, id1, false, "org.normal", "0", 1, null, @@ -71,22 +60,15 @@ public class SynchronousOrgJob implements IJob { coeProcessLevel.insert(model); parentModelId=model.getId(); -// createTree(orgdepartmentList); orgindex = 0; createTree(); } - public void createTree() { for (RowMap oneData : orgdepartmentList) { - - System.out.println("onedata======"+oneData.toString()); orgindex++; - /* if (oneData.getString("isCreate").equals("1")) { - continue; - }*/ creatNode(oneData); } @@ -104,56 +86,40 @@ public class SynchronousOrgJob implements IJob { String id1 = UUIDGener.getUUID(); Timestamp nowTime = new Timestamp(System.currentTimeMillis()); - System.out.println("=================当前节点ID：" + org.getString("ID")); if (org.getString("PARENTDEPARTMENTID").equals("0")) { - - + System.out.println("orgdepartment======="+org.getString("DEPARTMENTNAME")); String sql1 = "SELECT ID FROM app_act_coe_pal_repository WHERE WSID='6f4e292c-1b90-4dd2-8c20-7da159cb20a5' and EXT1='" + org.getString("ID") + "'"; String parentPalOrgId1 = DBSql.getString(sql1); if(StringUtil.isEmpty(parentPalOrgId1)){ - System.out.println("org========"+org.toString()); - System.out.println("parentID"+org.getString("ORDERINDEX")); PALRepositoryModelImpl model1 = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, "6f4e292c-1b90-4dd2-8c20-7da159cb20a5", org.getString("DEPARTMENTNAME"), "", 1, parentModelId, "org", true, 1, id1, false, "org.normal", "0", Integer.valueOf(org.getString("ORDERINDEX")), null, null, "admin", "admin", nowTime, org.getString("ID"), null, null, null, null, null, null, null, null, 1); coeProcessLevel.insert(model1); - -// 修改创建状态 - //orgdepartmentList.get(orgindex).put("isCreate", "1"); -// org.put("isCreate","1"); - - - System.out.println("父节点创建" + model1.getId()); + createPostData(model1.getId(),org.getString("ID"),model1); return modelId=model1.getId(); } } else { -// 获取父部门 -// getParentOrg(org); - String parentPalOrgId = getParentPalOrgId(org); if(StringUtil.isNotEmpty(parentPalOrgId)){ - System.out.println("xxxxxxxxxxxxxxxxxx"+org.getString("ORDERINDEX")); + System.out.println("orgdepartment======"+org.getString("ID")); + System.out.println("orgdepartment======="+org.getString("DEPARTMENTNAME")); PALRepositoryModelImpl model2 = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, "6f4e292c-1b90-4dd2-8c20-7da159cb20a5", org.getString("DEPARTMENTNAME"), - "", 1, getParentPalOrgId(org), "org", true, 1, id1, false, "org.normal", "0", Integer.valueOf(org.getString("ORDERINDEX")), null, null, "admin", "admin", nowTime, org.getString("ID"), null, null, null, null, null, null, null, null, 1); coeProcessLevel.insert(model2); - System.out.println("bbbbbbbbbb" + model2.getId()); + createPostData(model2.getId(),org.getString("ID"),model2); return modelId=model2.getId(); - // 修改创建状态 - //orgdepartmentList.get(orgindex).put("isCreate", "1"); - } @@ -164,25 +130,13 @@ public class SynchronousOrgJob implements IJob { } public String getParentPalOrgId(RowMap org) { -// RowMap parentOrg; -// List orgdepartmentList = DBSql.getMaps("select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID from ORGDEPARTMENT where id = '" +org.getString("PARENTDEPARTMENTID")+"'"); -// parentOrg = orgdepartmentList.get(0); -// System.out.println( "==============父节点ID"+parentOrg.getString("ID")); -// return parentOrg.getString("ID"); + String sql = "SELECT ID FROM app_act_coe_pal_repository WHERE WSID='6f4e292c-1b90-4dd2-8c20-7da159cb20a5' and EXT1='" + org.getString("PARENTDEPARTMENTID") + "'"; String parentPalOrgId = DBSql.getString(sql); - if (parentPalOrgId.equals("0") || parentPalOrgId.equals("") || parentPalOrgId == null) { RowMap parentOrg = DBSql.getMap("select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT where id = '" + org.getString("PARENTDEPARTMENTID") + "'"); - - creatNode(parentOrg); - -// 修改创建状态 - - //orgdepartmentList.remove(org); - // orgdepartmentList.add(parentOrg); } @@ -191,15 +145,10 @@ public class SynchronousOrgJob implements IJob { public String getParentPallevel(RowMap org) { -// RowMap parentOrg; -// List orgdepartmentList = DBSql.getMaps("select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID from ORGDEPARTMENT where id = '" +org.getString("PARENTDEPARTMENTID")+"'"); -// parentOrg = orgdepartmentList.get(0); -// System.out.println( "==============父节点ID"+parentOrg.getString("ID")); -// return parentOrg.getString("ID"); + String sql = "SELECT ID FROM app_act_coe_pal_repository WHERE WSID='6f4e292c-1b90-4dd2-8c20-7da159cb20a5' and EXT1='" + org.getString("PARENTDEPARTMENTID") + "'"; String parentPalOrgId = DBSql.getString(sql); - if (parentPalOrgId.equals("0") || parentPalOrgId.equals("") || parentPalOrgId == null) { RowMap parentOrg = DBSql.getMap("select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID from ORGDEPARTMENT where id = '" + org.getString("PARENTDEPARTMENTID") + "'"); @@ -209,6 +158,74 @@ public class SynchronousOrgJob implements IJob { } + /** + * 创建岗位图形 + * @param uuid + * @return + */ + public void createPostData(String uuid,String departmentId,PALRepositoryModelImpl model){ + Map idRelationMap = new HashMap<>(); + + + BaseModel defineModel = CoeDesignerAPIManager.getInstance().getDefinition(model.getId(), 0); + if(defineModel ==null ){ + defineModel = CoeDesignerUtil.createModel(model.getId(),0); + defineModel.setCreateHistory(false); + } + String define = defineModel.getDefinition(); + JSONObject definition = JSONObject.parseObject(define); + JSONObject elements = definition.getJSONObject("elements"); + + //新建一个uuid + String shapeId = UUIDGener.getObjectId(); + + //拿到基础结构 + JSONObject shape = ShapeUtil.getProcessShapeDefinitionByName("org.normal", "position"); + + if (StringUtils.isNotEmpty(definition.getString("commonShapeConfig"))) { + definition.remove("commonShapeConfig"); + } + + List orgdepartmentList=DBSql.getMaps("select * from ORGUSER WHERE DEPARTMENTID=?",departmentId); + + int zindex = 1; + + if(orgdepartmentList.size()>0){ + + for(int i=0;i