Skip to content

孙克 / smf-core

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

hik接口地址改为可配置

1 个父辈 07e55839
内嵌 并排
正在显示 6 个修改的文件 包含 258 行增加 和 62 行删除
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
......@@ -321,7 +321,7 @@ public class LiteOrderCache implements ITaskListener {
* @return
*/
public LiteOrder updateOrderFromApi(String userName,LiteOrder liteOrder) {
if (!liteOrder.isNew()) {
if ((!liteOrder.isNew()) &&(!liteOrder.isShortage()) ) {
return liteOrder;
}
......@@ -330,7 +330,7 @@ public class LiteOrderCache implements ITaskListener {
List<OrderItemInfo> newItems = null;
if (ObjectUtil.isNotEmpty(liteOrder.getReplenishmentNo())) {
// 7.9补料单发料状态查询接口
apiResults = HikApi.updateReplenishmentOrderApi(userName, liteOrder.getReplenishmentNo());
apiResults = HikApi.updateRepOrderApi(userName, liteOrder.getReplenishmentNo());
} else {
// 7.7工单发料状态查询接口
apiResults = HikApi.updateOrderApi(userName, liteOrder.getOrderNo());
......
src/main/java/com/neotel/smfcore/hikvision/HikApi.java
......@@ -11,43 +11,22 @@ import com.neotel.smfcore.hikvision.util.JsonUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.text.SimpleDateFormat;
import java.util.*;
@Slf4j
@Component
public class HikApi {
//读取配置中的地址
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 HikConfig config;
@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);
public void setConfig(HikConfig config){
HikApi.config=config;
}
/**
* 0 成功
*/
......@@ -84,14 +63,18 @@ public class HikApi {
return currReqCodeNum.toString();
}
public static String getUrl(String apiName){
if(ObjectUtil.isNotEmpty(mesServer)&&ObjectUtil.isNotEmpty(apiName)){
if(mesServer.endsWith("/")){
return mesServer+apiName;
}else{
return mesServer+"/"+apiName;
}
public static String getUrl(String apiAddr,String apiName){
if(ObjectUtil.isNotEmpty(apiAddr)){
return apiAddr;
}
// if(ObjectUtil.isNotEmpty(mesServer)&&ObjectUtil.isNotEmpty(apiName)){
// if(mesServer.endsWith("/")){
// return mesServer+apiName;
// }else{
// return mesServer+"/"+apiName;
// }
// }
return "";
}
/**
......@@ -117,7 +100,7 @@ public class HikApi {
public static List<TransferOrderInfo> transferOrderApi (String userName,String docNo,String docType) {
String apiName="Hik 转储单接口 (transferOrderApi): ";
String url =getUrl( "转储单接口");
String url =getUrl(config. addr_1_transferOrderApi,"transferOrderApi");
Map<String, Object> dataMap = new HashMap<String, Object>();
dataMap.put("docNo", docNo);//单据号
......@@ -161,7 +144,7 @@ public class HikApi {
*/
public static boolean transferOrderInApi(String userName, TransferOrderInInfo inInfo){
String apiName="Hik 转储单入库过账接口 (transferOrderInApi): ";
String url = getUrl( "转储单入库过账接口");
String url = getUrl( config.addr_2_transferOrderInApi,"transferOrderInApi");
Map<String, Object> dataMap = new HashMap<String, Object>();
dataMap.put("docNo", inInfo.getDocNo());//单据号
......@@ -208,7 +191,7 @@ public class HikApi {
*/
public static boolean scheduleTaskApi(String userName, ScheduleTaskInfo param){
String apiName="Hik 排程发料接口 (scheduleTaskApi): ";
String url = getUrl( "排程发料接口");
String url = getUrl(config.addr_3_scheduleTaskApi, "scheduleTaskApi");
// jobNo String 32 是 工单号/合单号
// replenishmentNo String 32 否 补料单号（补料单业务补料单为必填项）
// station String 40 是 站位号
......@@ -268,7 +251,7 @@ public class HikApi {
*/
public static int returnMaterialApi(String userName, String trayId){
String apiName="Hik 退料唯一码数量获取接口 (returnMaterialApi): ";
String url = getUrl( "退料唯一码数量获取接口");
String url = getUrl(config.addr_4_returnMaterialApi, "returnMaterialApi");
// Map<String, Object> dataMap = new HashMap<String, Object>();
// dataMap.put("trayId", trayId);//料盘ID
......@@ -315,7 +298,7 @@ public class HikApi {
*/
public static boolean putInApi(String userName, InOutApiInfo param){
String apiName="Hik 入库上架过账接口 (putInApi): ";
String url = getUrl( "入库上架过账接口");
String url = getUrl( config.addr_5_putInApi,"putInApi");
// warehousingType Integer 是 入库类型(0普通入库1退料入库2并盘入库3截料入库)
// trayId String 41 是 料盘ID/唯一码
// qty Integer 是 数量
......@@ -334,11 +317,11 @@ public class HikApi {
}
param.setInType(inType);
if(ObjectUtil.isEmpty(param.getBaseCode())&& ObjectUtil.isNotEmpty(baseCode)){
param.setBaseCode(baseCode);
if(ObjectUtil.isEmpty(param.getBaseCode())&& ObjectUtil.isNotEmpty(config.baseCode)){
param.setBaseCode(config.baseCode);
}
if(ObjectUtil.isEmpty(param.getLgort())&&ObjectUtil.isNotEmpty(lgort)){
param.setLgort(lgort);
if(ObjectUtil.isEmpty(param.getLgort())&&ObjectUtil.isNotEmpty(config.lgort)){
param.setLgort(config.lgort);
}
Map<String, Object> dataMap = new HashMap<String, Object>();
......@@ -386,7 +369,7 @@ public class HikApi {
*/
public static boolean checkOutApi(String userName, InOutApiInfo param){
String apiName="Hik 出库下架过账接口 (checkOutApi): ";
String url = getUrl( "出库下架过账接口");
String url = getUrl( config.addr_6_checkOutApi,"checkOutApi");
// warehousingType Integer 是 出库类型(0普通出库1并盘出库 2湿敏出库)
// trayId String 41 是 料盘ID/唯一码
// qty Integer 是 数量
......@@ -399,11 +382,11 @@ public class HikApi {
dataMap.put("baseCode", param.getBaseCode());//基地
dataMap.put("lgort", param.getLgort());//库位
if(ObjectUtil.isEmpty(param.getBaseCode())&& ObjectUtil.isNotEmpty(baseCode)){
param.setBaseCode(baseCode);
if(ObjectUtil.isEmpty(param.getBaseCode())&& ObjectUtil.isNotEmpty(config.baseCode)){
param.setBaseCode(config.baseCode);
}
if(ObjectUtil.isEmpty(param.getLgort())&&ObjectUtil.isNotEmpty(lgort)){
param.setLgort(lgort);
if(ObjectUtil.isEmpty(param.getLgort())&&ObjectUtil.isNotEmpty(config.lgort)){
param.setLgort(config.lgort);
}
......@@ -446,7 +429,7 @@ public class HikApi {
public static List<Object> updateOrderApi(String userName, String orderNo){
boolean needResend = false;
String apiName="Hik 工单发料状态查询接口 (updateOrderApi): ";
String url = getUrl( "工单发料状态查询接口");
String url = getUrl( config.addr_7_updateOrderApi,"updateOrderApi");
// data String 16 是 工单号/合单号
RequestParam info = new RequestParam(getReqCode(), userName, orderNo);
HikApiRequest request = new HikApiRequest(1, url, new Date(), info);
......@@ -499,14 +482,14 @@ public class HikApi {
*/
public static ResponseParam riCheckApi(String userName, String trayId,String baseCode,String lgort){
String apiName="Hik 唯一码校验接口 (riCheckApi): ";
String url = getUrl( "唯一码校验接口");
String url = getUrl(config.addr_8_riCheckApi, "riCheckApi");
if(ObjectUtil.isEmpty(baseCode)&& ObjectUtil.isNotEmpty(HikApi.baseCode)){
baseCode=HikApi.baseCode;
if(ObjectUtil.isEmpty(baseCode)&& ObjectUtil.isNotEmpty(config.baseCode)){
baseCode=config.baseCode;
}
if(ObjectUtil.isEmpty(lgort)&&ObjectUtil.isNotEmpty(HikApi.lgort)){
lgort=HikApi.lgort;
if(ObjectUtil.isEmpty(lgort)&&ObjectUtil.isNotEmpty(config.lgort)){
lgort=config.lgort;
}
......@@ -552,9 +535,9 @@ public class HikApi {
* @param replenishmentNo 补料单号
* @return 返回备料列表
*/
public static List<Object> updateReplenishmentOrderApi(String userName, String replenishmentNo){
String apiName="Hik 补料单发料状态查询接口 (updateReplenishmentOrderApi): ";
String url = getUrl( "补料单发料状态查询接口");
public static List<Object> updateRepOrderApi(String userName, String replenishmentNo){
String apiName="Hik 补料单发料状态查询接口 (updateRepOrderApi): ";
String url = getUrl(config.addr_9_updateRepOrderApi, "updateRepOrderApi");
List<Object> resultList=new ArrayList<>();
// data String 41 是 补料单号
RequestParam info = new RequestParam(getReqCode(), userName, replenishmentNo);
......@@ -605,8 +588,8 @@ public class HikApi {
* @return 返回预留单详情列表
*/
public static List<ReservedOrderItem> reservedOrderApi(String userName, String docNo , int businessType){
String apiName="Hik 预留单转储出库接口 (updateReplenishmentOrderApi): ";
String url = getUrl( "预留单转储出库接口");
String apiName="Hik 预留单转储出库接口 (reservedOrderApi): ";
String url = getUrl( config.addr_10_reservedOrderApi,"reservedOrderApi");
// 接口名 预留单转储出库接口
// data docNo String 16 是 预留单号
// BusinessType Integer 是 单据类型(0 线边仓间转储，1 )
......@@ -664,7 +647,7 @@ public class HikApi {
// message String 64 结果描述
// reqCode String 32 唯一请求号
String apiName="Hik 订单发料完成通知接口 (orderEndApi): ";
String url = getUrl( "订单发料完成通知接口");
String url = getUrl(config.addr_11_orderEndApi, "orderEndApi");
// data String 41 是 补料单号
RequestParam info = new RequestParam(getReqCode(), userName, orderNo);
HikApiRequest request = new HikApiRequest(1, url, new Date(), info);
......
src/main/java/com/neotel/smfcore/hikvision/HikConfig.java 0 → 100644
package com.neotel.smfcore.hikvision;
import com.neotel.smfcore.core.device.util.DataCache;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
@Service
@Slf4j
public class HikConfig {
//读取配置中的地址
@Value("${hik.server:}")
public String mesServer = "";
@Value("${hik.baseCode:}")
public String baseCode = "";
@Value("${hik.lgort:}")
public String lgort = "";
@Value("${hik.addr_1_transferOrderApi:}")
public String addr_1_transferOrderApi = "";
@Value("${hik.addr_2_transferOrderInApi:}")
public String addr_2_transferOrderInApi = "";
@Value("${hik.addr_3_scheduleTaskApi:}")
public String addr_3_scheduleTaskApi = "";
@Value("${hik.addr_4_returnMaterialApi:}")
public String addr_4_returnMaterialApi = "";
@Value("${hik.addr_5_putInApi:}")
public String addr_5_putInApi = "";
@Value("${hik.addr_6_checkOutApi:}")
public String addr_6_checkOutApi = "";
@Value("${hik.addr_7_updateOrderApi:}")
public String addr_7_updateOrderApi = "";
@Value("${hik.addr_8_riCheckApi:}")
public String addr_8_riCheckApi = "";
@Value("${hik.addr_9_updateRepOrderApi:}")
public String addr_9_updateRepOrderApi = "";
@Value("${hik.addr_10_reservedOrderApi:}")
public String addr_10_reservedOrderApi = "";
@Value("${hik.addr_11_orderEndApi:}")
public String addr_11_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);
addr_1_transferOrderApi = dataCache.GetConfigCache("hik.addr_1_transferOrderApi", "hik.addr_1_transferOrderApi", addr_1_transferOrderApi);
addr_2_transferOrderInApi = dataCache.GetConfigCache("hik.addr_2_transferOrderInApi", "hik.addr_2_transferOrderInApi", addr_2_transferOrderInApi);
addr_3_scheduleTaskApi = dataCache.GetConfigCache("hik.addr_3_scheduleTaskApi", "hik.addr_3_scheduleTaskApi", addr_3_scheduleTaskApi);
addr_4_returnMaterialApi = dataCache.GetConfigCache("hik.addr_4_returnMaterialApi", "hik.addr_4_returnMaterialApi", addr_4_returnMaterialApi);
addr_5_putInApi = dataCache.GetConfigCache("hik.addr_5_putInApi", "hik.addr_5_putInApi", addr_5_putInApi);
addr_6_checkOutApi = dataCache.GetConfigCache("hik.addr_6_checkOutApi", "hik.addr_6_checkOutApi", addr_6_checkOutApi);
addr_7_updateOrderApi = dataCache.GetConfigCache("hik.addr_7_updateOrderApi", "hik.addr_7_updateOrderApi", addr_7_updateOrderApi);
addr_8_riCheckApi = dataCache.GetConfigCache("hik.addr_8_riCheckApi", "hik.addr_8_riCheckApi", addr_8_riCheckApi);
addr_9_updateRepOrderApi = dataCache.GetConfigCache("hik.addr_9_updateRepOrderApi", "hik.addr_9_updateRepOrderApi", addr_9_updateRepOrderApi);
addr_10_reservedOrderApi = dataCache.GetConfigCache("hik.addr_10_reservedOrderApi", "hik.addr_10_reservedOrderApi", addr_10_reservedOrderApi);
addr_11_orderEndApi = dataCache.GetConfigCache("hik.addr_11_orderEndApi", "hik.addr_11_orderEndApi", addr_11_orderEndApi);
log.info("HIK服务器地址：" + mesServer + ",baseCode=" + baseCode + ",lgort=" + lgort);
}
// //读取配置中的地址
// 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/util/HttpHelper.java
......@@ -481,9 +481,11 @@ public class HttpHelper {
params.put("data", requestInfo.getData());
String result = postJson(url, params, cookies, protocol);
ResponseParam responseInfo = JsonUtil.toObj(result, ResponseParam.class);
if (requestInfo == null) {
if (responseInfo == null) {
log.error("[" + url + "]发送[" + requestInfo.getReqCode() + "][" + requestInfo.getUserCode() + "][" + requestInfo.getData() + "],返回值：" + result);
responseInfo = new ResponseParam(requestInfo.getReqCode(), "-1", "", "");
}else{
log.info("[" + url + "]发送[" + requestInfo.getReqCode() + "][" + requestInfo.getUserCode() + "][" + requestInfo.getData() + "],返回值：" + result);
}
return responseInfo;
......
src/main/resources/config/application.yml
......@@ -4,6 +4,17 @@ hik:
server:
baseCode: baseCode
lgort: lgort
addr_1_transferOrderApi:
addr_2_transferOrderInApi:
addr_3_scheduleTaskApi:
addr_4_returnMaterialApi:
addr_5_putInApi:
addr_6_checkOutApi:
addr_7_updateOrderApi:
addr_8_riCheckApi:
addr_9_updateRepOrderApi:
addr_10_reservedOrderApi:
addr_11_orderEndApi:
# 文件存储路径
file:
......
修改记录.txt
......@@ -34,3 +34,24 @@
20220322
菜单调整。元器件增加整盘：散盘比。条形码增加是否锁定。
20200402
HIK配置
hik:
server:
baseCode: baseCode
lgort: lgort
addr_1_transferOrderApi: http://192.168.0.0.1/mes/transferOrderApi
addr_2_transferOrderInApi: http://192.168.0.0.1/mes/transferOrderInApi
addr_3_scheduleTaskApi: http://192.168.0.0.1/mes/scheduleTaskApi
addr_4_returnMaterialApi: http://192.168.0.0.1/mes/returnMaterialApi
addr_5_putInApi: http://192.168.0.0.1/mes/putInApi
addr_6_checkOutApi: http://192.168.0.0.1/mes/checkOutApi
addr_7_updateOrderApi: http://192.168.0.0.1/mes/updateOrderApi
addr_8_riCheckApi: http://192.168.0.0.1/mes/riCheckApi
addr_9_updateRepOrderApi: http://192.168.0.0.1/mes/updateRepOrderApi
addr_10_reservedOrderApi: http://192.168.0.0.1/mes/reservedOrderApi
addr_11_orderEndApi: http://192.168.0.0.1/mes/orderEndApi
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!