hik接口修改.料仓通信接口http头中返回时间字符串。

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -9,6 +9,7 @@ import com.neotel.smfcore.common.bean.ReelLockPosInfo;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.Constants;
+import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.ReelLockPosUtil;
 import com.neotel.smfcore.common.utils.ReelLockPosUtil;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
@@ -34,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.*;
 
 
 
 
@@ -70,7 +72,7 @@ public class DeviceController {
     @PostMapping(value = "/service/store/communication")
     @PostMapping(value = "/service/store/communication")
     @ResponseBody
     @ResponseBody
     @AnonymousAccess
     @AnonymousAccess
-    public StatusBean communication(@RequestBody final StatusBean statusBean, HttpServletRequest request) {
+    public StatusBean communication(@RequestBody final StatusBean statusBean, HttpServletRequest request, HttpServletResponse response) {
         try {
         try {
             String cid = statusBean.getCid();
             String cid = statusBean.getCid();
             Storage storage = dataCache.getStorage(cid);
             Storage storage = dataCache.getStorage(cid);
@@ -91,6 +93,9 @@ public class DeviceController {
         } catch (Exception e) {
         } catch (Exception e) {
             log.error("", e);
             log.error("", e);
         }
         }
+        //增加时间
+        String timeStr= DateUtil.toDateString(new Date(),"");
+        response.addHeader("time", timeStr);
         return statusBean;
         return statusBean;
     }
     }
 
 

src/main/java/com/neotel/smfcore/hikvision/HikApi.java

@@ -124,7 +124,7 @@ public class HikApi {
                 log.info(apiName+"返回code=" + responseInfo.getCode() + ",需要重发," + JsonUtil.toJsonStr(responseInfo));
                 log.info(apiName+"返回code=" + responseInfo.getCode() + ",需要重发," + JsonUtil.toJsonStr(responseInfo));
             } else {
             } else {
                 log.info(apiName + "返回" + JsonUtil.toJsonStr(responseInfo));
                 log.info(apiName + "返回" + JsonUtil.toJsonStr(responseInfo));
-                String dataStr = responseInfo.getData();
+                String dataStr = responseInfo.getDataStr();
                 List<TransferOrderInfo> list = JsonUtil.toList(dataStr,   TransferOrderInfo .class);
                 List<TransferOrderInfo> list = JsonUtil.toList(dataStr,   TransferOrderInfo .class);
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {
@@ -274,7 +274,7 @@ public class HikApi {
                 log.info(apiName+"返回code=" + responseInfo.getCode() + ",需要重发," + JsonUtil.toJsonStr(responseInfo));
                 log.info(apiName+"返回code=" + responseInfo.getCode() + ",需要重发," + JsonUtil.toJsonStr(responseInfo));
             } else {
             } else {
                 log.info(apiName+" 返回" + JsonUtil.toJsonStr(responseInfo));
                 log.info(apiName+" 返回" + JsonUtil.toJsonStr(responseInfo));
-                Map<String,Object> rdataMap= JsonUtil.toMap(responseInfo.getData());
+                Map<String,Object> rdataMap= JsonUtil.toMap(responseInfo.getDataStr());
 
 
                 int num=Integer.parseInt(rdataMap.get("qty").toString());
                 int num=Integer.parseInt(rdataMap.get("qty").toString());
                 return num;
                 return num;
@@ -456,7 +456,7 @@ public class HikApi {
             }
             }
             else {
             else {
                 log.info(apiName + "返回" + JsonUtil.toJsonStr(responseInfo));
                 log.info(apiName + "返回" + JsonUtil.toJsonStr(responseInfo));
-                String dataStr = responseInfo.getData();
+                String dataStr = responseInfo.getDataStr();
                 List<HikOrderInfo> list = JsonUtil.toList(dataStr,   HikOrderInfo .class);
                 List<HikOrderInfo> list = JsonUtil.toList(dataStr,   HikOrderInfo .class);
                 resultList.add(responseInfo.getCode());
                 resultList.add(responseInfo.getCode());
                 resultList.add(list);
                 resultList.add(list);
@@ -563,7 +563,7 @@ public class HikApi {
                 return resultList;
                 return resultList;
             } else {
             } else {
                 log.info(apiName + "返回" + JsonUtil.toJsonStr(responseInfo));
                 log.info(apiName + "返回" + JsonUtil.toJsonStr(responseInfo));
-                String dataStr = responseInfo.getData();
+                String dataStr = responseInfo.getDataStr();
                 List<HikOrderInfo> list = JsonUtil.toList(dataStr,   HikOrderInfo .class);
                 List<HikOrderInfo> list = JsonUtil.toList(dataStr,   HikOrderInfo .class);
                 resultList.add(responseInfo.getCode());
                 resultList.add(responseInfo.getCode());
                 resultList.add(list);
                 resultList.add(list);
@@ -614,7 +614,7 @@ public class HikApi {
                 log.info(apiName+"返回code=" + responseInfo.getCode() + ",需要重发," + JsonUtil.toJsonStr(responseInfo));
                 log.info(apiName+"返回code=" + responseInfo.getCode() + ",需要重发," + JsonUtil.toJsonStr(responseInfo));
             }  else {
             }  else {
                 log.info(apiName + "返回" + JsonUtil.toJsonStr(responseInfo));
                 log.info(apiName + "返回" + JsonUtil.toJsonStr(responseInfo));
-                String dataStr = responseInfo.getData();
+                String dataStr = responseInfo.getDataStr();
                 List<ReservedOrderItem> list = JsonUtil.toList(dataStr,   ReservedOrderItem.class);
                 List<ReservedOrderItem> list = JsonUtil.toList(dataStr,   ReservedOrderItem.class);
               return list;
               return list;
             }
             }

src/main/java/com/neotel/smfcore/hikvision/HikvisionApiController.java

@@ -114,8 +114,8 @@ public class HikvisionApiController {
                 }
                 }
             }
             }
         }
         }
-
-        return ResultBean.newOkResult("smfcore.order.uploadOK", "工单上传成功", "");
+        return ResultBean.newOkResult("");
+//        return ResultBean.newOkResult("smfcore.order.uploadOK", "工单上传成功", "");
     }
     }
 
 
     @ApiOperation("对湿敏过期物料进行冻结")
     @ApiOperation("对湿敏过期物料进行冻结")
@@ -165,6 +165,7 @@ public class HikvisionApiController {
             log.info("lockMsl：对湿敏过期物料进行冻结 " + reelIds);
             log.info("lockMsl：对湿敏过期物料进行冻结 " + reelIds);
         }
         }
 
 
-        return ResultBean.newOkResult("smfcore.order.lockMslOk","冻结湿敏物料成功","");
+        return ResultBean.newOkResult("");
+//        return ResultBean.newOkResult("smfcore.order.lockMslOk","冻结湿敏物料成功","");
     }
     }
 }
 }

src/main/java/com/neotel/smfcore/hikvision/bean/api/ResponseParam.java

 package com.neotel.smfcore.hikvision.bean.api;
 package com.neotel.smfcore.hikvision.bean.api;
 
 
+import cn.hutool.core.util.ObjectUtil;
+import com.neotel.smfcore.hikvision.util.JsonUtil;
 import lombok.*;
 import lombok.*;
+import springfox.documentation.spring.web.json.Json;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 
 
@@ -28,6 +31,10 @@ public class ResponseParam implements Serializable {
     /**
     /**
      *data	选填	Json	返回的数据结构
      *data	选填	Json	返回的数据结构
      */
      */
-    private String data;
+    private Object data;
+
+    public String getDataStr(){
+        return JsonUtil.toJsonStr(data);
+    }
 
 
 }
 }

src/main/java/com/neotel/smfcore/hikvision/util/HttpHelper.java

@@ -51,7 +51,15 @@ public class HttpHelper {
         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 result = postJson(url, params, key, secret);
-        ResponseParam responseInfo = JsonUtil.toObj(result, ResponseParam.class);
+
+        String dataStr="";
+        //转成map，只取里面的data
+        Map<String,Object> resultMap= JsonUtil.toMap(result);
+        if(resultMap!=null&&resultMap.containsKey("data")){
+            dataStr=JsonUtil.toJsonStr(resultMap.get("data"))   ;
+        }
+
+        ResponseParam responseInfo = JsonUtil.toObj(dataStr, ResponseParam.class);
         if (responseInfo == null) {
         if (responseInfo == null) {
             log.error("[" + url + "][" + key + "][" + secret + "]发送[" + param.getReqCode() + "][" + param.getUserCode() + "][" + param.getData() + "],返回值：" + result);
             log.error("[" + url + "][" + key + "][" + secret + "]发送[" + param.getReqCode() + "][" + param.getUserCode() + "][" + param.getData() + "],返回值：" + result);
             responseInfo = new ResponseParam(param.getReqCode(), "-1", "", "");
             responseInfo = new ResponseParam(param.getReqCode(), "-1", "", "");

src/main/resources/config/application.yml

 server:
 server:
   port: 8800
   port: 8800
 hik:
 hik:
-  server: http://cloudapi-tst.hikvision1.com.cn/api/
+  server: http://cloudapi-tst.hikvision.com.cn/api/
   baseCode: baseCode
   baseCode: baseCode
   lgort: lgort
   lgort: lgort
   addr_1_transferOrderApi:
   addr_1_transferOrderApi:
@@ -17,15 +17,15 @@ hik:
   addr_11_orderEndApi:
   addr_11_orderEndApi:
   key_1_transferOrderApi:
   key_1_transferOrderApi:
   key_2_transferOrderInApi:
   key_2_transferOrderInApi:
-  key_3_scheduleTaskApi: 065009097
-  key_4_returnMaterialApi: 065009043
-  key_5_putInApi: 065009094
-  key_6_checkOutApi: 065009095
-  key_7_updateOrderApi: 065009096
-  key_8_riCheckApi: 065009099
+  key_3_scheduleTaskApi: "065009097"
+  key_4_returnMaterialApi: "065009043"
+  key_5_putInApi: "065009094"
+  key_6_checkOutApi: "065009095"
+  key_7_updateOrderApi: "065009096"
+  key_8_riCheckApi: "065009099"
   key_9_updateRepOrderApi:
   key_9_updateRepOrderApi:
   key_10_reservedOrderApi:
   key_10_reservedOrderApi:
-  key_11_orderEndApi: 065009098
+  key_11_orderEndApi: "065009098"
   secret_1_transferOrderApi:
   secret_1_transferOrderApi:
   secret_2_transferOrderInApi:
   secret_2_transferOrderInApi:
   secret_3_scheduleTaskApi: eR2RbW9zHVglHfDweBHPzDF2pYR0RpF1dUpHJKrVKLmYCyHErz2NjXvMsWNJoKgz
   secret_3_scheduleTaskApi: eR2RbW9zHVglHfDweBHPzDF2pYR0RpF1dUpHJKrVKLmYCyHErz2NjXvMsWNJoKgz
@@ -67,4 +67,4 @@ rsa:
   private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
   private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
 
 
 app:
 app:
-  version: '1.23.2909'
\ No newline at end of file
+  version: '1.24.1210'
\ No newline at end of file