Merge branch 'fix/eraseContentLog' into 'develop'

清理print

See merge request o2oa/o2oa!506

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/schedule/DingdingAttendanceStatisticPersonScheduleTask.java

@@ -24,7 +24,6 @@ public class DingdingAttendanceStatisticPersonScheduleTask extends AbstractJob {
     @Override
     public void schedule(JobExecutionContext jobExecutionContext) throws Exception {
         try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-            logger.info("开始执行钉钉考勤统计的程序。。。。。。。。。。。。。。。。。。。。。");
             //前一天 0点到23点
             Date from = new Date();
             from = DateTools.addDay(from, -1);//前面一天

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/schedule/DingdingAttendanceStatisticScheduleTask.java

@@ -24,7 +24,6 @@ public class DingdingAttendanceStatisticScheduleTask extends AbstractJob {
     @Override
     public void schedule(JobExecutionContext jobExecutionContext) throws Exception {
         try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-            logger.info("开始执行钉钉考勤统计的程序。。。。。。。。。。。。。。。。。。。。。");
             //前一天 0点到23点
             Date from = new Date();
             from = DateTools.addDay(from, -1);//前面一天

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/schedule/DingdingAttendanceSyncScheduleTask.java

@@ -25,7 +25,6 @@ public class DingdingAttendanceSyncScheduleTask extends AbstractJob {
     @Override
     public void schedule(JobExecutionContext jobExecutionContext) throws Exception {
         try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-            logger.info("开始同步钉钉考勤打卡结果。。。。。。。。。。。。。。。。。。。。。");
             //前一天 0点到23点
             Date from = new Date();
             from = DateTools.addDay(from, -1);

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/schedule/QywxAttendanceSyncScheduleTask.java

@@ -25,7 +25,6 @@ public class QywxAttendanceSyncScheduleTask extends AbstractJob {
     @Override
     public void schedule(JobExecutionContext jobExecutionContext) throws Exception {
         try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-            logger.info("开始同步企业微信考勤打卡结果。。。。。。。。。。。。。。。。。。。。。");
             //前一天 0点到23点
             Date from = new Date();
             from = DateTools.addDay(from, -1);

o2server/x_console/src/main/java/com/x/server/console/action/EraseContentBbs.java

@@ -16,7 +16,7 @@ import com.x.bbs.entity.BBSVoteRecord;
 public class EraseContentBbs extends EraseContentProcessPlatform {
 
 	private static Logger logger = LoggerFactory.getLogger(EraseContentBbs.class);
-
+	@Override
 	public boolean execute() throws Exception {
 		this.init("bbs", ItemCategory.bbs);
 		addClass(BBSOperationRecord.class);

o2server/x_console/src/main/java/com/x/server/console/action/EraseContentCms.java

@@ -21,8 +21,8 @@ import com.x.cms.core.entity.CmsBatchOperation;
 public class EraseContentCms extends EraseContentProcessPlatform {
 
 	private static Logger logger = LoggerFactory.getLogger(EraseContentCms.class);
-
-	public boolean execute(String password) throws Exception {
+	@Override
+	public boolean execute() throws Exception {
 		this.init("cms", ItemCategory.cms);
 		addClass(Document.class);
 		addClass(Review.class);

o2server/x_console/src/main/java/com/x/server/console/action/EraseContentLog.java

@@ -1,8 +1,5 @@
 package com.x.server.console.action;
 
-import org.apache.commons.lang3.StringUtils;
-
-import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.program.center.core.entity.PromptErrorLog;
@@ -14,7 +11,8 @@ public class EraseContentLog extends EraseContentProcessPlatform {
 
 	private static Logger logger = LoggerFactory.getLogger(EraseContentLog.class);
 
-	public boolean execute(String password) throws Exception {
+	@Override
+	public boolean execute() throws Exception {
 		this.init("log", null);
 		addClass(ScheduleLog.class);
 		addClass(PromptErrorLog.class);

o2server/x_console/src/main/java/com/x/server/console/action/EraseContentProcessPlatform.java

@@ -12,10 +12,6 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.apache.commons.collections4.ListUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-
 import com.x.base.core.container.factory.PersistenceXmlHelper;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.entity.StorageObject;
@@ -43,6 +39,9 @@ import com.x.processplatform.core.entity.content.WorkCompleted;
 import com.x.processplatform.core.entity.content.WorkLog;
 import com.x.query.core.entity.Item;
 
+import org.apache.commons.collections4.ListUtils;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+
 public class EraseContentProcessPlatform {
 
 	private static Logger logger = LoggerFactory.getLogger(EraseContentProcessPlatform.class);
@@ -129,7 +128,7 @@ public class EraseContentProcessPlatform {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Long> cq = cb.createQuery(Long.class);
 		Root<T> root = cq.from(cls);
-		Predicate p = cb.equal(root.get(Item.itemCategory_FIELDNAME), this.itemCategory);
+		Predicate p = cb.equal(root.get(DataItem.itemCategory_FIELDNAME), this.itemCategory);
 		cq.select(cb.count(root)).where(p);
 		return em.createQuery(cq).getSingleResult();
 	}
@@ -182,7 +181,7 @@ public class EraseContentProcessPlatform {
 			CriteriaBuilder cb = em.getCriteriaBuilder();
 			CriteriaQuery<T> cq = cb.createQuery(cls);
 			Root<T> root = cq.from(cls);
-			Predicate p = cb.equal(root.get(Item.itemCategory_FIELDNAME), itemCategory);
+			Predicate p = cb.equal(root.get(DataItem.itemCategory_FIELDNAME), itemCategory);
 			cq.select(root).where(p);
 			list = em.createQuery(cq).setMaxResults(1000).getResultList();
 		} while (ListTools.isNotEmpty(list));

o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/connector/ActionCreate.java

@@ -37,7 +37,6 @@ class ActionCreate extends BaseAction {
 	private static ConcurrentMap<String,CompiledScript> scriptMap = new ConcurrentHashMap<>();
 
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception {
-		logger.info("接收到消息。。。。。。。。。。。。。。。。。");
 		List<Message> messages = new ArrayList<>();
 		ActionResult<Wo> result = new ActionResult<>();
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {

o2server/x_message_assemble_communicate/src/main/webapp/describe/sources/com/x/message/assemble/communicate/jaxrs/connector/ActionCreate.java

@@ -37,7 +37,6 @@ class ActionCreate extends BaseAction {
 	private static ConcurrentMap<String,CompiledScript> scriptMap = new ConcurrentHashMap<>();
 
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception {
-		logger.info("接收到消息。。。。。。。。。。。。。。。。。");
 		List<Message> messages = new ArrayList<>();
 		ActionResult<Wo> result = new ActionResult<>();
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
@@ -51,7 +50,6 @@ class ActionCreate extends BaseAction {
 				}
 			}
 			Instant instant = this.instant(effectivePerson, business, wi, new ArrayList<>(consumersV2.keySet()));
-			logger.info("生成消息。，，，consumersV2 "+ consumersV2.size());
 			if (!consumersV2.isEmpty()) {
 				for (String consumer : consumersV2.keySet()) {
 					Wi cpwi = wi;
@@ -89,7 +87,6 @@ class ActionCreate extends BaseAction {
 						logger.warn("执行消息发送脚本[{}]方法异常:{}", func, e.getMessage());
 					}
 					Message message = null;
-					logger.info("这里是生成消息对象，consumer:"+consumer);
 					switch (Objects.toString(consumer, "")) {
 					case MessageConnector.CONSUME_WS:
 						message = this.wsMessage(effectivePerson, business, cpwi, instant);