Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Quilan
/
medicinal-supplier
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
1436cea7
authored
2019-11-27 16:34:05 +0800
by
Quilan
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
1
1 parent
2839757d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
3 deletions
conf/prod/config.properties
src/main/java/com/phxl/common/constants/PlatformConstant.java
src/main/java/com/phxl/modules/goods/web/spd/SpdControlller.java
src/main/resources/config.properties
conf/prod/config.properties
View file @
1436cea
...
...
@@ -7,6 +7,8 @@ jdbc.password=BOE190326jdfyy
spd_service_url
=
http://10.146.9.50:8080/medicinal-web/a/spdrecvsupplier/
spd_common_url
=
http://10.146.9.50:8080/medicinal-web/a/
huarun_service_url
=
http://61.190.54.189:8001/huarun/spd/syn/
platform_url
=
http://61.190.54.189:8001/huarun/
...
...
src/main/java/com/phxl/common/constants/PlatformConstant.java
View file @
1436cea
...
...
@@ -10,6 +10,9 @@ public class PlatformConstant {
//SPD接口地址
public
static
final
String
PlatForm_SPD_Url
=
Global
.
getConfig
(
"spd_service_url"
);
//SPD接口地址
public
static
final
String
PlatForm_SPD_Common_Url
=
Global
.
getConfig
(
"spd_common_url"
);
//推送对账,发药,库存平台地址
public
static
final
String
PlatForm_URL
=
Global
.
getConfig
(
"platform_url"
);
...
...
src/main/java/com/phxl/modules/goods/web/spd/SpdControlller.java
View file @
1436cea
...
...
@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
import
com.phxl.modules.goods.entity.billback.BillBackWithDetail
;
import
org.apache.commons.fileupload.disk.DiskFileItem
;
import
org.apache.http.HttpEntity
;
import
org.apache.http.HttpResponse
;
import
org.apache.http.NameValuePair
;
...
...
@@ -29,24 +30,36 @@ import org.springframework.web.bind.annotation.RequestMethod;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.commons.CommonsMultipartFile
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.serializer.SerializerFeature
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.phxl.common.constants.PlatformConstant
;
import
com.phxl.common.response.PlatFormResponse
;
import
com.phxl.common.response.PlatFormResponseConstant
;
import
com.phxl.common.util.HTTPClient
;
import
com.phxl.common.util.JsonMapper
;
import
com.phxl.common.utils.IdUtil
;
import
com.phxl.modules.goods.entity.billback.BillBack
;
import
com.phxl.modules.goods.entity.billsettlement.BillSettlement
;
import
com.phxl.modules.goods.entity.billsettlement.BillSettlementWithDetail
;
import
com.phxl.modules.goods.entity.ctcareprov.CTCareProv
;
import
com.phxl.modules.goods.entity.ctdept.HisCtDept
;
import
com.phxl.modules.goods.entity.hisCtMedicineMaterial.HisCtMedicineMaterial
;
import
com.phxl.modules.goods.entity.invoiceback.SuInvoiceBack
;
import
com.phxl.modules.goods.entity.invoiceback.SuInvoiceBackWithDetail
;
import
com.phxl.modules.goods.entity.medinstore.MedInStoreWithDetail
;
import
com.phxl.modules.goods.entity.medplan.MedPlan
;
import
com.phxl.modules.goods.entity.medplan.MedPlanWithDetail
;
import
com.phxl.modules.goods.entity.medstock.MedStock
;
import
com.phxl.modules.goods.entity.medstock.MedStockList
;
import
com.phxl.modules.goods.entity.spills.HisSpills
;
import
com.phxl.modules.goods.entity.spills.HisSpillsList
;
import
com.phxl.modules.goods.entity.suoutstore.SuOutStore
;
import
com.phxl.modules.goods.entity.suoutstore.SuOutStoreWithDetail
;
import
com.phxl.modules.goods.entity.supplierstock.SupplierStock
;
import
com.phxl.modules.goods.entity.supplierstock.SupplierStockList
;
import
com.phxl.modules.goods.entity.supplygoods.MedSupplyGoods
;
import
com.phxl.modules.goods.service.billback.BillBackService
;
...
...
@@ -944,7 +957,7 @@ public class SpdControlller {
logger
.
debug
(
"查询库存:{}"
,
params
);
String
result
=
""
;
try
{
result
=
HTTPClient
.
sendJsonDataByPost
(
"http://10.146.8.221:9002/medicinal-web/a/
StoreDetail/queryDrugByDeptAll"
,
params
);
result
=
HTTPClient
.
sendJsonDataByPost
(
PlatformConstant
.
PlatForm_SPD_Common_Url
+
"
StoreDetail/queryDrugByDeptAll"
,
params
);
}
catch
(
Exception
e
)
{
result
=
e
.
getMessage
();
}
...
...
@@ -962,7 +975,7 @@ public class SpdControlller {
logger
.
debug
(
"查询近效期:{}"
,
params
);
String
result
=
""
;
try
{
result
=
HTTPClient
.
sendJsonDataByPost
(
"http://10.146.8.221:9002/medicinal-web/a/
ypjxq/statics/list"
,
params
);
result
=
HTTPClient
.
sendJsonDataByPost
(
PlatformConstant
.
PlatForm_SPD_Common_Url
+
"
ypjxq/statics/list"
,
params
);
}
catch
(
Exception
e
)
{
result
=
e
.
getMessage
();
}
...
...
@@ -990,7 +1003,7 @@ public class SpdControlller {
param
.
add
(
new
BasicNameValuePair
(
"pageSize"
,
objec
.
getString
(
"pageSize"
)));
param
.
add
(
new
BasicNameValuePair
(
"startTime"
,
objec
.
getString
(
"startTime"
)));
param
.
add
(
new
BasicNameValuePair
(
"endTime"
,
objec
.
getString
(
"endTime"
)));
HttpPost
post
=
new
HttpPost
(
"http://10.146.8.221:9002/medicinal-web/a/
statics/delayStore/list"
);
HttpPost
post
=
new
HttpPost
(
PlatformConstant
.
PlatForm_SPD_Common_Url
+
"
statics/delayStore/list"
);
post
.
setHeader
(
"Content-Type"
,
"application/x-www-form-urlencoded"
);
post
.
setEntity
(
new
UrlEncodedFormEntity
(
param
));
HttpResponse
reponse
=
client
.
execute
(
post
);
...
...
src/main/resources/config.properties
View file @
1436cea
...
...
@@ -7,6 +7,8 @@ jdbc.password=BOE190326jdfyy
spd_service_url
=
http://10.146.9.50:8080/medicinal-web/a/spdrecvsupplier/
spd_common_url
=
http://10.146.9.50:8080/medicinal-web/a/
huarun_service_url
=
http://61.190.54.189:8001/huarun/spd/syn/
platform_url
=
http://61.190.54.189:8001/huarun/
...
...
Write
Preview
Styling with
Markdown
is supported
Attach a file
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 post a comment