1.reelSize按照设备传上来的返回

src/main/java/com/neotel/smfcore/custom/deif20861/DEIF20861Controller.java

@@ -80,10 +80,8 @@ public class DEIF20861Controller {
             }
             }
             Map<String, Object> itemMap = new HashMap<>();
             Map<String, Object> itemMap = new HashMap<>();
             itemMap.put("cid", storage.getCid());
             itemMap.put("cid", storage.getCid());
-
             String reelSize = shelfType.replace("smallReel", "7").replace("bigReel", "15");
             String reelSize = shelfType.replace("smallReel", "7").replace("bigReel", "15");
-            String s = StringUtil.join(reelSize);
-            itemMap.put("reelSize", s);
+            itemMap.put("reelSize", reelSize);
             itemMap.put("status", shelfS);
             itemMap.put("status", shelfS);
             itemMap.put("hSerial", hserial);
             itemMap.put("hSerial", hserial);
 
 
@@ -180,6 +178,7 @@ public class DEIF20861Controller {
             }
             }
             String outShelfStatus  = equipStatus.getData().getOrDefault("outShelfStatus", "").toString();
             String outShelfStatus  = equipStatus.getData().getOrDefault("outShelfStatus", "").toString();
             String inShelfStatus   = equipStatus.getData().getOrDefault("inShelfStatus", "").toString();
             String inShelfStatus   = equipStatus.getData().getOrDefault("inShelfStatus", "").toString();
+            String shelfType = equipStatus.getData().getOrDefault("shelfType", "").toString();
             if(status==1&&(!equipStatus.timeOut())){
             if(status==1&&(!equipStatus.timeOut())){
                 if(ObjectUtil.isEmpty(outShelfStatus)){
                 if(ObjectUtil.isEmpty(outShelfStatus)){
                     outShelfStatus="IDLE";
                     outShelfStatus="IDLE";
@@ -194,7 +193,8 @@ public class DEIF20861Controller {
             }
             }
             Map<String, Object> itemMap = new HashMap<>();
             Map<String, Object> itemMap = new HashMap<>();
             itemMap.put("cid", equipment.getCid());
             itemMap.put("cid", equipment.getCid());
-            itemMap.put("reelSize", "7,15");
+            String reelSize = shelfType.replace("smallReel", "7").replace("bigReel", "15");
+            itemMap.put("reelSize", reelSize);
             itemMap.put("inShelfStatus", inShelfStatus);
             itemMap.put("inShelfStatus", inShelfStatus);
             itemMap.put("outShelfStatus", outShelfStatus);
             itemMap.put("outShelfStatus", outShelfStatus);
 
 
@@ -204,4 +204,5 @@ public class DEIF20861Controller {
         EquipStatusUtil.UpdateAgvInfo("",JsonUtil.toJsonStr(paramMap), JsonUtil.toJsonStr(bean),"OK");
         EquipStatusUtil.UpdateAgvInfo("",JsonUtil.toJsonStr(paramMap), JsonUtil.toJsonStr(bean),"OK");
         return bean;
         return bean;
     }
     }
+
 }
 }