遥测现场问题解决

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java

@@ -1437,13 +1437,17 @@ public class TopographyController extends AbstractBaseController {
 
 
     private Date dateParse(String value) throws ParseException {
-        String strDate = value.substring(0, 19);
-        SimpleDateFormat sdf = new SimpleDateFormat(ISO8601_DATE_HOUR_MIN_SEC);
-        SimpleDateFormat sdf1 = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
-        sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
-        Date date = sdf.parse(strDate);
-        String time = DateTimeUtil.format(date, DateTimeUtil.ISO_DATE_HOUR24_MIN_SEC);
-        return  sdf1.parse(time);
+        if(value.length() > 19) {
+            String strDate = value.substring(0, 19);
+            SimpleDateFormat sdf = new SimpleDateFormat(ISO8601_DATE_HOUR_MIN_SEC);
+            SimpleDateFormat sdf1 = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
+            sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+            Date date = sdf.parse(strDate);
+            String time = DateTimeUtil.format(date, DateTimeUtil.ISO_DATE_HOUR24_MIN_SEC);
+            return  sdf1.parse(time);
+        } else {
+            return DateUtils.dateParse(value, DateUtils.DATE_TIME_PATTERN);
+        }
     }
 
     /***