Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 3d6a613e 由 LN
选项

调用hikapi修改

1 个父辈 92da1a2c
内嵌 并排
正在显示 5 个修改的文件 包含 60 行增加 和 40 行删除
src/main/java/com/neotel/smfcore/hikvision/HikApi.java
...@@ -106,11 +106,11 @@ public class HikApi { ...@@ -106,11 +106,11 @@ public class HikApi {
dataMap.put("docNo", docNo);//单据号 dataMap.put("docNo", docNo);//单据号
dataMap.put("docType", docType);//单据类型(0物料凭证,1交货单,2预留单、3AGV任务单) dataMap.put("docType", docType);//单据类型(0物料凭证,1交货单,2预留单、3AGV任务单)
String data = JsonUtil.toJsonStr(dataMap); // String data = JsonUtil.toJsonStr(dataMap);
RequestParam info = new RequestParam(getReqCode(), userName, data); RequestParam info = new RequestParam(getReqCode(), userName, dataMap);
HikApiRequest request = new HikApiRequest(1, url,config.key_1_transferOrderApi,config.secret_1_transferOrderApi, info,new Date()); HikApiRequest request = new HikApiRequest(1, url,config.key_1_transferOrderApi,config.secret_1_transferOrderApi, info,new Date());
log.info("Hik 转储单接口 (transferOrder): 发送" + data); log.info(apiName+" 发送 " + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.post(request); ResponseParam responseInfo = HttpHelper.post(request);
...@@ -154,11 +154,11 @@ public class HikApi { ...@@ -154,11 +154,11 @@ public class HikApi {
dataMap.put("lgort", inInfo.getLgort());//库位 dataMap.put("lgort", inInfo.getLgort());//库位
dataMap.put("qty", inInfo.getQty());//数量 dataMap.put("qty", inInfo.getQty());//数量
String data = JsonUtil.toJsonStr(dataMap); // String data = JsonUtil.toJsonStr(dataMap);
RequestParam info = new RequestParam(getReqCode(), userName, data); RequestParam info = new RequestParam(getReqCode(), userName, dataMap);
HikApiRequest request = new HikApiRequest(2, url,config.key_2_transferOrderInApi,config.secret_2_transferOrderInApi, info, new Date()); HikApiRequest request = new HikApiRequest(2, url,config.key_2_transferOrderInApi,config.secret_2_transferOrderInApi, info, new Date());
log.info(apiName+" 发送" + data); log.info(apiName+" 发送 " + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.post(request); ResponseParam responseInfo = HttpHelper.post(request);
...@@ -212,11 +212,11 @@ public class HikApi { ...@@ -212,11 +212,11 @@ public class HikApi {
dataMap.put("interceptQty", param.getInterceptQty());//截料数量 dataMap.put("interceptQty", param.getInterceptQty());//截料数量
dataMap.put("trayId", param.getTrayId());//料盘ID dataMap.put("trayId", param.getTrayId());//料盘ID
String data = JsonUtil.toJsonStr(dataMap); // String data = JsonUtil.toJsonStr(dataMap);
RequestParam info = new RequestParam(getReqCode(), userName, data); RequestParam info = new RequestParam(getReqCode(), userName, dataMap);
HikApiRequest request = new HikApiRequest(3, url,config.key_3_scheduleTaskApi,config.secret_3_scheduleTaskApi,info, new Date()); HikApiRequest request = new HikApiRequest(3, url,config.key_3_scheduleTaskApi,config.secret_3_scheduleTaskApi,info, new Date());
log.info(apiName+" 发送" + data); log.info(apiName+" 发送 " + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.post(request); ResponseParam responseInfo = HttpHelper.post(request);
...@@ -331,11 +331,11 @@ public class HikApi { ...@@ -331,11 +331,11 @@ public class HikApi {
dataMap.put("baseCode", param.getBaseCode());//基地 dataMap.put("baseCode", param.getBaseCode());//基地
dataMap.put("lgort", param.getLgort());//库位 dataMap.put("lgort", param.getLgort());//库位
String data = JsonUtil.toJsonStr(dataMap); // String data = JsonUtil.toJsonStr(dataMap);
RequestParam info = new RequestParam(getReqCode(), userName, data); RequestParam info = new RequestParam(getReqCode(), userName, dataMap);
HikApiRequest request = new HikApiRequest(5, url,config.key_5_putInApi,config.secret_5_putInApi, info, new Date()); HikApiRequest request = new HikApiRequest(5, url,config.key_5_putInApi,config.secret_5_putInApi, info, new Date());
log.info(apiName+" 发送" + data); log.info(apiName+" 发送 " + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.post(request); ResponseParam responseInfo = HttpHelper.post(request);
...@@ -390,11 +390,11 @@ public class HikApi { ...@@ -390,11 +390,11 @@ public class HikApi {
} }
String data = JsonUtil.toJsonStr(dataMap); // String data = JsonUtil.toJsonStr(dataMap);
RequestParam info = new RequestParam(getReqCode(), userName, data); RequestParam info = new RequestParam(getReqCode(), userName, dataMap);
HikApiRequest request = new HikApiRequest(6, url,config.key_6_checkOutApi,config.secret_6_checkOutApi, info, new Date()); HikApiRequest request = new HikApiRequest(6, url,config.key_6_checkOutApi,config.secret_6_checkOutApi, info, new Date());
log.info(apiName+" 发送" + data); log.info(apiName+" 发送 " + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.post(request); ResponseParam responseInfo = HttpHelper.post(request);
...@@ -501,10 +501,10 @@ public class HikApi { ...@@ -501,10 +501,10 @@ public class HikApi {
dataMap.put("baseCode", baseCode);//基地 dataMap.put("baseCode", baseCode);//基地
dataMap.put("lgort", lgort);//库位 dataMap.put("lgort", lgort);//库位
String data = JsonUtil.toJsonStr(dataMap); // String data = JsonUtil.toJsonStr(dataMap);
RequestParam info = new RequestParam(getReqCode(), userName, data); RequestParam info = new RequestParam(getReqCode(), userName, dataMap);
HikApiRequest request = new HikApiRequest(8, url,config.key_8_riCheckApi,config.secret_8_riCheckApi, info, new Date()); HikApiRequest request = new HikApiRequest(8, url,config.key_8_riCheckApi,config.secret_8_riCheckApi, info, new Date());
log.info(apiName+" 发送" + info.getData()); log.info(apiName+" 发送 " + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.post(request); ResponseParam responseInfo = HttpHelper.post(request);
...@@ -597,11 +597,11 @@ public class HikApi { ...@@ -597,11 +597,11 @@ public class HikApi {
Map<String,Object> dataMap=new HashMap<>(); Map<String,Object> dataMap=new HashMap<>();
dataMap.put("docNo",docNo); dataMap.put("docNo",docNo);
dataMap.put("BusinessType",businessType); dataMap.put("BusinessType",businessType);
String data=JsonUtil.toJsonStr(dataMap); // String data=JsonUtil.toJsonStr(dataMap);
RequestParam info = new RequestParam(getReqCode(), userName, data); RequestParam info = new RequestParam(getReqCode(), userName, dataMap);
HikApiRequest request = new HikApiRequest(10, url,config.key_10_reservedOrderApi,config.secret_10_reservedOrderApi, info, new Date()); HikApiRequest request = new HikApiRequest(10, url,config.key_10_reservedOrderApi,config.secret_10_reservedOrderApi, info, new Date());
log.info(apiName+" 发送" + info.getData()); log.info(apiName+" 发送 " + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.post(request); ResponseParam responseInfo = HttpHelper.post(request);
......
src/main/java/com/neotel/smfcore/hikvision/bean/api/HikApiRequest.java
package com.neotel.smfcore.hikvision.bean.api; package com.neotel.smfcore.hikvision.bean.api;
import com.neotel.smfcore.hikvision.bean.api.RequestParam; import com.neotel.smfcore.hikvision.util.JsonUtil;
import lombok.*; import lombok.*;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
...@@ -40,4 +42,14 @@ public class HikApiRequest implements Serializable { ...@@ -40,4 +42,14 @@ public class HikApiRequest implements Serializable {
* 消息创建时间 * 消息创建时间
*/ */
private Date createTime; private Date createTime;
public String getParamJson(){
Map<String, Object> params = new HashMap<>();
params.put("reqCode", param.getReqCode());
params.put("userCode", param.getUserCode());
params.put("data", param.getData());
String jsonStr = JsonUtil.toJsonStr(params);
return jsonStr;
}
} }
src/main/java/com/neotel/smfcore/hikvision/bean/api/RequestParam.java
...@@ -19,5 +19,5 @@ public class RequestParam { ...@@ -19,5 +19,5 @@ public class RequestParam {
/** /**
* data 否 Json 视具体业务而定 * data 否 Json 视具体业务而定
*/ */
private String data; private Object data;
} }
src/main/java/com/neotel/smfcore/hikvision/util/HttpHelper.java
...@@ -50,24 +50,32 @@ public class HttpHelper { ...@@ -50,24 +50,32 @@ public class HttpHelper {
params.put("reqCode", param.getReqCode()); params.put("reqCode", param.getReqCode());
params.put("userCode", param.getUserCode()); params.put("userCode", param.getUserCode());
params.put("data", param.getData()); params.put("data", param.getData());
String result = postJson(url, params, key, secret);
String dataStr=""; String jsonStr = JsonUtil.toJsonStr(params);
//转成map，只取里面的data try {
Map<String,Object> resultMap= JsonUtil.toMap(result); String result = postJson(url, params, key, secret);
if(resultMap!=null&&resultMap.containsKey("data")){
dataStr=JsonUtil.toJsonStr(resultMap.get("data")) ;
}
ResponseParam responseInfo = JsonUtil.toObj(dataStr, ResponseParam.class); String dataStr = "";
if (responseInfo == null) { //转成map，只取里面的data
log.error("[" + url + "][" + key + "][" + secret + "]发送[" + param.getReqCode() + "][" + param.getUserCode() + "][" + param.getData() + "],返回值：" + result); Map<String, Object> resultMap = JsonUtil.toMap(result);
responseInfo = new ResponseParam(param.getReqCode(), "-1", "", ""); if (resultMap != null && resultMap.containsKey("data")) {
} else { dataStr = JsonUtil.toJsonStr(resultMap.get("data"));
log.info("[" + url + "][" + key + "][" + secret + "]发送[" + param.getReqCode() + "][" + param.getUserCode() + "][" + param.getData() + "],返回值：" + result); }
}
return responseInfo; ResponseParam responseInfo = JsonUtil.toObj(dataStr, ResponseParam.class);
if (responseInfo == null) {
// log.error("[" + url + "][" + key + "][" + secret + "]发送[" + param.getReqCode() + "][" + param.getUserCode() + "][" + param.getData() + "],返回值：" + result);
log.error("[" + url + "][" + key + "][" + secret + "]发送 " + jsonStr + ",返回值：" + result);
responseInfo = new ResponseParam(param.getReqCode(), "-1", "", "");
} else {
// log.info("[" + url + "][" + key + "][" + secret + "]发送[" + param.getReqCode() + "][" + param.getUserCode() + "][" + param.getData() + "],返回值：" + result);
log.info("[" + url + "][" + key + "][" + secret + "]发送 " + jsonStr + ",返回值：" + result);
}
return responseInfo;
} catch (Exception e) {
log.error("[" + url + "][" + key + "][" + secret + "]发送 " + jsonStr + ",出错:", e);
}
return null;
} }
public static String postJson(String url, Map<String, Object> params,String key,String secret ) throws ApiException { public static String postJson(String url, Map<String, Object> params,String key,String secret ) throws ApiException {
......
src/main/resources/config/application.yml
...@@ -2,8 +2,8 @@ server: ...@@ -2,8 +2,8 @@ server:
port: 8800 port: 8800
hik: hik:
server: http://cloudapi-tst.hikvision.com.cn/api/ server: http://cloudapi-tst.hikvision.com.cn/api/
baseCode: baseCode baseCode: "8001"
lgort: lgort lgort: "M9142"
addr_1_transferOrderApi: addr_1_transferOrderApi:
addr_2_transferOrderInApi: addr_2_transferOrderInApi:
addr_3_scheduleTaskApi: addr_3_scheduleTaskApi:
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!