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

1.修改请求第三方产品，订单信息接口，增加授权字段

Browse Source 
2.第三方服务请求时增加权限校验
master
MrZhai 3 years ago
parent 497b584bbf
commit 51afe2f1ec
18 changed files with 191 additions and 119 deletions
Show Stats Download Patch File Download Diff File

56
api-admin/src/main/java/com/glxp/api/admin/aspect/AuthorizeAspect.java
Unescape Escape View File

@ -1,10 +1,13 @@
package com.glxp.api.admin.aspect;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.dao.auth.AuthLicenseDao;
import com.glxp.api.admin.entity.auth.AuthLicense;
import com.glxp.api.admin.exception.JsonException;
import com.glxp.api.admin.service.auth.AuthLoginService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.admin.util.JwtUtils;
import com.glxp.api.common.enums.ResultEnum;
import io.jsonwebtoken.Claims;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
@ -31,6 +34,8 @@ public class AuthorizeAspect {
@Resource
private AuthLoginService authLoginService;
@Resource
private AuthLicenseDao authLicenseDao;
@Pointcut("@annotation(com.glxp.api.admin.annotation.AuthRuleAnnotation)")
public void adminLoginVerify() {
@ -51,27 +56,38 @@ public class AuthorizeAspect {
HttpServletRequest request = attributes.getRequest();
String id = request.getHeader("ADMIN_ID");
String query = request.getQueryString();
Long adminId = null;
try {
adminId = Long.valueOf(id);
}catch (Exception e) {
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
}
if (StrUtil.isBlank(id)) {
String apiKey = request.getHeader("api_key");
String secretKey = request.getHeader("secret_key");
AuthLicense authLicense = authLicenseDao.get(apiKey);
if (authLicense != null && authLicense.getSecretKey().equals(secretKey)) {
} else {
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
}
} else {
String query = request.getQueryString();
Long adminId = null;
try {
adminId = Long.valueOf(id);
} catch (Exception e) {
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
}
String token = request.getHeader("ADMIN_TOKEN");
if (token == null) {
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
}
String token = request.getHeader("ADMIN_TOKEN");
if (token == null) {
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
}
// 验证 token
Claims claims = JwtUtils.parse(token);
if (claims == null) {
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
}
Long jwtAdminId = Long.valueOf(claims.get("admin_id").toString());
if (adminId.compareTo(jwtAdminId) != 0) {
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
// 验证 token
Claims claims = JwtUtils.parse(token);
if (claims == null) {
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
}
Long jwtAdminId = Long.valueOf(claims.get("admin_id").toString());
if (adminId.compareTo(jwtAdminId) != 0) {
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
}
}
// 判断是否进行权限验证

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

@ -2,25 +2,27 @@ package com.glxp.api.admin.controller.basic;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.admin.entity.info.CompanyEntity;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.entity.inout.OrderEntity;
import com.glxp.api.admin.entity.thrsys.ThrCorpEntity;
import com.glxp.api.admin.httpclient.ErpBasicClient;
import com.glxp.api.admin.req.basic.*;
import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.api.admin.req.basic.CombineSingleUnitRequest;
import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest;
import com.glxp.api.admin.req.basic.RemoveRelRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.inout.OrderFilterRequest;
import com.glxp.api.admin.req.receipt.CombineUnitRequest;
import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.*;
import com.glxp.api.admin.res.inout.WarehouseResponse;
import com.glxp.api.admin.res.basic.BasicProductThirdSysResponse;
import com.glxp.api.admin.res.basic.BasicUnitMaintainResponse;
import com.glxp.api.admin.res.basic.ErpUnitsResponse;
import com.glxp.api.admin.res.basic.SrtBasicUnitResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.BasicThirdSysService;
import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
@ -66,6 +68,8 @@ public class BasicUnitMaintainController {
BasicUnitImportService basicUnitImportService;
@Resource
private OrderService orderService;
@Resource
private ErpBasicClient erpBasicClient;
@GetMapping("/udiwms/basic/unit/maintain/filter")
public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
@ -344,7 +348,7 @@ public class BasicUnitMaintainController {
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getFromType() == 0 || (unitMaintainFilterRequest.getIsDownThrSys() != null && unitMaintainFilterRequest.getIsDownThrSys())) {
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
erpBasicClient.getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
if (udiDlDeviceResponse.getCode() == 20000) {
for (ErpUnitsResponse erpUnitsResponse : udiDlDeviceResponse.getData().getList()) {

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

@ -4,13 +4,10 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.entity.basic.*;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.api.admin.httpclient.ErpBasicClient;
import com.glxp.api.admin.httpclient.ErpOrderClient;
import com.glxp.api.admin.req.basic.FilterErpGoodsRequest;
import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.api.admin.req.info.SystemParamConfigRequest;
import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpProductsResponse;
@ -18,7 +15,6 @@ import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.BasicThirdSysService;
import com.glxp.api.admin.service.basic.UdiInfoService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.service.thrsys.ThrProductsService;
import com.glxp.api.admin.util.FilterUdiUtils;
import com.glxp.api.admin.util.HttpClient;
@ -26,7 +22,6 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
@ -51,6 +46,8 @@ public class UdiInfoController {
private ThrProductsService thrProductsService;
@Value("${UDI_SERVER_URL}")
private String udiUrl;
@Resource
private BasicThirdSysService basicThirdSysService;
//获取同步库UDI信息
@GetMapping("udiwms/udiinfo/filterUdi")

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

@ -42,9 +42,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@RestController
@ -373,6 +371,7 @@ public class UdiRelevanceController {
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
return ResultVOUtils.error(500, "ERP产品信息接口地址未定义");
String url = basicThirdSysDetailEntity.getValue();
combineRequest.setThirdId(basicThirdSysDetailEntity.getThirdSysFk());
if (basicThirdSysDetailEntity.getFromType() == 0) {
String errMsg = basicUpdateProductService.addProduct(combineRequest, url);
if (errMsg == null)

32
api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java
Unescape Escape View File

@ -5,30 +5,35 @@ import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.entity.info.CompanyEntity;
import com.glxp.api.admin.entity.inout.*;
import com.glxp.api.admin.entity.inout.ErpOrderEntity;
import com.glxp.api.admin.entity.inout.FilterErpOrderRequest;
import com.glxp.api.admin.entity.inout.OrderEntity;
import com.glxp.api.admin.entity.inout.WarehouseEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderEntity;
import com.glxp.api.admin.httpclient.ErpOrderClient;
import com.glxp.api.admin.req.basic.BusOriginJoinFilterRequest;
import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest;
import com.glxp.api.admin.req.business.StockOrderFilterRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.inout.FilterOrderRequest;
import com.glxp.api.admin.req.inout.ImportErpOrderRequest;
import com.glxp.api.admin.req.inout.OrderFilterRequest;
import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest;
import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse;
import com.glxp.api.admin.res.inout.ErpOrderResponse;
import com.glxp.api.admin.req.inout.*;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.basic.*;
import com.glxp.api.admin.service.business.StockOrderDetailService;
import com.glxp.api.admin.service.business.StockOrderService;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.service.inout.*;
import com.glxp.api.admin.service.inout.CodesService;
import com.glxp.api.admin.service.inout.OrderDetailService;
import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.service.thrsys.ThrOrderDetailService;
import com.glxp.api.admin.service.thrsys.ThrOrderService;
import com.glxp.api.admin.thread.IoTransInoutService;
@ -87,6 +92,8 @@ public class OrderDetailController {
ContrastErpUtil contrastErpUtil;
@Resource
BussinessOriginTypeService bussinessOriginTypeService;
@Resource
private ErpOrderClient erpOrderClient;
@AuthRuleAnnotation("")
@GetMapping("/spms/erpOrder/filter")
@ -163,7 +170,7 @@ public class OrderDetailController {
}
if (filterErpOrderRequest.getIsDownThrSys() != null && filterErpOrderRequest.getIsDownThrSys()) {
return new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrderResponse(filterErpOrderRequest);
return erpOrderClient.getErpOrderResponse(basicThirdSysDetailEntity.getValue(), filterErpOrderRequest);
}
// if (filterErpOrderRequest.getIsLocal() != null && filterErpOrderRequest.getIsLocal()) {
@ -180,7 +187,7 @@ public class OrderDetailController {
return ResultVOUtils.error(500, "业务单据查询接口未定义");
}
filterErpOrderRequest.setBillAction(basicThirdSysDetailEntity.getThirdAction());
BaseResponse<PageSimpleResponse<ErpOrderResponse>> baseResponse = new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrderResponse(filterErpOrderRequest);
BaseResponse<PageSimpleResponse<ErpOrderResponse>> baseResponse = erpOrderClient.getErpOrderResponse(basicThirdSysDetailEntity.getValue(), filterErpOrderRequest);
//
if (bussinessOriginTypeResponse.getLocalAction() != null) {
@ -310,6 +317,7 @@ public class OrderDetailController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessOriginTypeService.findSysByAction(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
filterErpOrderRequest.setThirdOrderFk(basicThirdSysDetailEntity.getThirdSysFk());
if (basicThirdSysDetailEntity == null || !basicThirdSysDetailEntity.getEnabled()) {
return ResultVOUtils.error(500, "第三方业务单据服务未启用");
}
@ -319,13 +327,13 @@ public class OrderDetailController {
}
if (filterErpOrderRequest.getIsDownThrSys() != null && filterErpOrderRequest.getIsDownThrSys()) {
return new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrderResponse(filterErpOrderRequest);
return erpOrderClient.getErpOrderResponse(basicThirdSysDetailEntity.getValue(), filterErpOrderRequest);
}
if (basicThirdSysDetailEntity.getFromType() != null && basicThirdSysDetailEntity.getFromType() == 0) {
if (basicThirdSysDetailEntity.getValue() == null) {
return ResultVOUtils.error(500, "业务单据查询接口未定义");
}
BaseResponse<PageSimpleResponse<ErpOrderResponse>> baseResponse = new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrderResponse(filterErpOrderRequest);
BaseResponse<PageSimpleResponse<ErpOrderResponse>> baseResponse = erpOrderClient.getErpOrderResponse(basicThirdSysDetailEntity.getValue(), filterErpOrderRequest);
return baseResponse;
} else {
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
@ -490,7 +498,7 @@ public class OrderDetailController {
}
String url = basicThirdSysDetailEntity.getValue();
Map<String, List<ErpOrderEntity>> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId));
BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url);
BaseResponse baseResponse = erpOrderClient.postBill(listMap, orderEntity.getAction(), url, basicThirdSysDetailEntity.getThirdSysFk());
if (baseResponse != null && baseResponse.getCode() == 20000) {
orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED);
return ResultVOUtils.success("修改成功");

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

@ -52,6 +52,8 @@ public class ThrCorpExportLogController {
ThrCorpsDlService thrCorpsDlService;
@Resource
BasicThirdSysDetailService basicThirdSysDetailService;
@Resource
private ErpBasicClient erpBasicClient;
@GetMapping("/udiwms/thrCorp/exportLog/filter")
public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques,
@ -191,7 +193,7 @@ public class ThrCorpExportLogController {
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getFromType() == 0) {
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
erpBasicClient.getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
return udiDlDeviceResponse;
} else {
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();

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

@ -53,6 +53,8 @@ public class ThrOrderExportLogController {
private ThrOrderService thrOrderService;
@Resource
private ThrOrderDetailService thrOrderDetailService;
@Resource
private ErpOrderClient erpOrderClient;
@GetMapping("/udiwms/thrOrder/exportLog/filter")
public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques,
@ -122,7 +124,8 @@ public class ThrOrderExportLogController {
@PostMapping("/udiwms/thrOrder/importLog/export")
public BaseResponse excelDownload(@RequestBody ThrOrderExportRequest thrOrderExportRequest) {
String fileName = "D:\\udiwms\\exportFile\\" + "业务单据导出" + System.currentTimeMillis() + ".udi";
String fileName = "D:\\udiwms\\exportFile\\" + "业务单据导出" + System.currentTimeMillis() + ".xls";
File file = new File(fileName);
if (!file.exists()) {
try {
@ -140,8 +143,8 @@ public class ThrOrderExportLogController {
udiInfoExportLogEntity.setType(BasicProcessStatus.EXPORT_EXCEL);
udiInfoExportLogEntity.setDlCount(0);
thrOrderExportLogService.insertThrOrderExportLog(udiInfoExportLogEntity);
thrOrdersDlService.genJsonFile(genKey, thrOrderExportRequest);
return ResultVOUtils.success("后台正在导出生成udi文件，请稍后刷新查看!");
thrOrdersDlService.genExcel(genKey, thrOrderExportRequest);
return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!");
}
@ -158,7 +161,7 @@ public class ThrOrderExportLogController {
udiInfoExportLogEntity.setType(BasicProcessStatus.EXPORT_SMP);
udiInfoExportLogEntity.setDlCount(0);
thrOrderExportLogService.insertThrOrderExportLog(udiInfoExportLogEntity);
thrOrdersDlService.uploadSpssync(genKey, thrOrderExportRequest);
thrOrdersDlService.uploadSmp(genKey, thrOrderExportRequest);
return ResultVOUtils.success("后台正在上传，请稍后刷新查看!");
}
@ -181,7 +184,7 @@ public class ThrOrderExportLogController {
}
if (basicThirdSysDetailEntity.getFromType() != null && basicThirdSysDetailEntity.getFromType() == 0) {
return new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrderResponse(filterErpOrderRequest);
return erpOrderClient.getErpOrderResponse(basicThirdSysDetailEntity.getValue(), filterErpOrderRequest);
} else {
//todo 订单查询，需加日期
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();

28
api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java
Unescape Escape View File

@ -2,16 +2,21 @@ package com.glxp.api.admin.httpclient;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.api.admin.httpclient.req.UdiwmsUnitRequest;
import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.api.admin.res.basic.ErpProductsResponse;
import com.glxp.api.admin.res.basic.ErpUnitsResponse;
import com.glxp.api.admin.req.basic.FilterErpGoodsRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpProductsResponse;
import com.glxp.api.admin.res.basic.ErpUnitsResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysService;
import com.glxp.api.admin.util.HttpClient;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
@ -19,8 +24,13 @@ import java.util.Map;
/**
* 获取ERP基础数据
*/
@Slf4j
@Service
public class ErpBasicClient {
@Autowired
private BasicThirdSysService basicThirdSysService;
//获取往来单位
public BaseResponse<PageSimpleResponse<ErpUnitsResponse>> getErpCrop(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, String url) {
@ -30,10 +40,12 @@ public class ErpBasicClient {
paramMap.put("key", unitMaintainFilterRequest.getKey());
paramMap.put("page", unitMaintainFilterRequest.getPage());
paramMap.put("limit", unitMaintainFilterRequest.getLimit());
// String response = HttpClient.mipsGet(url, paramMap);
UdiwmsUnitRequest udiwmsUnitRequest = new UdiwmsUnitRequest();
BeanUtils.copyProperties(unitMaintainFilterRequest, udiwmsUnitRequest);
udiwmsUnitRequest.setUnitId(unitMaintainFilterRequest.getErpId());
//查询第三方系统授权参数
basicThirdSysService.selectByThirdId(unitMaintainFilterRequest.getThirdSys());
String response = HttpClient.uCloudPost(url, udiwmsUnitRequest);
try {
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
@ -41,7 +53,7 @@ public class ErpBasicClient {
});
return udiDlDeviceResponse;
} catch (Exception e) {
e.printStackTrace();
log.error("获取往来单位异常", e);
return ResultVOUtils.error(500, "连接ERP服务出错！");
}
}
@ -56,15 +68,17 @@ public class ErpBasicClient {
paramMap.put("manufactory", filterErpGoodsRequest.getManufactory());
paramMap.put("limit", filterErpGoodsRequest.getLimit());
paramMap.put("page", filterErpGoodsRequest.getPage());
String response = HttpClient.uCloudPost(url, filterErpGoodsRequest);
// String response = HttpClient.mipsGet(url, paramMap);
//查询第三方服务授权参数
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterErpGoodsRequest.getThirdSys());
String response = HttpClient.uCloudPost(url, filterErpGoodsRequest, basicThirdSysEntity);
try {
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpProductsResponse>>>() {
});
return udiDlDeviceResponse;
} catch (Exception e) {
e.printStackTrace();
log.error("获取产品信息异常", e);
return ResultVOUtils.error(500, "连接ERP服务出错！");
}
}

56
api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java
Unescape Escape View File

@ -3,39 +3,38 @@ package com.glxp.api.admin.httpclient;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.api.admin.entity.inout.ErpOrderEntity;
import com.glxp.api.admin.req.inout.ERPPostBillRequest;
import com.glxp.api.admin.req.inout.FilterOrderRequest;
import com.glxp.api.admin.req.inout.USignRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inout.ErpOrderResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysService;
import com.glxp.api.admin.util.DateUtil;
import com.glxp.api.admin.util.HttpClient;
import com.glxp.api.common.res.BaseResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 获取ERP出入库单据
*/
@Slf4j
@Service
public class ErpOrderClient {
private String url;
public ErpOrderClient() {
}
public ErpOrderClient(String url) {
this.url = url;
}
@Autowired
private BasicThirdSysService basicThirdSysService;
public List<ErpOrderEntity> getErpOrder(List<String> billCodes, String action) {
public List<ErpOrderEntity> getErpOrder(String url, List<String> billCodes, String action) {
List<ErpOrderEntity> erpOrderEntities = new ArrayList<>();
if (billCodes != null && billCodes.size() > 0) {
for (int i = 0; i < billCodes.size(); i++) {
List<ErpOrderEntity> erpOrderEntitys = getErpOrder(billCodes.get(i), action);
List<ErpOrderEntity> erpOrderEntitys = getErpOrder(url, Arrays.asList(billCodes.get(i)), action);
if (erpOrderEntitys != null) {
erpOrderEntities.addAll(erpOrderEntitys);
}
@ -44,7 +43,7 @@ public class ErpOrderClient {
return erpOrderEntities;
}
public BaseResponse<PageSimpleResponse<ErpOrderResponse>> getErpOrderResponse(FilterOrderRequest filterOrderRequest) {
public BaseResponse<PageSimpleResponse<ErpOrderResponse>> getErpOrderResponse(String url, FilterOrderRequest filterOrderRequest) {
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("billNo", filterOrderRequest.getBillNo());
paramMap.put("page", filterOrderRequest.getPage());
@ -63,25 +62,24 @@ public class ErpOrderClient {
paramMap.put("startDate", filterOrderRequest.getStartDate());
paramMap.put("endDate", filterOrderRequest.getEndDate());
String response = HttpClient.uCloudPost(url, filterOrderRequest);
// response = HttpClient.mipsGet(url, paramMap);
//查询第三方服务授权参数
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterOrderRequest.getThirdOrderFk());
String response = HttpClient.uCloudPost(url, filterOrderRequest, basicThirdSysEntity);
try {
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpOrderResponse>>>() {
});
return responseBaseResponse;
} catch (
Exception e) {
e.printStackTrace();
} catch (Exception e) {
log.error("获取订单数据异常", e);
}
return null;
}
public List<ErpOrderEntity> getErpOrder(FilterOrderRequest filterOrderRequest) {
public List<ErpOrderEntity> getErpOrder(String url, FilterOrderRequest filterOrderRequest) {
try {
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = getErpOrderResponse(filterOrderRequest);
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = getErpOrderResponse(url, filterOrderRequest);
List<ErpOrderResponse> purchaseinResponseList = responseBaseResponse.getData().getList();
if (purchaseinResponseList != null && purchaseinResponseList.size() > 0) {
List<ErpOrderEntity> erpOrderEntities = new ArrayList<>();
@ -120,18 +118,20 @@ public class ErpOrderClient {
filterOrderRequest.setLimit(1);
filterOrderRequest.setBillAction(action);
filterOrderRequest.setBillNo(billCode);
List<ErpOrderEntity> erpOrderEntities = getErpOrder(filterOrderRequest);
List<ErpOrderEntity> erpOrderEntities = getErpOrder(null, filterOrderRequest);
return erpOrderEntities;
}
public BaseResponse postBill(Map<String, List<ErpOrderEntity>> postMap, String billAction, String uploadUrl) {
public BaseResponse postBill(Map<String, List<ErpOrderEntity>> postMap, String billAction, String uploadUrl, String thirdSysFk) {
ERPPostBillRequest erpPostBillRequest = new ERPPostBillRequest();
erpPostBillRequest.setPostMap(postMap);
erpPostBillRequest.setBillAction(billAction);
String response = HttpClient.uCloudPost(uploadUrl, erpPostBillRequest);
BaseResponse baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
//查询第三方服务授权参数
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(thirdSysFk);
String response = HttpClient.uCloudPost(uploadUrl, erpPostBillRequest, basicThirdSysEntity);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
return baseResponse;
}

8
api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java
Unescape Escape View File

@ -2,10 +2,9 @@ package com.glxp.api.admin.service.thrsys;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.inout.ErpOrderEntity;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.admin.entity.inout.ErpOrderEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.api.admin.httpclient.ErpBasicClient;
import com.glxp.api.admin.req.basic.FilterErpGoodsRequest;
@ -43,6 +42,9 @@ public class ThrDataService {
private StockOrderService stockOrderService;
@Resource
private StockOrderDetailService stockOrderDetailService;
@Resource
private ErpBasicClient erpBasicClient;
final Logger logger = LoggerFactory.getLogger(ThrDataService.class);
public ThrProductsEntity getProducts(String code, String thirdSys) {
@ -59,7 +61,7 @@ public class ThrDataService {
filterErpGoodsRequest.setCode(code);
filterErpGoodsRequest.setPage(1);
filterErpGoodsRequest.setLimit(1);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue());
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue());
if (udiDlDeviceResponse.getCode() == 20000) {
List<ErpProductsResponse> erpProductsResponses = udiDlDeviceResponse.getData().getList();
if (erpProductsResponses != null) {

5
api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java
Unescape Escape View File

@ -35,6 +35,7 @@ import java.util.stream.Collectors;
@Service
public class BasicBackUpdateProductService {
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
@ -45,6 +46,8 @@ public class BasicBackUpdateProductService {
SystemParamConfigService systemParamConfigService;
@Resource
BasicThirdSysService basicThirdSysService;
@Resource
private ErpBasicClient erpBasicClient;
//定时或一键下载更新全部线上产品信息
@Async
@ -64,7 +67,7 @@ public class BasicBackUpdateProductService {
public int getAllProducts(FilterErpGoodsRequest filterErpGoodsRequest, String productUrl, String
onHandUrl, String thirdSysId, Boolean isEnable) {
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, productUrl);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest, productUrl);
List<ErpProductsResponse> invmandocResponses = erpProducts.getData().getList();
SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("erp_updateErpData_type");
if (isEnable == null || isEnable == false) {

5
api-admin/src/main/java/com/glxp/api/admin/thread/BasicUnitImportService.java
Unescape Escape View File

@ -26,10 +26,13 @@ import java.util.stream.Collectors;
@Service
public class BasicUnitImportService {
@Resource
private BasicUnitMaintainService basicUnitMaintainService;
@Resource
private ThrCorpService thrCorpService;
@Resource
private ErpBasicClient erpBasicClient;
@Async
@ -43,7 +46,7 @@ public class BasicUnitImportService {
unitMaintainFilterRequest.setPage(page);
unitMaintainFilterRequest.setLimit(100);
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> baseResponse =
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
erpBasicClient.getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
List<ErpUnitsResponse> temps = baseResponse.getData().getList();
if (temps.size() < 100) {
erpUnitsResponses.addAll(temps);

10
api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java
Unescape Escape View File

@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.basic.*;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.api.admin.httpclient.ErpBasicClient;
@ -22,7 +21,6 @@ import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.BasicThirdSysService;
import com.glxp.api.admin.service.basic.UdiInfoService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.service.thrsys.ThrInvProductsService;
import com.glxp.api.admin.service.thrsys.ThrProductsService;
import com.glxp.api.admin.util.CustomUtil;
@ -30,7 +28,6 @@ import com.glxp.api.admin.util.DateUtil;
import com.glxp.api.admin.util.FilterUdiUtils;
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.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
@ -57,11 +54,11 @@ public class BasicUpdateProductService {
@Resource
ThrInvProductsService thrInvProductsService;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
BasicThirdSysDetailService basicThirdSysDetailService;
@Resource
BasicThirdSysService basicThirdSysService;
@Resource
private ErpBasicClient erpBasicClient;
public String addProduct(CombineRequest combineRequest, String url) {
@ -80,7 +77,8 @@ public class BasicUpdateProductService {
filterErpGoodsRequest.setCode(inventoryCode);
filterErpGoodsRequest.setPage(1);
filterErpGoodsRequest.setLimit(1);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, url);
filterErpGoodsRequest.setThirdSys(combineRequest.getThirdSys());
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest, url);
List<ErpProductsResponse> erpProductsResponses = erpProducts.getData().getList();
if (erpProductsResponses != null & erpProductsResponses.size() > 0) {
if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {

14
api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java
Unescape Escape View File

@ -47,6 +47,8 @@ public class IoModifyErpTask implements SchedulingConfigurer {
private SystemParamConfigService systemParamConfigService;
@Resource
private BussinessTypeService bussinessTypeService;
@Resource
private ErpOrderClient erpOrderClient;
@Override
public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
@ -87,21 +89,21 @@ public class IoModifyErpTask implements SchedulingConfigurer {
filterErpOrderRequest.setOrderId(orderEntity.getId());
List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest);
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
if (basicThirdSysDetailEntity.getEnabled() && basicThirdSysDetailEntity.getFromType() == 0 ) {
if (basicThirdSysDetailEntity.getEnabled() && basicThirdSysDetailEntity.getFromType() == 0) {
if (basicThirdSysDetailEntity.getValue() != null) {
String url = basicThirdSysDetailEntity.getValue();
if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) {
Map<String, List<ErpOrderEntity>> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId));
if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
if ("1".equals(isErpSaleOutModify)) {
BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url);
BaseResponse baseResponse = erpOrderClient.postBill(listMap, orderEntity.getAction(), url, basicThirdSysDetailEntity.getThirdSysFk());
if (baseResponse != null && baseResponse.getCode() == 20000) {
orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED);
}
}
} else {
if ("1".equals(isErpPruchaseModify)) {
BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url);
BaseResponse baseResponse = erpOrderClient.postBill(listMap, orderEntity.getAction(), url, basicThirdSysDetailEntity.getThirdSysFk());
if (baseResponse != null && baseResponse.getCode() == 20000) {
orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED);
}
@ -111,7 +113,7 @@ public class IoModifyErpTask implements SchedulingConfigurer {
} else {
logger.error("ERP单据修改接口地址未定义");
}
}else {
} else {
logger.error("ERP单据修改未启用");
}
@ -132,7 +134,7 @@ public class IoModifyErpTask implements SchedulingConfigurer {
for (OrderEntity orderEntity : signsOrderEntities) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(orderEntity.getAction(), "orderQueryUrl");
if (basicThirdSysDetailEntity.getEnabled() && basicThirdSysDetailEntity.getFromType() == 0 ) {
if (basicThirdSysDetailEntity.getEnabled() && basicThirdSysDetailEntity.getFromType() == 0) {
if (basicThirdSysDetailEntity.getValue() != null) {
String url = basicThirdSysDetailEntity.getValue();
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
@ -175,7 +177,7 @@ public class IoModifyErpTask implements SchedulingConfigurer {
} else {
logger.error("ERP单据修改接口地址未定义");
}
}else {
} else {
logger.error("ERP单据修改未启用");
}

5
api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java
Unescape Escape View File

@ -10,7 +10,6 @@ import com.glxp.api.admin.controller.inout.utils.InoutUtils;
import com.glxp.api.admin.entity.basic.*;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.entity.info.CompanyEntity;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.entity.inout.ErpOrderEntity;
import com.glxp.api.admin.entity.inout.FilterErpOrderRequest;
@ -102,6 +101,8 @@ public class IoTransInoutService {
BasicUnitMaintainService basicUnitMaintainService;
@Resource
InvProductDetailService invProductDetailService;
@Resource
private ErpOrderClient erpOrderClient;
@Async
public void creatOrderAsycn(PostOrderRequest postOrderRequest, Integer fromType) {
@ -686,7 +687,7 @@ public class IoTransInoutService {
orderService.updateOrder(orderEntity);
} else {
String erpOrderUrl = basicThirdSysDetailEntity.getValue();
List<ErpOrderEntity> cloudErps = new ErpOrderClient(erpOrderUrl).getErpOrder(erpIds, orderEntity.getAction());
List<ErpOrderEntity> cloudErps = erpOrderClient.getErpOrder(erpOrderUrl, erpIds, orderEntity.getAction());
if (basicThirdSysDetailEntity.getLocalAction() != null) {
List<ErpOrderEntity> erpOrderEntities = thrDataService.getStockOrders(erpIds);

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

@ -9,10 +9,8 @@ import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
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;
import com.glxp.api.admin.req.inout.FilterOrderRequest;
import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest;
import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest;
@ -25,7 +23,6 @@ import com.glxp.api.admin.res.thrsys.ThrOrderExportJsonResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
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;
@ -34,7 +31,6 @@ import com.glxp.api.admin.util.RedisUtil;
import com.glxp.api.common.res.BaseResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@ -67,9 +63,9 @@ public class ThrOrdersDlService {
@Resource
ThrOrderImportService thrOrderImportService;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
BasicUnitMaintainService basicUnitMaintainService;
@Resource
private ErpOrderClient erpOrderClient;
@Async
@ -515,7 +511,7 @@ public class ThrOrdersDlService {
filterThrOrderRequest.setBillAction(action);
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
BeanUtils.copyProperties(filterThrOrderRequest, filterOrderRequest);
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = new ErpOrderClient(orderUrl).getErpOrderResponse(filterOrderRequest);
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = erpOrderClient.getErpOrderResponse(orderUrl, filterOrderRequest);
if (responseBaseResponse != null && responseBaseResponse.getCode() == 20000) {
List<ErpOrderResponse> erpOrderResponses = responseBaseResponse.getData().getList();
if (erpOrderResponses != null && erpOrderResponses.size() > 0) {
@ -636,7 +632,7 @@ public class ThrOrdersDlService {
BeanUtils.copyProperties(filterThrOrderRequest, filterOrderRequest);
filterOrderRequest.setPage(page);
filterOrderRequest.setLimit(limit);
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = new ErpOrderClient(orderQueryUrl).getErpOrderResponse(filterOrderRequest);
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = erpOrderClient.getErpOrderResponse(orderQueryUrl, filterOrderRequest);
if (responseBaseResponse != null && responseBaseResponse.getCode() == 20000) {
List<ErpOrderResponse> erpOrderResponses = responseBaseResponse.getData().getList();
if (erpOrderResponses != null && erpOrderResponses.size() > 0) {

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

@ -20,7 +20,6 @@ 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;
@ -57,7 +56,7 @@ public class ThrProductsDlService {
@Resource
ThrProductsExportLogService thrProductsExportLogService;
@Resource
SystemParamConfigService systemParamConfigService;
private ErpBasicClient erpBasicClient;
@Async
public void importSelectProducrs(String genKey, List<ThrProductsEntity> thrProductsEntities, String thirdSys) {
@ -413,7 +412,7 @@ public class ThrProductsDlService {
filterErpGoodsRequest.setPage(page);
filterErpGoodsRequest.setLimit(limit);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, productUrl);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest, productUrl);
if (erpProducts != null && erpProducts.getCode() == 20000) {
List<ErpProductsResponse> erpProductsResponses = erpProducts.getData().getList();
if (erpProductsResponses != null && erpProductsResponses.size() > 0) {
@ -473,7 +472,7 @@ public class ThrProductsDlService {
BeanUtils.copyProperties(filterThrProductsRequest, filterErpGoodsRequest);
filterErpGoodsRequest.setPage(page);
filterErpGoodsRequest.setLimit(limit);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, productUrl);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest, productUrl);
if (erpProducts != null && erpProducts.getCode() == 20000) {
List<ErpProductsResponse> erpProductsResponses = erpProducts.getData().getList();
if (erpProductsResponses != null && erpProductsResponses.size() > 0) {

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

@ -1,6 +1,7 @@
package com.glxp.api.admin.util;
import com.alibaba.fastjson.JSONObject;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpEntity;
@ -63,6 +64,30 @@ public class HttpClient {
return response;
}
/**
* 携带头部权限参数的请求方法
*
* @param url
* @param object
* @param basicThirdSysEntity
* @return
*/
public static String uCloudPost(String url, Object object, BasicThirdSysEntity basicThirdSysEntity) {
RestTemplate restTemplate = new RestTemplate();
String json = JSONObject.toJSON(object).toString();
logger.info(url + "\n" + json);
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
if (null != basicThirdSysEntity) {
headers.add("api_key", basicThirdSysEntity.getApikey());
headers.add("secret_key", basicThirdSysEntity.getSecretkey());
}
HttpEntity<String> httpEntity = new HttpEntity<>(json, headers);
logger.info(httpEntity.toString());
String response = restTemplate.postForObject(url, httpEntity, String.class);
return response;
}
public static String mipsGet(String url) {
RestTemplate restTemplate = new RestTemplate();
@ -84,7 +109,7 @@ public class HttpClient {
//过滤value为null，value为null时进行拼接字符串会变成 "null"字符串
if (entry.getValue() != null) {
String value = String.valueOf(((Map.Entry) element).getValue());
if(value.contains("#")){
if (value.contains("#")) {
try {
String ps = URLEncoder.encode(value, "UTF-8");
((Map.Entry) element).setValue(ps);

Write Preview
Loading…
Cancel
Save