时区保险

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/DABuildExService.java

@@ -21,6 +21,7 @@ import cn.ibizlab.core.rule.service.IExecLogService;
 import cn.ibizlab.core.rule.service.IRuleItemService;
 import cn.ibizlab.util.errors.BadRequestAlertException;
 import cn.ibizlab.util.helper.CachedBeanCopier;
+import cn.ibizlab.util.helper.DataObject;
 import cn.ibizlab.util.helper.Setting;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -40,6 +41,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 import java.io.File;
+import java.sql.Timestamp;
 import java.util.*;
 
 
@@ -141,7 +143,17 @@ public class DABuildExService extends DABuildServiceImpl {
 
             java.sql.Timestamp starttime = new java.sql.Timestamp(System.currentTimeMillis());
 
-            liteDataService.processDataModel(et.getModelId(), et.getLastRuntime(), new LiteDataCallback<List<EntityObj>>() {
+            Timestamp lastTimestamp= DataObject.getTimestampValue(et.getLastRuntime(),DataObject.getBeginDate());
+
+
+            {
+                Calendar c = Calendar.getInstance();
+                c.setTime(lastTimestamp);
+                c.add(Calendar.HOUR, -8);
+                lastTimestamp=new java.sql.Timestamp(c.getTime().getTime());
+            }
+
+            liteDataService.processDataModel(et.getModelId(), lastTimestamp, new LiteDataCallback<List<EntityObj>>() {
                 @Override
                 public void total(Integer total) {
                     String state = "FINISH";

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/RuleEngineExService.java

@@ -4,6 +4,7 @@ import cn.ibizlab.core.extensions.domain.BaseRequest;
 import cn.ibizlab.core.extensions.domain.EngineMQMsg;
 import cn.ibizlab.core.extensions.util.MsgProducerService;
 import cn.ibizlab.core.lite.extensions.domain.EntityObj;
+import cn.ibizlab.util.helper.DataObject;
 import cn.ibizlab.util.helper.Setting;
 import cn.ibizlab.core.lite.extensions.model.DataModel;
 import cn.ibizlab.core.lite.extensions.service.LiteDataCallback;
@@ -32,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.io.File;
+import java.sql.Timestamp;
 import java.util.*;
 
 /**
@@ -95,7 +97,17 @@ public class RuleEngineExService extends RuleEngineServiceImpl {
 
             java.sql.Timestamp starttime = new java.sql.Timestamp(System.currentTimeMillis());
 
-            liteDataService.processDataModel(et.getModelId(), et.getLastRuntime(), new LiteDataCallback<List<EntityObj>>() {
+            Timestamp lastTimestamp= DataObject.getTimestampValue(et.getLastRuntime(),DataObject.getBeginDate());
+
+
+            {
+                Calendar c = Calendar.getInstance();
+                c.setTime(lastTimestamp);
+                c.add(Calendar.HOUR, -8);
+                lastTimestamp=new java.sql.Timestamp(c.getTime().getTime());
+            }
+
+            liteDataService.processDataModel(et.getModelId(), lastTimestamp, new LiteDataCallback<List<EntityObj>>() {
                 @Override
                 public void total(Integer total) {
                     String state = "FINISH";