update

徐烜
1 parent 2baff217
Showing 1 changed file with 11 additions and 7 deletions
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
@@ -429,20 +429,23 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                     }
  
                     // 班次时间验证，正则表达式，格式hh:mm或者hhmm
-                    String el = "^(([0-1]\\d)|(2[0-4])):[0-5]\\d$"; // hh:mm格式
-                    String el2 = "^(([0-1]\\d)|(2[0-4]))[0-5]\\d$"; // hhmm格式
-                    Pattern p = Pattern.compile(el);
-                    Pattern p2 = Pattern.compile(el2);
+                    String rex1 = "^([01]?[0-9]|2[0-3]):[0-5][0-9]$"; // hh:mm格式
+                    String rex2 = "^([01]?[0-9]|2[0-3]),[0-5][0-9]$"; // hh,mm格式
+                    String rex3 = "^([01]?[0-9]|2[0-3])[0-5][0-9]$"; // hhmm格式
+                    Pattern p1 = Pattern.compile(rex1);
+                    Pattern p2 = Pattern.compile(rex2);
+                    Pattern p3 = Pattern.compile(rex3);
  
                     for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
                         Cell[] bcells = sheet.getRow(i);
                         for (int j = 1; j < bcells.length; j++) { // 从第2列开始
                             String bcell_con = bcells[j].getContents();
                             if (StringUtils.isNotEmpty(bcell_con)) {
-                                Matcher m = p.matcher(bcell_con.trim());
+                                Matcher m1 = p1.matcher(bcell_con.trim());
                                 Matcher m2 = p2.matcher(bcell_con.trim());
-                                if ((!m.matches()) && (!m2.matches())) {
-                                    throw new Exception(String.format("第%d行，第%d列的发车时间格式不正确，格式应为hh:mm或hhmm", i + 1, j + 1));
+                                Matcher m3 = p3.matcher(bcell_con.trim());
+                                if ((!m1.matches()) && (!m2.matches()) && (!m3.matches())) {
+                                    throw new Exception(String.format("第%d行，第%d列的发车时间格式不正确，格式应为hh:mm或hh,mm或hhmm", i + 1, j + 1));
                                 }
                             }
                         }
@@ -509,4 +512,5 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     public List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId) {
         return ttInfoDetailRepository.findBcdetails(xlId, ttinfoId, lpId);
     }
+
 }