Skip to content

孙克 / smf-core

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

hik接口修改

1 个父辈 93b61fb9
全部展开
内嵌 并排
正在显示 7 个修改的文件 包含 40 行增加 和 33 行删除
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
...@@ -367,6 +367,9 @@ public class LiteOrderCache implements ITaskListener { ...@@ -367,6 +367,9 @@ public class LiteOrderCache implements ITaskListener {
public LiteOrder updateOrderItem(LiteOrder order,LiteOrderItem item) { public LiteOrder updateOrderItem(LiteOrder order,LiteOrderItem item) {
List<LiteOrderItem> items = order.getOrderItems(); List<LiteOrderItem> items = order.getOrderItems();
if(items==null){
items=new ArrayList<>();
}
boolean find = false; boolean find = false;
for (LiteOrderItem oldItem : for (LiteOrderItem oldItem :
......
src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrder.java
...@@ -279,8 +279,10 @@ public class LiteOrder extends BasePo implements Serializable { ...@@ -279,8 +279,10 @@ public class LiteOrder extends BasePo implements Serializable {
this.setUpdateDate(new Date()); this.setUpdateDate(new Date());
this.setEndDate(outInfo.getEndD()); this.setEndDate(outInfo.getEndD());
this.setWemng(outInfo.getWemng()); this.setWemng(outInfo.getWemng());
if(orderItems==null){
orderItems=new ArrayList<>(); orderItems=new ArrayList<>();
} }
}
public void addOrderItems(LiteOrderItem item){ public void addOrderItems(LiteOrderItem item){
orderItems.add(item); orderItems.add(item);
......
src/main/java/com/neotel/smfcore/hikvision/HikApi.java
package com.neotel.smfcore.hikvision; package com.neotel.smfcore.hikvision;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.core.device.util.DataCache;
import com.neotel.smfcore.hikvision.bean.*; import com.neotel.smfcore.hikvision.bean.*;
import com.neotel.smfcore.hikvision.bean.api.HikApiRequest; import com.neotel.smfcore.hikvision.bean.api.HikApiRequest;
import com.neotel.smfcore.hikvision.bean.api.RequestParam; import com.neotel.smfcore.hikvision.bean.api.RequestParam;
...@@ -10,10 +9,8 @@ import com.neotel.smfcore.hikvision.util.HttpHelper; ...@@ -10,10 +9,8 @@ import com.neotel.smfcore.hikvision.util.HttpHelper;
import com.neotel.smfcore.hikvision.util.JsonUtil; import com.neotel.smfcore.hikvision.util.JsonUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
...@@ -116,7 +113,7 @@ public class HikApi { ...@@ -116,7 +113,7 @@ public class HikApi {
log.info("Hik 转储单接口 (transferOrder): 发送" + data); log.info("Hik 转储单接口 (transferOrder): 发送" + data);
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(request); ResponseParam responseInfo = HttpHelper.post(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -164,7 +161,7 @@ public class HikApi { ...@@ -164,7 +161,7 @@ public class HikApi {
log.info(apiName+" 发送" + data); log.info(apiName+" 发送" + data);
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(request); ResponseParam responseInfo = HttpHelper.post(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -222,7 +219,7 @@ public class HikApi { ...@@ -222,7 +219,7 @@ public class HikApi {
log.info(apiName+" 发送" + data); log.info(apiName+" 发送" + data);
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(request); ResponseParam responseInfo = HttpHelper.post(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -266,7 +263,7 @@ public class HikApi { ...@@ -266,7 +263,7 @@ public class HikApi {
log.info(apiName+" 发送" + info.getData()); log.info(apiName+" 发送" + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(request); ResponseParam responseInfo = HttpHelper.post(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -341,7 +338,7 @@ public class HikApi { ...@@ -341,7 +338,7 @@ public class HikApi {
log.info(apiName+" 发送" + data); log.info(apiName+" 发送" + data);
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(request); ResponseParam responseInfo = HttpHelper.post(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -400,7 +397,7 @@ public class HikApi { ...@@ -400,7 +397,7 @@ public class HikApi {
log.info(apiName+" 发送" + data); log.info(apiName+" 发送" + data);
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(request); ResponseParam responseInfo = HttpHelper.post(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -439,7 +436,7 @@ public class HikApi { ...@@ -439,7 +436,7 @@ public class HikApi {
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(request); ResponseParam responseInfo = HttpHelper.post(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -510,7 +507,7 @@ public class HikApi { ...@@ -510,7 +507,7 @@ public class HikApi {
log.info(apiName+" 发送" + info.getData()); log.info(apiName+" 发送" + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(request); ResponseParam responseInfo = HttpHelper.post(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -548,7 +545,7 @@ public class HikApi { ...@@ -548,7 +545,7 @@ public class HikApi {
log.info(apiName+" 发送" + info.getData()); log.info(apiName+" 发送" + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(request); ResponseParam responseInfo = HttpHelper.post(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -607,7 +604,7 @@ public class HikApi { ...@@ -607,7 +604,7 @@ public class HikApi {
log.info(apiName+" 发送" + info.getData()); log.info(apiName+" 发送" + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(request); ResponseParam responseInfo = HttpHelper.post(request);
if (responseInfo == null || responseInfo.getCode().equals(-1)) { if (responseInfo == null || responseInfo.getCode().equals(-1)) {
// needResend = true; // needResend = true;
...@@ -657,7 +654,7 @@ public class HikApi { ...@@ -657,7 +654,7 @@ public class HikApi {
log.info(apiName+" 发送" + info.getData()); log.info(apiName+" 发送" + info.getData());
boolean needResend = false; boolean needResend = false;
try { try {
ResponseParam responseInfo = HttpHelper.postJson(request); ResponseParam responseInfo = HttpHelper.post(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); ResponseParam responseParam = HttpHelper.post(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/HikvisionApiController.java
...@@ -14,6 +14,7 @@ import com.neotel.smfcore.hikvision.bean.HikOrderInfo; ...@@ -14,6 +14,7 @@ import com.neotel.smfcore.hikvision.bean.HikOrderInfo;
import com.neotel.smfcore.security.annotation.AnonymousAccess; import com.neotel.smfcore.security.annotation.AnonymousAccess;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -23,7 +24,8 @@ import java.util.List; ...@@ -23,7 +24,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@Slf4j @Slf4j
@Controller @RestController
@RequiredArgsConstructor
@RequestMapping("/rest/api") @RequestMapping("/rest/api")
@Api(tags = "海康API") @Api(tags = "海康API")
public class HikvisionApiController { public class HikvisionApiController {
...@@ -93,6 +95,7 @@ public class HikvisionApiController { ...@@ -93,6 +95,7 @@ public class HikvisionApiController {
liteOrderManager.createWithItems(order); liteOrderManager.createWithItems(order);
liteOrderCache.addOrderToMap(order); liteOrderCache.addOrderToMap(order);
log.info("新建工单[" + order.getOrderNo() + "]工单详情"+order.getOrderItems().size()+"条" );
} else { } else {
if (order.getStatus() > LITEORDER_STATUS.NEW) { if (order.getStatus() > LITEORDER_STATUS.NEW) {
...@@ -104,13 +107,15 @@ public class HikvisionApiController { ...@@ -104,13 +107,15 @@ public class HikvisionApiController {
LiteOrderItem item = outInfo.crateOrderItem(orderNo); LiteOrderItem item = outInfo.crateOrderItem(orderNo);
order = liteOrderCache.updateOrderItem(order, item); order = liteOrderCache.updateOrderItem(order, item);
liteOrderManager.save(order);
liteOrderCache.addOrderToMap(order); liteOrderCache.addOrderToMap(order);
log.info("更新工单[" + order.getOrderNo() + "]物料号["+item.getMaterialNo()+"]" );
} }
} }
} }
return ResultBean.newOkResult(""); return ResultBean.newOkResult("smfcore.order.uploadOK", "工单上传成功", "");
} }
@ApiOperation("对湿敏过期物料进行冻结") @ApiOperation("对湿敏过期物料进行冻结")
...@@ -160,6 +165,6 @@ public class HikvisionApiController { ...@@ -160,6 +165,6 @@ public class HikvisionApiController {
log.info("lockMsl：对湿敏过期物料进行冻结 " + reelIds); log.info("lockMsl：对湿敏过期物料进行冻结 " + reelIds);
} }
return ResultBean.newOkResult(""); return ResultBean.newOkResult("smfcore.order.lockMslOk","冻结湿敏物料成功","");
} }
} }
src/main/resources/config/application.yml
server: server:
port: 8800 port: 8800
hik: hik:
server: server: http://cloudapi-tst.hikvision1.com.cn/api/
baseCode: baseCode baseCode: baseCode
lgort: lgort lgort: lgort
addr_1_transferOrderApi: addr_1_transferOrderApi:
...@@ -17,26 +17,26 @@ hik: ...@@ -17,26 +17,26 @@ hik:
addr_11_orderEndApi: addr_11_orderEndApi:
key_1_transferOrderApi: key_1_transferOrderApi:
key_2_transferOrderInApi: key_2_transferOrderInApi:
key_3_scheduleTaskApi: key_3_scheduleTaskApi: 065009097
key_4_returnMaterialApi: key_4_returnMaterialApi: 065009043
key_5_putInApi: key_5_putInApi: 065009094
key_6_checkOutApi: key_6_checkOutApi: 065009095
key_7_updateOrderApi: key_7_updateOrderApi: 065009096
key_8_riCheckApi: key_8_riCheckApi: 065009099
key_9_updateRepOrderApi: key_9_updateRepOrderApi:
key_10_reservedOrderApi: key_10_reservedOrderApi:
key_11_orderEndApi: key_11_orderEndApi: 065009098
secret_1_transferOrderApi: secret_1_transferOrderApi:
secret_2_transferOrderInApi: secret_2_transferOrderInApi:
secret_3_scheduleTaskApi: secret_3_scheduleTaskApi: eR2RbW9zHVglHfDweBHPzDF2pYR0RpF1dUpHJKrVKLmYCyHErz2NjXvMsWNJoKgz
secret_4_returnMaterialApi: secret_4_returnMaterialApi: sRs9lFTsRYpTvORhSI32FhjEPhJDb6TzTvIxhPudrmo9jgwwCiKJWi8go1yN8988
secret_5_putInApi: secret_5_putInApi: 1ifjm9mFtpXep0aJXOFtNi3R502v1Lzl6VuaKEKVZdQLmlKhzxIjjmtn29WDG7R0
secret_6_checkOutApi: secret_6_checkOutApi: MDulYCOgEasYYJXOk2tLycnpYKS2HQK0vXcIvJNzPt79isaHJkyE24BcCzn3hTg4
secret_7_updateOrderApi: secret_7_updateOrderApi: HvbUVz6vQJYIDfmWokk98rxSUHAoDlUWNSsPuVc0hB8JtIOzZLDQYARW9tmeU2Fy
secret_8_riCheckApi: secret_8_riCheckApi: eQPd3y8xDvwXKMetEbwp2LdzJe8tD0Dg48YA1H68SPsGeKSt2Yj3pOrKibguwzwe
secret_9_updateRepOrderApi: secret_9_updateRepOrderApi:
secret_10_reservedOrderApi: secret_10_reservedOrderApi:
secret_11_orderEndApi: secret_11_orderEndApi: W0KWumdsD4eMyTm3Qail9HxHTfqdvxAJW30hLKtiTpJeGO7wXwBe7aUO6n0eicf8
# 文件存储路径 # 文件存储路径
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!