Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-service-hmhj
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangweidong
patzn-cloud-service-hmhj
Commits
5fdeba93
Commit
5fdeba93
authored
Apr 25, 2023
by
lijingjing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加推送日志;
parent
aeb90102
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
2 deletions
+28
-2
ErpRequest.java
.../com/patzn/cloud/service/lims/hmhj/common/ErpRequest.java
+11
-0
WmsRequest.java
.../com/patzn/cloud/service/lims/hmhj/common/WmsRequest.java
+8
-0
StatisticsServiceImpl.java
...service/lims/hmhj/service/impl/StatisticsServiceImpl.java
+1
-1
application-hmhj.yml
src/main/resources/application-hmhj.yml
+7
-0
application.yml
src/main/resources/application.yml
+1
-1
No files found.
src/main/java/com/patzn/cloud/service/lims/hmhj/common/ErpRequest.java
View file @
5fdeba93
...
...
@@ -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
);
...
...
src/main/java/com/patzn/cloud/service/lims/hmhj/common/WmsRequest.java
View file @
5fdeba93
...
...
@@ -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
());
...
...
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/StatisticsServiceImpl.java
View file @
5fdeba93
...
...
@@ -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
;
...
...
src/main/resources/application-hmhj.yml
View file @
5fdeba93
...
...
@@ -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
src/main/resources/application.yml
View file @
5fdeba93
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment