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

1.移除第三方系统接口地址和apikey等鉴权参数，修改为使用数据库配置

Browse Source 
2.增加测试类
3.增加查询仓库货位号测试接口
4.修改平和接口权限
master
x_z 3 years ago
parent b2af9456c2
commit cc5895c4eb
20 changed files with 305 additions and 76 deletions
Show Stats Download Patch File Download Diff File

4
api-sync/src/main/java/com/glxp/mipsdl/admin/client/BaseHttpClient.java
Unescape Escape View File

@ -7,7 +7,7 @@ public interface BaseHttpClient {
BaseResponse getUnit(UdiwmsUnitRequest testUnitRequest);
BaseResponse getPrdoucts(UdiwmsProductRequest udiwmsProductRequest);
BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest);
BaseResponse getOrderTypes(UdiwmsBusTypeRequest udiwmsOrderRequest);
@ -17,4 +17,6 @@ public interface BaseHttpClient {
BaseResponse getInvProducts(UdiwmsOnhandRequest udiwmsOnhandRequest);
BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest);
}

44
api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.mipsdl.admin.client.BaseHttpClient;
import com.glxp.mipsdl.admin.config.ThirdSysConfig;
import com.glxp.mipsdl.admin.dao.phxyy.BasicThirdSysDetailDao;
import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity;
import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysDetailEntity;
@ -14,7 +15,6 @@ import com.glxp.mipsdl.admin.service.phxyy.BussinessOriginTypeService;
import com.glxp.mipsdl.admin.util.HttpClient;
import com.glxp.mipsdl.common.res.BaseResponse;
import com.glxp.mipsdl.common.util.ResultVOUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Service;
@ -26,19 +26,15 @@ import javax.annotation.Resource;
@Service
public class PhxyyClient implements BaseHttpClient {
@Value("${UDIWMS_IP}")
private String udiWmsUrl;
@Value("${API_KEY}")
private String apiKey;
@Value("${API_SECRET}")
private String apiSecret;
@Resource
private ThirdSysConfig thirdSysConfig;
public HttpHeaders getHeaders() {
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
headers.add("api_key", apiKey);
headers.add("secret_key", apiSecret);
headers.add("api_key", thirdSysConfig.getThirdSysConfig().getApikey());
headers.add("secret_key", thirdSysConfig.getThirdSysConfig().getSecretkey());
return headers;
}
@ -51,10 +47,8 @@ public class PhxyyClient implements BaseHttpClient {
@Override
public BaseResponse getUnit(UdiwmsUnitRequest unitRequest) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("corpUrl", unitRequest.getThirdSys());
String response = HttpClient.postJson(udiWmsUrl + basicThirdSysDetailEntity.getValue(), unitRequest, getHeaders());
String response = HttpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), unitRequest, getHeaders());
BaseResponse baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
@ -62,9 +56,9 @@ public class PhxyyClient implements BaseHttpClient {
}
@Override
public BaseResponse getPrdoucts(UdiwmsProductRequest udiwmsProductRequest) {
public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("piQueryUrl", udiwmsProductRequest.getThirdSys());
String response = HttpClient.postJson(udiWmsUrl + basicThirdSysDetailEntity.getValue(), udiwmsProductRequest, getHeaders());
String response = HttpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsProductRequest, getHeaders());
BaseResponse baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
@ -73,9 +67,8 @@ public class PhxyyClient implements BaseHttpClient {
@Override
public BaseResponse getOrderTypes(UdiwmsBusTypeRequest udiwmsBusTypeRequest) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("busTypeQueryUrl", udiwmsBusTypeRequest.getThirdSys());
String response = HttpClient.postJson(udiWmsUrl + basicThirdSysDetailEntity.getValue(), udiwmsBusTypeRequest, getHeaders());
String response = HttpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsBusTypeRequest, getHeaders());
BaseResponse baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
@ -84,7 +77,6 @@ public class PhxyyClient implements BaseHttpClient {
@Override
public BaseResponse getOrders(UdiwmsOrderRequest udiwmsOrderRequest) {
if (StrUtil.isEmpty(udiwmsOrderRequest.getBillType())) {
return ResultVOUtils.error(500, "单据类型不能未空");
}
@ -94,7 +86,7 @@ public class PhxyyClient implements BaseHttpClient {
BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.findByKey(udiwmsOrderRequest.getBillType(), udiwmsOrderRequest.getThirdSys());
udiwmsOrderRequest.setBillType(bussinessOriginTypeResponse.getThirdAction());
BasicThirdSysBusApiEntity basicThirdSysBusApiEntity = basicThirdSysBusApiService.selectByKey(bussinessOriginTypeResponse.getThirdAction(), bussinessOriginTypeResponse.getThirdSys(), 1);
String response = HttpClient.postJson(udiWmsUrl+basicThirdSysBusApiEntity.getUrl(), udiwmsOrderRequest, getHeaders());
String response = HttpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysBusApiEntity.getUrl(), udiwmsOrderRequest, getHeaders());
BaseResponse baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
@ -103,8 +95,6 @@ public class PhxyyClient implements BaseHttpClient {
@Override
public BaseResponse submitOrders(UdiwmsOrderRequest udiwmsOrderRequest) {
if (StrUtil.isEmpty(udiwmsOrderRequest.getBillType())) {
return ResultVOUtils.error(500, "单据类型不能未空");
}
@ -119,7 +109,7 @@ public class PhxyyClient implements BaseHttpClient {
udiwmsOrderRequest.setInoutType(2);
}
BasicThirdSysBusApiEntity basicThirdSysBusApiEntity = basicThirdSysBusApiService.selectByKey(bussinessOriginTypeResponse.getThirdAction(), bussinessOriginTypeResponse.getThirdSys(), 1);
String response = HttpClient.postJson(udiWmsUrl+basicThirdSysBusApiEntity.getUrl(), udiwmsOrderRequest, getHeaders());
String response = HttpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysBusApiEntity.getUrl(), udiwmsOrderRequest, getHeaders());
BaseResponse baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
@ -129,7 +119,17 @@ public class PhxyyClient implements BaseHttpClient {
@Override
public BaseResponse getInvProducts(UdiwmsOnhandRequest udiwmsOnhandRequest) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("invPiUrl", udiwmsOnhandRequest.getThirdSys());
String response = HttpClient.postJson(udiWmsUrl + basicThirdSysDetailEntity.getValue(), udiwmsOnhandRequest, getHeaders());
String response = HttpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsOnhandRequest, getHeaders());
BaseResponse baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
return baseResponse;
}
@Override
public BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("warehouseUrl", udiwmsWarehouseRequest.getThirdSys());
String response = HttpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsWarehouseRequest, getHeaders());
BaseResponse baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});

22
api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.mipsdl.admin.req.*;
import com.glxp.mipsdl.admin.res.system.UdiwmsWarehouseResponse;
import com.glxp.mipsdl.admin.res.system.*;
import com.glxp.mipsdl.admin.util.CustomUtil;
import com.glxp.mipsdl.common.res.BaseResponse;
@ -259,4 +260,25 @@ public class TestClient {
}
return ResultVOUtils.success(list);
}
public BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) {
if (null == udiwmsWarehouseRequest || StrUtil.isBlank(udiwmsWarehouseRequest.getThirdSys())) {
return ResultVOUtils.error(500, "第三方系统ID不能为空");
}
List<UdiwmsWarehouseResponse> list = new ArrayList<>();
for (int i = 0; i < 3; i++) {
UdiwmsWarehouseResponse response = new UdiwmsWarehouseResponse();
response.setCode("1001");
response.setName("总库");
response.setRemark("备注");
for (int j = 0; j < 3; j++) {
UdiwmsWarehouseDetail detail = new UdiwmsWarehouseDetail();
detail.setCode("100101");
detail.setName("货位1");
detail.setRemark("货位备注");
response.getDetails().add(detail);
}
}
return ResultVOUtils.success(list);
}
}

7
api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/UdPlatClient.java
Unescape Escape View File

@ -41,7 +41,7 @@ public class UdPlatClient implements BaseHttpClient {
}
@Override
public BaseResponse getPrdoucts(UdiwmsProductRequest udiwmsProductRequest) {
public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) {
StringBuilder builder = new StringBuilder();
Map<String, Object> params = new TreeMap<>();
if (null != udiwmsProductRequest) {
@ -149,6 +149,11 @@ public class UdPlatClient implements BaseHttpClient {
return null;
}
@Override
public BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) {
return null;
}
/**
* 转换产品数据格式
*

6
api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YyUCloud31Client.java
Unescape Escape View File

@ -40,7 +40,6 @@ public class YyUCloud31Client implements BaseHttpClient {
YyUcloudV31SetEntity setEntity;
public HttpHeaders getNewHeads() {
setEntity = setService.finSetUp();
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json; charset=UTF-8");
@ -87,7 +86,7 @@ public class YyUCloud31Client implements BaseHttpClient {
}
@Override
public BaseResponse getPrdoucts(UdiwmsProductRequest udiwmsProductRequest) {
public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) {
HttpHeaders headers = getNewHeads();
UInvmandocRequest uInvmandocRequest = new UInvmandocRequest();
uInvmandocRequest.setUnitcode(setEntity.getUnitCode());
@ -659,4 +658,7 @@ public class YyUCloud31Client implements BaseHttpClient {
}
public BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) {
return ResultVOUtils.success();
}
}

30
api-sync/src/main/java/com/glxp/mipsdl/admin/config/ThirdSysConfig.java
Unescape Escape View File

@ -0,0 +1,30 @@
package com.glxp.mipsdl.admin.config;
import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysDao;
import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import javax.annotation.Resource;
@Slf4j
@Configuration
public class ThirdSysConfig {
@Value("THIRD_ID")
private String thirdSys;
@Resource
private BasicThirdSysDao basicThirdSysDao;
private BasicThirdSysEntity basicThirdSysEntity;
public BasicThirdSysEntity getThirdSysConfig() {
if (basicThirdSysEntity == null) {
basicThirdSysEntity = basicThirdSysDao.selectByThirdId(thirdSys);
}
return basicThirdSysEntity;
}
}

46
api-sync/src/main/java/com/glxp/mipsdl/admin/controller/TestController.java
Unescape Escape View File

@ -0,0 +1,46 @@
package com.glxp.mipsdl.admin.controller;
import com.glxp.mipsdl.admin.client.http.PhxyyClient;
import com.glxp.mipsdl.admin.req.*;
import com.glxp.mipsdl.common.res.BaseResponse;
import com.glxp.mipsdl.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import javax.annotation.Resource;
@Slf4j
//@RestController
public class TestController {
@Resource
private PhxyyClient phxyyClient;
@PostMapping("/test/getUnit")
public BaseResponse getUnit(@RequestBody UdiwmsUnitRequest unitRequest) {
return ResultVOUtils.success(phxyyClient.getUnit(unitRequest));
}
@PostMapping("/test/getPrdoucts")
public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest){
return ResultVOUtils.success(phxyyClient.getProducts(udiwmsProductRequest));
}
@PostMapping("/test/getOrderTypes")
public BaseResponse getOrderTypes(UdiwmsBusTypeRequest udiwmsBusTypeRequest){
return ResultVOUtils.success(phxyyClient.getOrderTypes(udiwmsBusTypeRequest));
}
@PostMapping("/test/submitOrders")
public BaseResponse submitOrders(UdiwmsOrderRequest udiwmsOrderRequest){
return ResultVOUtils.success(phxyyClient.submitOrders(udiwmsOrderRequest));
}
@PostMapping("/test/getWarehouse")
public BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest){
return ResultVOUtils.success(phxyyClient.getWarehouse(udiwmsWarehouseRequest));
}
}

18
api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java
Unescape Escape View File

@ -58,16 +58,26 @@ public class UdiWmsController {
@PostMapping("/udiwms/erp/getProducts")
public BaseResponse getProducts(@RequestBody UdiwmsProductRequest udiwmsProductRequest) {
if (curFlag.equals("YONGYOU_U8_V3.1")) {
return pzhzdClient.getPrdoucts(udiwmsProductRequest);
return pzhzdClient.getProducts(udiwmsProductRequest);
} else if (curFlag.equals("YG_UDPLAT_V1.0")) {
return udPlatClient.getPrdoucts(udiwmsProductRequest);
return udPlatClient.getProducts(udiwmsProductRequest);
} else if (curFlag.equals("TEST")) {
return testClient.getProducuts(udiwmsProductRequest);
} else if (curFlag.equals("PHXYY")) {
return phxyyClient.getPrdoucts(udiwmsProductRequest);
return phxyyClient.getProducts(udiwmsProductRequest);
}
return ResultVOUtils.error(500, "当前第三方系统不支持产品信息查询！");
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/erp/getWarehouse")
public BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) {
if (curFlag.equals("YONGYOU_U8_V3.1")) {
return pzhzdClient.getWarehouse(udiwmsWarehouseRequest);
} else if (curFlag.equals("TEST")) {
return testClient.getWarehouse(udiwmsWarehouseRequest);
} else
return ResultVOUtils.error(500, "当前第三方系统不支持仓库货位号查询！");
}
//获取ERP订单接口
@ -78,8 +88,6 @@ public class UdiWmsController {
return pzhzdClient.getOrders(udiwmsOrderRequest);
} else if (curFlag.equals("TEST")) {
return testClient.getOrders(udiwmsOrderRequest);
} else if (curFlag.equals("PHXYY")) {
return phxyyClient.getOrders(udiwmsOrderRequest);
} else
return ResultVOUtils.error(500, "当前第三方系统不支持业务单据查询！");

11
api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BasicThirdSysDao.java
Unescape Escape View File

@ -0,0 +1,11 @@
package com.glxp.mipsdl.admin.dao.basic;
import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface BasicThirdSysDao {
BasicThirdSysEntity selectByThirdId(String thirdId);
}

32
api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BasicThirdSysEntity.java
Unescape Escape View File

@ -0,0 +1,32 @@
package com.glxp.mipsdl.admin.entity.basic;
import lombok.Data;
@Data
public class BasicThirdSysEntity {
private String id;
private String thirdId;
private String thirdName;
private Boolean enabled;
private String remark;
private String guideUrl;
private String thridUrl;
private Boolean mainSys;
//第三方系统IP地址
private String thirdSysUrl;
//第三方系统授权码
private String apikey;
//第三方系统接口秘钥
private String secretkey;
//业务字段
//本系统授权码
private String licenseApikey;
//本系统秘钥
private String licenseSecretkey;
}

26
api-sync/src/main/java/com/glxp/mipsdl/admin/http/UdiwmsClient.java
Unescape Escape View File

@ -2,40 +2,36 @@ package com.glxp.mipsdl.admin.http;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.mipsdl.admin.config.ThirdSysConfig;
import com.glxp.mipsdl.admin.req.system.PostFileThrOrderRequest;
import com.glxp.mipsdl.admin.req.system.PostThrCorpRequest;
import com.glxp.mipsdl.admin.req.system.PostThrInvProductsRequest;
import com.glxp.mipsdl.admin.req.system.PostThrProductsRequest;
import com.glxp.mipsdl.admin.util.HttpClient;
import com.glxp.mipsdl.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 UdiwmsClient {
@Value("${UDIWMS_IP}")
private String udiWmsUrl;
@Value("${API_KEY}")
private String apiKey;
@Value("${API_SECRET}")
private String apiSecret;
@Resource
private ThirdSysConfig thirdSysConfig;
public HttpHeaders getHeaders() {
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
headers.add("api_key", apiKey);
headers.add("secret_key", apiSecret);
headers.add("api_key", thirdSysConfig.getThirdSysConfig().getApikey());
headers.add("secret_key", thirdSysConfig.getThirdSysConfig().getSecretkey());
return headers;
}
public BaseResponse postProducts(PostThrProductsRequest postThrProductsRequest) {
String response = HttpClient.postJson(udiWmsUrl + "/udiwms/thrsys/postThrProducts", postThrProductsRequest, getHeaders());
String response = HttpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + "/udiwms/thrsys/postThrProducts", postThrProductsRequest, getHeaders());
BaseResponse baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
@ -44,7 +40,7 @@ public class UdiwmsClient {
public BaseResponse postCorps(PostThrCorpRequest postThrCorpRequest) {
postThrCorpRequest.setUploadType("文件导入");
String response = HttpClient.postJson(udiWmsUrl + "/udiwms/thrsys/postCorps", postThrCorpRequest, getHeaders());
String response = HttpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + "/udiwms/thrsys/postCorps", postThrCorpRequest, getHeaders());
BaseResponse baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
@ -52,7 +48,7 @@ public class UdiwmsClient {
}
public BaseResponse postOrderDetail(PostFileThrOrderRequest postFileThrOrderRequest) {
String response = HttpClient.postJson(udiWmsUrl + "/udiwms/thrsys/postFileOrder", postFileThrOrderRequest, getHeaders());
String response = HttpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + "/udiwms/thrsys/postFileOrder", postFileThrOrderRequest, getHeaders());
BaseResponse baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
@ -60,7 +56,7 @@ public class UdiwmsClient {
}
public BaseResponse postInvProducts(PostThrInvProductsRequest postThrInvProductsRequest) {
String response = HttpClient.postJson(udiWmsUrl + "/udiwms/thrsys/postInvProducts", postThrInvProductsRequest, getHeaders());
String response = HttpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + "/udiwms/thrsys/postInvProducts", postThrInvProductsRequest, getHeaders());
BaseResponse baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});

19
api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsWarehouseRequest.java
Unescape Escape View File

@ -0,0 +1,19 @@
package com.glxp.mipsdl.admin.req;
import lombok.Data;
/**
* 仓库货位信息查询参数
*/
@Data
public class UdiwmsWarehouseRequest extends ListPageRequest {
//仓库号，支持模糊查询
private String inventoryCode;
//货位号，支持模糊查询
private String warehouseCode;
private String thirdSys; //第三方系统ID
}

16
api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/FilterBasicThirdSysRequest.java
Unescape Escape View File

@ -0,0 +1,16 @@
package com.glxp.mipsdl.admin.req.basic;
import lombok.Data;
@Data
public class FilterBasicThirdSysRequest {
private String thirdId;
private String thirdName;
private Boolean enabled;
private Integer fromType;
private Boolean mainSys;
private Boolean filter;
private Boolean isBuType;
}

2
api-sync/src/main/java/com/glxp/mipsdl/admin/res/system/UdiwmsBusTypeResponse.java
Unescape Escape View File

@ -1,10 +1,12 @@
package com.glxp.mipsdl.admin.res.system;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
@Data
public class UdiwmsBusTypeResponse {
@JsonIgnore
private String id;
private String code;
private String name;

16
api-sync/src/main/java/com/glxp/mipsdl/admin/res/system/UdiwmsWarehouseDetail.java
Unescape Escape View File

@ -0,0 +1,16 @@
package com.glxp.mipsdl.admin.res.system;
import lombok.Data;
@Data
public class UdiwmsWarehouseDetail {
//货位号
private String code;
//货位名称
private String name;
//备注
private String remark;
}

17
api-sync/src/main/java/com/glxp/mipsdl/admin/res/system/UdiwmsWarehouseResponse.java
Unescape Escape View File

@ -0,0 +1,17 @@
package com.glxp.mipsdl.admin.res.system;
import lombok.Data;
import java.util.List;
/**
* 仓库货位号返回信息
*/
@Data
public class UdiwmsWarehouseResponse extends UdiwmsWarehouseDetail{
private List<UdiwmsWarehouseDetail> details;
}

7
api-sync/src/main/java/com/glxp/mipsdl/admin/thread/yyu8v31/InvDlErpStockTask.java
Unescape Escape View File

@ -1,14 +1,11 @@
package com.glxp.mipsdl.admin.thread.yyu8v31;
import com.glxp.mipsdl.admin.dao.ScheduledDao;
import com.glxp.mipsdl.admin.entity.system.ScheduledEntity;
import com.glxp.mipsdl.admin.req.ScheduledRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
import org.springframework.scheduling.support.CronTrigger;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@ -24,7 +21,7 @@ public class InvDlErpStockTask implements SchedulingConfigurer {
@Override
public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
scheduledTaskRegistrar.addTriggerTask(() -> process(),
/*scheduledTaskRegistrar.addTriggerTask(() -> process(),
triggerContext -> {
ScheduledRequest scheduledRequest = new ScheduledRequest();
scheduledRequest.setCronName("dlStockEr");
@ -34,7 +31,7 @@ public class InvDlErpStockTask implements SchedulingConfigurer {
logger.error("cron is null");
}
return new CronTrigger(cron).nextExecutionTime(triggerContext);
});
});*/
}
private void process() {

32
api-sync/src/main/resources/application-pro.properties
Unescape Escape View File

@ -1,36 +1,32 @@
# 本地环境
# \u672C\u5730\u73AF\u5883
server.port=9997
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:33306/udiwms_erp?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:33306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=123456
spring.datasource.password=root
#spring.datasource.password=89083fb2fc145533
logging.level.com.glxp.mipsdl.admin.dao=debug
#logging.level.com.glxp.mipsdl.admin.barcode=debug
# 跨域设置
# \u8DE8\u57DF\u8BBE\u7F6E
cors.allowed-origins=*
cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN
cors.allowed-methods=GET,POST,OPTIONS
server.servlet.context-path=
#请求参数长度
#\u8BF7\u6C42\u53C2\u6570\u957F\u5EA6
server.tomcat.max-http-form-post-size=100MB
server.max-http-header-size=100MB
#最大上传文件大小(10MB)
#\u6700\u5927\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F(10MB)
spring.servlet.multipart.max-file-size=200MB
spring.servlet.multipart.max-request-size=200MB
server.connectionTimeout=180000
#U8参数
#udi管理系统IP地址（上传文件解析后回传）
UDIWMS_IP=http://192.168.0.109:9991
#UDIWMS_IP=http://139.9.178.73:8080/UDI_WMS_MC/
API_KEY=1102
API_SECRET=4dc07484afd34e8083ba96e8fe564224
#文件导入
#0.NULL(空，未配置），1.GLXP(自定义规范标准），2.ZHIYE_V1(智业V1,诏安医院),3.YG_UDPLAT_V1(阳光采购平台）,4.PHXYY(平和县医院)
FILE_VERSION_FLAG=PHXYY
#接口实时获取
#0.NULL(空，未配置）,1.YONGYOU_U8_V3.1(用友3.1版本，片仔癀诊断） 2.YG_UDPLAT_V1.0(阳光采购平台) 3.TEST(标准接口，测试用),4.PHXYY(诏安县医院)
#U8\u53C2\u6570
#\u6587\u4EF6\u5BFC\u5165
#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09\uFF0C1.GLXP(\u81EA\u5B9A\u4E49\u89C4\u8303\u6807\u51C6\uFF09\uFF0C2.ZHIYE_V1(\u667A\u4E1AV1,\u8BCF\u5B89\u533B\u9662),3.YG_UDPLAT_V1(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0\uFF09
FILE_VERSION_FLAG=ZHIYE_V1
#\u63A5\u53E3\u5B9E\u65F6\u83B7\u53D6
#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09,1.YONGYOU_U8_V3.1(\u7528\u53CB3.1\u7248\u672C\uFF0C\u7247\u4ED4\u7640\u8BCA\u65AD\uFF09 2.YG_UDPLAT_V1.0(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0) 3.TEST(\u6807\u51C6\u63A5\u53E3\uFF0C\u6D4B\u8BD5\u7528)
ONLINE_VESRION_FLAG=PHXYY
#\u7B2C\u4E09\u65B9\u7CFB\u7EDF\u6807\u8BC6
THIRD_ID=thirdId

12
api-sync/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml
Unescape Escape View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.mipsdl.admin.dao.basic.BasicThirdSysDao">
<select id="selectByThirdId" resultType="com.glxp.mipsdl.admin.entity.basic.BasicThirdSysEntity">
</select>
</mapper>

6
api-sync/src/main/resources/mybatis/mapper/system/ScheduleDao.xml
Unescape Escape View File

@ -6,7 +6,7 @@
<insert id="insertScheduled" keyProperty="id"
parameterType="com.glxp.mipsdl.admin.entity.system.ScheduledEntity">
insert INTO sys_scheduled
insert INTO scheduled
(cronName, cron, customerId)
values (#{cronName},
#{cron},
@ -16,14 +16,14 @@
<delete id="deleteScheduled" parameterType="java.lang.String">
delete
from sys_scheduled
from scheduled
where id = #{id}
</delete>
<select id="findScheduled" parameterType="com.glxp.mipsdl.admin.req.ScheduledRequest"
resultType="com.glxp.mipsdl.admin.entity.system.ScheduledEntity">
select * from sys_scheduled
select * from scheduled
<where>
<if test="cronName != null and cronName != ''">
and cronName = #{cronName}

Write Preview
Loading…
Cancel
Save