This commit is contained in:
devezhao 2020-10-21 14:08:55 +08:00
parent d6dfedaa38
commit beb7b0173b
16 changed files with 49 additions and 13 deletions

View file

@ -7,7 +7,6 @@ See LICENSE and COMMERCIAL in the project root for license information.
package com.rebuild.core;
import com.rebuild.core.support.RebuildConfiguration;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@ -41,7 +40,7 @@ import javax.servlet.ServletException;
@ImportResource("classpath:application-bean.xml")
public class BootApplication extends SpringBootServletInitializer {
private static final Logger LOG = LoggerFactory.getLogger(RebuildConfiguration.class);
private static final Logger LOG = LoggerFactory.getLogger(BootApplication.class);
private static boolean DEBUG = false;

View file

@ -22,6 +22,8 @@ import org.apache.commons.lang.StringUtils;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletRequest;
import java.util.Iterator;
@ -34,6 +36,8 @@ import java.util.Iterator;
*/
public class NavBuilder extends NavManager {
private static final Logger LOG = LoggerFactory.getLogger(NavBuilder.class);
public static final NavBuilder instance = new NavBuilder();
private NavBuilder() {

View file

@ -20,6 +20,8 @@ import com.rebuild.core.metadata.MetadataHelper;
import com.rebuild.core.metadata.impl.EasyMeta;
import com.rebuild.utils.JSONUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
@ -34,6 +36,8 @@ import java.util.Map;
*/
public class DataListManager extends BaseLayoutManager {
private static final Logger LOG = LoggerFactory.getLogger(DataListManager.class);
public static final DataListManager instance = new DataListManager();
private DataListManager() {

View file

@ -36,6 +36,8 @@ import com.rebuild.core.support.general.FieldValueWrapper;
import com.rebuild.core.support.i18n.Language;
import com.rebuild.core.support.state.StateManager;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.Assert;
import java.util.*;
@ -48,6 +50,8 @@ import java.util.*;
*/
public class FormsBuilder extends FormsManager {
private static final Logger LOG = LoggerFactory.getLogger(FormsBuilder.class);
public static final FormsBuilder instance = new FormsBuilder();
private FormsBuilder() {

View file

@ -18,8 +18,6 @@ import com.rebuild.core.privileges.UserHelper;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
@ -31,8 +29,6 @@ import java.util.*;
*/
public abstract class ShareToManager implements ConfigManager {
protected static final Logger LOG = LoggerFactory.getLogger(ShareToManager.class);
// 共享给全部
public static final String SHARE_ALL = "ALL";
// 私有

View file

@ -13,6 +13,8 @@ import com.rebuild.core.Application;
import com.rebuild.core.metadata.EntityHelper;
import com.rebuild.core.metadata.MetadataHelper;
import com.rebuild.core.support.task.HeavyTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.text.MessageFormat;
@ -24,6 +26,8 @@ import java.text.MessageFormat;
*/
public class ChangeOwningDeptTask extends HeavyTask<Integer> {
private static final Logger LOG = LoggerFactory.getLogger(ChangeOwningDeptTask.class);
final private ID user;
final private ID deptNew;

View file

@ -11,6 +11,8 @@ import com.alibaba.fastjson.JSONObject;
import com.rebuild.core.metadata.MetadataHelper;
import com.rebuild.core.metadata.impl.DynamicMetadataContextHolder;
import com.rebuild.core.support.task.HeavyTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* 批量导入业务模块
@ -20,6 +22,8 @@ import com.rebuild.core.support.task.HeavyTask;
*/
public class BusinessModelImporter extends HeavyTask<Integer> {
private static final Logger LOG = LoggerFactory.getLogger(BusinessModelImporter.class);
private final String[] modelFiles;
public BusinessModelImporter(String[] modelFiles) {

View file

@ -21,6 +21,8 @@ import com.rebuild.core.metadata.impl.DisplayType;
import com.rebuild.core.service.general.GeneralEntityServiceContextHolder;
import com.rebuild.core.support.task.HeavyTask;
import com.rebuild.utils.JSONUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
@ -33,6 +35,8 @@ import java.util.*;
*/
public class DataImporter extends HeavyTask<Integer> {
private static final Logger LOG = LoggerFactory.getLogger(DataImporter.class);
final private ImportRule rule;
private ID owningUser;

View file

@ -12,8 +12,11 @@ import cn.devezhao.persist4j.Record;
import cn.devezhao.persist4j.engine.ID;
import com.rebuild.core.Application;
import com.rebuild.core.metadata.EntityHelper;
import com.rebuild.core.service.dataimport.DataImporter;
import com.rebuild.core.service.notification.NotificationObserver;
import com.rebuild.core.service.notification.NotificationOnce;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Set;
@ -25,6 +28,8 @@ import java.util.Set;
*/
public class BulkAssign extends BulkOperator {
private static final Logger LOG = LoggerFactory.getLogger(BulkAssign.class);
public BulkAssign(BulkContext context, GeneralEntityService ges) {
super(context, ges);
}

View file

@ -17,6 +17,8 @@ import com.rebuild.core.metadata.EntityHelper;
import com.rebuild.core.service.DataSpecificationException;
import com.rebuild.core.support.general.BatchOperatorQuery;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* 批量修改
@ -26,6 +28,8 @@ import org.apache.commons.lang.StringUtils;
*/
public class BulkBacthUpdate extends BulkOperator {
private static final Logger LOG = LoggerFactory.getLogger(BulkBacthUpdate.class);
/**
* 修改为
*/
@ -40,7 +44,7 @@ public class BulkBacthUpdate extends BulkOperator {
}
@Override
protected Integer exec() throws Exception {
protected Integer exec() {
final ID[] willUpdates = prepareRecords();
this.setTotal(willUpdates.length);

View file

@ -10,6 +10,8 @@ package com.rebuild.core.service.general;
import cn.devezhao.persist4j.engine.ID;
import com.rebuild.core.Application;
import com.rebuild.core.service.DataSpecificationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* 删除
@ -19,6 +21,8 @@ import com.rebuild.core.service.DataSpecificationException;
*/
public class BulkDelete extends BulkOperator {
private static final Logger LOG = LoggerFactory.getLogger(BulkDelete.class);
public BulkDelete(BulkContext context, GeneralEntityService ges) {
super(context, ges);
}

View file

@ -16,8 +16,6 @@ import com.rebuild.core.Application;
import com.rebuild.core.metadata.MetadataHelper;
import com.rebuild.core.service.query.AdvFilterParser;
import com.rebuild.core.support.task.HeavyTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Set;
@ -30,8 +28,6 @@ import java.util.Set;
*/
public abstract class BulkOperator extends HeavyTask<Integer> {
protected static final Logger LOG = LoggerFactory.getLogger(BulkOperator.class);
final protected BulkContext context;
final protected GeneralEntityService ges;

View file

@ -14,6 +14,8 @@ import com.rebuild.core.Application;
import com.rebuild.core.metadata.EntityHelper;
import com.rebuild.core.service.notification.NotificationObserver;
import com.rebuild.core.service.notification.NotificationOnce;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Set;
@ -25,6 +27,8 @@ import java.util.Set;
*/
public class BulkShare extends BulkOperator {
private static final Logger LOG = LoggerFactory.getLogger(BulkShare.class);
public BulkShare(BulkContext context, GeneralEntityService ges) {
super(context, ges);
}

View file

@ -26,6 +26,8 @@ import com.rebuild.core.support.state.StateManager;
import com.rebuild.core.support.state.StateSpec;
import com.rebuild.core.support.task.HeavyTask;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
@ -37,6 +39,8 @@ import java.util.List;
*/
public class QuickCodeReindexTask extends HeavyTask<Integer> {
private static final Logger LOG = LoggerFactory.getLogger(QuickCodeReindexTask.class);
private static final int PAGE_SIZE = 1000;
final private Entity entity;

View file

@ -33,7 +33,7 @@ import java.util.regex.Pattern;
*/
public class AggregationEvaluator {
private static final Logger LOG = LoggerFactory.getLogger(FieldAggregation.class);
private static final Logger LOG = LoggerFactory.getLogger(AggregationEvaluator.class);
private static final Pattern FIELD_PATT = Pattern.compile("\\{(.*?)}");

View file

@ -27,7 +27,7 @@ import java.util.Date;
*/
public abstract class HeavyTask<T> extends SetUser<HeavyTask<T>> implements Runnable {
protected static final Logger LOG = LoggerFactory.getLogger(HeavyTask.class);
private static final Logger LOG = LoggerFactory.getLogger(HeavyTask.class);
volatile private boolean interrupt = false;
volatile private boolean interruptState = false;