Skip to content

Quilan / medicinal-supplier

Go to a project
Toggle navigation
Toggle navigation pinning
c0702d3c by shiyunfei
Options

Merge branch 'master' of http://test.csylcloud.com:8000/zsef5966/medicinal-supplier

2 parents d6e710be bbbac712
Inline Side-by-side
Showing 5 changed files with 246 additions and 160 deletions
conf/prod/config.properties
......@@ -7,8 +7,11 @@ 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/
#spd服务地址
spd_wechat_url = http://10.146.9.50:8080/medicinal-web/a/wechat/
spd_wechat_login=http://10.146.9.50:8080/medicinal-web/a/login
......
conf/test/config.properties
......@@ -7,8 +7,11 @@ jdbc.password=BOE190326jdfyy
spd_service_url = http://10.146.9.50:8080/medicinal-web/a/spdrecvsupplier/
spd_common_url = http://10.146.8.221:9002/medicinal-web/a/
huarun_service_url = http://61.190.54.189:8001/huarun/spd/syn/
platform_url= http://61.190.54.189:8005/huarun/
#spd服务地址
spd_wechat_url = http://10.146.9.50:8080/medicinal-web/a/wechat/
spd_wechat_login=http://10.146.9.50:8080/medicinal-web/a/login
......
src/main/java/com/phxl/common/constants/PlatformConstant.java
......@@ -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
......@@ -8,11 +8,14 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.entity.mime.content.FileBody;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -64,58 +67,59 @@ import com.phxl.modules.goods.service.supplygoods.MedSupplyGoodsService;
@RequestMapping(value = "/Api")
public class SpdControlller {
/**
* 日志对象
*/
protected Logger logger = LoggerFactory.getLogger(getClass());
/**
* 日志对象
*/
protected Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
@Autowired
private HisCtMedicineMaterialService ctMedicineMaterialService;
@Autowired
private InterfaceLogService interfaceLogService;
@Autowired
private HisCtDeptService hisCtDeptService;
@Autowired
private CTCareProvService cTCareProvService;
@Autowired
private MedSupplyGoodsService supplyGoodsService;
@Autowired
private MedStockService stockService;
@Autowired
private MedPlanService medPlanService;
@Autowired
private MedInStoreService medInStoreService;
@Autowired
private BillBackService backService;
@Autowired
private BillSettlementService billSettlementService;
@Autowired
private SupplierStockService supplierStockService;
@Autowired
private SuOutStoreService suOutStoreService;
@Autowired
private HisSpillsService hisSpillsService;
@Autowired
private SuInvoiceBackService suInvoiceBackService;
@RequestMapping(value="/setMFMedGoods")
@ResponseBody
public String setMFMedGoods(String id,HttpServletRequest request, @RequestBody String medgoodsList){
logger.debug("药品目录接口请求参数:{}",medgoodsList);
@Autowired
private InterfaceLogService interfaceLogService;
@Autowired
private HisCtDeptService hisCtDeptService;
@Autowired
private CTCareProvService cTCareProvService;
@Autowired
private MedSupplyGoodsService supplyGoodsService;
@Autowired
private MedStockService stockService;
@Autowired
private MedPlanService medPlanService;
@Autowired
private MedInStoreService medInStoreService;
@Autowired
private BillBackService backService;
@Autowired
private BillSettlementService billSettlementService;
@Autowired
private SupplierStockService supplierStockService;
@Autowired
private SuOutStoreService suOutStoreService;
@Autowired
private HisSpillsService hisSpillsService;
@Autowired
private SuInvoiceBackService suInvoiceBackService;
private static HttpClient client;
@RequestMapping(value="/setMFMedGoods")
@ResponseBody
public String setMFMedGoods(String id,HttpServletRequest request, @RequestBody String medgoodsList){
logger.debug("药品目录接口请求参数:{}",medgoodsList);
String result = "";
String logId = IdUtil.uuid();
String exception = "";
......@@ -142,12 +146,12 @@ public class SpdControlller {
}
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
@RequestMapping(value="/setHDept")
@ResponseBody
public String setHDept(String id,HttpServletRequest request, @RequestBody String params){
logger.debug("医院科室资料接口请求参数:{}",params);
}
@RequestMapping(value="/setHDept")
@ResponseBody
public String setHDept(String id,HttpServletRequest request, @RequestBody String params){
logger.debug("医院科室资料接口请求参数:{}",params);
String result = "";
String logId = IdUtil.uuid();
String exception = "";
......@@ -176,9 +180,9 @@ public class SpdControlller {
}
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
}
/**
* 医院人员资料接口
* @param request
* @param params
......@@ -218,8 +222,8 @@ public class SpdControlller {
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
* 医院采购目录接口
* @param request
......@@ -260,8 +264,8 @@ public class SpdControlller {
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
* 医院库存接口
* @param request
......@@ -302,8 +306,8 @@ public class SpdControlller {
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
* 医院补货计划接口
* @param request
......@@ -345,8 +349,8 @@ public class SpdControlller {
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
* 医院退货接口
* @param request
......@@ -387,7 +391,7 @@ public class SpdControlller {
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
* 结算单接口
* @param request
......@@ -428,8 +432,8 @@ public class SpdControlller {
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
* 供应商库存接口
* @param request
......@@ -460,7 +464,7 @@ public class SpdControlller {
result = JSON.toJSONString(response);
try
{
//SPD服务请求：
//SPD服务请求：
result = HTTPClient.sendJsonDataByPost(PlatformConstant.PlatForm_SPD_Url+"setStock", params);
response = JSONObject.parseObject(result,PlatFormResponse.class);
response.setMsg("SPD:"+response.getMsg());
......@@ -472,7 +476,7 @@ public class SpdControlller {
response.setMsg("SPD:"+ex.getMessage());
result = JSON.toJSONString(response);
}
} catch (Exception e) {
logger.error("前置机:"+e.getMessage());
exception = "前置机:"+e.getMessage();
......@@ -483,8 +487,8 @@ public class SpdControlller {
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
* 供应商出库单接口
* @param request
......@@ -515,7 +519,7 @@ public class SpdControlller {
result = JSON.toJSONString(response);
try
{
//SPD服务请求：
//SPD服务请求：
result = HTTPClient.sendJsonDataByPost(PlatformConstant.PlatForm_SPD_Url+"setTrmedwv", params);
response = JSONObject.parseObject(result,PlatFormResponse.class);
response.setMsg("SPD:"+response.getMsg());
......@@ -527,7 +531,7 @@ public class SpdControlller {
response.setMsg("SPD:"+ex.getMessage());
result = JSON.toJSONString(response);
}
} catch (Exception e) {
logger.error("前置机:"+e.getMessage());
exception = "前置机:"+e.getMessage();
......@@ -538,7 +542,7 @@ public class SpdControlller {
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
* 医院盘点损溢接口
* @param request
......@@ -546,9 +550,9 @@ public class SpdControlller {
* @return
*/
@RequestMapping(value="/setTrDiff")
@ResponseBody
public String setTrDiff(String id,HttpServletRequest request, @RequestBody String params){
logger.debug("医院盘点损溢接口请求参数:{}",params);
@ResponseBody
public String setTrDiff(String id,HttpServletRequest request, @RequestBody String params){
logger.debug("医院盘点损溢接口请求参数:{}",params);
String result = "";
String logId = IdUtil.uuid();
String exception = "";
......@@ -578,9 +582,9 @@ public class SpdControlller {
}
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
}
/**
* 供应商发票回传接口
* @param request
......@@ -608,10 +612,10 @@ public class SpdControlller {
response.setFlag(PlatFormResponseConstant.ResponseBodyMsg.fail_ResultCode);
response.setMsg(PlatFormResponseConstant.ResponseBodyMsg.getFail_ResultContent);
}
result = JSON.toJSONString(response);
result = JSON.toJSONString(response);
try
{
//SPD服务请求：
//SPD服务请求：
result = HTTPClient.sendJsonDataByPost(PlatformConstant.PlatForm_SPD_Url+"setInvoice", params);
response = JSONObject.parseObject(result,PlatFormResponse.class);
response.setMsg("SPD:"+response.getMsg());
......@@ -623,7 +627,7 @@ public class SpdControlller {
response.setMsg("SPD:"+ex.getMessage());
result = JSON.toJSONString(response);
}
} catch (Exception e) {
logger.error("前置机:"+e.getMessage());
exception = "前置机:"+e.getMessage();
......@@ -781,7 +785,7 @@ public class SpdControlller {
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
* 推送证照数据到平台
* @param params
......@@ -815,8 +819,8 @@ public class SpdControlller {
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
* 推送证照图片数据到平台
* @param params
......@@ -831,29 +835,29 @@ public class SpdControlller {
PlatFormResponse response = new PlatFormResponse();
interfaceLogService.saveLog("pushDispensing:(推送证照数据)","filename////"+file.getOriginalFilename(), logId);
try {
if (file!=null) {
if (file!=null) {
HttpClient client = HttpClients.createDefault();
HttpPost post = new HttpPost(PlatformConstant.PlatForm_SPD_Url + "saveresLicpic");//
File newfile = new File("/usr/local/img/"+file.getOriginalFilename());
file.transferTo(newfile);
FileBody bin = new FileBody(newfile);
file.transferTo(newfile);
FileBody bin = new FileBody(newfile);
HttpEntity reqEntity = MultipartEntityBuilder.create().addPart("file", bin).build();
post.setEntity(reqEntity);
HttpResponse htppresponse = client.execute(post);
HttpEntity resEntity = htppresponse.getEntity();
result = EntityUtils.toString(resEntity, "UTF-8");
JSONObject jsonObject = JSONObject.parseObject(result);
if(!"Y".equals(jsonObject.getString("FLAG"))){
result = EntityUtils.toString(resEntity, "UTF-8");
JSONObject jsonObject = JSONObject.parseObject(result);
if(!"Y".equals(jsonObject.getString("FLAG"))){
response.setFlag(PlatFormResponseConstant.ResponseBodyMsg.fail_ResultCode);
}else {
response.setFlag(PlatFormResponseConstant.ResponseBodyMsg.success_ResultCode);
}
response.setMsg(jsonObject.toJSONString());
if (newfile.exists()) {
newfile.delete();
}
}
if (newfile.exists()) {
newfile.delete();
}
}
} catch (Exception e) {
logger.error(e.getMessage());
exception = e.getMessage();
......@@ -864,66 +868,136 @@ public class SpdControlller {
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
@RequestMapping(value="/CancelMedPlan")
@ResponseBody
public String CancelMedPlan(HttpServletRequest request, @RequestBody String param){
logger.debug("补货计划作废接口请求参数:{}",param);
String result = "";
String logId = IdUtil.uuid();
String exception = "";
interfaceLogService.saveLog("CancelMedPlan:(补货计划作废接口)", param, logId);
PlatFormResponse response = new PlatFormResponse();
try {
result = HTTPClient.sendJsonDataByPost(PlatformConstant.PlatForm_HUARUN_Url+"CancelMedPlan", param);
JSONObject jsonObject = JSONObject.parseObject(result);
response.setFlag( jsonObject.getString("FLAG"));
response.setMsg(jsonObject.getString("message"));
} catch (Exception e) {
logger.error(e.getMessage());
exception = e.getMessage();
response.setFlag("E");
response.setMsg(e.getMessage());
result = JSON.toJSONString(response);
}
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
* 推送证照数据到平台
* @param params
* @return
*/
@RequestMapping("/doBarcode")
@ResponseBody
public String doBarcode(@RequestBody String params){
logger.debug("供应商出库条码回传:{}", params);
String result = "";
String logId = IdUtil.uuid();
String exception = "";
interfaceLogService.saveLog("doBarcode:(供应商出库条码回传)", params, logId);
PlatFormResponse response = new PlatFormResponse();
try {
result = HTTPClient.sendJsonDataByPost(PlatformConstant.PlatForm_SPD_Url + "doBarcode", params);//
JSONObject jsonObject = JSONObject.parseObject(result);
if(jsonObject.getString("FLAG") != null){
response.setFlag(jsonObject.getString("FLAG"));
response.setMsg(jsonObject.getString("MSG"));
}else{
response.setFlag("Y");
response.setMsg("doBarcode:(供应商出库条码回传)返回值格式未对应");
}
} catch (Exception e) {
logger.error(e.getMessage());
exception = e.getMessage();
response.setFlag(PlatFormResponseConstant.ResponseBodyMsg.fail_ResultCode);
response.setMsg("doBarcode:(供应商出库条码回传)给SPD平台错误:" + e.getMessage());
result = JSON.toJSONString(response);
@RequestMapping(value="/CancelMedPlan")
@ResponseBody
public String CancelMedPlan(HttpServletRequest request, @RequestBody String param){
logger.debug("补货计划作废接口请求参数:{}",param);
String result = "";
String logId = IdUtil.uuid();
String exception = "";
interfaceLogService.saveLog("CancelMedPlan:(补货计划作废接口)", param, logId);
PlatFormResponse response = new PlatFormResponse();
try {
result = HTTPClient.sendJsonDataByPost(PlatformConstant.PlatForm_HUARUN_Url+"CancelMedPlan", param);
JSONObject jsonObject = JSONObject.parseObject(result);
response.setFlag( jsonObject.getString("FLAG"));
response.setMsg(jsonObject.getString("message"));
} catch (Exception e) {
logger.error(e.getMessage());
exception = e.getMessage();
response.setFlag("E");
response.setMsg(e.getMessage());
result = JSON.toJSONString(response);
}
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
* 推送证照数据到平台
* @param params
* @return
*/
@RequestMapping("/doBarcode")
@ResponseBody
public String doBarcode(@RequestBody String params){
logger.debug("供应商出库条码回传:{}", params);
String result = "";
String logId = IdUtil.uuid();
String exception = "";
interfaceLogService.saveLog("doBarcode:(供应商出库条码回传)", params, logId);
PlatFormResponse response = new PlatFormResponse();
try {
result = HTTPClient.sendJsonDataByPost(PlatformConstant.PlatForm_SPD_Url + "doBarcode", params);//
JSONObject jsonObject = JSONObject.parseObject(result);
if(jsonObject.getString("FLAG") != null){
response.setFlag(jsonObject.getString("FLAG"));
response.setMsg(jsonObject.getString("MSG"));
}else{
response.setFlag("Y");
response.setMsg("doBarcode:(供应商出库条码回传)返回值格式未对应");
}
interfaceLogService.setResultLog(response, logId, exception);
return result;
} catch (Exception e) {
logger.error(e.getMessage());
exception = e.getMessage();
response.setFlag(PlatFormResponseConstant.ResponseBodyMsg.fail_ResultCode);
response.setMsg("doBarcode:(供应商出库条码回传)给SPD平台错误:" + e.getMessage());
result = JSON.toJSONString(response);
}
interfaceLogService.setResultLog(response, logId, exception);
return result;
}
/**
* 库存查询接口
* @param params
* @return
*/
@RequestMapping("/querystock")
@ResponseBody
public String querystock(@RequestBody String params){
logger.debug("查询库存:{}", params);
String result = "";
try {
result = HTTPClient.sendJsonDataByPost(PlatformConstant.PlatForm_SPD_Common_Url+"StoreDetail/queryDrugByDeptAll", params);
} catch (Exception e) {
result = e.getMessage();
}
return result;
}
/**
* 近效期查询接口
* @param params
* @return
*/
@RequestMapping("/queryexpir")
@ResponseBody
public String queryexpir(@RequestBody String params){
logger.debug("查询近效期:{}", params);
String result = "";
try {
result = HTTPClient.sendJsonDataByPost(PlatformConstant.PlatForm_SPD_Common_Url+"ypjxq/statics/list", params);
} catch (Exception e) {
result = e.getMessage();
}
return result;
}
/**
* 呆滞品查询接口
* @param params
* @return
*/
@RequestMapping("/querydetained")
@ResponseBody
public String querydetained(@RequestBody String params){
logger.debug("查询近效期:{}", params);
String result = "";
if (client == null){
client = HttpClients.createDefault();
}
try {
JSONObject objec = JSON.parseObject(params);
List<NameValuePair> param = new ArrayList<NameValuePair>();
param.add(new BasicNameValuePair("depetCode",objec.getString("depetCode")));
param.add(new BasicNameValuePair("pageNo",objec.getString("pageNo")));
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(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);
HttpEntity entity = reponse.getEntity();
result = EntityUtils.toString(entity, "UTF-8");
} catch (Exception e) {
result = e.getMessage();
}
return result;
}
}
......
src/main/resources/config.properties
......@@ -7,8 +7,11 @@ 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/
#spd服务地址
spd_wechat_url = http://10.146.9.50:8080/medicinal-web/a/wechat/
spd_wechat_login=http://10.146.9.50:8080/medicinal-web/a/login
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!