luobang 2 years ago
parent
commit
045e7a68c5

+ 7 - 2
src/main/java/com/steerinfo/dil/service/impl/OmstrainOrderServiceImpl.java

@@ -105,8 +105,13 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
             omstrainOrder.setOutstationTime(new Date(OutStationTime));
         }
         if(map.get("EnStation") != null && !"null".equals(map.get("EnStation")) && !"".equals(map.get("EnStation"))){
-            long EnStationTime = (long) map.get("EnStation");
-            omstrainOrder.setEnstationTime(new Date(EnStationTime));
+            long EnStationTime = 0;
+            try {
+                EnStationTime = (long) map.get("EnStation");
+                omstrainOrder.setEnstationTime(new Date(EnStationTime));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         if (map.get("wagonWeight") != null && !"null".equals(map.get("wagonWeight"))){
             BigDecimal wagonWeight = DataChange.dataToBigDecimal(map.get("wagonWeight"));

+ 3 - 0
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -507,6 +507,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public int dispatchOrder(Map<String, Object> mapValue) {
         List<Map<String,Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
         int result = 0;
+        if(mapList == null) {
+            return result;
+        }
         for (Map<String, Object> map : mapList) {
             Integer orderId = (Integer) map.get("orderId");
             OmstruckOrder omstruckOrder = new OmstruckOrder();