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

Merge branch 'master' into test

Browse Source
master
wj 3 years ago
parent a99eaac220 948d9ce1f3
commit 56794f2a3b
7 changed files with 96 additions and 16 deletions
Show Stats Download Patch File Download Diff File

7
src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java
Unescape Escape View File

@ -15,7 +15,7 @@ public enum BasicExportTypeEnum {
/**
* 国家库DI数据
*/
// COUNTRY_DI_DATA("country_di_data", "国家库DI数据"),
COUNTRY_DI_DATA("country_di_data", "国家库DI数据"),
/**
* 单据类型
@ -42,6 +42,11 @@ public enum BasicExportTypeEnum {
*/
SYS_SET_DATA("sys_set_data", "系统设置数据"),
/**
* 单据信息
*/
IO_ORDER("io_order", "单据信息"),
//
// NEW_ALL_ORDER("all_order", "出入库扫码单据"),
// ALL_BUS_ORDER("all_bus_order", "业务单据"),

4
src/main/java/com/glxp/api/controller/auth/SysUserController.java
Unescape Escape View File

@ -260,8 +260,8 @@ public class SysUserController extends BaseController {
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
// 修改角色
// userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles());
// 修改角色
userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles());
userService.updateAuthAdmin(authAdmin);

52
src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java
Unescape Escape View File

@ -4,23 +4,30 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.dao.system.SyncDataSetDao;
import com.glxp.api.entity.sync.BasicDownloadStatusEntity;
import com.glxp.api.entity.sync.BasicExportStatusEntity;
import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
import com.glxp.api.entity.system.SyncDataSetEntity;
import com.glxp.api.http.sync.SpGetHttpClient;
import com.glxp.api.req.sync.BasicExportStatusRequest;
import com.glxp.api.req.sync.BasicExportTimeRequest;
import com.glxp.api.req.sync.ManualUploadDataReq;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.sync.BasicDownloadService;
import com.glxp.api.service.sync.BasicExportService;
import com.glxp.api.service.sync.BasicExportTimeService;
import com.glxp.api.res.system.SyncDataSetResponse;
import com.glxp.api.service.sync.*;
import com.glxp.api.task.TaskExecutorConfig;
import com.glxp.api.util.BeanCopyUtils;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.RedisUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -36,9 +43,11 @@ import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@Slf4j
@RestController
@RequiredArgsConstructor
public class SpsSyncExportStatusController {
@ -185,4 +194,41 @@ public class SpsSyncExportStatusController {
}
private final SyncDataSetDao syncDataSetDao;
private final HeartService heartService;
private final ThreadPoolTaskExecutor executorConfig;
/**
* 手动上传数据
*
* @param req 参数
* @return 结果
*/
@AuthRuleAnnotation("")
@PostMapping("/spssync/udiinfo/uploadData")
public BaseResponse uploadData(@RequestBody ManualUploadDataReq req) {
if (req.getExportType() == null || req.getSyncTime() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet();
if (syncDataSetEntity.getSyncTime() == null) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK.getCode(), "缺少初始化数据");
}
CompletableFuture future = CompletableFuture.runAsync(() -> {
switch (req.getExportType()) {
case IO_ORDER:
heartService.uploadAllBusOrder(DateUtil.formatDateTime(req.getSyncTime()));
heartService.uploadAllOrder(DateUtil.formatDateTime(req.getSyncTime()));
break;
default:
heartService.pushData(syncDataSetEntity, req.getSyncTime(), req.getExportType());
}
}, executorConfig);
return ResultVOUtils.success();
}
}

1
src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
Unescape Escape View File

@ -37,6 +37,5 @@ public class BasicExportStatusEntity {
private String receiveStatus;
@TableField(value = "cacheFilePath")
private String cacheFilePath;
private String execInfo;
}

18
src/main/java/com/glxp/api/req/sync/ManualUploadDataReq.java
Unescape Escape View File

@ -0,0 +1,18 @@
package com.glxp.api.req.sync;
import com.glxp.api.constant.BasicExportTypeEnum;
import lombok.Data;
import java.util.Date;
/**
* 手动调用上传数据
*/
@Data
public class ManualUploadDataReq {
private BasicExportTypeEnum exportType;
private Date syncTime;
}

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

@ -281,11 +281,10 @@ public class HeartService {
* @return
*/
public SpsSyncBasicDataResponse getBasicData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) {
StringBuffer remark = new StringBuffer();
StringBuilder remark = new StringBuilder();
SpsSyncBasicDataResponse dataResponse = null;
Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
syncTimeMap.put("isNew", true);
syncTimeMap.put("oldDate", syncTime);
//确认有开启物资字典同步
if (needExec(info.getBasicProducts())) {
Map<String, Object> map;
@ -293,6 +292,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_PRODUCTS);
} else {
map = syncTimeMap;
now = syncTime;
}
List<BasicHospTypeEntity> hospTypeList = basicHospTypeDao.selectList(Wrappers.lambdaQuery(BasicHospTypeEntity.class)
.le((boolean) map.get("isNew"), BasicHospTypeEntity::getUpdateTime, now)
@ -348,6 +348,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_CORP);
} else {
map = syncTimeMap;
now = syncTime;
}
List<BasicCorpEntity> corpList = corpDao.selectList(Wrappers.lambdaQuery(BasicCorpEntity.class)
.le((boolean) map.get("isNew"), BasicCorpEntity::getUpdateTime, now)
@ -370,6 +371,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SUP_CERT);
} else {
map = syncTimeMap;
now = syncTime;
}
List<SupCertEntity> supCertList = supCertDao.selectList(Wrappers.lambdaQuery(SupCertEntity.class)
.le((boolean) map.get("isNew"), SupCertEntity::getUpdateTime, now)
@ -456,7 +458,6 @@ public class HeartService {
SpsSyncOtherDataResponse dataResponse = null;
Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
syncTimeMap.put("isNew", true);
syncTimeMap.put("oldDate", syncTime);
//确认有开启udi码补齐同步
if (needExec(info.getUdiCodeLost())) {
Map<String, Object> map;
@ -464,6 +465,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.IO_CODE_LOST);
} else {
map = syncTimeMap;
now = syncTime;
}
List<IoCodeLostEntity> ioCodeLostList = ioCodeLostMapper.selectList(Wrappers.lambdaQuery(IoCodeLostEntity.class)
.le((boolean) map.get("isNew"), IoCodeLostEntity::getUpdateTime, now)
@ -483,6 +485,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.IO_CODE_REL);
} else {
map = syncTimeMap;
now = syncTime;
}
List<IoCodeRelEntity> ioCodeRelList = ioCodeRelMapper.selectList(Wrappers.lambdaQuery(IoCodeRelEntity.class)
.le((boolean) map.get("isNew"), IoCodeRelEntity::getUpdateTime, now)
@ -554,6 +557,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSSINESS_TYPE);
} else {
map = syncTimeMap;
now = syncTime;
}
List<BasicBussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.list(Wrappers.lambdaQuery(BasicBussinessTypeEntity.class)
.le((boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime, now)
@ -573,6 +577,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSTYPE_CHANGE);
} else {
map = syncTimeMap;
now = syncTime;
}
List<BasicBusTypeChangeEntity> busTypeChangeList = busTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class)
.le((boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now)
@ -595,6 +600,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_BUSTYPE_ORIGIN);
} else {
map = syncTimeMap;
now = syncTime;
}
List<ThrBusTypeOriginEntity> thrBusTypeOriginEntities = thrBusTypeOriginService.list(Wrappers.lambdaQuery(ThrBusTypeOriginEntity.class)
.le((boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime, now)
@ -640,7 +646,6 @@ public class HeartService {
SpsSyncDataResponse dataResponse = null;
Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
syncTimeMap.put("isNew", true);
syncTimeMap.put("oldDate", syncTime);
StringBuffer remark = new StringBuffer();
//确认有开启部门信息同步
if (needExec(info.getBasicDept())) {
@ -649,6 +654,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEPT_DATA);
} else {
map = syncTimeMap;
now = syncTime;
}
List<DeptEntity> deptEntityList = deptService.list(Wrappers.lambdaQuery(DeptEntity.class)
.le((boolean) map.get("isNew"), DeptEntity::getUpdateTime, now)
@ -681,6 +687,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.WAREHOUSE_DICT);
} else {
map = syncTimeMap;
now = syncTime;
}
List<InvWarehouseEntity> warehouseEntityList = warehouseService.list(Wrappers.lambdaQuery(InvWarehouseEntity.class)
.le((boolean) map.get("isNew"), InvWarehouseEntity::getUpdateTime, now)
@ -739,6 +746,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.USER_DATA);
} else {
map = syncTimeMap;
now = syncTime;
}
List<AuthAdmin> adminList = adminService.list(Wrappers.lambdaQuery(AuthAdmin.class)
.le((boolean) map.get("isNew"), AuthAdmin::getLastModifyTime, now)
@ -791,7 +799,6 @@ public class HeartService {
SpsSyncThrDataResponse dataResponse = null;
Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
syncTimeMap.put("isNew", true);
syncTimeMap.put("oldDate", syncTime);
StringBuffer remark = new StringBuffer();
//确认有开启第三方部门信息同步
if (needExec(info.getBasicThirdInv())) {
@ -800,6 +807,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_DEPT);
} else {
map = syncTimeMap;
now = syncTime;
}
List<ThrDeptEntity> deptEntityList = thrDeptService.list(Wrappers.lambdaQuery(ThrDeptEntity.class)
.le((boolean) map.get("isNew"), ThrDeptEntity::getUpdateTime, now)
@ -820,6 +828,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_WAREHOUSE);
} else {
map = syncTimeMap;
now = syncTime;
}
List<ThrInvWarehouseEntity> warehouseEntityList = thrInvWarehouseService.list(Wrappers.lambdaQuery(ThrInvWarehouseEntity.class)
.le((boolean) map.get("isNew"), ThrInvWarehouseEntity::getUpdateTime, now)
@ -842,6 +851,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_PRODUCTS);
} else {
map = syncTimeMap;
now = syncTime;
}
List<ThrProductsEntity> productsEntityList = thrProductsService.list(Wrappers.lambdaQuery(ThrProductsEntity.class)
.le((boolean) map.get("isNew"), ThrProductsEntity::getUpdateTime, now)
@ -864,6 +874,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_CORP);
} else {
map = syncTimeMap;
now = syncTime;
}
List<ThrCorpEntity> corpEntities = thrCorpService.list(Wrappers.lambdaQuery(ThrCorpEntity.class)
.le((boolean) map.get("isNew"), ThrCorpEntity::getUpdateTime, now)
@ -911,7 +922,6 @@ public class HeartService {
SpsSyncSysSettingResponse dataResponse = null;
Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
syncTimeMap.put("isNew", true);
syncTimeMap.put("oldDate", syncTime);
StringBuffer remark = new StringBuffer();
if (needExec(info.getSystemConfig())) {
Map<String, Object> map;
@ -919,6 +929,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SYSTEM_PARAM_CONFIG);
} else {
map = syncTimeMap;
now = syncTime;
}
List<SystemParamConfigEntity> systemParamConfigEntities = systemParamConfigService.list(Wrappers.lambdaQuery(SystemParamConfigEntity.class)
.le((boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime, now)
@ -937,6 +948,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.ENTRUST_ACCEPT);
} else {
map = syncTimeMap;
now = syncTime;
}
List<EntrustReceEntity> entrustReceEntities = entrustReceService.list(Wrappers.lambdaQuery(EntrustReceEntity.class)
.le((boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime, now)
@ -957,6 +969,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.PRINT_CONFIG);
} else {
map = syncTimeMap;
now = syncTime;
}
List<SystemPDFModuleEntity> systemPDFModuleEntities = systemPDFModuleService.list(Wrappers.lambdaQuery(SystemPDFModuleEntity.class)
.le((boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time, now)
@ -1043,6 +1056,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SCAN_CHANGE);
} else {
map = syncTimeMap;
now = syncTime;
}
List<BasicBusTypePreEntity> basicBusTypePreEntities = iBasicBusTypePreService.list(Wrappers.lambdaQuery(BasicBusTypePreEntity.class)
.le((boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime, now)
@ -1061,6 +1075,7 @@ public class HeartService {
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BUS_TYPE_CHANGE);
} else {
map = syncTimeMap;
now = syncTime;
}
List<BasicBusTypeChangeEntity> basicBusTypeChangeEntities = iBasicBusTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class)
.le((boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now)
@ -1135,7 +1150,6 @@ public class HeartService {
.receiveStatus(String.valueOf(status))
.scheduleType(BasicProcessStatus.SCHEDULE_NORMAL)
.remark(baseSyncResponse.getSyncRemark())
.execInfo(baseResponse.getMessage())
.build();
try {
String fileFullPath = writeFile(filePrefix, exportType.getRemark(), JsonUtils.toJsonString(data));

2
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -1,7 +1,5 @@
# 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除）
CALL Pro_Temp_ColumnWork('basic_download_status', 'execInfo',
'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('basic_download_status', 'cacheFilePath',
'varchar(255) ', 1);

Write Preview
Loading…
Cancel
Save