Skip to content

孙克 / smf-core

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

增加hik接口key和secret的配置

1 个父辈 da33cb54
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 153 行增加 和 121 行删除
src/main/java/com/neotel/smfcore/hikvision/HikApi.java
...@@ -68,6 +68,9 @@ public class HikApi { ...@@ -68,6 +68,9 @@ public class HikApi {
return apiAddr; return apiAddr;
} }
if(ObjectUtil.isNotEmpty(config.mesServer)){
return config.mesServer;
}
// if(ObjectUtil.isNotEmpty(mesServer)&&ObjectUtil.isNotEmpty(apiName)){ // if(ObjectUtil.isNotEmpty(mesServer)&&ObjectUtil.isNotEmpty(apiName)){
// if(mesServer.endsWith("/")){ // if(mesServer.endsWith("/")){
// return mesServer+apiName; // return mesServer+apiName;
...@@ -109,11 +112,11 @@ public class HikApi { ...@@ -109,11 +112,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, data);
HikApiRequest request = new HikApiRequest(1, url, new Date(), info); HikApiRequest request = new HikApiRequest(1, url,config.key_1_transferOrderApi,config.secret_1_transferOrderApi, info,new Date());
log.info("Hik 转储单接口 (transferOrder): 发送" + data); log.info("Hik 转储单接口 (transferOrder): 发送" + data);
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(url, info); ResponseParam responseInfo = HttpHelper.postJson(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -157,11 +160,11 @@ public class HikApi { ...@@ -157,11 +160,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, data);
HikApiRequest request = new HikApiRequest(1, url, new Date(), info); HikApiRequest request = new HikApiRequest(2, url,config.key_2_transferOrderInApi,config.secret_2_transferOrderInApi, info, new Date());
log.info(apiName+" 发送" + data); log.info(apiName+" 发送" + data);
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(url, info); ResponseParam responseInfo = HttpHelper.postJson(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -215,11 +218,11 @@ public class HikApi { ...@@ -215,11 +218,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, data);
HikApiRequest request = new HikApiRequest(1, url, new Date(), info); HikApiRequest request = new HikApiRequest(3, url,config.key_3_scheduleTaskApi,config.secret_3_scheduleTaskApi,info, new Date());
log.info(apiName+" 发送" + data); log.info(apiName+" 发送" + data);
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(url, info); ResponseParam responseInfo = HttpHelper.postJson(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -259,11 +262,11 @@ public class HikApi { ...@@ -259,11 +262,11 @@ public class HikApi {
// String data = JsonUtil.toJsonStr(dataMap); // String data = JsonUtil.toJsonStr(dataMap);
// data String 41 是 料盘ID // data String 41 是 料盘ID
RequestParam info = new RequestParam(getReqCode(), userName, trayId); RequestParam info = new RequestParam(getReqCode(), userName, trayId);
HikApiRequest request = new HikApiRequest(1, url, new Date(), info); HikApiRequest request = new HikApiRequest(4, url, config.key_4_returnMaterialApi,config.secret_4_returnMaterialApi, info,new Date());
log.info(apiName+" 发送" + info.getData()); log.info(apiName+" 发送" + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(url, info); ResponseParam responseInfo = HttpHelper.postJson(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -334,11 +337,11 @@ public class HikApi { ...@@ -334,11 +337,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, data);
HikApiRequest request = new HikApiRequest(1, url, new Date(), info); HikApiRequest request = new HikApiRequest(5, url,config.key_5_putInApi,config.secret_5_putInApi, info, new Date());
log.info(apiName+" 发送" + data); log.info(apiName+" 发送" + data);
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(url, info); ResponseParam responseInfo = HttpHelper.postJson(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -393,11 +396,11 @@ public class HikApi { ...@@ -393,11 +396,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, data);
HikApiRequest request = new HikApiRequest(1, url, new Date(), info); HikApiRequest request = new HikApiRequest(6, url,config.key_6_checkOutApi,config.secret_6_checkOutApi, info, new Date());
log.info(apiName+" 发送" + data); log.info(apiName+" 发送" + data);
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(url, info); ResponseParam responseInfo = HttpHelper.postJson(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -432,11 +435,11 @@ public class HikApi { ...@@ -432,11 +435,11 @@ public class HikApi {
String url = getUrl( config.addr_7_updateOrderApi,"updateOrderApi"); String url = getUrl( config.addr_7_updateOrderApi,"updateOrderApi");
// data String 16 是 工单号/合单号 // data String 16 是 工单号/合单号
RequestParam info = new RequestParam(getReqCode(), userName, orderNo); RequestParam info = new RequestParam(getReqCode(), userName, orderNo);
HikApiRequest request = new HikApiRequest(1, url, new Date(), info); HikApiRequest request = new HikApiRequest(6, url,config.key_7_updateOrderApi,config.secret_7_updateOrderApi , info,new Date());
List<Object> resultList=new ArrayList<>(); List<Object> resultList=new ArrayList<>();
log.info(apiName+" 发送" + info.getData()); log.info(apiName+" 发送" + info.getData());
try { try {
ResponseParam responseInfo = HttpHelper.postJson(url, info); ResponseParam responseInfo = HttpHelper.postJson(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -503,11 +506,11 @@ public class HikApi { ...@@ -503,11 +506,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, data);
HikApiRequest request = new HikApiRequest(1, url, new Date(), info); 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.postJson(url, info); ResponseParam responseInfo = HttpHelper.postJson(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -541,11 +544,11 @@ public class HikApi { ...@@ -541,11 +544,11 @@ public class HikApi {
List<Object> resultList=new ArrayList<>(); List<Object> resultList=new ArrayList<>();
// data String 41 是 补料单号 // data String 41 是 补料单号
RequestParam info = new RequestParam(getReqCode(), userName, replenishmentNo); RequestParam info = new RequestParam(getReqCode(), userName, replenishmentNo);
HikApiRequest request = new HikApiRequest(1, url, new Date(), info); HikApiRequest request = new HikApiRequest(9, url,config.key_9_updateRepOrderApi,config.secret_9_updateRepOrderApi, info, new Date());
log.info(apiName+" 发送" + info.getData()); log.info(apiName+" 发送" + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(url, info); ResponseParam responseInfo = HttpHelper.postJson(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -600,11 +603,11 @@ public class HikApi { ...@@ -600,11 +603,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, data);
HikApiRequest request = new HikApiRequest(1, url, new Date(), info); 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.postJson(url, info); ResponseParam responseInfo = HttpHelper.postJson(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -650,11 +653,11 @@ public class HikApi { ...@@ -650,11 +653,11 @@ public class HikApi {
String url = getUrl(config.addr_11_orderEndApi, "orderEndApi"); String url = getUrl(config.addr_11_orderEndApi, "orderEndApi");
// data String 41 是 补料单号 // data String 41 是 补料单号
RequestParam info = new RequestParam(getReqCode(), userName, orderNo); RequestParam info = new RequestParam(getReqCode(), userName, orderNo);
HikApiRequest request = new HikApiRequest(1, url, new Date(), info); HikApiRequest request = new HikApiRequest(11, url,config.key_11_orderEndApi,config.secret_11_orderEndApi, info, new Date());
log.info(apiName+" 发送" + info.getData()); log.info(apiName+" 发送" + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(url, info); ResponseParam responseInfo = HttpHelper.postJson(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
......
src/main/java/com/neotel/smfcore/hikvision/HikApiCache.java
...@@ -89,7 +89,7 @@ public class HikApiCache { ...@@ -89,7 +89,7 @@ public class HikApiCache {
}); });
for (HikApiRequest apiRequest : failedList) { for (HikApiRequest apiRequest : failedList) {
ResponseParam responseParam = HttpHelper.postJson(apiRequest.getUrl(), apiRequest.getParam()); ResponseParam responseParam = HttpHelper.postJson(apiRequest);
boolean needResend = false; boolean needResend = false;
if (responseParam == null || responseParam.getCode().equals(-1)) { if (responseParam == null || responseParam.getCode().equals(-1)) {
......
src/main/java/com/neotel/smfcore/hikvision/HikConfig.java
...@@ -54,6 +54,99 @@ public class HikConfig { ...@@ -54,6 +54,99 @@ public class HikConfig {
@Value("${hik.addr_11_orderEndApi:}") @Value("${hik.addr_11_orderEndApi:}")
public String addr_11_orderEndApi = ""; public String addr_11_orderEndApi = "";
// key_1_transferOrderApi:
// key_2_transferOrderInApi:
// key_3_scheduleTaskApi:
// key_4_returnMaterialApi:
// key_5_putInApi:
// key_6_checkOutApi:
// key_7_updateOrderApi:
// key_8_riCheckApi:
// key_9_updateRepOrderApi:
// key_10_reservedOrderApi:
// key_11_orderEndApi:
@Value("${hik.key_1_transferOrderApi:}")
public String key_1_transferOrderApi = "";
@Value("${hik.key_2_transferOrderInApi:}")
public String key_2_transferOrderInApi = "";
@Value("${hik.key_3_scheduleTaskApi:}")
public String key_3_scheduleTaskApi = "";
@Value("${hik.key_4_returnMaterialApi:}")
public String key_4_returnMaterialApi = "";
@Value("${hik.key_5_putInApi:}")
public String key_5_putInApi = "";
@Value("${hik.key_6_checkOutApi:}")
public String key_6_checkOutApi = "";
@Value("${hik.key_7_updateOrderApi:}")
public String key_7_updateOrderApi = "";
@Value("${hik.key_8_riCheckApi:}")
public String key_8_riCheckApi = "";
@Value("${hik.key_9_updateRepOrderApi:}")
public String key_9_updateRepOrderApi = "";
@Value("${hik.key_10_reservedOrderApi:}")
public String key_10_reservedOrderApi = "";
@Value("${hik.key_11_orderEndApi:}")
public String key_11_orderEndApi = "";
// secret_1_transferOrderApi:
// secret_2_transferOrderInApi:
// secret_3_scheduleTaskApi:
// secret_4_returnMaterialApi:
// secret_5_putInApi:
// secret_6_checkOutApi:
// secret_7_updateOrderApi:
// secret_8_riCheckApi:
// secret_9_updateRepOrderApi:
// secret_10_reservedOrderApi:
// secret_11_orderEndApi:
@Value("${hik.secret_1_transferOrderApi:}")
public String secret_1_transferOrderApi = "";
@Value("${hik.secret_2_transferOrderInApi:}")
public String secret_2_transferOrderInApi = "";
@Value("${hik.secret_3_scheduleTaskApi:}")
public String secret_3_scheduleTaskApi = "";
@Value("${hik.secret_4_returnMaterialApi:}")
public String secret_4_returnMaterialApi = "";
@Value("${hik.secret_5_putInApi:}")
public String secret_5_putInApi = "";
@Value("${hik.secret_6_checkOutApi:}")
public String secret_6_checkOutApi = "";
@Value("${hik.secret_7_updateOrderApi:}")
public String secret_7_updateOrderApi = "";
@Value("${hik.secret_8_riCheckApi:}")
public String secret_8_riCheckApi = "";
@Value("${hik.secret_9_updateRepOrderApi:}")
public String secret_9_updateRepOrderApi = "";
@Value("${hik.secret_10_reservedOrderApi:}")
public String secret_10_reservedOrderApi = "";
@Value("${hik.secret_11_orderEndApi:}")
public String secret_11_orderEndApi = "";
@Autowired @Autowired
private DataCache dataCache; private DataCache dataCache;
...@@ -80,100 +173,4 @@ public class HikConfig { ...@@ -80,100 +173,4 @@ public class HikConfig {
} }
// //读取配置中的地址
// private static String mesServer = "";
// @Value("${hik.server:}")
// public void setMesServer(String mesServer) {
// HikApi.mesServer = mesServer;
// }
//
// private static String baseCode="";
// @Value("${hik.baseCode:}")
// public void setBaseCode(String baseCode) {
// HikApi.baseCode = baseCode;
// }
//
// private static String lgort="";
// @Value("${hik.lgort:}")
// public void setLgort(String lgort) {
// HikApi.lgort = lgort;
// }
//
// private static String addr_1_transferOrderApi ="";
// @Value("${hik.addr_1_transferOrderApi:}")
// public void setTransferOrderApi(String transferOrderApi) {
// HikApi.addr_1_transferOrderApi = transferOrderApi;
// }
//
// private static String addr_2_transferOrderInApi="";
// @Value("${hik.addr_2_transferOrderInApi:}")
// public void setTransferOrderInApi(String transferOrderInApi) {
// HikApi.addr_2_transferOrderInApi = transferOrderInApi;
// }
//
// private static String addr_3_scheduleTaskApi="";
// @Value("${hik.addr_3_scheduleTaskApi:}")
// public void setScheduleTaskApi(String scheduleTaskApi) {
// HikApi.addr_3_scheduleTaskApi = scheduleTaskApi;
// }
//
// private static String addr_4_returnMaterialApi="";
// @Value("${hik.addr_4_returnMaterialApi:}")
// public void setReturnMaterialApi(String returnMaterialApi) {
// HikApi.addr_4_returnMaterialApi = returnMaterialApi;
// }
//
// private static String addr_5_putInApi="";
// @Value("${hik.addr_5_putInApi:}")
// public void setPutInApi(String putInApi) {
// HikApi.addr_5_putInApi = putInApi;
// }
//
// private static String addr_6_checkOutApi="";
// @Value("${hik.addr_6_checkOutApi:}")
// public void setCheckOutApi(String checkOutApi) {
// HikApi.addr_6_checkOutApi = checkOutApi;
// }
//
// private static String addr_7_updateOrderApi="";
// @Value("${hik.addr_7_updateOrderApi:}")
// public void setUpdateOrderApi(String updateOrderApi) {
// HikApi.addr_7_updateOrderApi = updateOrderApi;
// }
//
// private static String addr_8_riCheckApi="";
// @Value("${hik.addr_8_riCheckApi:}")
// public void setRiCheckApi(String riCheckApi) {
// HikApi.addr_8_riCheckApi = riCheckApi;
// }
//
// private static String addr_9_updateRepOrderApi="";
// @Value("${hik.addr_9_updateRepOrderApi:}")
// public void setUpdateRepOrderApi(String updateRepOrderApi) {
// HikApi.addr_9_updateRepOrderApi = updateRepOrderApi;
// }
//
// private static String addr_10_reservedOrderApi="";
// @Value("${hik.addr_10_reservedOrderApi:}")
// public void setReservedOrderApi(String reservedOrderApi) {
// HikApi.addr_10_reservedOrderApi = reservedOrderApi;
// }
//
// private static String addr_11_orderEndApi="";
// @Value("${hik.addr_11_orderEndApi:}")
// public void setOrderEndApi(String orderEndApi) {
// HikApi.addr_11_orderEndApi = orderEndApi;
// }
// @Autowired
// private DataCache dataCache;
// @PostConstruct
// public void init(){
// mesServer=dataCache.GetConfigCache("hik.server","hik.server",mesServer);
// baseCode=dataCache.GetConfigCache("hik.baseCode","hik.baseCode",baseCode);
// lgort=dataCache.GetConfigCache("hik.lgort","hik.lgort",lgort);
// log.info("HIK服务器地址："+mesServer+",baseCode="+baseCode+",lgort="+lgort);
// }
} }
src/main/java/com/neotel/smfcore/hikvision/bean/api/HikApiRequest.java
...@@ -22,13 +22,22 @@ public class HikApiRequest implements Serializable { ...@@ -22,13 +22,22 @@ public class HikApiRequest implements Serializable {
private String url=""; private String url="";
/** /**
* 消息创建时间 * 接口key
*/ */
private Date createTime; private String key="";
/**
* 接口密钥
*/
private String secret="";
/** /**
* 参数信息 * 参数信息
*/ */
private RequestParam param; private RequestParam param;
/**
* 消息创建时间
*/
private Date createTime;
} }
src/main/resources/config/application.yml
...@@ -15,6 +15,29 @@ hik: ...@@ -15,6 +15,29 @@ hik:
addr_9_updateRepOrderApi: addr_9_updateRepOrderApi:
addr_10_reservedOrderApi: addr_10_reservedOrderApi:
addr_11_orderEndApi: addr_11_orderEndApi:
key_1_transferOrderApi:
key_2_transferOrderInApi:
key_3_scheduleTaskApi:
key_4_returnMaterialApi:
key_5_putInApi:
key_6_checkOutApi:
key_7_updateOrderApi:
key_8_riCheckApi:
key_9_updateRepOrderApi:
key_10_reservedOrderApi:
key_11_orderEndApi:
secret_1_transferOrderApi:
secret_2_transferOrderInApi:
secret_3_scheduleTaskApi:
secret_4_returnMaterialApi:
secret_5_putInApi:
secret_6_checkOutApi:
secret_7_updateOrderApi:
secret_8_riCheckApi:
secret_9_updateRepOrderApi:
secret_10_reservedOrderApi:
secret_11_orderEndApi:
# 文件存储路径 # 文件存储路径
file: file:
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!