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

导入导出接口bug修复

Browse Source
master
anthonywj 4 years ago
parent 9296e18d02
commit dfeb8e3133
19 changed files with 214 additions and 60 deletions
Show Stats Download Patch File Download Diff File

24
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java
Unescape Escape View File

@ -7,6 +7,8 @@ import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest;
import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest;
import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.BasicThirdSysResponse;
import com.glxp.api.admin.res.inout.WarehouseResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.BasicThirdSysService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
@ -14,6 +16,7 @@ import com.glxp.api.admin.service.basic.UnitMaintainService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -22,7 +25,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@RestController
public class BasicThirdSysController {
@ -54,6 +59,25 @@ public class BasicThirdSysController {
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("/udiwms/basic/thirdsys/get")
public BaseResponse get(FilterBasicThirdSysRequest filterBasicThirdSysRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BasicThirdSysEntity> basicThirdSysEntities;
basicThirdSysEntities = basicThirdSysService.filterBasicThiSys(filterBasicThirdSysRequest);
List<BasicThirdSysResponse> basicThirdSysResponses = basicThirdSysEntities.stream().map(item ->
{
BasicThirdSysResponse basicThirdSysResponse = new BasicThirdSysResponse();
BeanUtils.copyProperties(item, basicThirdSysResponse);
return basicThirdSysResponse;
}).collect(Collectors.toList());
return ResultVOUtils.success(basicThirdSysResponses);
}
@GetMapping("/udiwms/basic/thirdsys/selectIp")
public BaseResponse selectIp(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest,
BindingResult bindingResult) {

2
api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpExportLogController.java
Unescape Escape View File

@ -129,7 +129,7 @@ public class CorpExportLogController {
corpExportLogEntity.setType(BasicProcessStatus.EXPORT_SMP);
corpExportLogService.insertCorpExportLog(corpExportLogEntity);
basicGenExcelService.uploadCorpSmp(genKey, corpsExportRequest);
return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!");
return ResultVOUtils.success("后台正在上传，请稍后刷新查看!");
}
//往来单位接口下载（第三方使用）

2
api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java
Unescape Escape View File

@ -140,7 +140,7 @@ public class UdiInfoExportLogController {
udiInfoExportLogEntity.setDlCount(0);
udiInfoExportLogService.insertUdiInfoExportLog(udiInfoExportLogEntity);
basicGenExcelService.uploadProductsSmp(genKey, udiInfoExportRequest);
return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!");
return ResultVOUtils.success("后台正在上传，请稍后刷新查看!");
}

70
api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderImportLogEntity;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.thrsys.*;
@ -14,8 +15,10 @@ import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inout.ErpOrderResponse;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.service.thrsys.ThrOrderDetailService;
import com.glxp.api.admin.service.thrsys.ThrOrderImportDetailService;
import com.glxp.api.admin.service.thrsys.ThrOrderImportLogService;
import com.glxp.api.admin.service.thrsys.ThrOrderService;
import com.glxp.api.admin.thread.ThrOrderImportService;
import com.glxp.api.admin.thread.ThrOrdersDlService;
import com.glxp.api.admin.util.Constant;
import com.glxp.api.admin.util.CustomUtil;
@ -45,9 +48,13 @@ public class ThrOrderController {
@Resource
private ThrOrderImportLogService thrOrderImportLogService;
@Resource
private ThrOrderImportDetailService thrOrderImportDetailService;
@Resource
RedisUtil redisUtil;
@Resource
private SystemParamConfigService systemParamConfigService;
@Resource
ThrOrderImportService thrOrderImportService;
@GetMapping("/udiwms/thrsys/getOrders")
public BaseResponse getOrders(FilterThrOrderRequest filterThrOrderRequest,
@ -98,48 +105,45 @@ public class ThrOrderController {
}
ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(genKey);
if (thrOrderImportLogEntity == null) {
thrOrderImportLogEntity = new ThrOrderImportLogEntity();
thrOrderImportLogEntity.setGenKey(genKey);
thrOrderImportLogEntity.setFromType("第三方系统上传");
thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS);
thrOrderImportLogEntity.setUpdateTime(new Date());
thrOrderImportLogEntity.setThirdSysFk(postThrOrderRequest.getThirdSys());
thrOrderImportLogService.insertImportLog(thrOrderImportLogEntity);
}
List<ThrOrderEntity> thrOrderEntities;
List<ErpOrderResponse> erpOrderResponses = postThrOrderRequest.getDatas();
if (erpOrderResponses != null && erpOrderResponses.size() > 0) {
thrOrderEntities = erpOrderResponses.stream().map(
item -> {
ThrOrderEntity thrOrderEntity = new ThrOrderEntity();
BeanUtils.copyProperties(item, thrOrderEntity);
thrOrderEntity.setThirdSysFk(postThrOrderRequest.getThirdSys());
thrOrderService.insertThrOrder(thrOrderEntity);
thrOrderEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk());
List<ErpOrderResponse.SubErpOrder> subErpOrders = item.getSubErpOrders();
if (subErpOrders != null && subErpOrders.size() > 0) {
List<ThrOrderDetailEntity> thrOrderDetailEntities;
ThrOrderEntity finalThrOrderEntity = thrOrderEntity;
thrOrderDetailEntities = subErpOrders.stream().map(subItem ->
{
ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity();
BeanUtils.copyProperties(subItem, finalThrOrderEntity);
thrOrderDetailEntity.setOrderIdFk(finalThrOrderEntity.getId() + "");
thrOrderDetailEntity.setThirdSysFk(finalThrOrderEntity.getThirdSysFk());
return thrOrderDetailEntity;
}).collect(Collectors.toList());
thrOrderDetailService.insertThrOrderDetails(thrOrderDetailEntities);
}
return thrOrderEntity;
List<ThrOrderImportDetailEntity> thrOrderImportDetailEntities = new ArrayList<>();
String finalGenKey = genKey;
for (ErpOrderResponse erpOrderResponse : erpOrderResponses) {
List<ErpOrderResponse.SubErpOrder> subErpOrders = erpOrderResponse.getSubErpOrders();
if (subErpOrders != null && subErpOrders.size() > 0) {
for (ErpOrderResponse.SubErpOrder subErpOrder : subErpOrders) {
ThrOrderImportDetailEntity thrOrderDetailEntity = new ThrOrderImportDetailEntity();
BeanUtils.copyProperties(erpOrderResponse, thrOrderDetailEntity);
BeanUtils.copyProperties(subErpOrder, thrOrderDetailEntity);
thrOrderDetailEntity.setGenKeyFk(finalGenKey);
thrOrderDetailEntity.setThirdSysFk(postThrOrderRequest.getThirdSys());
thrOrderDetailEntity.setUpdateTime(new Date());
thrOrderImportDetailEntities.add(thrOrderDetailEntity);
}
).collect(Collectors.toList());
thrOrderService.insertThrOrders(thrOrderEntities);
return ResultVOUtils.success("单据上传成功！");
}
}
thrOrderImportDetailService.insertOrderImportDetails(thrOrderImportDetailEntities);
thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS);
thrOrderImportLogEntity.setUpdateTime(new Date());
thrOrderImportLogService.updateImportLog(thrOrderImportLogEntity);
thrOrderImportService.importThrOrder(finalGenKey);
} else {
thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrOrderImportLogEntity.setUpdateTime(new Date());
thrOrderImportLogService.updateImportLog(thrOrderImportLogEntity);
return ResultVOUtils.error(500, "上传数据为空");
}
thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
thrOrderImportLogEntity.setUpdateTime(new Date());
thrOrderImportLogService.updateImportLog(thrOrderImportLogEntity);
return ResultVOUtils.error(500, "上传数据为空");
return ResultVOUtils.success("单据上传成功！");
}
@PostMapping("/udiwms/thrsys/delOrder")
@ -184,7 +188,7 @@ public class ThrOrderController {
thrOrderImportLogEntity.setThirdSysFk(filterThrProductsRequest.getThirdSysFk());
thrOrderImportLogService.insertImportLog(thrOrderImportLogEntity);
thrOrdersDlService.importOrders(genKey,filterThrProductsRequest.getBillAction());
thrOrdersDlService.importOrders(genKey, filterThrProductsRequest.getBillAction());
return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看");
}
}

1
api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpExportLogEntity.java
Unescape Escape View File

@ -13,4 +13,5 @@ public class ThrCorpExportLogEntity {
private String remark;
private Integer dlCount;
private String filePath;
private Integer type;
}

1
api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsExportLogEntity.java
Unescape Escape View File

@ -13,4 +13,5 @@ public class ThrInvProductsExportLogEntity {
private String remark;
private Integer dlCount;
private String filePath;
private Integer type;
}

14
api-admin/src/main/java/com/glxp/api/admin/httpclient/SmpClient.java
Unescape Escape View File

@ -0,0 +1,14 @@
package com.glxp.api.admin.httpclient;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
public class SmpClient {
public void uploadCorp(){
}
}

1
api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiEpLogRequest.java
Unescape Escape View File

@ -10,4 +10,5 @@ public class FilterUdiEpLogRequest extends ListPageRequest {
private String genKey;
private Integer status;
private Integer type;
}

12
api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicThirdSysResponse.java
Unescape Escape View File

@ -0,0 +1,12 @@
package com.glxp.api.admin.res.basic;
import lombok.Data;
@Data
public class BasicThirdSysResponse {
private String id;
private String thirdId;
private String thirdName;
}

48
api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java
Unescape Escape View File

@ -1,14 +1,21 @@
package com.glxp.api.admin.thread;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.entity.basic.*;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.req.basic.*;
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
import com.glxp.api.admin.service.basic.CorpExportLogService;
import com.glxp.api.admin.service.basic.UdiInfoExportLogService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.util.ExcelUtil;
import com.glxp.api.admin.util.HttpClient;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@ -29,6 +36,8 @@ public class BasicGenExcelService {
UdiInfoExportLogService udiInfoExportLogService;
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
SystemParamConfigService systemParamConfigService;
//往来单位导出excel文件
@Async
@ -106,7 +115,6 @@ public class BasicGenExcelService {
for (Integer id : ids) {
BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest();
filterRequest.setId(id);
List<List<String>> excelData = new ArrayList<>();
List<BasicUnitMaintainEntity> unitMaintainEntities = basicUnitMaintainService.filterList(filterRequest);
if (unitMaintainEntities != null && unitMaintainEntities.size() > 0) {
for (BasicUnitMaintainEntity basicUnitMaintainEntity : unitMaintainEntities) {
@ -114,6 +122,7 @@ public class BasicGenExcelService {
BeanUtils.copyProperties(basicUnitMaintainEntity, corpImportDetailEntity);
corpImportDetailEntities.add(corpImportDetailEntity);
}
postCorpsRequest.setDatas(corpImportDetailEntities);
}
}
@ -130,11 +139,28 @@ public class BasicGenExcelService {
BeanUtils.copyProperties(basicUnitMaintainEntity, corpImportDetailEntity);
corpImportDetailEntities.add(corpImportDetailEntity);
}
postCorpsRequest.setDatas(corpImportDetailEntities);
}
}
//todo 上传SMP
corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip");
if(systemParamConfigEntity!=null){
String response = HttpClient.uCloudPost(systemParamConfigEntity.getParamValue()+"/udiwms/basic/corps/upload", postCorpsRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {});
if (baseResponse.getCode() == 20000) {
corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
} else {
corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}
}else {
corpExportLogEntity.setRemark("SMP服务IP地址未定义！");
corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}
corpExportLogService.updateCorpExportLog(corpExportLogEntity);
}
@ -194,6 +220,7 @@ public class BasicGenExcelService {
public void uploadProductsSmp(String genKey, UdiInfoExportRequest udiInfoExportRequest) {
UdiInfoExportLogEntity udiInfoExportLogEntity = udiInfoExportLogService.selectByGenKey(genKey);
PostUdiInfoRequest postUdiInfoRequest = new PostUdiInfoRequest();
postUdiInfoRequest.setGenKey(genKey);
//选中导出
if (udiInfoExportRequest.getUuids() != null && udiInfoExportRequest.getUuids().size() > 0) {
List<String> uuids = udiInfoExportRequest.getUuids();
@ -210,9 +237,20 @@ public class BasicGenExcelService {
List<UdiInfoImportDetailEntity> genDatas = genSmpData(filterUdiInfoRequest);
postUdiInfoRequest.setDatas(genDatas);
}
//todo 上传smp
udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
//todo 上传SMP
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip");
if(systemParamConfigEntity!=null){
String response = HttpClient.uCloudPost(systemParamConfigEntity.getParamValue()+"/udiwms/basic/products/upload", postUdiInfoRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {});
if (baseResponse.getCode() == 20000) {
udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
} else {
udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}
}else {
udiInfoExportLogEntity.setRemark("SMP服务IP地址未定义！");
udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}
udiInfoExportLogService.updateUdiInfoExportLog(udiInfoExportLogEntity);
}

25
api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java
Unescape Escape View File

@ -1,8 +1,11 @@
package com.glxp.api.admin.thread;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.config.WebSocketServer;
import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.entity.thrsys.*;
import com.glxp.api.admin.httpclient.ErpOrderClient;
import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest;
@ -15,9 +18,11 @@ import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inout.ErpOrderResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.BussinessTypeService;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.service.thrsys.*;
import com.glxp.api.admin.util.Constant;
import com.glxp.api.admin.util.ExcelUtil;
import com.glxp.api.admin.util.HttpClient;
import com.glxp.api.admin.util.RedisUtil;
import com.glxp.api.common.res.BaseResponse;
import org.springframework.beans.BeanUtils;
@ -49,6 +54,10 @@ public class ThrOrdersDlService {
ThrOrderImportDetailService thrOrderImportDetailService;
@Resource
ThrOrderImportService thrOrderImportService;
@Resource
SystemParamConfigService systemParamConfigService;
@Async
public void importOrders(String genKey, String action) {
@ -189,7 +198,6 @@ public class ThrOrdersDlService {
} else {
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest);
List<List<String>> excelData = new ArrayList<>();
List<ThrOrderEntity> thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest);
for (ThrOrderEntity thrOrderEntity : thrOrderEntities) {
ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
@ -210,10 +218,25 @@ public class ThrOrdersDlService {
}
}
postThrOrderRequest.setDatas(erpOrderResponses);
}
//toDo 上傳SMP
postThrOrderRequest.setGenKey(genKey);
postThrOrderRequest.setThirdSys(thrOrderExportRequest.getThirdSysFk());
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip");
if(systemParamConfigEntity!=null){
String response = HttpClient.uCloudPost(systemParamConfigEntity.getParamValue()+"/udiwms/thrsys/postOrderDetail", postThrOrderRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {});
if (baseResponse.getCode() == 20000) {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
} else {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}
}else {
thrOrderExportLogEntity.setRemark("SMP服务IP地址未定义！");
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
}

30
api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java
Unescape Escape View File

@ -1,8 +1,11 @@
package com.glxp.api.admin.thread;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.config.WebSocketServer;
import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.entity.thrsys.*;
import com.glxp.api.admin.httpclient.ErpBasicClient;
import com.glxp.api.admin.req.basic.FilterErpGoodsRequest;
@ -13,12 +16,14 @@ import com.glxp.api.admin.req.thrsys.ThrProductsExportRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpProductsResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.service.thrsys.ThrProductsExportLogService;
import com.glxp.api.admin.service.thrsys.ThrProductsImportDetailService;
import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService;
import com.glxp.api.admin.service.thrsys.ThrProductsService;
import com.glxp.api.admin.util.Constant;
import com.glxp.api.admin.util.ExcelUtil;
import com.glxp.api.admin.util.HttpClient;
import com.glxp.api.admin.util.RedisUtil;
import com.glxp.api.common.res.BaseResponse;
import org.springframework.beans.BeanUtils;
@ -45,7 +50,8 @@ public class ThrProductsDlService {
ThrProductsImportDetailService thrProductsImportDetailService;
@Resource
ThrProductsExportLogService thrProductsExportLogService;
@Resource
SystemParamConfigService systemParamConfigService;
//主动下载产品信息
@Async
@ -166,7 +172,6 @@ public class ThrProductsDlService {
postThrProductsRequest.setGenKey(genKey);
postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys());
postThrProductsRequest.setUploadType("接口上传");
//Todo 接口上传SMP
} else {//一键导出
@ -208,12 +213,27 @@ public class ThrProductsDlService {
postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys());
postThrProductsRequest.setUploadType("接口上传");
}
//Todo 接口上传SMP
thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
}
//Todo 接口上传SMP
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip");
if(systemParamConfigEntity!=null){
String response = HttpClient.uCloudPost(systemParamConfigEntity.getParamValue()+"/udiwms/thrsys/postThrProducts", postThrProductsRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {});
if (baseResponse.getCode() == 20000) {
thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
} else {
thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}
}else {
thrProductsExportLogEntity.setRemark("SMP服务IP地址未定义！");
thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}
thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
}
// //接收第三方上传或文件导入数据

2
api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java
Unescape Escape View File

@ -49,8 +49,6 @@ public class HttpClient {
public static String uCloudPost(String url, Object object) {
RestTemplate restTemplate = new RestTemplate();
String json = JSONObject.toJSON(object).toString();
// MultiValueMap<String, Object> postParameters = new LinkedMultiValueMap<>();
// postParameters.add("params", json);
logger.info(url+"\n"+json);
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");

7
api-admin/src/main/resources/mybatis/mapper/basic/CorpExportLogDao.xml
Unescape Escape View File

@ -13,6 +13,9 @@
<if test="status != '' and status != null">
AND status = #{status}
</if>
<if test="type != '' and type != null">
AND `type` = #{type}
</if>
</where>
</select>
@ -21,12 +24,12 @@
<insert id="insertCorpExportLog" keyProperty="id"
parameterType="com.glxp.api.admin.entity.basic.CorpExportLogEntity">
insert INTO basic_corps_export_log
(genKey,updateTime,dlCount,status,filePath,remark)
(genKey,updateTime,dlCount,status,filePath,remark,`type`)
values
(
#{genKey},
#{updateTime},
#{dlCount},#{status},#{filePath},#{remark}
#{dlCount},#{status},#{filePath},#{remark},#{type}
)
</insert>

7
api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoExportLogDao.xml
Unescape Escape View File

@ -13,6 +13,9 @@
<if test="status != '' and status != null">
AND status = #{status}
</if>
<if test="type != '' and type != null">
AND `type` = #{type}
</if>
</where>
</select>
@ -21,12 +24,12 @@
<insert id="insertUdiInfoExportLog" keyProperty="id"
parameterType="com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity">
insert INTO basic_products_export_log
(genKey,updateTime,dlCount,status,filePath,remark)
(genKey,updateTime,dlCount,status,filePath,remark,`type`)
values
(
#{genKey},
#{updateTime},
#{dlCount},#{status},#{filePath},#{remark}
#{dlCount},#{status},#{filePath},#{remark},#{type}
)
</insert>

7
api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml
Unescape Escape View File

@ -13,6 +13,9 @@
<if test="status != '' and status != null">
AND status = #{status}
</if>
<if test="type != '' and type != null">
AND `type` = #{type}
</if>
</where>
</select>
@ -21,12 +24,12 @@
<insert id="insertThrCorpExportLog" keyProperty="id"
parameterType="com.glxp.api.admin.entity.thrsys.ThrCorpExportLogEntity">
insert INTO thr_corp_export_log
(genKey,updateTime,dlCount,status,filePath,remark)
(genKey,updateTime,dlCount,status,filePath,remark,`type`)
values
(
#{genKey},
#{updateTime},
#{dlCount},#{status},#{filePath},#{remark}
#{dlCount},#{status},#{filePath},#{remark},#{type}
)
</insert>

7
api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml
Unescape Escape View File

@ -13,6 +13,9 @@
<if test="status != '' and status != null">
AND status = #{status}
</if>
<if test="type != '' and type != null">
AND `type` = #{type}
</if>
</where>
</select>
@ -21,12 +24,12 @@
<insert id="insertThrInvProductsExportLog" keyProperty="id"
parameterType="com.glxp.api.admin.entity.thrsys.ThrInvProductsExportLogEntity">
insert INTO thr_inv_products_export_log
(genKey,updateTime,dlCount,status,filePath,remark)
(genKey,updateTime,dlCount,status,filePath,remark,`type`)
values
(
#{genKey},
#{updateTime},
#{dlCount},#{status},#{filePath},#{remark}
#{dlCount},#{status},#{filePath},#{remark},#{type}
)
</insert>

7
api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml
Unescape Escape View File

@ -13,6 +13,9 @@
<if test="status != '' and status != null">
AND status = #{status}
</if>
<if test="type != '' and type != null">
AND `type` = #{type}
</if>
</where>
</select>
@ -21,12 +24,12 @@
<insert id="insertThrOrderExportLog" keyProperty="id"
parameterType="com.glxp.api.admin.entity.thrsys.ThrOrderExportLogEntity">
insert INTO thr_order_export_log
(genKey,updateTime,dlCount,status,filePath,remark)
(genKey,updateTime,dlCount,status,filePath,remark,`type`)
values
(
#{genKey},
#{updateTime},
#{dlCount},#{status},#{filePath},#{remark}
#{dlCount},#{status},#{filePath},#{remark},#{type}
)
</insert>

7
api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml
Unescape Escape View File

@ -13,6 +13,9 @@
<if test="status != '' and status != null">
AND status = #{status}
</if>
<if test="type != '' and type != null">
AND `type` = #{type}
</if>
</where>
</select>
@ -21,12 +24,12 @@
<insert id="insertThrProductsExportLog" keyProperty="id"
parameterType="com.glxp.api.admin.entity.thrsys.ThrProductsExportLogEntity">
insert INTO thr_products_export_log
(genKey,updateTime,dlCount,status,filePath,remark)
(genKey,updateTime,dlCount,status,filePath,remark,`type`)
values
(
#{genKey},
#{updateTime},
#{dlCount},#{status},#{filePath},#{remark}
#{dlCount},#{status},#{filePath},#{remark},#{type}
)
</insert>

Write Preview
Loading…
Cancel
Save