Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/log/OperateType.java

@@ -185,6 +185,9 @@ public enum OperateType {
     OBU_SUPPLY_ORDER_PAY_QUERY("增补OBU订单支付查询结果"),
     OBU_SUPPLY_REVIEW("增补OBU订单审核"),
     OBU_SUPPLY_SEND("增补OBU发货"),
+
+    //签约信息变更
+    SIGN_CHANGE_APPLY("签约信息变更申请"),
     ;
     private final String value;
 

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/MyPatterns.java

@@ -0,0 +1,656 @@
+package cn.com.taiji.core.manager.tools;
+
+import java.util.Calendar;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang3.RandomUtils;
+
+import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.pub.StringTools;
+
+/**
+ * 
+ * 
+ * 
+ * @author Tom <br>
+ *         <a href="mailto:tomesc@msn.com">tomesc@msn.com</a>
+ * @since 1.0
+ * @version 1.0
+ */
+public class MyPatterns
+{
+
+	// 只能18位,最后一位如果是X,必须是大写
+	public static final String idCodeRegexp = "^[1-9]{1}[0-9]{17}$|^[1-9]{1}[0-9]{16}X$";
+	public static final String mobileRegexp = "^13[0-9]{9}|14[0-9]{9}|15[0-9]{9}|17[0-9]{9}|18[0-9]{9}$";
+	public static final String phoneRegexp = "^0[1-9][0-9]{1,2}\\-?[1-9][0-9]{6,7}$|^[1-9][0-9]{6,7}$|^0[1-9][0-9]{1,2}\\-?[1-9][0-9]{6,7}\\-[0-9]{1,4}$|^[1-9][0-9]{6,7}\\-[0-9]{1,4}$|^0{0,1}13[0-9]{9}$|^0{0,1}15[0-9]{9}$|^0{0,1}18[0-9]{9}$";
+	public static final String zipRegexp = "^\\d{6}$";
+	public static final String smsCodeRegexp = "^\\d{6}$";
+	public static final String validCodeRegexp = "^[0-9a-zA-Z]{4}$";
+	public static final String driverIdRegexp = "^[1-9]{1}[0-9]{11}$|^[1-9]{1}[0-9]{9}$";
+	public static final String emailRegexp = "^((([a-zA-Z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\\.([a-zA-Z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\\x22)((((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(([\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]|\\x21|[\\x23-\\x5b]|[\\x5d-\\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\\\([\\x01-\\x09\\x0b\\x0c\\x0d-\\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(\\x22)))@((([a-zA-Z]|\\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|\\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\\d|-|\\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|\\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\\.)+(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\\d|-|\\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\\.?$";
+	public static final String chineseNameRegexp = "^[\u4e00-\u9fa5·]+$";
+	public static final String noChineseRegexp = "^[^\u4e00-\u9fa5]+$";
+	public static final String orgCodeRegexp = "^[0-9A-Z]{9}$";
+	public static final String creditCodeRegexp = "^[0-9A-Z]{18}$";
+	public static final String twCnIdCodeRegexp = "^(\\d{8}|\\d{10})$";
+	public static final String localTaxCodeRegexp = "^[0-9A-Z]{15,20}$";
+	public static final String localTaxWsCodeRegexp = "^[0-9]{20}$";
+	public static final String countryTaxCodeRegexp = "^[0-9A-Z]{15,20}$";
+	public static final String countryTaxWsCodeRegexp = "^[0-9]{15,20}$";
+	public static final String acceptNoRegexp = "^[0-9a-zA-Z]{2,}$";
+	public static final String licenceCodeRegexp = "^B[0-9a-zA-Z]{5,15}$";
+	public static final String mylicenceCodeRegexp = "^[0-9A-Z]{4,7}$";// 除更新指标外，其他业务使用
+	public static final String workCodeRegexp = "^[0-9A-Z]{1,20}$";
+	public static final String intRegexp = "[0-9]*";
+	public static final String passwordRegexp = "^(?![0-9]+$)(?![a-zA-Z]+$)(?![!@#$%^&*()_.']+$)[0-9A-Za-z!@#$%^&*()_.']{8,20}$";
+	public static final String sequenceCodeRegexp = "^\\d{4}$";
+	public static final String gaCnIdCodeRegexp = "^[H,M]\\d{10}$";
+	public static final String fileReferenceRegexp = "^[0-9]{2}[0-9]{7}$";// 其他指标申请档案编号
+	public static final String defaultVal = "1000000000";// 默认机动车驾驶证档案编码，个人盗抢车用
+	public static final String urlRegexp = "^(http|https)://([\\w-]+\\.)+[\\w-]+(/[\\w-./?%&=]*)?$";// 验证URL
+	
+	public static final String ipRegexp = "^((2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(2[0-4]\\d|25[0-5]|[01]?\\d\\d?)$";// 验证IP地址
+	
+	public static final String nickNameRegexp = "^[0-9a-zA-Z]{6,20}$";//用户名验证
+	public static final String frameNoRegexp = "^[0-9a-zA-Z]{2,30}$";//车架号
+	//卡号
+	public static final String cardNum = "^\\d{20}$";
+	public static final String cardNumTail = "^\\d{16}$";
+
+	private static final Pattern idCodePattern = Pattern.compile(idCodeRegexp);
+	private static final Pattern mobilePattern = Pattern.compile(mobileRegexp);
+	private static final Pattern phonePattern = Pattern.compile(phoneRegexp);
+	private static final Pattern zipCodePattern = Pattern.compile(zipRegexp);
+	private static final Pattern acceptNoPattern = Pattern.compile(acceptNoRegexp);
+	
+	private static final Pattern smsCodePattern = Pattern.compile(smsCodeRegexp);
+	private static final Pattern validCodePattern = Pattern.compile(validCodeRegexp);
+	private static final Pattern driverIdPattern = Pattern.compile(driverIdRegexp);
+	private static final Pattern emailPattern = Pattern.compile(emailRegexp);
+	private static final Pattern chineseNamePattern = Pattern.compile(chineseNameRegexp);
+	// private static final Pattern noChinesePattern = Pattern.compile(noChineseRegexp);
+	private static final Pattern orgCodePattern = Pattern.compile(orgCodeRegexp);
+	private static final Pattern creditCodePattern = Pattern.compile(creditCodeRegexp);
+	private static final Pattern twCnIdCodePattern = Pattern.compile(twCnIdCodeRegexp);
+	private static final Pattern localTaxCodePattern = Pattern.compile(localTaxCodeRegexp);
+	private static final Pattern localTaxWsCodePattern = Pattern.compile(localTaxWsCodeRegexp);
+	private static final Pattern countryTaxCodePattern = Pattern.compile(countryTaxCodeRegexp);
+	private static final Pattern countryTaxWsCodePattern = Pattern.compile(countryTaxWsCodeRegexp);
+	private static final Pattern licenceCodePattern = Pattern.compile(licenceCodeRegexp);
+	private static final Pattern workCodePattern = Pattern.compile(workCodeRegexp);
+	public static final Pattern intPattern = Pattern.compile(intRegexp);
+	public static final Pattern passwordPattern = Pattern.compile(passwordRegexp);// 密码8-20位
+	public static final Pattern sequenceCodePattern = Pattern.compile(sequenceCodeRegexp);
+	private static final Pattern gaCnIdCodePattern = Pattern.compile(gaCnIdCodeRegexp);
+	private static final Pattern myLicenceCodePattern = Pattern.compile(mylicenceCodeRegexp);
+	//private static final Pattern fileReferencePattern = Pattern.compile(fileReferenceRegexp);
+	private static final Pattern urlPattern = Pattern.compile(urlRegexp);
+	private static final Pattern ipPattern = Pattern.compile(ipRegexp);
+	
+	private static final Pattern nickNamePattern = Pattern.compile(nickNameRegexp);
+	private static final Pattern frameNopattern = Pattern.compile(frameNoRegexp);
+	//卡号
+	private static final Pattern cardNumpattern = Pattern.compile(cardNum);
+	private static final Pattern cardTailNumpattern = Pattern.compile(cardNumTail);
+	
+	public static boolean checkCardNum(String cardNum)
+	{
+		return cardNumpattern.matcher(cardNum).matches();
+	}
+	
+	public static boolean checkCardNumTail(String cardNumTail)
+	{
+		return cardTailNumpattern.matcher(cardNumTail).matches();
+	}
+
+	public static boolean checkMyLicenceCode(String licenceCode)
+	{
+		return myLicenceCodePattern.matcher(licenceCode).matches();
+	}
+
+	/**
+	 * 获得当前时间离今天24点的秒数
+	 * 
+	 * @return
+	 */
+	public static int getExpTime()
+	{
+		int time = 0;
+		Calendar now = Calendar.getInstance();
+		Calendar end = Calendar.getInstance();
+		end.set(Calendar.HOUR_OF_DAY, 23);
+		end.set(Calendar.MINUTE, 59);
+		end.set(Calendar.SECOND, 59);
+		time = (int) ((end.getTimeInMillis() - now.getTimeInMillis()) / 1000);
+		return time;
+	}
+
+	public static String trimAllChar(String value)
+	{
+		if (!StringTools.hasText(value)) return null;
+		String tmp = value.replaceAll(",", "");
+		tmp = tmp.replaceAll("<", "");
+		tmp = tmp.replaceAll(">", "");
+		tmp = tmp.replaceAll("&", "");
+		tmp = tmp.replaceAll("\\s", "");
+		return tmp;
+	}
+
+	public static String trimAllHtmlTagAndScriptTag(String string)
+	{
+		if (!StringTools.hasText(string)) return string;
+		String tmp = string.replaceAll("<", "");
+		tmp = tmp.replaceAll(">", "");
+		tmp = tmp.replaceAll("\"", "");
+		tmp = tmp.replaceAll("\'", "");
+		tmp = tmp.replaceAll("\\%", "");
+		tmp = tmp.replaceAll("javascript", "");
+		tmp = tmp.replaceAll("script", "");
+		return tmp;
+	}
+
+	public static boolean checkacceptNo(String acceptNo)
+	{
+		if (!StringTools.hasText(acceptNo)) return false;
+		return acceptNoPattern.matcher(acceptNo).matches();
+	}
+	/**
+	 * 
+	 * 检查手机验证码格式，全数字，六位
+	 * 
+	 * @param smsCode
+	 * @return
+	 */
+	public static boolean checkSmsCode(String smsCode)
+	{
+		if (!StringTools.hasText(smsCode)) return false;
+		return smsCodePattern.matcher(smsCode).matches();
+	}
+
+	public static boolean checkValidCode(String validCode)
+	{
+		if (!StringTools.hasText(validCode)) return false;
+		return validCodePattern.matcher(validCode).matches();
+	}
+
+	/**
+	 * 获得某个位数的随机数
+	 * 
+	 * @param bit
+	 * @return
+	 */
+	public static String getRandCode(int bit)
+	{
+		StringBuilder randomCode = new StringBuilder();
+		for (int i = 0; i < bit; i++)
+		{
+			int code = RandomUtils.nextInt(0, 10);
+			randomCode.append(code);
+		}
+		return randomCode.toString();
+	}
+
+	public static boolean checkDateExpired()
+	{
+		Calendar now = (Calendar) Calendar.getInstance().clone();
+		int day = now.get(Calendar.DAY_OF_MONTH);
+		if (20 < day && day <= 25) return true;
+		return false;
+	}
+
+	private static int[] idWeight = { 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2 };
+	private static String[] idLastCode = { "1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2" };
+
+	/**
+	 * 检测身份证号码格式
+	 * 
+	 * @param idCode
+	 * @throws ManagerException
+	 */
+	public static boolean checkIdCode(String idCode)
+	{
+		if (!StringTools.hasText(idCode)) return false;
+		boolean b = idCodePattern.matcher(idCode).matches();
+		if (!b) return false;
+		String inYear = (idCode.length() == 18) ? idCode.substring(6, 10) : "19" + idCode.substring(6, 8);
+		String inMonth = (idCode.length() == 18) ? idCode.substring(10, 12) : idCode.substring(8, 10);
+		String inDay = (idCode.length() == 18) ? idCode.substring(12, 14) : idCode.substring(10, 12);
+		Calendar idCodeTime = Calendar.getInstance();
+		idCodeTime.set(Integer.parseInt(inYear), Integer.parseInt(inMonth) - 1, Integer.parseInt(inDay));
+		Calendar now = Calendar.getInstance();
+		int year = idCodeTime.get(Calendar.YEAR);
+		int month = idCodeTime.get(Calendar.MONTH) + 1;
+		int day = idCodeTime.get(Calendar.DAY_OF_MONTH);
+		if (!(Integer.parseInt(inYear) == year) || !(Integer.parseInt(inMonth) == month)
+				|| !(Integer.parseInt(inDay) == day) || idCodeTime.after(now) || year < 1900) return false;
+
+		int sum = 0;
+		for (int i = 0; i < 17; i++)
+		{
+			sum += Integer.parseInt(idCode.substring(i, i + 1)) * idWeight[i];
+		}
+		int idIndex = sum % 11;
+		return idLastCode[idIndex].equals(idCode.toUpperCase().substring(17));
+	}
+
+	public static boolean checkBirthday(Calendar birthday)
+	{
+		Calendar before = getBeforeYear(18);
+		return birthday.getTimeInMillis() <= before.getTimeInMillis();
+	}
+
+	/**
+	 * 检测手机号码格式
+	 * 
+	 * @param mobile
+	 * @throws ManagerException
+	 */
+	public static boolean checkMobileFormat(String mobile)
+	{
+		if (!StringTools.hasText(mobile)) return false;
+		if (mobile.length() != 11) return false;
+
+		return mobilePattern.matcher(mobile).matches();
+	}
+
+	/**
+	 * 检测港澳台身份证号 目前只检测长度且不能是港澳通行证
+	 * 
+	 * @param phone
+	 * @throws ManagerException
+	 */
+	public static boolean checkGaIdCodeFormat(String gaIdCode)
+	{
+		if (!StringTools.hasText(gaIdCode)) return false;
+		if (gaIdCode.length() > 10) return false;
+		if (gaIdCode.contains("（") || gaIdCode.contains("）")) return false;
+		return !gaCnIdCodePattern.matcher(gaIdCode).matches();
+	}
+
+	/**
+	 * 
+	 * 检测领馆人员身份证（外交部核发的有效证件） 目前只检测长度
+	 * 
+	 * @param lsCnIdCode
+	 * @return
+	 */
+	public static boolean checkLsCnIdCodeFormat(String lsCnIdCode)
+	{
+		if (!StringTools.hasText(lsCnIdCode)) return false;
+		// TODO 目前只能检测长度
+		return lsCnIdCode.length() <= 14;
+	}
+
+	/**
+	 * 
+	 * 检测驻华机构代码 目前只检测长度
+	 * 
+	 * @param orgCode
+	 * @return
+	 */
+	public static boolean checkZHJGFormat(String orgCode)
+	{
+		if (!StringTools.hasText(orgCode)) return false;
+		// TODO 目前只能检测长度,小于9避免企业误填写机构代码
+		return orgCode.length() <= 8;
+	}
+
+	/**
+	 * 检测电话号码
+	 * 
+	 * @param phone
+	 * @throws ManagerException
+	 */
+	public static boolean checkPhoneFormat(String phone)
+	{
+		if (!StringTools.hasText(phone)) return false;
+		return phonePattern.matcher(phone).matches();
+	}
+
+	/**
+	 * 检测邮编
+	 * 
+	 * @param zipcode
+	 * @throws ManagerException
+	 */
+	public static boolean checkZipcodeFormat(String zipcode)
+	{
+		if (!StringTools.hasText(zipcode)) return false;
+		return zipCodePattern.matcher(zipcode).matches();
+	}
+
+	/**
+	 * 检测驾驶证号
+	 * 
+	 * @param driverId
+	 * @throws ManagerException
+	 */
+	public static boolean checkDriverIdFormat(String driverId)
+	{
+		if (!StringTools.hasText(driverId)) return false;
+		return driverIdPattern.matcher(driverId).matches();
+	}
+
+	/**
+	 * 检测邮箱地址
+	 * 
+	 * @param email
+	 * @return
+	 */
+	public static boolean checkEmailFormat(String email)
+	{
+		if (!StringTools.hasText(email)) return false;
+		return emailPattern.matcher(email).matches();
+	}
+
+	/**
+	 * 检测 中文名
+	 * 
+	 * @param name
+	 * @return
+	 */
+	public static boolean checkChineseNameFormat(String name)
+	{
+		if (!StringTools.hasText(name)) return false;
+		return chineseNamePattern.matcher(name.replace("#", "").replace("·", "")).matches();
+	}
+
+	public static boolean checkLicenceCodeFormat(String licenceCode)
+	{
+		if (!StringTools.hasText(licenceCode)) return false;
+		return licenceCodePattern.matcher(licenceCode).matches();
+	}
+
+	public static boolean checkWorkCodeFormat(String workCode)
+	{
+		if (!StringTools.hasText(workCode)) return false;
+		return workCodePattern.matcher(workCode).matches();
+	}
+
+	private static String symbol = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+	private static int[] orgWeight = { 3, 7, 9, 10, 5, 8, 4, 2 };
+	private static String[] orgLastCode = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "X", "0" };
+
+	public static boolean checkOrgCodeFormat(String orgCode)
+	{
+		if (!StringTools.hasText(orgCode)) return false;
+		boolean b = orgCodePattern.matcher(orgCode).matches();
+		if (!b) return false;
+		int sum = 0;
+		for (int i = 0; i < 8; i++)
+		{
+			String temp = orgCode.substring(i, i + 1);
+			sum += symbol.indexOf(temp) * orgWeight[i];
+		}
+		int idIndex = 11 - (sum % 11);
+		return orgLastCode[idIndex].equals(orgCode.substring(8));
+	}
+	
+	private static String creditSymbol = "0123456789ABCDEFGHJKLMNPQRTUWXY0";
+	private static int[] creditOrgWeight = {1,3,9,27,19,26,16,17,20,29,25,13,8,24,10,30,28 };
+	
+	/**
+	 * 验证统一社会信用代码
+	 * @param creditCode
+	 * @return
+	 */
+	public static boolean checkCreditCodeFormat(String creditCode)
+	{
+		if (!StringTools.hasText(creditCode)) return false;
+		boolean b = creditCodePattern.matcher(creditCode).matches();
+		if (!b) return false;
+		if(!checkOrgCodeFormat(creditCode.substring(8, 17))) return false;
+		int sum = 0;
+		for (int i = 0; i < 17; i++)
+		{
+			String temp = creditCode.substring(i, i + 1);
+			sum += creditSymbol.indexOf(temp) * creditOrgWeight[i];
+		}
+		int idIndex = 31 - (sum % 31);
+		return creditSymbol.substring(idIndex, idIndex + 1).equals(creditCode.substring(17));
+	}
+
+	/**
+	 * 检测 台湾往来大陆通行证
+	 * 
+	 * @param TwCnIdCode
+	 * @return
+	 */
+	public static boolean checkTwCnIdCodeFormat(String TwCnIdCode)
+	{
+		if (!StringTools.hasText(TwCnIdCode)) return false;
+		return twCnIdCodePattern.matcher(TwCnIdCode).matches();
+	}
+
+	/**
+	 * 检测 港澳往来内地通行证
+	 * 
+	 * @param gaCnIdCode
+	 * @return
+	 */
+	public static boolean checkGaCnIdCodeFormat(String gaCnIdCode)
+	{
+		if (!StringTools.hasText(gaCnIdCode)) return false;
+		return gaCnIdCodePattern.matcher(gaCnIdCode).matches();
+	}
+
+	/**
+	 * 检测士官证
+	 * 
+	 * @param sgzCnIdCode
+	 * @return
+	 */
+	public static boolean checkSgzCnIdCodeFormat(String sgzCnIdCode)
+	{
+		if (!StringTools.hasText(sgzCnIdCode)) return false;
+		// TODO 目前只检测长度
+		return sgzCnIdCode.length() <= 20;
+	}
+
+	public static boolean checkPassportCnIdCodeFormat(String passportCnIdCode)
+	{
+		if (!StringTools.hasText(passportCnIdCode)) return false;
+		// TODO 目前只检测长度
+		return passportCnIdCode.length() <= 14;
+	}
+
+	// 港澳台及境外人员身份证明(申请原机动车所使用的)
+	public static boolean checkGatwIdCodeFormat(String idCode)
+	{
+		if (!StringTools.hasText(idCode)) return false;
+		// TODO 目前只检测长度
+		return idCode.length() <= 20;
+	}
+
+	/**
+	 * 20140527 根据工商的要求进行修改
+	 * 
+	 * 纯数字的必须是13或15位， 含汉字的小于等于20位
+	 * 
+	 *** 
+	 * 请严格按照营业执照上的注册号填写，如： a.新的注册号为15位数字 如 330100123456789； 也有一些企业的注册号为13位数字 如 3301081234567
+	 * b.有些外资企业的注册号为汉字数字组合 如 “企合粤深总字第012345号”，汉字部分也要输入完全。
+	 *** 
+	 * @param busLicence
+	 * @return
+	 */
+	public static boolean checkBusLicenceFormat(String busLicence)
+	{
+		if (!StringTools.hasText(busLicence)) return false;
+		if (busLicence.matches("^[0-9]*$"))
+		{
+			if (busLicence.length() == 13 || busLicence.length() == 15) return true;
+		}
+		else if (busLicence.matches("^[\u4e00-\u9fa5]+[0-9]+[\u4e00-\u9fa5]$") && busLicence.length() <= 20)
+			return true;
+		return false;
+		// if (busLicence.length() != 6 && busLicence.length() != 13 && busLicence.length() != 15)
+		// return false;
+		// return busLicence.matches("[0-9]{1,}");
+	}
+
+	/**
+	 * 国税号 为数字+大写字母，9-25位 并且后9为是 组织机构代码
+	 * 
+	 * @param countryTaxCode
+	 * @param orgCode
+	 * @return
+	 */
+	public static boolean checkCountryTaxCodeFormat(String countryTaxCode, String orgCode)
+	{
+		if (!StringTools.hasText(countryTaxCode)) return false;
+		if (!countryTaxCodePattern.matcher(countryTaxCode).matches()) return false;
+		return true;
+	}
+
+	// 国税文书号校验
+	public static boolean checkGsWsCodeFormat(String gsWs)
+	{
+		if (!StringTools.hasText(gsWs)) return false;
+		if (!countryTaxWsCodePattern.matcher(gsWs).matches()) return false;
+		return true;
+	}
+
+	// 地税文书号校验
+	public static boolean checkDsWsCodeFormat(String dsWs)
+	{
+		if (!StringTools.hasText(dsWs)) return false;
+		if (!localTaxWsCodePattern.matcher(dsWs).matches()) return false;
+		return true;
+	}
+
+	public static boolean checkSequenceCode(String sequenceCode)
+	{
+		if (!StringTools.hasText(sequenceCode)) return false;
+		return sequenceCodePattern.matcher(sequenceCode).matches();
+	}
+
+	public static boolean checkPassword(String passwd)
+	{
+		if (!StringTools.hasText(passwd)) return false;
+		return passwordPattern.matcher(passwd).matches();
+	}
+
+	/**
+	 * 地税号 为数字+大写字母，9-25位 并且后9为是 组织机构代码
+	 * 
+	 * @param localTaxCode
+	 * @param orgCode
+	 * @return
+	 */
+	public static boolean checkLocalTaxCodeFormat(String localTaxCode, String orgCode)
+	{
+		if (!StringTools.hasText(localTaxCode)) return false;
+		if (!localTaxCodePattern.matcher(localTaxCode).matches()) return false;
+		return true;
+	}
+
+	/**
+	 * 检查编码情况
+	 * 
+	 * @param str
+	 * @return
+	 */
+	public static boolean checkCode(String str)
+	{
+		int length = str.length();
+		int bytLength = str.getBytes().length;
+
+		// 都是半角的情况
+		if (bytLength == length)
+		{
+			return true;
+		}
+
+		// 都是全角的情况
+		else if (bytLength == 2 * length)
+		{
+			return false;
+		}
+
+		// 有全角有半角
+		else
+		{
+			return false;
+		}
+	}
+
+	public static boolean checkFileReferenceFormat(String fileReference)
+	{
+		if (!StringTools.hasText(fileReference)) return false;
+		// return fileReferencePattern.matcher(fileReference).matches();
+		if (fileReference.length() < 9 || fileReference.length() > 10) return false;
+		return true;
+	}
+
+	private static Calendar getBeforeYear(int before)
+	{
+		Calendar now = Calendar.getInstance();
+		now.add(Calendar.YEAR, -before);
+		now.set(Calendar.HOUR_OF_DAY, 0);
+		now.set(Calendar.MINUTE, 0);
+		now.set(Calendar.SECOND, 0);
+		now.set(Calendar.MILLISECOND, 0);
+		return now;
+	}
+
+	/**
+	 * 
+	 * 2014年11月12日 下午4:44:27 检验输入项是否为数字
+	 * 
+	 * @param intRegexp
+	 * @return
+	 */
+	public static boolean checkIntRege(String intRegexp)
+	{
+		if (!StringTools.hasText(intRegexp)) return false;
+		return intPattern.matcher(intRegexp).matches();
+	}
+	
+	/**
+	 * 检测URL
+	 * 
+	 * @param email
+	 * @return
+	 */
+	public static boolean checkUrlFormat(String url)
+	{
+		if (!StringTools.hasText(url)) return false;
+		return urlPattern.matcher(url).matches();
+	}
+	
+	/**
+	 * 检测IP地址
+	 * 
+	 * @param email
+	 * @return
+	 */
+	public static boolean checkIpFormat(String ip)
+	{
+		if (!StringTools.hasText(ip)) return false;
+		return ipPattern.matcher(ip).matches();
+	}
+	/**
+	 * 检测用户名
+	 * @param nickName
+	 * @return
+	 */
+	public static boolean checkNickName(String nickName)
+	{
+		if(!StringTools.hasText(nickName)) return false;
+		return nickNamePattern.matcher(nickName).matches();
+	}
+	
+	public static boolean checkFrameNo(String frameNo)
+	{
+		if(!StringTools.hasText(frameNo)) return false;
+		return frameNopattern.matcher(frameNo).matches();
+	}
+
+	public static void main(String[] args) {
+		boolean b = checkIdCode("411522199809197556");
+		System.out.println("打印==========");
+		System.out.println(b);
+	}
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/ass/AssServiceCmd.java

@@ -43,6 +43,7 @@ public enum AssServiceCmd implements SignServiceCommand {
 //    REIMBURSEORDERPAY("补缴订单支付", ReimburseOrderPayRequest.class),
 //    REIMBURSEORDERPAY("补缴订单通行流水查询", ReimburseOrderPayRequest.class),
     SIGNCHANGEAPPLY("签约变更申请", SignChangeApplyRequest.class),
+    SIGNCHANGECOLLECT("签约变更收集信息", SignChangeCollectRequest.class),
     ;
 
     private final String value;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/ass/SignChangeApplyRequest.java

@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
 @Setter
 public class SignChangeApplyRequest extends AbstractSignTypeRequest<SignChangeApplyResponse> {
 
-    protected SignChangeApplyRequest() {
+    public SignChangeApplyRequest() {
         super(AssServiceCmd.SIGNCHANGEAPPLY);
     }
     private String staffId;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/ass/SignChangeCollectRequest.java

@@ -0,0 +1,90 @@
+package cn.com.taiji.core.model.comm.protocol.ias.ass;
+
+import cn.com.taiji.core.entity.dict.basic.UseUserType;
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
+import cn.com.taiji.core.model.comm.protocol.constraint.EnumInteger;
+import cn.com.taiji.core.model.comm.protocol.valid.RegexConstant;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.*;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/9/18 20:28
+ * @Filename：SignChangeCollectRequest
+ * @description:
+ */
+@Getter
+@Setter
+public class SignChangeCollectRequest extends AbstractSignTypeRequest<SignChangeCollectResponse> {
+    protected SignChangeCollectRequest() {
+        super(AssServiceCmd.SIGNCHANGECOLLECT);
+    }
+    @NotBlank
+    private String orderNo;
+    @NotBlank
+    private String vehiclePlate;// 车牌号
+    //    @NotNull
+//    @EnumInteger(enumClazz = PlateColorType.class)
+//    @ApiModelProperty(value = "车牌颜色", required = true)
+//    private Integer vehiclePlateColor;// 车牌颜色
+    @NotBlank
+    private String vehPosImgUrl;// 行驶证主页照片
+    @NotBlank
+    private String vehNegImgUrl;// 行驶证副页照片
+    @NotBlank
+    private String vehicleName;//行驶证姓名
+    @NotNull
+    @EnumInteger(enumClazz = UseUserType.class)
+    private Integer useUserType;//车辆使用类型
+    //    @NotNull
+//    @IntegerConstant(values = "1,2,3")
+//    @ApiModelProperty(value = "客货类型 1客车 2货车 3专项作业；用户选择", required = true)
+//    private Integer vanType;// 客货类型 1客车 2货车 3专项作业
+    @NotBlank
+    @Pattern(message = "VIN格式不正确", regexp = RegexConstant.vinRegexp)
+    @Size(message = "VIN码最大长度为50字符", max = 50)
+    private String vin;// vin码
+    @NotBlank
+    private String engineNum;// 发动机编号
+    @NotBlank
+    private String vehicleType;// 行驶证车辆类型
+    @NotBlank
+    private String vehicleModel;// 行驶证车辆品牌
+    @NotNull
+    private Integer approvedCount;// 核定载人数
+    @NotNull
+    private Integer totalMass;// 总质量
+    private Integer maintenaceMass;// 整备质量
+    private Integer permittedWeight;// 核定载质量
+    private Integer permittedTowWeight;// 准牵引总质量
+    @NotBlank
+    private String vehicleDimensions;// 车辆尺寸
+    @Min(value = 2)
+    @NotNull
+    private Integer axleCount;// 车轴数
+    @NotBlank
+    private String issueDate;// 发证日期
+    //    @ApiModelProperty(value = "道路运输证号码")
+//    private String transportIdNum;// 道路运输证编号
+//    @ApiModelProperty(value = "经营许可证编号")
+//    private String licenseIdNum;// 经营许可证编号
+    @NotBlank
+    private String vehBodyUrl;// 车身45°照片
+    //    @ApiModelProperty(value = "道路运输许可证图片地址")
+//    private String roadTransportPermitPicUrl;// 道路运输许可证图片地址
+//    @NotNull
+//    @EnumInteger(enumClazz = VehicleUseCharacter.class)
+//    @ApiModelProperty(value = "车辆使用性质", required = true)
+//    private Integer character;//车辆使用性质;
+    @NotBlank
+    private String registerDate;// 注册日期
+//    @IntegerConstant(values = "0,1")
+//    @ApiModelProperty(value = "应急车辆标识")
+//    private Integer emergencyFlag;// 应急车辆标识 0-非应急车辆 1-应急车辆
+//    @NotNull
+//    @EnumInteger(enumClazz = VehicleType.class)
+//    @ApiModelProperty(value = "收费车型", required = true)
+//    private Integer feeVehicleType;//收费车型 后端自己计算
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/ass/SignChangeCollectResponse.java

@@ -0,0 +1,16 @@
+package cn.com.taiji.core.model.comm.protocol.ias.ass;
+
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/9/18 20:28
+ * @Filename：SignChangeCollectResponse
+ * @description:
+ */
+@Getter
+@Setter
+public class SignChangeCollectResponse extends AbstractSignTypeResponse {
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/VehicleUploadRequest.java

@@ -8,13 +8,12 @@ import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
 import cn.com.taiji.core.model.comm.protocol.constraint.EnumInteger;
 import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
 import cn.com.taiji.core.model.comm.protocol.valid.ErrorMsgBuilder;
+import cn.com.taiji.core.model.comm.protocol.valid.RegexConstant;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.*;
 
 @Getter
 @Setter
@@ -42,6 +41,8 @@ public class VehicleUploadRequest extends AbstractSignTypeRequest<VehicleUploadR
     @IntegerConstant(values = "1,2,3")
     private Integer vanType;// 客货类型 1客车 2货车 3专项作业
     @NotBlank
+    @Pattern(message = "VIN格式不正确", regexp = RegexConstant.vinRegexp)
+    @Size(message = "VIN码最大长度为50字符", max = 50)
     private String vin;// vin码
     @NotBlank
     private String engineNum;// 发动机编号

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/ass/AssReimburseOrderRepo.java

@@ -0,0 +1,14 @@
+package cn.com.taiji.core.repo.jpa.ass;
+
+import org.springframework.data.jpa.repository.Query;
+
+import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.ass.AssReimburseOrder;
+
+public interface AssReimburseOrderRepo extends AbstractJpaRepo<AssReimburseOrder, String> {
+
+    //根据订单号查询
+    @Query(" from AssReimburseOrder where reimburseOrderId=?1")
+    public AssReimburseOrder findByReimburseOrderId(String reimburseOrderId);
+
+}

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/log/YgzInterfaceLogRepo.java

@@ -2,6 +2,7 @@ package cn.com.taiji.core.repo.jpa.log;
 
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
 import cn.com.taiji.core.entity.dict.InterfaceStatus;
+import cn.com.taiji.core.entity.dict.ygz.NioTransferType;
 import cn.com.taiji.core.entity.dict.ygz.YgzSendStatus;
 import cn.com.taiji.core.entity.log.YgzInterfaceLog;
 import org.springframework.data.jpa.repository.Query;
@@ -14,4 +15,5 @@ public interface YgzInterfaceLogRepo extends AbstractJpaRepo<YgzInterfaceLog, St
     YgzInterfaceLog findBy(String uniqueId, String ifCode, InterfaceStatus status, YgzSendStatus sendStatus);
     @Query(" from YgzInterfaceLog where sendStatus = ?1 and resendTimes < 5")
     List<YgzInterfaceLog> listBySendStatusLessThen5Times(YgzSendStatus sendStatus);
+    List<YgzInterfaceLog> findBySendStatusAndNioTransferType(YgzSendStatus sendStatus, NioTransferType nioTransferType);
 }

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/ygz/DaspOfflineHasSendRepo.java

@@ -14,6 +14,8 @@ import java.util.List;
 
 public interface DaspOfflineHasSendRepo extends AbstractJpaRepo<DaspOfflineHasSend, String> {
 
+    List<DaspOfflineHasSend> findBySuccessAndOfflineSendType(Boolean success, OfflineSendType offlineSendType);
+
     @Query(" from DaspOfflineHasSend where ygzOperation=?1 and offlineSendType=?2 and currentSendStatus=?3 and sendTimes<5 ")
     List<DaspOfflineHasSend> listBy(Operation ygzOperation, OfflineSendType offlineSendType, int currentSendStatus);
     @Query(" from DaspOfflineHasSend where id=?1 and offlineSendType=?2 ")

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/ass/AssReimburseOrderPageRequest.java

@@ -0,0 +1,44 @@
+package cn.com.taiji.core.repo.request.ass;
+
+import cn.com.taiji.common.pub.dao.HqlBuilder;
+import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
+import cn.com.taiji.core.entity.ass.AssReimburseOrder;
+import cn.com.taiji.core.entity.dict.AuditStatus;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AssReimburseOrderPageRequest extends JpaDateTimePageableDataRequest<AssReimburseOrder> {
+
+    private String reimburseOrderId; // 订单id
+    private SourceType sourceType;//来源
+    private String operateStaffId;// 录入员工工号
+    private String customerId;//用户编号
+    private String cardId;//卡号
+    private String vehicleId;
+    private String agencyIds;
+    private String payOrderNo;//支付订单编号 自己规则生成 商户订单号
+    private AuditStatus status;//审核状态
+
+    public AssReimburseOrderPageRequest() {
+        this.orderBy="updateTime";
+        this.desc=true;
+    }
+
+    @Override
+    public HqlBuilder toSelectHql() {
+        HqlBuilder hql = new HqlBuilder("from AssReimburseOrder where 1=1 ");
+        hql.append(" and reimburseOrderId = :reimburseOrderId", reimburseOrderId);
+        hql.append(" and sourceType = :sourceType", sourceType);
+        hql.append(" and operateStaffId = :operateStaffId", operateStaffId);
+        hql.append(" and customerId = :customerId", customerId);
+        hql.append(" and cardId = :cardId", cardId);
+        hql.append(" and vehicleId = :vehicleId", vehicleId);
+        hql.append(" and agencyId in (:agencyIds)", agencyIds);
+        hql.append(" and payOrderNo = :payOrderNo", payOrderNo);
+        hql.append(" and status = :status", status);
+        return hql;
+    }
+}

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/dict/DataType.java

@@ -47,6 +47,7 @@ public enum DataType {
     ASSORDER_PAYINFO("assOrderPayInfo", IasServiceType.ASS, AssServiceCmd.PAYINFO),
     ASSORDER_SENDINFO("assOrderSendInfo", IasServiceType.ASS, AssServiceCmd.SENDINFO),
     SIGNCHANGE_APPLY("signChangeApply", IasServiceType.ASS, AssServiceCmd.SIGNCHANGEAPPLY),
+    SIGNCHANGE_COLLECT("signChangeCollect", IasServiceType.ASS, AssServiceCmd.SIGNCHANGECOLLECT),
 
 
     ;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/SignChangeCollectManager.java

@@ -0,0 +1,73 @@
+package cn.com.taiji.ias.manager.ass;
+
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
+import cn.com.taiji.core.entity.ass.AssOrderinfo;
+import cn.com.taiji.core.entity.basic.QtkVehicleInfo;
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.ass.SignChangeCollectRequest;
+import cn.com.taiji.core.model.comm.protocol.valid.ErrorMsgBuilder;
+import cn.com.taiji.ias.dict.DataType;
+import cn.com.taiji.ias.manager.audit.VerificationRuleManager;
+import cn.com.taiji.ias.model.ServiceLogEvent;
+import cn.com.taiji.ias.model.issue.CarOcrCheck;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/9/18 20:34
+ * @Filename：SignChangeCollectManager
+ * @description:
+ */
+@Service
+public class SignChangeCollectManager extends AbstractAssManager<SignChangeCollectRequest>{
+    public SignChangeCollectManager() {
+        super(DataType.SIGNCHANGE_COLLECT);
+    }
+    @Autowired
+    protected VerificationRuleManager verificationRuleManager;
+
+
+    @Override
+    protected String getDataId(SignChangeCollectRequest req) {
+        return "";
+    }
+
+    @Override
+    protected void formatValidateInternal(ErrorMsgBuilder builder, SignChangeCollectRequest req, ServiceLogEvent event, Map<String, Object> dataStream) throws ServiceHandleException {
+
+    }
+
+    @Override
+    protected void businessValidateInternal(ErrorMsgBuilder builder, SignChangeCollectRequest req, ServiceLogEvent event, Map<String, Object> dataStream) throws ServiceHandleException {
+
+        AssOrderinfo assOrderinfo = orderInfoRepo.findByOrderNo(req.getOrderNo());
+        if (assOrderinfo == null) {
+            throw newBusinessException("订单不存在");
+        }
+        StringBuilder sBuilder = new StringBuilder();
+        QtkVehicleInfo vehicleInfo = vehicleInfoRepo.findByVehicleId(assOrderinfo.getVehicleId());
+        CarOcrCheck carOcrCheck = new CarOcrCheck();
+        carOcrCheck.setVehiclePlate(req.getVehiclePlate());
+        carOcrCheck.setOwnerName(req.getVehicleName());
+        carOcrCheck.setVin(req.getVin());
+        carOcrCheck.setVehicleModel(req.getVehicleModel());
+        carOcrCheck.setVehPosImgUrl(req.getVehPosImgUrl());
+        int i = vehicleInfo.getType() / 10;
+        carOcrCheck.setVanType(i+1);
+        carOcrCheck.setVehicleDimensions(req.getVehicleDimensions());
+        carOcrCheck.setApprovedCount(req.getApprovedCount());
+        carOcrCheck.setTotalMass(req.getTotalMass());
+        carOcrCheck.setVehNegImgUrl(req.getVehNegImgUrl());
+        verificationRuleManager.ocrVarifyVehicle(carOcrCheck, sBuilder);
+
+    }
+
+    @Override
+    protected AbstractSignTypeResponse getRes(SignChangeCollectRequest req, ServiceLogEvent event, Map<String, Object> dataStream) throws ServiceHandleException, IOException {
+        return null;
+    }
+}

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/AssServiceHandler.java

@@ -99,6 +99,8 @@ public class AssServiceHandler extends AbstractIasServiceHandler<AssServiceCmd>
 
     @Autowired
     private SignChangeApplyManager signChangeApplyManager;
+    @Autowired
+    private SignChangeCollectManager signChangeCollectManager;
 
 
     public AssServiceHandler() {
@@ -171,6 +173,8 @@ public class AssServiceHandler extends AbstractIasServiceHandler<AssServiceCmd>
 //                return reimburseOrderCancelManager.serviceHandle((ReimburseOrderCancelRequest) request);
             case SIGNCHANGEAPPLY:
                 return signChangeApplyManager.serviceHandle((SignChangeApplyRequest) request, jsonReq.getIfCode(), jsonReq.getReqId(), reqInfo);
+            case SIGNCHANGECOLLECT:
+                return signChangeCollectManager.serviceHandle((SignChangeCollectRequest) request, jsonReq.getIfCode(), jsonReq.getReqId(), reqInfo);
             default:
                 throw FileProtocolSystemError.NOT_SUPPORT.toHandleException(jsonReq.getIfCode());
         }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/AbstractOrderManager.java

@@ -88,6 +88,7 @@ public abstract class AbstractOrderManager<T extends AbstractSignTypeRequest<?>>
         return order;
     }
 
+
     protected IssueOrderinfo checkQdOrder(String qdOrderNo) throws ServiceHandleException {
         IssueOrderinfo order = orderInfoRepo.findByQdOrderNo(qdOrderNo);
         if (order == null) {

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/UserUploadManager.java

@@ -13,6 +13,7 @@ import cn.com.taiji.core.entity.issue.IssueOrderinfo;
 import cn.com.taiji.core.entity.issue.IssueOrderinfoExt;
 import cn.com.taiji.core.entity.user.AccountInfo;
 import cn.com.taiji.core.entity.user.Staff;
+import cn.com.taiji.core.manager.tools.MyPatterns;
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.order.GetCustomerIdRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.order.GetCustomerIdResponse;
@@ -23,6 +24,7 @@ import cn.com.taiji.core.model.comm.protocol.ods.oqs.issue.OqsUserQueryRequest;
 import cn.com.taiji.core.model.comm.protocol.ods.oqs.issue.OqsUserQueryResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.ErrorMsgBuilder;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
+import cn.com.taiji.core.model.comm.protocol.valid.RegexConstant;
 import cn.com.taiji.ias.dict.DataType;
 import cn.com.taiji.ias.manager.portal.AuthManager;
 import cn.com.taiji.ias.manager.portal.RegisterNoCodeManager;
@@ -35,8 +37,11 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+
 
 @Service
 public class UserUploadManager extends AbstractOrderManager<UserUploadRequest> {
@@ -46,8 +51,7 @@ public class UserUploadManager extends AbstractOrderManager<UserUploadRequest> {
 
     @Autowired
     private RegisterNoCodeManager registerNoCodeManager;
-    @Autowired
-    private AuthManager authManager;
+
     public UserUploadManager() {
         super(DataType.USER_UPLOAD);
     }
@@ -99,9 +103,15 @@ public class UserUploadManager extends AbstractOrderManager<UserUploadRequest> {
         // 判断手机号账号情况
         String mobile = request.getMobile();
         String idNum = request.getUserIdNum();
+        IdType idType = IdType.findByCode(request.getUserIdType());
         if (!UserType.PERSONAL_USER.equals(order.getUserType())){
             mobile = request.getAgentTel();
             idNum = request.getAgentIdNum();
+            idType = IdType.findByCode(request.getAgentIdType());
+        }
+        //身份证校验
+        if (IdType.SFZ == idType) {
+            throwBisExceptionOn(!MyPatterns.checkIdCode(idNum),"身份证证件号码不正确");
         }
         AccountInfo accountInfo = accountInfoRepo.findByMobile(mobile);
         throwBisExceptionOn(accountInfo!=null && hasText(accountInfo.getIdNum())&&!idNum.equals(accountInfo.getIdNum()), "手机号已绑定其他证件号码");

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ygz/nio/YgzParameterCorrectUtil.java

@@ -357,7 +357,7 @@ public class YgzParameterCorrectUtil extends AbstractManager {
         vehicleUpload.setAxleCount(axleCount);
         vehicleUpload.setAxleDistance(axleDistance);
         vehicleUpload.setAxleType(axleType);
-        vehicleUpload.setContact(contact);
+        vehicleUpload.setContact(contact.replace("(","").replace(")","").replace("（","").replace("）",""));
         vehicleUpload.setCustomer(customerInfo);
         vehicleUpload.setDataSource(dataSource);
         vehicleUpload.setEngineNum(engineNum);