From 7c64ee6083d18943863103fefd7653ba790f484b Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Tue, 5 Jul 2022 17:48:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/coe/pal/CoEPALController.java | 6 +- .../pal/repository/job/SynchronousOrgJob.java | 19 ++++--- .../repository/web/CoeProcessLevelWeb.java | 57 +++++++++++++++++++ 3 files changed, 73 insertions(+), 9 deletions(-) diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java index 8b1b6d26..595bf16f 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java @@ -2998,7 +2998,11 @@ public class CoEPALController { } - + @Mapping("com.actionsoft.apps.coe.pal_repository_process_define_Performance_check") + public String definePerformanceCheck(UserContext me,String sid,String obj) { + CoeProcessLevelWeb web = new CoeProcessLevelWeb(me); + return web.definePerformanceCheck(sid,obj); + } /** diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java index d0f235fa..093c4895 100644 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java @@ -47,10 +47,11 @@ public class SynchronousOrgJob implements IJob { String plRid1 = UUIDGener.getUUID(); String id1 = UUIDGener.getUUID(); - orgdepartmentList = DBSql.getMaps("select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT "); + 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, @@ -69,7 +70,6 @@ public class SynchronousOrgJob implements IJob { for (RowMap oneData : orgdepartmentList) { orgindex++; creatNode(oneData); - } System.out.println("同步完成,数据" + orgindex); @@ -87,7 +87,7 @@ public class SynchronousOrgJob implements IJob { 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 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)){ PALRepositoryModelImpl model1 = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, "6f4e292c-1b90-4dd2-8c20-7da159cb20a5", org.getString("DEPARTMENTNAME"), @@ -130,7 +130,7 @@ public class SynchronousOrgJob implements IJob { public String getParentPalOrgId(RowMap org) { - String sql = "SELECT ID FROM app_act_coe_pal_repository WHERE WSID='6f4e292c-1b90-4dd2-8c20-7da159cb20a5' and EXT1='" + org.getString("PARENTDEPARTMENTID") + "'"; + 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) { @@ -145,7 +145,7 @@ public class SynchronousOrgJob implements IJob { public String getParentPallevel(RowMap org) { - String sql = "SELECT ID FROM app_act_coe_pal_repository WHERE WSID='6f4e292c-1b90-4dd2-8c20-7da159cb20a5' and EXT1='" + org.getString("PARENTDEPARTMENTID") + "'"; + 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) { @@ -178,6 +178,7 @@ public class SynchronousOrgJob implements IJob { String shapeId = UUIDGener.getObjectId(); //拿到基础结构 + JSONObject shape = ShapeUtil.getProcessShapeDefinitionByName("org.normal", "position"); if (StringUtils.isNotEmpty(definition.getString("commonShapeConfig"))) { @@ -190,7 +191,7 @@ public class SynchronousOrgJob implements IJob { if(orgdepartmentList.size()>0){ - /* for(int i=0;i sIterator = elementJsonobject.keySet().iterator(); + //循环并得到key列表 + while (sIterator.hasNext()) { + // 获得key + String key = sIterator.next(); + //获得key值对应的value + String value = elementJsonobject.getString(key); + JSONObject jsonvalue = JSON.parseObject(value); + String id = jsonvalue.getString("id"); + + JSONArray jo=JSONObject.parseObject(obj).getJSONObject("elements").getJSONObject(id).getJSONArray("dataAttributes"); + + for(int j=0;j