inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-3727 - fixed query and exposed cron job expression in properties

Browse Source
This commit is contained in:
Ana Bozianu
2017-04-04 18:31:17 +03:00
parent 2c295a35f4
commit 38a81d5934
4 changed files with 59 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
View File

@@ -51,6 +51,11 @@ rm.autocompletesuggestion.nodeParameterSuggester.aspectsAndTypes=rma:record,cm:c
# #
rm.dispositionlifecycletrigger.cronexpression=0 0/5 * * * ? rm.dispositionlifecycletrigger.cronexpression=0 0/5 * * * ?
#
# Global RM notify of records due for review cron job expression
#
rm.notifyOfRecordsDueForReview.cronExpression=0 0/8 * * * ?
# #
# Records contributors group # Records contributors group
# #

2
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml
View File

@@ -47,7 +47,7 @@
</property> </property>
<property name="cronExpression"> <property name="cronExpression">
<!-- <value>0 30 2 * * ?</value> --> <!-- <value>0 30 2 * * ?</value> -->
<value>0 0/15 * * * ?</value> <value>${rm.notifyOfRecordsDueForReview.cronExpression}</value>
</property> </property>
</bean> </bean>

8
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java
View File

@@ -91,12 +91,8 @@ public class NotifyOfRecordsDueForReviewJobExecuter extends RecordsManagementJob
// Query is for all records that are due for review and for which // Query is for all records that are due for review and for which
// notification has not been sent. // notification has not been sent.
StringBuilder queryBuffer = new StringBuilder(); StringBuilder queryBuffer = new StringBuilder();
queryBuffer.append("+ASPECT:\"rma:vitalRecord\" "); queryBuffer.append("ASPECT:\"rma:vitalRecord\" ");
queryBuffer.append("+(@rma\\:reviewAsOf:[MIN TO NOW] ) "); queryBuffer.append("AND @rma\\:reviewAsOf:[MIN TO NOW] ");
queryBuffer.append("+( ");
queryBuffer.append("@rma\\:notificationIssued:false ");
queryBuffer.append("OR ISNULL:\"rma:notificationIssued\" ");
queryBuffer.append(") ");
String query = queryBuffer.toString(); String query = queryBuffer.toString();
ResultSet results = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_FTS_ALFRESCO, query); ResultSet results = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_FTS_ALFRESCO, query);

85
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/vital/ReviewedAction.java
View File

@@ -30,6 +30,7 @@ package org.alfresco.module.org_alfresco_module_rm.vital;
import java.util.Date; import java.util.Date;
import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase; import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase;
import org.alfresco.repo.dictionary.types.period.Immediately;
import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@@ -44,56 +45,72 @@ public class ReviewedAction extends RMActionExecuterAbstractBase
{ {
private static Log logger = LogFactory.getLog(ReviewedAction.class); private static Log logger = LogFactory.getLog(ReviewedAction.class);
/** /**
* *
* @see org.alfresco.repo.action.executer.ActionExecuterAbstractBase#executeImpl(org.alfresco.service.cmr.action.Action, * @see org.alfresco.repo.action.executer.ActionExecuterAbstractBase#executeImpl(org.alfresco.service.cmr.action.Action,
* org.alfresco.service.cmr.repository.NodeRef) * org.alfresco.service.cmr.repository.NodeRef)
*/ */
@Override @Override
protected void executeImpl(Action action, NodeRef actionedUponNodeRef) protected void executeImpl(Action action, NodeRef actionedUponNodeRef)
{ {
VitalRecordDefinition vrDef = getVitalRecordService().getVitalRecordDefinition(actionedUponNodeRef); VitalRecordDefinition vrDef = getVitalRecordService().getVitalRecordDefinition(actionedUponNodeRef);
if (vrDef != null && vrDef.isEnabled()) if (vrDef != null && vrDef.isEnabled())
{ {
if (getRecordService().isRecord(actionedUponNodeRef)) if (getRecordService().isRecord(actionedUponNodeRef))
{ {
reviewRecord(actionedUponNodeRef, vrDef); reviewRecord(actionedUponNodeRef, vrDef);
} }
else if (getRecordFolderService().isRecordFolder(actionedUponNodeRef)) else if (getRecordFolderService().isRecordFolder(actionedUponNodeRef))
{ {
for (NodeRef record : getRecordService().getRecords(actionedUponNodeRef)) for (NodeRef record : getRecordService().getRecords(actionedUponNodeRef))
{ {
reviewRecord(record, vrDef); reviewRecord(record, vrDef);
} }
} }
} }
} }
/** /**
* Make record as reviewed. * Make record as reviewed.
* *
* @param nodeRef * @param nodeRef
* @param vrDef * @param vrDef
*/ */
private void reviewRecord(NodeRef nodeRef, VitalRecordDefinition vrDef) private void reviewRecord(NodeRef nodeRef, VitalRecordDefinition vrDef)
{ {
// Calculate the next review date // Calculate the next review date
Date reviewAsOf = vrDef.getNextReviewDate(); if (vrDef.getReviewPeriod().getPeriodType().equals(Immediately.PERIOD_TYPE))
if (reviewAsOf != null)
{ {
// Log // Log
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
msg.append("Removind reviewAsOf property from")
.append(nodeRef);
logger.debug(msg.toString());
}
this.getNodeService().removeProperty(nodeRef, PROP_REVIEW_AS_OF);
}
else
{
Date reviewAsOf = vrDef.getNextReviewDate();
if (reviewAsOf != null)
{
// Log
if (logger.isDebugEnabled())
{
StringBuilder msg = new StringBuilder();
msg.append("Setting new reviewAsOf property [") msg.append("Setting new reviewAsOf property [")
.append(reviewAsOf) .append(reviewAsOf)
.append("] on ") .append("] on ")
.append(nodeRef); .append(nodeRef);
logger.debug(msg.toString()); logger.debug(msg.toString());
}
this.getNodeService().setProperty(nodeRef, PROP_REVIEW_AS_OF, reviewAsOf);
// TODO And record previous review date, time, user
} }
this.getNodeService().setProperty(nodeRef, PROP_REVIEW_AS_OF, reviewAsOf);
//TODO And record previous review date, time, user
} }
} }
} }