优化同步岗位消耗数据库连接
This commit is contained in:
parent
e20f385f08
commit
aa316e1c05
@ -1,5 +1,8 @@
|
||||
package com.actionsoft.apps.coe.pal.pal.repository.job;
|
||||
|
||||
import com.actionsoft.apps.coe.pal.pal.backup.dao.CoEPALBackup;
|
||||
import com.actionsoft.apps.coe.pal.pal.backup.extend.CoEPALBackupProcessor;
|
||||
import com.actionsoft.apps.coe.pal.pal.backup.model.CoEPALBackupModel;
|
||||
import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodAttributeModel;
|
||||
import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
|
||||
import com.actionsoft.apps.coe.pal.pal.repository.dao.CoeProcessLevelDaoFacotory;
|
||||
@ -25,6 +28,7 @@ import com.alibaba.fastjson.JSONObject;
|
||||
import jodd.util.StringUtil;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.checkerframework.checker.units.qual.C;
|
||||
import org.quartz.JobExecutionContext;
|
||||
import org.quartz.JobExecutionException;
|
||||
|
||||
@ -34,8 +38,6 @@ import java.util.*;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* 同步部门、岗位数据
|
||||
*/
|
||||
public class SynchronousOrgJob implements IJob {
|
||||
@ -65,12 +67,13 @@ public class SynchronousOrgJob implements IJob {
|
||||
|
||||
Timestamp nowTime = new Timestamp(System.currentTimeMillis());
|
||||
|
||||
|
||||
String modeldefaultId = Createfolder(orderIndex);
|
||||
|
||||
|
||||
Connection open = DBSql.open();
|
||||
orgdepartmentList = DBSql.getMaps(open,"select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT");
|
||||
try {
|
||||
|
||||
orgdepartmentList = DBSql.getMaps(open, "select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT");
|
||||
|
||||
PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, wsId, "内蒙古伊利实业集团股份有限公司",
|
||||
"", orderIndex, modeldefaultId, "org", true, 1,
|
||||
@ -79,16 +82,20 @@ public class SynchronousOrgJob implements IJob {
|
||||
null, null, null, null, null, null, null, 1);
|
||||
coeProcessLevel.insert(model);
|
||||
|
||||
|
||||
parentModelId = model.getId();
|
||||
orgindex = 0;
|
||||
createTree();
|
||||
createTree(open);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
DBSql.close(open);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建岗位模型文件夹
|
||||
*
|
||||
* @param orderIndex
|
||||
* @return
|
||||
*/
|
||||
@ -109,18 +116,18 @@ public class SynchronousOrgJob implements IJob {
|
||||
return modeldefault.getId();
|
||||
}
|
||||
|
||||
public void createTree() {
|
||||
public void createTree(Connection open) {
|
||||
|
||||
for (RowMap oneData : orgdepartmentList) {
|
||||
orgindex++;
|
||||
creatNode(oneData);
|
||||
creatNode(oneData, open);
|
||||
}
|
||||
System.out.println("同步完成,数据" + orgindex);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public String creatNode(RowMap org) {
|
||||
public String creatNode(RowMap org, Connection conn) {
|
||||
//先执行新建操作产生plid
|
||||
PALRepository coeProcessLevel = CoeProcessLevelDaoFacotory.createCoeProcessLevel();
|
||||
|
||||
@ -132,7 +139,7 @@ public class SynchronousOrgJob implements IJob {
|
||||
|
||||
if (org.getString("PARENTDEPARTMENTID").equals("0")) {
|
||||
String sql1 = "SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE wsId='" + wsId + "' and EXT1='" + org.getString("ID") + "'";
|
||||
String parentPalOrgId1 = DBSql.getString(sql1);
|
||||
String parentPalOrgId1 = DBSql.getString(conn, sql1);
|
||||
if (StringUtil.isEmpty(parentPalOrgId1)) {
|
||||
PALRepositoryModelImpl model1 = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, wsId, org.getString("DEPARTMENTNAME"),
|
||||
"", 1, parentModelId, "org", true, 1,
|
||||
@ -140,24 +147,24 @@ public class SynchronousOrgJob implements IJob {
|
||||
null, "admin", "admin", nowTime, org.getString("ID"), null,
|
||||
null, null, null, null, null, null, null, 1);
|
||||
coeProcessLevel.insert(model1);
|
||||
createPostData(model1.getId(),org.getString("ID"),model1);
|
||||
createPostData(model1.getId(), org.getString("ID"), model1, conn);
|
||||
return modelId = model1.getId();
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
String parentPalOrgId = getParentPalOrgId(org);
|
||||
String parentPalOrgId = getParentPalOrgId(org, conn);
|
||||
|
||||
if (StringUtil.isNotEmpty(parentPalOrgId)) {
|
||||
|
||||
PALRepositoryModelImpl model2 = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, wsId, org.getString("DEPARTMENTNAME"),
|
||||
"", 1, getParentPalOrgId(org), "org", true, 1,
|
||||
"", 1, getParentPalOrgId(org, conn), "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);
|
||||
|
||||
createPostData(model2.getId(),org.getString("ID"),model2);
|
||||
createPostData(model2.getId(), org.getString("ID"), model2, conn);
|
||||
return modelId = model2.getId();
|
||||
|
||||
|
||||
@ -170,28 +177,28 @@ public class SynchronousOrgJob implements IJob {
|
||||
|
||||
}
|
||||
|
||||
public String getParentPalOrgId(RowMap org) {
|
||||
public String getParentPalOrgId(RowMap org, Connection conn) {
|
||||
|
||||
String sql = "SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE wsId='" + wsId + "' and EXT1='" + org.getString("PARENTDEPARTMENTID") + "'";
|
||||
String parentPalOrgId = DBSql.getString(sql);
|
||||
String parentPalOrgId = DBSql.getString(conn, 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);
|
||||
RowMap parentOrg = DBSql.getMap(conn, "select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT where id = '" + org.getString("PARENTDEPARTMENTID") + "'");
|
||||
creatNode(parentOrg, conn);
|
||||
}
|
||||
|
||||
return parentPalOrgId;
|
||||
}
|
||||
|
||||
|
||||
public String getParentPallevel(RowMap org) {
|
||||
public String getParentPallevel(RowMap org, Connection conn) {
|
||||
String sql = "SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE wsId='" + wsId + "' and EXT1='" + org.getString("PARENTDEPARTMENTID") + "'";
|
||||
String parentPalOrgId = DBSql.getString(sql);
|
||||
String parentPalOrgId = DBSql.getString(conn, 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") + "'");
|
||||
|
||||
creatNode(parentOrg);
|
||||
creatNode(parentOrg, conn);
|
||||
}
|
||||
|
||||
return parentPalOrgId;
|
||||
@ -200,10 +207,11 @@ public class SynchronousOrgJob implements IJob {
|
||||
|
||||
/**
|
||||
* 创建岗位图形
|
||||
*
|
||||
* @param uuid
|
||||
* @return
|
||||
*/
|
||||
public void createPostData(String uuid,String departmentId,PALRepositoryModelImpl model){
|
||||
public void createPostData(String uuid, String departmentId, PALRepositoryModelImpl model, Connection conn) {
|
||||
|
||||
Map<String, String> idRelationMap = new HashMap<>();
|
||||
|
||||
@ -227,7 +235,7 @@ public class SynchronousOrgJob implements IJob {
|
||||
}
|
||||
|
||||
|
||||
List<RowMap> orgdepartmentList=DBSql.getMaps("select DISTINCT(POSITION_NAME) from ORGUSER WHERE DEPARTMENTID=?",departmentId);
|
||||
List<RowMap> orgdepartmentList = DBSql.getMaps(conn, "select DISTINCT(POSITION_NAME) from ORGUSER WHERE DEPARTMENTID=?", departmentId);
|
||||
|
||||
JSONArray shapes = new JSONArray();
|
||||
if (orgdepartmentList.size() > 0) {
|
||||
@ -262,7 +270,6 @@ public class SynchronousOrgJob implements IJob {
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 设置画布大小
|
||||
DiagramsUtil.setDiagramHeightWidth(definition, elements);
|
||||
defineModel.setDefinition(definition.toString());
|
||||
@ -272,8 +279,6 @@ public class SynchronousOrgJob implements IJob {
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 创建具有合理位置的节点数据
|
||||
*
|
||||
@ -331,7 +336,6 @@ public class SynchronousOrgJob implements IJob {
|
||||
}
|
||||
|
||||
|
||||
|
||||
private String validateJson(String name) {
|
||||
return name == null ? "" : name;
|
||||
}
|
||||
@ -341,10 +345,10 @@ public class SynchronousOrgJob implements IJob {
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 获取文件的下级文件的最大orderIndex
|
||||
* 在不同的资产库根节点(palId)都相同，增加资产库避免统计时错误
|
||||
*
|
||||
* @param palId
|
||||
* @param wsId
|
||||
* @return
|
||||
|
||||
Loading…
Reference in New Issue
Block a user