Commit 5fdeba93 by lijingjing

添加推送日志;

parent aeb90102
......@@ -19,14 +19,20 @@ public class ErpRequest {
private static final Logger logger = LoggerFactory.getLogger(ErpRequest.class);
public static ErpRespResult sendPost(String url, Map<String, ?> params, HttpHeaders headers) {
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ [url, params, headers]");
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ url:{}", url);
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ params:{}", JacksonUtils.toJSONString(params));
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ headers:{}", JacksonUtils.toJSONString(headers));
try {
String resultStr = RestTemplateUtils.sendPost(url, params, headers);
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ resultStr: {}", resultStr);
if (StringUtils.isBlank(resultStr)) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ DPS响应结果为空!");
return ErpRespResult.failure("DPS响应结果为空!");
}
ErpRespResult result = JacksonUtils.readValue(resultStr, new TypeReference<ErpRespResult>() {
});
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ result: {}", JacksonUtils.toJSONString(result));
if (Objects.isNull(result)) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求DPS接口失败:{}", JacksonUtils.toJSONString(result));
return ErpRespResult.failure("请求DPS接口失败!");
......@@ -39,6 +45,9 @@ public class ErpRequest {
}
public static <T> ErpRespResult<T> sendGet(String url, Map<String, ?> params, TypeReference<ErpRespResult<T>> typeReference) {
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ [url, params, typeReference]");
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ url:{}", url);
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ params:{}", JacksonUtils.toJSONString(params));
try {
String resultStr = RestTemplateUtils.sendGet(url, params);
if (StringUtils.isBlank(resultStr)) {
......@@ -46,10 +55,12 @@ public class ErpRequest {
return ErpRespResult.failure("DPS响应结果为空!");
}
ErpRespResult<T> result = JacksonUtils.readValue(resultStr, typeReference);
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ resultStr: {}", resultStr);
if (Objects.isNull(result)) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ 请求DPS接口失败:{}", JacksonUtils.toJSONString(result));
return ErpRespResult.failure("请求DPS接口失败!");
}
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ result: {}", JacksonUtils.toJSONString(result));
return result;
} catch (Exception e) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ 请求DPS接口异常:", e);
......
......@@ -17,6 +17,9 @@ public class WmsRequest {
private static final Logger logger = LoggerFactory.getLogger(WmsRequest.class);
public static <T> T sendPost(String url, Map<String, ?> params, TypeReference<WmsRespResult<T>> typeReference) {
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ [url,params,typeReference]");
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ url: {}", url);
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ params: {}", JacksonUtils.toJSONString(params));
try {
String resultStr = RestTemplateUtils.sendPost(url, params);
if (StringUtils.isBlank(resultStr)) {
......@@ -24,6 +27,7 @@ public class WmsRequest {
return null;
}
WmsRespResult<T> result = JacksonUtils.readValue(resultStr, typeReference);
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ result: {}",JacksonUtils.toJSONString(result));
if (!result.success()) {
logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求WMS接口失败:{}", JacksonUtils.toJSONString(result));
return null;
......@@ -38,6 +42,9 @@ public class WmsRequest {
}
public static WmsRespResult sendPost(String url, Map<String, ?> params) {
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ [url,params]");
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ url: {}", url);
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ params: {}", JacksonUtils.toJSONString(params));
try {
String resultStr = RestTemplateUtils.sendPost(url, params);
if (StringUtils.isBlank(resultStr)) {
......@@ -46,6 +53,7 @@ public class WmsRequest {
}
WmsRespResult result = JacksonUtils.readValue(resultStr, new TypeReference<WmsRespResult>() {
});
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ result: {}",JacksonUtils.toJSONString(result));
if (!result.success()) {
logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求WMS接口失败:{}", JacksonUtils.toJSONString(result));
return WmsRespResult.failure(result.getDescription());
......
......@@ -316,7 +316,7 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
}
// 若为开发环境,模拟测试数据
if (!isProd()) {
if (isProd()) {
dataList = getMockData();
return dataList.stream().filter(d -> {
boolean f = true;
......
......@@ -66,6 +66,12 @@ oss:
grid-fs: true
bucket-name: base
# 日志
logging:
config: classpath:log4j2-pro.xml
pattern:
console: "%-5level - %msg%n"
### jobs
jobs:
admin-address: http://api.hmlims.com:9000/print
\ No newline at end of file
......@@ -10,7 +10,7 @@ service:
url: http://api.dev.patzn.com:7000
api-url: http://api.dev.patzn.com:7000
erp-url: http://192.168.0.216:5050/api/LimsData/
wms-url: http://192.168.207.103:9001/InterfaceAddr/
wms-url: http://192.168.207.235:9001/InterfaceAddr/
soffice: /opt/libreoffice6.2/program/soffice
food-url: http://food.hmlims.com:9000
static-url: static.hmlims.com:9000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment