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

中继服务字段补齐，修改中继服务连接配置，新增连通性测试

Browse Source
version1
anthonyywj2 3 years ago
parent caa76b919c
commit 2a84a93501
14 changed files with 156 additions and 56 deletions

23
api-admin/src/main/java/com/glxp/sale/admin/controller/sync/DirectConnectController.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.entity.sync.PostOrderRequest;
import com.glxp.sale.admin.http.UHttpClient;
import com.glxp.sale.admin.req.sync.OrderFilterRequest;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.beans.factory.annotation.Value;
@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
@ -26,13 +28,20 @@ import java.util.Map;
public class DirectConnectController {
@Value("${SPMS_IP}")
private String spmsUrl;
@Value("${API_KEY}")
private String apiKey;
@Value("${API_SECRET}")
private String apiSecret;
@Resource
SystemParamConfigService systemParamConfigService;
public String getSpmsUrl() {
return systemParamConfigService.selectValueByParamKey("upper_server_ip");
}
public HttpHeaders getHeaders() {
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
@ -45,7 +54,7 @@ public class DirectConnectController {
//单据验收
@PostMapping("/sps/review/download/order/finsih")
public BaseResponse reviewOrder(@RequestBody OrderFilterRequest orderFilterRequest) {
String result = UHttpClient.postJson(spmsUrl + "/spms/inout/order/check/updateStatus", orderFilterRequest, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/spms/inout/order/check/updateStatus", orderFilterRequest, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -64,7 +73,7 @@ public class DirectConnectController {
}
paramMap.put("orderId", orderFilterRequest.getOrderId());
paramMap.put("action", orderFilterRequest.getAction());
String response = UHttpClient.mipsGetHead(spmsUrl + "/udiwms/inout/order/download", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/udiwms/inout/order/download", paramMap, getHeaders());
try {
BaseResponse data = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
@ -87,7 +96,7 @@ public class DirectConnectController {
}
paramMap.put("orderId", orderFilterRequest.getOrderId());
String response = UHttpClient.mipsGetHead(spmsUrl + "/warehouse/inout/order/detail", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/warehouse/inout/order/detail", paramMap, getHeaders());
try {
BaseResponse data = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
@ -110,7 +119,7 @@ public class DirectConnectController {
paramMap.put("wmsUserName", orderFilterRequest.getWmsUserName());
}
paramMap.put("orderId", orderFilterRequest.getOrderId());
String response = UHttpClient.mipsGetHead(spmsUrl + "/spms/inout/dlcode/findByOrderId", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/spms/inout/dlcode/findByOrderId", paramMap, getHeaders());
try {
BaseResponse data = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
@ -124,7 +133,7 @@ public class DirectConnectController {
//手持终端单据提交
@PostMapping("/sps/pda/upload/orders")
public BaseResponse uploadOrder(@RequestBody PostOrderRequest postOrderRequest) {
String result = UHttpClient.postJson(spmsUrl + "/warehouse/inout/postOrders", postOrderRequest, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/warehouse/inout/postOrders", postOrderRequest, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});

5
api-admin/src/main/java/com/glxp/sale/admin/controller/sync/SpsSyncDataController.java
Unescape Escape View File

@ -6,6 +6,7 @@ import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.constant.FileConstant;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.sync.BasicUploadStatusEntity;
import com.glxp.sale.admin.http.SpGetHttp;
import com.glxp.sale.admin.http.SpPostHttp;
import com.glxp.sale.admin.req.sync.SpsSyncDataRequest;
import com.glxp.sale.admin.res.sync.*;
@ -35,6 +36,8 @@ public class SpsSyncDataController {
@Resource
SpPostHttp spPostHttp;
@Resource
SpGetHttp spGetHttp;
@Resource
private BasicUploadService basicUploadService;
@Resource
private GennerOrderUtils gennerOrderUtils;
@ -49,7 +52,7 @@ public class SpsSyncDataController {
@GetMapping("sps/sync/connect/test")
public BaseResponse connectTest(SpsSyncDataRequest spsSyncDataRequest) {
return ResultVOUtils.success("连接成功");
return spGetHttp.testUpConnect(null);
}

4
api-admin/src/main/java/com/glxp/sale/admin/entity/sync/BussinessTypeEntity.java
Unescape Escape View File

@ -61,4 +61,8 @@ public class BussinessTypeEntity {
private boolean vailInv;
private boolean codeFillCheck;
private String defaultSubInv;
private String defaultInv;
private int orderVisibleType; //订单详情展示方式：0：根据批次号展示，1:根据条码展示
private boolean supplementAll;
}

5
api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ErpOrderEntity.java
Unescape Escape View File

@ -67,7 +67,10 @@ public class ErpOrderEntity {
private String secSalesInvNo;
private String invoiceDate;
private BigDecimal price;
private boolean checkSuccess;
private String locStorageCode;
private String invWarehouseCode;//当前分库
private String fromSubInvCode; //往来分库
public Integer getBindStatus() {
if (bindStatus == null)

10
api-admin/src/main/java/com/glxp/sale/admin/entity/sync/InvSubWarehouseEntity.java
Unescape Escape View File

@ -13,4 +13,14 @@ public class InvSubWarehouseEntity {
private boolean defaultInv;
private String thirdId;
private String thirdName;
private String thirdId1;
private String thirdName1;
private String thirdId2;
private String thirdName2;
private String thirdId3;
private String thirdName3;
private String thirdId4;
private String thirdName4;
}

8
api-admin/src/main/java/com/glxp/sale/admin/entity/sync/OrderEntity.java
Unescape Escape View File

@ -52,4 +52,12 @@ public class OrderEntity {
private boolean syncOutChange;
private String fromSubInvCode;
private String createTime;
//复制单号，多个单号之间使用英文逗号,分隔
private String replicateNo;
private String billTypeName;
private String subInvName;
private String invName;
}

2
api-admin/src/main/java/com/glxp/sale/admin/entity/sync/UdiInfoEntity.java
Unescape Escape View File

@ -64,6 +64,8 @@ public class UdiInfoEntity {
private boolean allowNoExpire;
private boolean allowNoProduct;
private String price;
public Integer getId() {
return id;
}

3
api-admin/src/main/java/com/glxp/sale/admin/entity/sync/UdiRelevanceEntity.java
Unescape Escape View File

@ -43,4 +43,7 @@ public class UdiRelevanceEntity {
return 1;
return lockStatus;
}
private String modifyTime; //修改时间
}

3
api-admin/src/main/java/com/glxp/sale/admin/entity/sync/WarehouseEntity.java
Unescape Escape View File

@ -32,8 +32,7 @@ public class WarehouseEntity {
private String relId;
private Integer status;
private String locStorageCode;
private String fromSubInvCode;
private String mySupId;
public String getSupId() {

21
api-admin/src/main/java/com/glxp/sale/admin/http/PostSmpHttp.java
Unescape Escape View File

@ -6,26 +6,33 @@ import com.glxp.sale.admin.req.sync.*;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.sync.UdiRelevanceExportJsonResponse;
import com.glxp.sale.admin.res.sync.UdiRelevanceResponse;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
@Service
public class PostSmpHttp {
@Value("${SPMS_IP}")
private String spmsUrl;
@Value("${API_KEY}")
private String apiKey;
@Value("${API_SECRET}")
private String apiSecret;
@Resource
SystemParamConfigService systemParamConfigService;
public String getSpmsUrl() {
return systemParamConfigService.selectValueByParamKey("upper_server_ip");
}
public HttpHeaders getHeaders() {
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
@ -36,7 +43,7 @@ public class PostSmpHttp {
public BaseResponse<String> postOrder(PostThrOrderRequest postThrOrderRequest) {
String result = UHttpClient.postJson(spmsUrl + "/udiwms/thrsys/postOrderDetail", postThrOrderRequest, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/udiwms/thrsys/postOrderDetail", postThrOrderRequest, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -45,7 +52,7 @@ public class PostSmpHttp {
public BaseResponse<String> postUdiInfo(UdiRelevanceExportJsonResponse udiRelevanceExportJsonResponse) {
String result = UHttpClient.postJson(spmsUrl + "/udiwms/basic/products/sync/upload", udiRelevanceExportJsonResponse, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/udiwms/basic/products/sync/upload", udiRelevanceExportJsonResponse, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
@ -55,7 +62,7 @@ public class PostSmpHttp {
public BaseResponse<String> postThrProducts(PostThrProductsRequest postThrProductsRequest) {
String result = UHttpClient.postJson(spmsUrl + "/udiwms/thrsys/postThrProducts", postThrProductsRequest, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/udiwms/thrsys/postThrProducts", postThrProductsRequest, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -64,7 +71,7 @@ public class PostSmpHttp {
public BaseResponse<String> postCorp(PostCorpsRequest postCorpsRequest) {
String result = UHttpClient.postJson(spmsUrl + "/udiwms/basic/corps/upload", postCorpsRequest, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/udiwms/basic/corps/upload", postCorpsRequest, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -76,7 +83,7 @@ public class PostSmpHttp {
paramMap.put("page", filterUdiInfoRequest.getPage());
paramMap.put("limit", filterUdiInfoRequest.getLimit());
paramMap.put("lastUpdateTime", filterUdiInfoRequest.getLastUpdateTime());
String response = UHttpClient.mipsGetHead(spmsUrl + "/udiwms/basic/products/download", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/udiwms/basic/products/download", paramMap, getHeaders());
try {
BaseResponse<PageSimpleResponse<UdiRelevanceResponse>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<UdiRelevanceResponse>>>() {

63
api-admin/src/main/java/com/glxp/sale/admin/http/SpGetHttp.java
Unescape Escape View File

@ -10,12 +10,14 @@ import com.glxp.sale.admin.entity.sync.OrderEntity;
import com.glxp.sale.admin.req.sync.*;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.sync.*;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -23,13 +25,20 @@ import java.util.Map;
@Service
public class SpGetHttp {
@Value("${SPMS_IP}")
private String spmsUrl;
@Value("${API_KEY}")
private String apiKey;
@Value("${API_SECRET}")
private String apiSecret;
@Resource
SystemParamConfigService systemParamConfigService;
public String getSpmsUrl() {
return systemParamConfigService.selectValueByParamKey("upper_server_ip");
}
public HttpHeaders getHeaders() {
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
@ -41,7 +50,7 @@ public class SpGetHttp {
public BaseResponse<PageSimpleResponse<IOOrderStatusEntity>> getOrderStatus() {
Map<String, Object> paramMap = new HashMap<>(16);
String response = UHttpClient.mipsGetHead(spmsUrl + "/spms/inout/order/status", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/spms/inout/order/status", paramMap, getHeaders());
try {
BaseResponse<PageSimpleResponse<IOOrderStatusEntity>> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<IOOrderStatusEntity>>>() {
@ -58,7 +67,7 @@ public class SpGetHttp {
public BaseResponse<List<DlOrderResponse>> getOrders(String orderId) {
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("status", 0);
String response = UHttpClient.mipsGetHead(spmsUrl + "/spms/inout/order/dlByStatus", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/spms/inout/order/dlByStatus", paramMap, getHeaders());
try {
BaseResponse<List<DlOrderResponse>> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<DlOrderResponse>>>() {
@ -74,7 +83,7 @@ public class SpGetHttp {
public BaseResponse<String> postOrder(String orderId) {
OrderStatusFilterRequest orderStatusFilterRequest = new OrderStatusFilterRequest();
orderStatusFilterRequest.setOrderId(orderId);
String result = UHttpClient.postJson(spmsUrl + "/spms/inout/order/deleteStatus", orderStatusFilterRequest, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/spms/inout/order/deleteStatus", orderStatusFilterRequest, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -91,7 +100,7 @@ public class SpGetHttp {
paramMap.put("id", basicExportStatusRequest.getId());
if (basicExportStatusRequest.getScheduleType() != null)
paramMap.put("scheduleType", basicExportStatusRequest.getScheduleType());
String response = UHttpClient.mipsGetHead(spmsUrl + "/spssync/basic/udiinfo/getStatus", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/spssync/basic/udiinfo/getStatus", paramMap, getHeaders());
try {
BaseResponse<List<BasicExportStatusEntity>> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<BasicExportStatusEntity>>>() {
@ -107,7 +116,7 @@ public class SpGetHttp {
public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(String type) {
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("type", type);
String response = UHttpClient.mipsGetHead(spmsUrl + "/spssync/basic/udiinfo/getStatus", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/spssync/basic/udiinfo/getStatus", paramMap, getHeaders());
try {
BaseResponse<List<BasicExportStatusEntity>> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<BasicExportStatusEntity>>>() {
@ -120,11 +129,29 @@ public class SpGetHttp {
}
}
//测试连通性
public BaseResponse<String> testUpConnect(String key) {
Map<String, Object> paramMap = new HashMap<>(16);
try {
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/sps/sync/connect/test", paramMap, getHeaders());
BaseResponse<String> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<String>>() {
});
return data;
} catch (Exception e) {
e.printStackTrace();
return ResultVOUtils.error(500, "连接失败！");
}
}
//获取上一次更新时间
public BaseResponse<String> getLastUpdateTime(String key) {
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("key", key);
String response = UHttpClient.mipsGetHead(spmsUrl + "/spssync/basic/schedule/lastTime", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/spssync/basic/schedule/lastTime", paramMap, getHeaders());
try {
BaseResponse<String> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<String>>() {
@ -142,7 +169,7 @@ public class SpGetHttp {
BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
basicExportStatusTimeEntity.setKey(key);
basicExportStatusTimeEntity.setLastUpdateTime(time);
String result = UHttpClient.postJson(spmsUrl + "/spssync/basic/schedule/updateLastTime", basicExportStatusTimeEntity, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/spssync/basic/schedule/updateLastTime", basicExportStatusTimeEntity, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -154,7 +181,7 @@ public class SpGetHttp {
public String getBasicUdiInfo(List<String> ids) {
BasicDataFilterRequest basicDataFilterRequest = new BasicDataFilterRequest();
basicDataFilterRequest.setRelIds(ids);
String result = UHttpClient.postJson(spmsUrl + "/udiwms/basic/udiinfo/downloadByStatus", basicDataFilterRequest, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/udiwms/basic/udiinfo/downloadByStatus", basicDataFilterRequest, getHeaders());
BaseResponse<UdiRelevanceExportJsonResponse> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<UdiRelevanceExportJsonResponse>>() {
});
@ -167,7 +194,7 @@ public class SpGetHttp {
public String getBasicCorps(List<String> ids) {
BasicDataFilterRequest basicDataFilterRequest = new BasicDataFilterRequest();
basicDataFilterRequest.setIds(ids);
String result = UHttpClient.postJson(spmsUrl + "/udiwms/basic/corps/downloadByStatus", basicDataFilterRequest, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/udiwms/basic/corps/downloadByStatus", basicDataFilterRequest, getHeaders());
BaseResponse<BasicUnitMaintainExportResponse> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<BasicUnitMaintainExportResponse>>() {
});
@ -179,7 +206,7 @@ public class SpGetHttp {
public String getBasicInv(List<String> ids) {
BasicDataFilterRequest basicDataFilterRequest = new BasicDataFilterRequest();
basicDataFilterRequest.setIds(ids);
String result = UHttpClient.postJson(spmsUrl + "/spms/inv/warehouse/downloadByStatus", basicDataFilterRequest, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/spms/inv/warehouse/downloadByStatus", basicDataFilterRequest, getHeaders());
BaseResponse<InvWarehouseExportResponse> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<InvWarehouseExportResponse>>() {
});
@ -189,7 +216,7 @@ public class SpGetHttp {
public BaseResponse<String> postDeleteBasicStatus(String id) {
BasicStatusFilterRequest basicStatusFilterRequest = new BasicStatusFilterRequest();
basicStatusFilterRequest.setId(id);
String result = UHttpClient.postJson(spmsUrl + "/spssync/basic/udiinfo/deleteByStatus", basicStatusFilterRequest, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/spssync/basic/udiinfo/deleteByStatus", basicStatusFilterRequest, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -198,7 +225,7 @@ public class SpGetHttp {
public BaseResponse<String> postUpdateBasicStatus(BasicExportStatusEntity basicExportStatusEntity) {
String result = UHttpClient.postJson(spmsUrl + "/spssync/basic/udiinfo/updateStatus", basicExportStatusEntity, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/spssync/basic/udiinfo/updateStatus", basicExportStatusEntity, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -213,7 +240,7 @@ public class SpGetHttp {
paramMap.put("lastUpdateTime", spsSyncDataRequest.getLastUpdateTime());
if (spsSyncDataRequest.getId() != null)
paramMap.put("id", spsSyncDataRequest.getId());
String response = UHttpClient.mipsGetHead(spmsUrl + "/sps/sync/basic", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/sps/sync/basic", paramMap, getHeaders());
try {
BaseResponse<SpsSyncDataResponse> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<SpsSyncDataResponse>>() {
@ -234,7 +261,7 @@ public class SpGetHttp {
paramMap.put("lastUpdateTime", spsSyncDataRequest.getLastUpdateTime());
if (spsSyncDataRequest.getId() != null)
paramMap.put("id", spsSyncDataRequest.getId());
String response = UHttpClient.mipsGetHead(spmsUrl + "/sps/sync/order", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/sps/sync/order", paramMap, getHeaders());
try {
BaseResponse<SpsSyncOrderResponse> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<SpsSyncOrderResponse>>() {
@ -254,7 +281,7 @@ public class SpGetHttp {
paramMap.put("lastUpdateTime", spsSyncDataRequest.getLastUpdateTime());
if (spsSyncDataRequest.getId() != null)
paramMap.put("id", spsSyncDataRequest.getId());
String response = UHttpClient.mipsGetHead(spmsUrl + "/sps/sync/busType", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/sps/sync/busType", paramMap, getHeaders());
try {
BaseResponse<SpsSyncBusResponse> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<SpsSyncBusResponse>>() {
@ -274,7 +301,7 @@ public class SpGetHttp {
paramMap.put("lastUpdateTime", spsSyncDataRequest.getLastUpdateTime());
if (spsSyncDataRequest.getId() != null)
paramMap.put("id", spsSyncDataRequest.getId());
String response = UHttpClient.mipsGetHead(spmsUrl + "/sps/sync/syncUdi", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/sps/sync/syncUdi", paramMap, getHeaders());
try {
BaseResponse<SpSyncUdiResponse> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<SpSyncUdiResponse>>() {

36
api-admin/src/main/java/com/glxp/sale/admin/http/SpPostHttp.java
Unescape Escape View File

@ -6,21 +6,31 @@ import com.glxp.sale.admin.req.sync.OrderStatusFilterRequest;
import com.glxp.sale.admin.req.sync.PostThrCorpRequest;
import com.glxp.sale.admin.req.sync.PostThrProductsRequest;
import com.glxp.sale.admin.res.sync.*;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.common.res.BaseResponse;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class SpPostHttp {
@Value("${SPMS_IP}")
private String spmsUrl;
@Value("${API_KEY}")
private String apiKey;
@Value("${API_SECRET}")
private String apiSecret;
@Resource
SystemParamConfigService systemParamConfigService;
public String getSpmsUrl() {
return systemParamConfigService.selectValueByParamKey("upper_server_ip");
}
public HttpHeaders getHeaders() {
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
@ -31,7 +41,7 @@ public class SpPostHttp {
public BaseResponse<String> postOrder(DlOrderResponse dlOrderResponse) {
String result = UHttpClient.postJson(spmsUrl + "/spms/inout/order/deleteStatus", dlOrderResponse, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/spms/inout/order/deleteStatus", dlOrderResponse, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -40,7 +50,7 @@ public class SpPostHttp {
public BaseResponse<String> postUdiInfo(UdiRelevanceExportJsonResponse udiRelevanceExportJsonResponse) {
String result = UHttpClient.postJson(spmsUrl + "/spssync/basic/udiinfo/upload", udiRelevanceExportJsonResponse, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/spssync/basic/udiinfo/upload", udiRelevanceExportJsonResponse, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -49,7 +59,7 @@ public class SpPostHttp {
public BaseResponse<String> postCorp(BasicUnitMaintainExportResponse basicUnitMaintainExportResponse) {
String result = UHttpClient.postJson(spmsUrl + "/spssync/basic/corp/upload", basicUnitMaintainExportResponse, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/spssync/basic/corp/upload", basicUnitMaintainExportResponse, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -57,7 +67,7 @@ public class SpPostHttp {
}
public BaseResponse<String> postInv(InvWarehouseExportResponse invWarehouseExportResponse) {
String result = UHttpClient.postJson(spmsUrl + "/spssync/basic/inv/upload", invWarehouseExportResponse, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/spssync/basic/inv/upload", invWarehouseExportResponse, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -66,7 +76,7 @@ public class SpPostHttp {
public BaseResponse<String> postThirdProducts(PostThrProductsRequest postThrProductsRequest) {
String result = UHttpClient.postJson(spmsUrl + "/spssync/thirdsys/products/upload", postThrProductsRequest, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/spssync/thirdsys/products/upload", postThrProductsRequest, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -74,7 +84,7 @@ public class SpPostHttp {
}
public BaseResponse<String> postThirdCorps(PostThrCorpRequest postThrCorpRequest) {
String result = UHttpClient.postJson(spmsUrl + "/spssync/thirdsys/corp/upload", postThrCorpRequest, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/spssync/thirdsys/corp/upload", postThrCorpRequest, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -83,7 +93,7 @@ public class SpPostHttp {
public BaseResponse<String> postThirdOrders(ThrOrderExportJsonResponse thrOrderExportJsonResponse) {
String result = UHttpClient.postJson(spmsUrl + "/spssync/thirdsys/order/upload", thrOrderExportJsonResponse, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/spssync/thirdsys/order/upload", thrOrderExportJsonResponse, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -91,7 +101,7 @@ public class SpPostHttp {
}
public BaseResponse<String> postAllDatas(SpsSyncDataResponse syncDataResponse) {
String result = UHttpClient.postJson(spmsUrl + "/sps/sync/basic/upload", syncDataResponse, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/sps/sync/basic/upload", syncDataResponse, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -100,7 +110,7 @@ public class SpPostHttp {
public BaseResponse<String> postAllOrders(SpsSyncOrderResponse syncOrderResponse) {
String result = UHttpClient.postJson(spmsUrl + "/sps/sync/order/upload", syncOrderResponse, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/sps/sync/order/upload", syncOrderResponse, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -108,7 +118,7 @@ public class SpPostHttp {
}
public BaseResponse<String> postAllBus(SpsSyncBusResponse spsSyncBusResponse) {
String result = UHttpClient.postJson(spmsUrl + "/sps/sync/busType/upload", spsSyncBusResponse, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/sps/sync/busType/upload", spsSyncBusResponse, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
@ -116,7 +126,7 @@ public class SpPostHttp {
}
public BaseResponse<String> postAllSchedule(SpsSyncScheduleResponse spsSyncScheduleResponse) {
String result = UHttpClient.postJson(spmsUrl + "/sps/sync/schedule/upload", spsSyncScheduleResponse, getHeaders());
String result = UHttpClient.postJson(getSpmsUrl() + "/sps/sync/schedule/upload", spsSyncScheduleResponse, getHeaders());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});

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

@ -12,6 +12,7 @@ import com.glxp.sale.admin.http.UHttpClient;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.sync.ErpProductsResponse;
import com.glxp.sale.admin.res.sync.UdiRelevanceResponse;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.sync.ThrProductsImportDetailService;
import com.glxp.sale.admin.service.sync.ThrProductsImportLogService;
import com.glxp.sale.admin.service.sync.UdiInfoImportDetailService;
@ -44,13 +45,18 @@ public class DataImportService {
@Resource
UdiInfoImportDetailService udiInfoImportService;
@Value("${SPMS_IP}")
private String spmsUrl;
@Value("${API_KEY}")
private String apiKey;
@Value("${API_SECRET}")
private String apiSecret;
@Resource
SystemParamConfigService systemParamConfigService;
public String getSpmsUrl() {
return systemParamConfigService.selectValueByParamKey("upper_server_ip");
}
public HttpHeaders getHeaders() {
HttpHeaders headers = new HttpHeaders();
@ -134,7 +140,7 @@ public class DataImportService {
paramMap.put("page", page);
paramMap.put("limit", limit);
paramMap.put("lastUpdateTime", lastUpdateTime);
String response = UHttpClient.mipsGetHead(spmsUrl + "/udiwms/basic/products/download", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/udiwms/basic/products/download", paramMap, getHeaders());
try {
BaseResponse<PageSimpleResponse<UdiRelevanceResponse>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<UdiRelevanceResponse>>>() {

17
api-admin/src/main/java/com/glxp/sale/admin/thread/didl/AsyncDiDlHelper.java
Unescape Escape View File

@ -4,24 +4,33 @@ import com.alibaba.fastjson.JSONObject;
import com.glxp.sale.admin.entity.sync.ProductInfoEntity;
import com.glxp.sale.admin.entity.sync.UdiCompanyEntity;
import com.glxp.sale.admin.http.UHttpClient;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.common.res.BaseResponse;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class AsyncDiDlHelper {
@Value("${SPMS_IP}")
private String spmsUrl;
@Value("${API_KEY}")
private String apiKey;
@Value("${API_SECRET}")
private String apiSecret;
@Resource
SystemParamConfigService systemParamConfigService;
public String getSpmsUrl() {
return systemParamConfigService.selectValueByParamKey("upper_server_ip");
}
public HttpHeaders getHeaders() {
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
@ -35,7 +44,7 @@ public class AsyncDiDlHelper {
paramMap.put("page", page);
paramMap.put("limit", limit);
paramMap.put("updateTime", updateTime);
String response = UHttpClient.mipsGetHead(spmsUrl + "/udidl/udiwms/syncUdi", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/udidl/udiwms/syncUdi", paramMap, getHeaders());
try {
BaseResponse<List<ProductInfoEntity>> udiDlDeviceResponse = (BaseResponse<List<ProductInfoEntity>>) JSONObject.parseObject(response, BaseResponse.class);
List<ProductInfoEntity> udiInfoEntities = udiDlDeviceResponse.getData();
@ -52,7 +61,7 @@ public class AsyncDiDlHelper {
paramMap.put("page", page);
paramMap.put("limit", limit);
paramMap.put("updateTime", updateTime);
String response = UHttpClient.mipsGetHead(spmsUrl + "/udidl/udiwms/syncCompany", paramMap, getHeaders());
String response = UHttpClient.mipsGetHead(getSpmsUrl() + "/udidl/udiwms/syncCompany", paramMap, getHeaders());
try {
BaseResponse<List<UdiCompanyEntity>> baseResponse = (BaseResponse<List<UdiCompanyEntity>>) JSONObject.parseObject(response, BaseResponse.class);
List<UdiCompanyEntity> udiCompanyEntities = baseResponse.getData();

Write Preview
Loading…
Cancel
Save