UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

时间判断调整

Browse Source
pro
wj 2 years ago
parent 0c348c43ac
commit dded9d696b
3 changed files with 117 additions and 159 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
@ -154,7 +155,8 @@ public class IoOrderServiceImpl implements IoOrderService {
@Override
public List<IoOrderEntity> findByStatus(String action, Integer status, Date lastUpdateTime) {
return orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("action", action).eq("status", status).le(lastUpdateTime != null, "updateTime", lastUpdateTime));
return orderDao.selectList(Wrappers.lambdaQuery(IoOrderEntity.class).eq(IoOrderEntity::getAction, action).eq(IoOrderEntity::getStatus, status)
.between(IoOrderEntity::getUpdateTime, lastUpdateTime, cn.hutool.core.date.DateUtil.date()));
}

5
src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.glxp.api.service.purchase.impl;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.purchase.PurOrderDao;
import com.glxp.api.dao.purchase.PurPlanDao;
@ -56,7 +58,8 @@ public class PurOrderServiceImpl implements PurOrderService {
@Override
public List<PurOrderEntity> findByStatus(String billType, Integer status, Date lastUpdateTime) {
return purOrderDao.selectList(new QueryWrapper<PurOrderEntity>().eq("billType", billType).eq("status", status).le(lastUpdateTime != null, "updateTime", lastUpdateTime));
return purOrderDao.selectList(Wrappers.lambdaQuery(PurOrderEntity.class).eq(PurOrderEntity::getBillType, billType).eq(PurOrderEntity::getStatus, status)
.between(PurOrderEntity::getUpdateTime, lastUpdateTime, DateUtil.date()));
}
@Override

267
src/main/java/com/glxp/api/service/sync/HeartService.java
Unescape Escape View File

@ -272,6 +272,9 @@ public class HeartService {
uploadData(exportType, taskId, x -> x.getSysSettingData(info, taskId, now, syncTime));
}
break;
case IO_ORDER:
if(needExec())
break;
}
}
@ -552,19 +555,17 @@ public class HeartService {
syncTimeMap.put("isNew", true);
syncTimeMap.put("oldDate", syncTime);
StringBuffer remark = new StringBuffer();
boolean ge = false;
if (syncTime != null) {
ge = true;
}
//确认有开启扫码单据类型同步
if (needExec(info.getTypeScan())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSSINESS_TYPE);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSSINESS_TYPE);
List<BasicBussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.list(Wrappers.lambdaQuery(BasicBussinessTypeEntity.class)
.le((boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime, now)
.between(ge, BasicBussinessTypeEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(bussinessTypeEntities)) {
@ -575,16 +576,11 @@ public class HeartService {
}
//确认有开启业务单据类型同步
if (needExec(info.getTypeBus())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSTYPE_CHANGE);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSTYPE_CHANGE);
List<BasicBusTypeChangeEntity> busTypeChangeList = busTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class)
.le((boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now)
.between(ge, BasicBusTypeChangeEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(busTypeChangeList)) {
@ -598,16 +594,11 @@ public class HeartService {
//确认有开启第三方单据类型同步
if (needExec(info.getTypeThird())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_BUSTYPE_ORIGIN);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_BUSTYPE_ORIGIN);
List<ThrBusTypeOriginEntity> thrBusTypeOriginEntities = thrBusTypeOriginService.list(Wrappers.lambdaQuery(ThrBusTypeOriginEntity.class)
.le((boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime, now)
.between(ge, ThrBusTypeOriginEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(thrBusTypeOriginEntities)) {
@ -649,19 +640,18 @@ public class HeartService {
SpsSyncDataResponse dataResponse = null;
Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
syncTimeMap.put("isNew", true);
boolean ge = false;
if (syncTime != null) {
ge = true;
}
StringBuffer remark = new StringBuffer();
//确认有开启部门信息同步
if (needExec(info.getBasicDept())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEPT_DATA);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEPT_DATA);
List<DeptEntity> deptEntityList = deptService.list(Wrappers.lambdaQuery(DeptEntity.class)
.le((boolean) map.get("isNew"), DeptEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), DeptEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), DeptEntity::getUpdateTime, now)
.between(ge, DeptEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), DeptEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(deptEntityList)) {
@ -670,8 +660,9 @@ public class HeartService {
remark.append("部门信息：").append(deptEntityList.size()).append("条\n");
}
List<DeptUserEntity> deptUserEntityList = deptUserService.list(Wrappers.lambdaQuery(DeptUserEntity.class)
.le((boolean) map.get("isNew"), DeptUserEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), DeptUserEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), DeptUserEntity::getUpdateTime, now)
.between(ge, DeptUserEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), DeptUserEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(deptUserEntityList)) {
@ -685,16 +676,11 @@ public class HeartService {
//确认有开启仓库字典同步
if (needExec(info.getBasicInv())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.WAREHOUSE_DICT);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.WAREHOUSE_DICT);
List<InvWarehouseEntity> warehouseEntityList = warehouseService.list(Wrappers.lambdaQuery(InvWarehouseEntity.class)
.le((boolean) map.get("isNew"), InvWarehouseEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), InvWarehouseEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), InvWarehouseEntity::getUpdateTime, now)
.between(ge, InvWarehouseEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), InvWarehouseEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(warehouseEntityList)) {
@ -705,8 +691,9 @@ public class HeartService {
dataResponse.setInvWarehouseEntities(warehouseEntityList);
}
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.list(Wrappers.lambdaQuery(WarehouseUserEntity.class)
.le((boolean) map.get("isNew"), WarehouseUserEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), WarehouseUserEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), WarehouseUserEntity::getUpdateTime, now)
.between(ge, WarehouseUserEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), WarehouseUserEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(warehouseUserEntities)) {
@ -717,8 +704,9 @@ public class HeartService {
dataResponse.setWarehouseUserEntities(warehouseUserEntities);
}
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.list(Wrappers.lambdaQuery(WarehouseBussinessTypeEntity.class)
.le((boolean) map.get("isNew"), WarehouseBussinessTypeEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), WarehouseBussinessTypeEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), WarehouseBussinessTypeEntity::getUpdateTime, now)
.between(ge, WarehouseBussinessTypeEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), WarehouseBussinessTypeEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(warehouseBussinessTypeEntities)) {
@ -729,8 +717,9 @@ public class HeartService {
remark.append("仓库单据类型信息：").append(warehouseBussinessTypeEntities.size()).append("条\n");
}
List<InvSpace> invSpaceList = invSpaceService.list(Wrappers.lambdaQuery(InvSpace.class)
.le((boolean) map.get("isNew"), InvSpace::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), InvSpace::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), InvSpace::getUpdateTime, now)
.between(ge, InvSpace::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), InvSpace::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(invSpaceList)) {
@ -744,16 +733,11 @@ public class HeartService {
//确认有开启用户信息同步
if (needExec(info.getSysUser())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.USER_DATA);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.USER_DATA);
List<AuthAdmin> adminList = adminService.list(Wrappers.lambdaQuery(AuthAdmin.class)
.le((boolean) map.get("isNew"), AuthAdmin::getLastModifyTime, now)
.between(!(boolean) map.get("isNew"), AuthAdmin::getLastModifyTime
.le(!ge && (boolean) map.get("isNew"), AuthAdmin::getLastModifyTime, now)
.between(ge, AuthAdmin::getLastModifyTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), AuthAdmin::getLastModifyTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(adminList)) {
@ -764,8 +748,9 @@ public class HeartService {
remark.append("系统用户信息：").append(adminList.size()).append("条\n");
}
List<InvBusUserEntity> busUserEntities = invBusUserService.list(Wrappers.lambdaQuery(InvBusUserEntity.class)
.le((boolean) map.get("isNew"), InvBusUserEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), InvBusUserEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), InvBusUserEntity::getUpdateTime, now)
.between(ge, InvBusUserEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), InvBusUserEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(busUserEntities)) {
@ -802,19 +787,18 @@ public class HeartService {
SpsSyncThrDataResponse dataResponse = null;
Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
syncTimeMap.put("isNew", true);
boolean ge = false;
if (syncTime != null) {
ge = true;
}
StringBuffer remark = new StringBuffer();
//确认有开启第三方部门信息同步
if (needExec(info.getBasicThirdInv())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_DEPT);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_DEPT);
List<ThrDeptEntity> deptEntityList = thrDeptService.list(Wrappers.lambdaQuery(ThrDeptEntity.class)
.le((boolean) map.get("isNew"), ThrDeptEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), ThrDeptEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), ThrDeptEntity::getUpdateTime, now)
.between(ge, ThrDeptEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), ThrDeptEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(deptEntityList)) {
@ -826,16 +810,11 @@ public class HeartService {
//确认有开启第三方仓库信息同步
if (needExec(info.getBasicThirdInv())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_WAREHOUSE);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_WAREHOUSE);
List<ThrInvWarehouseEntity> warehouseEntityList = thrInvWarehouseService.list(Wrappers.lambdaQuery(ThrInvWarehouseEntity.class)
.le((boolean) map.get("isNew"), ThrInvWarehouseEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), ThrInvWarehouseEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), ThrInvWarehouseEntity::getUpdateTime, now)
.between(ge, ThrInvWarehouseEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), ThrInvWarehouseEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(warehouseEntityList)) {
@ -849,16 +828,11 @@ public class HeartService {
//确认有开启仓库字典同步
if (needExec(info.getBasicThirdProducts())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_PRODUCTS);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_PRODUCTS);
List<ThrProductsEntity> productsEntityList = thrProductsService.list(Wrappers.lambdaQuery(ThrProductsEntity.class)
.le((boolean) map.get("isNew"), ThrProductsEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), ThrProductsEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), ThrProductsEntity::getUpdateTime, now)
.between(ge, ThrProductsEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), ThrProductsEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(productsEntityList)) {
@ -872,16 +846,11 @@ public class HeartService {
//确认有开启第三方往来单位信息同步
if (needExec(info.getBasicThirdCorp())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_CORP);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_CORP);
List<ThrCorpEntity> corpEntities = thrCorpService.list(Wrappers.lambdaQuery(ThrCorpEntity.class)
.le((boolean) map.get("isNew"), ThrCorpEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), ThrCorpEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), ThrCorpEntity::getUpdateTime, now)
.between(ge, ThrCorpEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), ThrCorpEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(corpEntities)) {
@ -925,18 +894,17 @@ public class HeartService {
SpsSyncSysSettingResponse dataResponse = null;
Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
syncTimeMap.put("isNew", true);
boolean ge = false;
if (syncTime != null) {
ge = true;
}
StringBuffer remark = new StringBuffer();
if (needExec(info.getSystemConfig())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SYSTEM_PARAM_CONFIG);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SYSTEM_PARAM_CONFIG);
List<SystemParamConfigEntity> systemParamConfigEntities = systemParamConfigService.list(Wrappers.lambdaQuery(SystemParamConfigEntity.class)
.le((boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime, now)
.between(ge, SystemParamConfigEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(systemParamConfigEntities)) {
@ -946,16 +914,11 @@ public class HeartService {
}
}
if (needExec(info.getEntrustAction())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.ENTRUST_ACCEPT);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.ENTRUST_ACCEPT);
List<EntrustReceEntity> entrustReceEntities = entrustReceService.list(Wrappers.lambdaQuery(EntrustReceEntity.class)
.le((boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime, now)
.between(ge, EntrustReceEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(entrustReceEntities)) {
@ -967,16 +930,11 @@ public class HeartService {
}
}
if (needExec(info.getPrintConfig())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.PRINT_CONFIG);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.PRINT_CONFIG);
List<SystemPDFModuleEntity> systemPDFModuleEntities = systemPDFModuleService.list(Wrappers.lambdaQuery(SystemPDFModuleEntity.class)
.le((boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time, now)
.between(!(boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time
.le(!ge && (boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time, now)
.between(ge, SystemPDFModuleEntity::getUpdate_time, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(systemPDFModuleEntities)) {
@ -988,8 +946,9 @@ public class HeartService {
}
List<SystemPDFTemplateEntity> systemPDFTemplateEntities = systemPDFTemplateService.list(Wrappers.lambdaQuery(SystemPDFTemplateEntity.class)
.le((boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time, now)
.between(!(boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time
.le(!ge && (boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time, now)
.between(ge, SystemPDFTemplateEntity::getUpdate_time, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(systemPDFTemplateEntities)) {
@ -1001,8 +960,9 @@ public class HeartService {
}
List<SysPdfTemplateRelevanceCodeEntity> sysPdfTemplateRelevanceCodeEntities = systemPDFTemplateRelevanceCodeService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceCodeEntity.class)
.le((boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime, now)
.between(ge, SysPdfTemplateRelevanceCodeEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceCodeEntities)) {
@ -1014,8 +974,9 @@ public class HeartService {
}
List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntities = systemPDFTemplateRelevanceBizService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceBizEntity.class)
.le((boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime, now)
.between(ge, SysPdfTemplateRelevanceBizEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceBizEntities)) {
@ -1027,8 +988,9 @@ public class HeartService {
}
List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntities = systemPDFTemplateRelevanceLabelService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceLabelEntity.class)
.le((boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime, now)
.between(ge, SysPdfTemplateRelevanceLabelEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceLabelEntities)) {
@ -1040,8 +1002,9 @@ public class HeartService {
}
List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntities = systemPDFTemplateRelevanceStatemenService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceStatemenEntity.class)
.le((boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime, now)
.between(ge, SysPdfTemplateRelevanceStatemenEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceStatemenEntities)) {
@ -1054,16 +1017,11 @@ public class HeartService {
}
if (needExec(info.getScanChangeConfig())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SCAN_CHANGE);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SCAN_CHANGE);
List<BasicBusTypePreEntity> basicBusTypePreEntities = iBasicBusTypePreService.list(Wrappers.lambdaQuery(BasicBusTypePreEntity.class)
.le((boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime, now)
.between(ge, BasicBusTypePreEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(basicBusTypePreEntities)) {
@ -1073,16 +1031,11 @@ public class HeartService {
}
}
if (needExec(info.getBusChangeConfig())) {
Map<String, Object> map;
if (syncTime == null) {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BUS_TYPE_CHANGE);
} else {
map = syncTimeMap;
now = syncTime;
}
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BUS_TYPE_CHANGE);
List<BasicBusTypeChangeEntity> basicBusTypeChangeEntities = iBasicBusTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class)
.le((boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now)
.between(!(boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime
.le(!ge && (boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now)
.between(ge, BasicBusTypeChangeEntity::getUpdateTime, syncTime, now)
.between(!ge && !(boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime
, map.get("oldDate"), now)
);
if (CollectionUtil.isNotEmpty(basicBusTypeChangeEntities)) {
@ -1408,7 +1361,7 @@ public class HeartService {
}
}
}
if (fileJson != null&&fileJson.size()>0) {
if (fileJson != null && fileJson.size() > 0) {
List<String> syncFiles = fileJson.toList(String.class);
if (CollUtil.isNotEmpty(syncFiles)) {
idcService.batchDownloadFile(spGetHttp.getIpUrl(), syncFiles.toArray(new String[syncFiles.size()]));

Write Preview
Loading…
Cancel
Save