Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

src/main/java/com/steerinfo/dil/service/impl/TmstruckSmsRusultServiceImpl.java

@@ -18,6 +18,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 /**
  * TmstruckSmsRusult服务实现：
@@ -68,7 +69,7 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         String tmpTmp = MD5Util.formatTimeTmp();
         String sign = MD5Util.sign("EUCP-EMY-SMS1-0RHMZ","0CC1A5DEBB4590DA");
         String driverTel = tmstruckSmsRusultMapper.getDriverTel(orderId);
-        String mobile1 = mobile.trim();
+        String mobile1 = Pattern.compile("[^0-9]").matcher(mobile).replaceAll("");
         String content = "【达州钢铁】您好!您在达钢购买的钢材已发车。司机电话:" + driverTel + "。欲知详情，请前往达州钢铁智慧物流平台查看车辆实时轨迹。";
         String sendUrl = url+"timestamp=" + tmpTmp + "&sign=" + sign + "&mobiles=" + mobile1 + "&content=" + content;
         System.out.println(mobile1);
@@ -123,4 +124,6 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
     public List<Map<String, Object>> getSmsResult(Map<String, Object> map) {
         return tmstruckSmsRusultMapper.selectSmsResult(map);
     }
+
+
 }

src/main/java/com/steerinfo/dil/util/MD5Util.java

@@ -10,6 +10,7 @@ import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.SimpleTimeZone;
+import java.util.regex.Pattern;
 
 /**
  * @author luobang
@@ -64,13 +65,16 @@ import java.util.SimpleTimeZone;
          * @throws Exception
          */
         public static void main(String[] args) throws Exception {
-            String appkey = "p3w1aUqaAx7jDaXsg5bss4";
-            String mastersecret = "ENLIzfdMSc55VghR97lqJ4";
-            System.out.println(System.currentTimeMillis());
-            String sign = appkey + System.currentTimeMillis() + mastersecret;
-            //SHA256 sha256 = new SHA256();
-            //System.out.println(sha256(1))
-            System.out.println(getSHA256StrJava(sign));
+            //String appkey = "p3w1aUqaAx7jDaXsg5bss4";
+            //String mastersecret = "ENLIzfdMSc55VghR97lqJ4";
+            //System.out.println(System.currentTimeMillis());
+            //String sign = appkey + System.currentTimeMillis() + mastersecret;
+            ////SHA256 sha256 = new SHA256();
+            ////System.out.println(sha256(1))
+            //System.out.println(getSHA256StrJava(sign));
+            String s1 = "lb17670  540312 ";
+            String s2 = Pattern.compile("[^0-9]").matcher(s1).replaceAll("");
+            System.out.println(s2.replaceAll(" ",""));
         }
 
     public static String getSHA256StrJava(String str){

src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml

@@ -1383,6 +1383,7 @@
         select oo.PRINTNUMBER "printnumber"
         from OMSTRUCK_ORDER oo
         where oo.ORDER_NUMBER=#{orderNumber} and OO.ORDER_STATUS=5
+        FETCH NEXT 1 ROW ONLY
     </select>
 
     <update id="changeNumber">