修改AGV代码

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/externalApi/service/impl/AgvHikOrderInfoServiceImpl.java

@@ -236,6 +236,7 @@ public class AgvHikOrderInfoServiceImpl extends SuperCacheServiceImpl<AgvHikOrde
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("reqCode",reqCode);
         jsonObject.put("reqTime",reqTime);
+        jsonObject.put("mapShortName", "YJ");
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
         // TODO 后续联调真实对接

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/externalApi/HikAgvControl.java

@@ -113,11 +113,12 @@ public class HikAgvControl extends SuperController<AgvHikOrderInfoService, Long,
         // agv 任务id
         String taskCode = null == data.get("taskCode") ? "":data.get("taskCode");
         String code = null == data.get("code") ? "":data.get("code");
+        String method = null == data.get("method") ? "":data.get("method");
         String msg =  null == data.get("data") ? "":data.get("data");
         if(StringUtil.isEmpty(taskCode)){
             return HikR.fail("任务单号为空");
         }
-        if(StringUtil.isEmpty(code)){
+        if(StringUtil.isEmpty(method)){
             return HikR.fail("任务状态码为空");
         }
 
@@ -312,6 +313,7 @@ public class HikAgvControl extends SuperController<AgvHikOrderInfoService, Long,
         return baseService.query3dResouceDataInfo(data);
     }
 
+    //@PostMapping("/selectHikAgvTaskInfo")
     @Scheduled(cron="0 0/2 * * * ?")
     public void selectHikAgvTaskInfo(){
         BaseContextHandler.setTenant("0000");

imcs-admin-boot/imcs-tenant-biz/src/main/java/com/github/zuihou/tenant/service/impl/ProductionresourceServiceImpl.java

@@ -871,7 +871,7 @@ public class ProductionresourceServiceImpl extends SuperCacheServiceImpl<Product
                     DictionaryItem dictionaryItem = productionMap.get(item.get("onlineStatus"));
                     item.put("productionStatus",buildMap(dictionaryItem));
                     //直接存汉字
-                    item.put("productionStatusCN",dictionaryItem.getName());
+                    item.put("productionStatusCN",null!=dictionaryItem?dictionaryItem.getName():"");
                 }
 
                 return item;