diff --git a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar index 43a47f16..d18785ae 100644 Binary files a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar and b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar differ diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_gc.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_gc.java index 7576e0d3..334352bd 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_gc.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_gc.java @@ -7,6 +7,10 @@ import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppProfile; import com.actionsoft.apps.coe.pal.pal.output.model.OutputTaskModel; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; import com.actionsoft.apps.coe.pal.pal.repository.dao.CoeProcessLevelDaoFacotory; +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.dao.DesignerShapeRelationDao; +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.upfile.model.UpfileModel; import com.actionsoft.apps.coe.pal.pal.repository.upfile.web.UpfileWeb; @@ -26,6 +30,7 @@ import com.actionsoft.bpms.server.SSOUtil; import com.actionsoft.bpms.server.UserContext; import com.actionsoft.bpms.server.fs.DCContext; import com.actionsoft.bpms.util.DBSql; +import com.actionsoft.bpms.util.UUIDGener; import com.actionsoft.bpms.util.UtilString; import com.actionsoft.exception.AWSException; import com.actionsoft.sdk.local.SDK; @@ -625,6 +630,38 @@ public class ProcessEndAfterEvent_gc extends ExecuteListener implements ExecuteL try { String fileId = bo.getString("STOPFILEID"); DBSql.update(open,"UPDATE APP_ACT_COE_PAL_REPOSITORY SET EXT5 = '0' WHERE ID = '"+fileId+"'"); + + PALRepositoryModel plModel = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(fileId); + DesignerShapeRelationCache.getCache().remove(plModel.getId(), false); + + DesignerShapeRelationModel designerShapeRelationModel=new DesignerShapeRelationModel(); + designerShapeRelationModel.setId(UUIDGener.getUUID()); + designerShapeRelationModel.setFileId(fileId); + designerShapeRelationModel.setAttrId("nullifier"); + designerShapeRelationModel.setRelationFileId("00000000-0000-0000-0000-000000000000"); + designerShapeRelationModel.setRelationShapeId("00000000-0000-0000-0000-000000000000"); + + JSONObject js=new JSONObject(); + js.put("name", processExecutionContext.getUserContext().getUserName()); + js.put("id",processExecutionContext.getUserContext().getUID()); + js.put("type", "user"); + + designerShapeRelationModel.setRelationShapeText(js.toString()); + + DesignerShapeRelationDao dao = new DesignerShapeRelationDao(); + dao.insert(designerShapeRelationModel); + + PALRepositoryPropertyDao propertyDao = new PALRepositoryPropertyDao(); + //作废时间 + Date date=new Date(); + SimpleDateFormat sdfs = new SimpleDateFormat("yyyy-MM-dd"); + propertyDao.updatePropertyByPropertyId(fileId, "obsolescence_time", sdfs.format(date)); + + if (plModel != null) { + PALRepositoryCache.getCache().put(fileId, plModel); + } + + } catch (Exception e) { } } @@ -1184,7 +1221,7 @@ public class ProcessEndAfterEvent_gc extends ExecuteListener implements ExecuteL .addQuery("OPTIONTYPE IS NOT NULL", null).detail(); String sql = "SELECT ID FROM WFH_TASK WHERE PROCESSINSTID = '" + processInstance.getId() - + "' AND ACTIVITYDEFID = 'obj_c9e5a3144b200001b68cffa01ed0153e' "; + + "' AND ACTIVITYDEFID = 'obj_f84fb9833d754c5f8703477dfc6b1a33' "; String taskInd = DBSql.getString(sql); TaskInstance ta = SDK.getTaskAPI().getInstanceById(taskInd); @@ -1238,16 +1275,11 @@ public class ProcessEndAfterEvent_gc extends ExecuteListener implements ExecuteL Element result = rootElement.element("Body").element("serviceResponse").element("out"); String resultString = result.getData().toString(); JSONObject jsonObject1 = JSON.parseObject(resultString); - System.out.println("jsonObject1==============="+jsonObject1); String datas = jsonObject1.getString("data"); long have_time = System.currentTimeMillis(); - System.out.println("接收到返回的待阅ID时间>>>>>>>>>>>>>>>>"+have_time); bo_OA_read.set("HAVE_TIME",have_time); - System.out.println("接收到返回的待阅耗时时间>>>>>>>>>>>>"+(have_time-start_time)); bo_OA_read.set("SUM_TIME",(have_time-start_time)); - System.out.println("data================="+datas); String status = jsonObject1.getString("status"); - System.out.println("推送》》》》》》》》》》》" + status); if ("true".equals(status)) { @@ -1397,7 +1429,7 @@ public class ProcessEndAfterEvent_gc extends ExecuteListener implements ExecuteL .addQuery("OPTIONTYPE IS NOT NULL", null).detail(); String sql = "SELECT ID FROM WFH_TASK WHERE PROCESSINSTID = '" + processInstance.getId() - + "' AND ACTIVITYDEFID = 'obj_c9e5a3144b200001b68cffa01ed0153e' "; + + "' AND ACTIVITYDEFID = 'obj_f84fb9833d754c5f8703477dfc6b1a33' "; String taskInd = DBSql.getString(sql); TaskInstance ta = SDK.getTaskAPI().getInstanceById(taskInd); diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java index ab6fd89f..2e35bd4d 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java @@ -377,7 +377,7 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute String[] redata; redata = Arrays.copyOfRange(users, flag, flag+ys); list.add(redata); -// 创建线程来实现为每300人为一个的线程跑待阅 + // 创建线程来实现为每300人为一个的线程跑待阅 /** * 创建线程发送待阅数据 */ @@ -638,7 +638,6 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute PALRepositoryModel plModel = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(fileId); - DesignerShapeRelationCache.getCache().remove(plModel.getId(), false); DesignerShapeRelationModel designerShapeRelationModel=new DesignerShapeRelationModel(); designerShapeRelationModel.setId(UUIDGener.getUUID()); @@ -668,26 +667,6 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute } - /*PALRepositoryPropertyDao propertyDao = new PALRepositoryPropertyDao(); - - String sql = "insert into APP_ACT_COE_PAL_SHAPE_RLAT (ID,FILEID,ATTRID,RELATIONFILEID,RELATIONSHAPEID,RELATIONSHAPETEXT) values ('%s', '%s', '%s','%s','%s','%s')"; - - JSONObject js=new JSONObject(); - js.put("name", processExecutionContext.getUserContext().getUserName()); - js.put("id", processExecutionContext.getUserContext().getUID()); - js.put("type", "user"); - String id = UUIDGener.getUUID(); - int update = DBSql.update(String.format(sql, id, fileId, "nullifier","00000000-0000-0000-0000-000000000000","00000000-0000-0000-0000-000000000000",js)); - - //作废时间 - Date date=new Date(); - SimpleDateFormat sdfs = new SimpleDateFormat("yyyy-MM-dd"); - propertyDao.updatePropertyByPropertyId(fileId, "obsolescence_time", sdfs.format(date)); - - PALRepositoryModel plModel = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(fileId); - if (plModel != null) { - PALRepositoryCache.getCache().put(fileId, plModel); - }*/ @@ -830,12 +809,10 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute List List = DBSql.getMaps("SELECT NAME FROM BO_EU_READ_COUNT WHERE PROCESSID = '" + instanceById.getId() + "' AND RESULT = '待处理'"); if (List.size() != 0) { - System.err.println(instanceById.getTitle() + "批量推送失败后执行二次推送=======>" + List.size()); for (RowMap rowMap : List) { try { ArrayList secondUserList = new ArrayList(); secondUserList.add(rowMap.getString("NAME")); - System.err.println(instanceById.getTitle() + "二次推送账号=======>" + secondUserList); BO executiveTaskBO=SDK.getBOAPI().query("BO_ACT_EXECUTIVE_TASK").addQuery("TASKID=",processExecutionContext.getProcessInstance().getId()).addQuery("TASKSTATUS=",2).detail(); if(executiveTaskBO!=null){