瀏覽代碼

初次提骄傲你

u207805 5 年之前
父節點
當前提交
613203e1fc

+ 3 - 0
incremental_packet/.gitignore

@@ -0,0 +1,3 @@
+/bin/
+/.classpath
+/.settings/

+ 17 - 0
incremental_packet/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>incremental_packet</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

+ 128 - 0
incremental_packet/src/com/hy/ClassPatchUtil.java

@@ -0,0 +1,128 @@
+package com.hy;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ClassPatchUtil {
+	
+	public static String fileName="添加打印权限";//补丁文件名
+	
+	public static String patchFile="C:/办公文档/增量包/"+fileName+".txt";//补丁文件路径
+	public static String projectPath="C:/Development/WorkSpace";//工作空间路径
+	public static String webContent="/WebContent";//web应用文件夹名
+	public static String projectNmae=null;//项目名称(下边会自动从补丁文件中获取)
+	public static String classPath=null;//class存放路径(编译后的class,默认从/target/classes中取)
+	public static String desPath="C:/办公文档/增量包";//增量包存放路径
+	static SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
+	public static String version=fileName+"_"+sdfDate.format(new Date());//补丁版本(补丁文件名_当前日期)
+	
+	/**
+	 * @param args
+	 * @throws Exception 
+	 */
+	public static void main(String[] args) throws Exception {
+		copyFiles(getPatchFileList());
+	}
+	
+	@SuppressWarnings("resource")
+	public static List<String> getPatchFileList() throws Exception{
+		List<String> fileList=new ArrayList<String>();
+		FileInputStream f = new FileInputStream(patchFile); 
+		BufferedReader dr = new BufferedReader(new InputStreamReader(f,"utf-8"));
+		String line;
+		while((line=dr.readLine())!=null){ 
+			if(line.indexOf("path")!=-1){
+				line=line.replaceAll("\\s*", ""); 
+				line=line.substring(line.indexOf("path")+4,line.length());
+				if(classPath == null) {
+					int index = line.indexOf("/src");
+					index = index == -1 ? line.indexOf(webContent) : index;
+					projectNmae = line.substring(0, index);
+					projectPath += projectNmae;
+					classPath = projectPath + "/target/classes";
+				}
+				line=line.replaceAll(projectNmae,"");
+				fileList.add(line);
+			}
+		} 
+		return fileList;
+	}
+	
+	public static void copyFiles(List<String> list){
+		for(String fullFileName:list){
+			if(fullFileName.indexOf("src/")!=-1 || fullFileName.indexOf("config/")!=-1){//对源文件目录下的文件处理
+				String fileName=fullFileName.replace("/src","");
+				fullFileName=classPath+fileName;
+				if(fileName.endsWith(".java")){
+					fileName=fileName.replace(".java",".class");
+					fullFileName=fullFileName.replace(".java",".class");
+				}
+				String desFileNameStr=desPath+"/"+version+projectNmae+"/WEB-INF/classes"+fileName;
+				String desFilePathStr=desFileNameStr.substring(0,desFileNameStr.lastIndexOf("/"));
+				File desFilePath=new File(desFilePathStr);
+				if(!desFilePath.exists()){
+					desFilePath.mkdirs();
+				}
+				copyFile(fullFileName, desFileNameStr);
+				System.out.println(desFileNameStr);
+			}else{//对普通目录的处理
+				String desFileName=fullFileName.replaceAll(webContent,"");
+				fullFileName=projectPath+fullFileName;//将要复制的文件全路径
+				String fullDesFileNameStr=desPath+"/"+version+projectNmae+desFileName;
+				String desFilePathStr=fullDesFileNameStr.substring(0,fullDesFileNameStr.lastIndexOf("/"));
+				File desFilePath=new File(desFilePathStr);
+				if(!desFilePath.exists()){
+					desFilePath.mkdirs();
+				}
+				copyFile(fullFileName, fullDesFileNameStr);
+				System.out.println(fullDesFileNameStr);
+			}
+		}
+		System.out.println("共 "+list.size()+"个文件复制完成");
+	}
+
+	private static void copyFile(String sourceFileNameStr, String desFileNameStr) {
+		File srcFile=new File(sourceFileNameStr);
+		File desFile=new File(desFileNameStr);
+		try {
+			copyFile(srcFile, desFile);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	public static void copyFile(File sourceFile, File targetFile) throws IOException {
+        BufferedInputStream inBuff = null;
+        BufferedOutputStream outBuff = null;
+        try {
+            // 新建文件输入流并对它进行缓冲
+            inBuff = new BufferedInputStream(new FileInputStream(sourceFile));
+            // 新建文件输出流并对它进行缓冲
+            outBuff = new BufferedOutputStream(new FileOutputStream(targetFile));
+            // 缓冲数组
+            byte[] b = new byte[1024 * 5];
+            int len;
+            while ((len = inBuff.read(b)) != -1) {
+                outBuff.write(b, 0, len);
+            }
+            // 刷新此缓冲的输出流
+            outBuff.flush();
+        } finally {
+            // 关闭流
+            if (inBuff != null)
+                inBuff.close();
+            if (outBuff != null)
+                outBuff.close();
+        }
+    }
+}

+ 127 - 0
incremental_packet/src/com/hy/GitPatchUtil.java

@@ -0,0 +1,127 @@
+package com.hy;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class GitPatchUtil {
+	
+	public static String fileName="更新签收时间";//补丁文件名
+	
+	public static String patchFile="C:/办公文档/增量包/"+fileName+".txt";//补丁文件路径
+	public static String projectPath="C:/Development/GitRepository";//工作空间路径
+	public static String webContent="/src/main/webapp";//web应用文件夹名
+	public static String projectNmae=null;//项目名称(下边会自动从补丁文件中获取)
+	public static String classPath=null;//class存放路径(编译后的class,默认从/target/classes中取)
+	public static String desPath="C:/办公文档/增量包";//增量包存放路径
+	static SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
+	public static String version=fileName+"_"+sdfDate.format(new Date());//补丁版本(补丁文件名_当前日期)
+	
+	/**
+	 * @param args
+	 * @throws Exception 
+	 */
+	public static void main(String[] args) throws Exception {
+		copyFiles(getPatchFileList());
+	}
+	
+	@SuppressWarnings("resource")
+	public static List<String> getPatchFileList() throws Exception{
+		List<String> fileList=new ArrayList<String>();
+		FileInputStream f = new FileInputStream(patchFile); 
+		BufferedReader dr = new BufferedReader(new InputStreamReader(f,"utf-8"));
+		String line;
+		while((line=dr.readLine())!=null){ 
+			if(line.indexOf("path")!=-1){
+				line=line.replaceAll("\\s*", ""); 
+				line=line.substring(line.indexOf("path")+4,line.length());
+				if(classPath == null) {
+					int index = line.indexOf("/src");
+					projectNmae = line.substring(0, index);
+					projectPath += projectNmae;
+					classPath = projectPath + "/target/classes";
+				}
+				line=line.replaceAll(projectNmae,"");
+				fileList.add(line);
+			}
+		} 
+		return fileList;
+	}
+	
+	public static void copyFiles(List<String> list){
+		for(String fullFileName:list){
+			if(fullFileName.indexOf("java/")!=-1 || fullFileName.indexOf("resources/")!=-1){//对源文件目录下的文件处理
+				String fileName=fullFileName.replace("/src/main/java","").replace("/src/main/resources","");
+				fullFileName=classPath+fileName;
+				if(fileName.endsWith(".java")){
+					fileName=fileName.replace(".java",".class");
+					fullFileName=fullFileName.replace(".java",".class");
+				}
+				String desFileNameStr=desPath+"/"+version+projectNmae+"/WEB-INF/classes"+fileName;
+				String desFilePathStr=desFileNameStr.substring(0,desFileNameStr.lastIndexOf("/"));
+				File desFilePath=new File(desFilePathStr);
+				if(!desFilePath.exists()){
+					desFilePath.mkdirs();
+				}
+				copyFile(fullFileName, desFileNameStr);
+				System.out.println(desFileNameStr);
+			}else{//对普通目录的处理
+				String desFileName=fullFileName.replaceAll(webContent,"");
+				fullFileName=projectPath+fullFileName;//将要复制的文件全路径
+				String fullDesFileNameStr=desPath+"/"+version+projectNmae+desFileName;
+				String desFilePathStr=fullDesFileNameStr.substring(0,fullDesFileNameStr.lastIndexOf("/"));
+				File desFilePath=new File(desFilePathStr);
+				if(!desFilePath.exists()){
+					desFilePath.mkdirs();
+				}
+				copyFile(fullFileName, fullDesFileNameStr);
+				System.out.println(fullDesFileNameStr);
+			}
+		}
+		System.out.println("共 "+list.size()+"个文件复制完成");
+	}
+
+	private static void copyFile(String sourceFileNameStr, String desFileNameStr) {
+		File srcFile=new File(sourceFileNameStr);
+		File desFile=new File(desFileNameStr);
+		try {
+			copyFile(srcFile, desFile);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	public static void copyFile(File sourceFile, File targetFile) throws IOException {
+        BufferedInputStream inBuff = null;
+        BufferedOutputStream outBuff = null;
+        try {
+            // 新建文件输入流并对它进行缓冲
+            inBuff = new BufferedInputStream(new FileInputStream(sourceFile));
+            // 新建文件输出流并对它进行缓冲
+            outBuff = new BufferedOutputStream(new FileOutputStream(targetFile));
+            // 缓冲数组
+            byte[] b = new byte[1024 * 5];
+            int len;
+            while ((len = inBuff.read(b)) != -1) {
+                outBuff.write(b, 0, len);
+            }
+            // 刷新此缓冲的输出流
+            outBuff.flush();
+        } finally {
+            // 关闭流
+            if (inBuff != null)
+                inBuff.close();
+            if (outBuff != null)
+                outBuff.close();
+        }
+    }
+}

+ 124 - 0
incremental_packet/src/com/hy/JavaPatchUtil.java

@@ -0,0 +1,124 @@
+package com.hy;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class JavaPatchUtil {
+	
+	public static String fileName="打印";//补丁文件名
+	
+	public static String patchFile="C:/办公文档/增量包/"+fileName+".txt";//补丁文件路径
+	public static String projectPath="C:/Development/WorkSpace";//工作空间路径
+	public static String webContent="/WebContent";//web应用文件夹名
+	public static String projectNmae=null;//项目名称(下边会自动从补丁文件中获取)
+	public static String classPath=null;//class存放路径(编译后的class,默认从/target/classes中取)
+	public static String desPath="C:/办公文档/增量包";//增量包存放路径
+	static SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
+	public static String version=fileName+"_Java_"+sdfDate.format(new Date());//补丁版本(补丁文件名_当前日期)
+	
+	/**
+	 * @param args
+	 * @throws Exception 
+	 */
+	public static void main(String[] args) throws Exception {
+		copyFiles(getPatchFileList());
+	}
+	
+	@SuppressWarnings("resource")
+	public static List<String> getPatchFileList() throws Exception{
+		List<String> fileList=new ArrayList<String>();
+		FileInputStream f = new FileInputStream(patchFile); 
+		BufferedReader dr = new BufferedReader(new InputStreamReader(f,"utf-8"));
+		String line;
+		while((line=dr.readLine())!=null){ 
+			if(line.indexOf("path")!=-1){
+				line=line.replaceAll("\\s*", ""); 
+				line=line.substring(line.indexOf("path")+4,line.length());
+				if(classPath == null) {
+					int index = line.indexOf("/src");
+					index = index == -1 ? line.indexOf(webContent) : index;
+					projectNmae = line.substring(0, index);
+					projectPath += projectNmae;
+					classPath = projectPath + "/target/classes";
+				}
+				line=line.replaceAll(projectNmae,"");
+				fileList.add(line);
+			}
+		} 
+		return fileList;
+	}
+	
+	public static void copyFiles(List<String> list){
+		for(String fullFileName:list){
+			if(fullFileName.indexOf("src/")!=-1 || fullFileName.indexOf("config/")!=-1){//对源文件目录下的文件处理
+				String fileName=fullFileName.replace("/src","");
+				fullFileName=projectPath+fullFileName;
+				String desFileNameStr=desPath+"/"+version+projectNmae+fileName;
+				String desFilePathStr=desFileNameStr.substring(0,desFileNameStr.lastIndexOf("/"));
+				File desFilePath=new File(desFilePathStr);
+				if(!desFilePath.exists()){
+					desFilePath.mkdirs();
+				}
+				copyFile(fullFileName, desFileNameStr);
+				System.out.println(desFileNameStr);
+			}else{//对普通目录的处理
+				String desFileName=fullFileName.replaceAll(webContent,"");
+				fullFileName=projectPath+fullFileName;//将要复制的文件全路径
+				String fullDesFileNameStr=desPath+"/"+version+projectNmae+desFileName;
+				String desFilePathStr=fullDesFileNameStr.substring(0,fullDesFileNameStr.lastIndexOf("/"));
+				File desFilePath=new File(desFilePathStr);
+				if(!desFilePath.exists()){
+					desFilePath.mkdirs();
+				}
+				copyFile(fullFileName, fullDesFileNameStr);
+				System.out.println(fullDesFileNameStr);
+			}
+		}
+		System.out.println("共 "+list.size()+"个文件复制完成");
+	}
+
+	private static void copyFile(String sourceFileNameStr, String desFileNameStr) {
+		File srcFile=new File(sourceFileNameStr);
+		File desFile=new File(desFileNameStr);
+		try {
+			copyFile(srcFile, desFile);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	public static void copyFile(File sourceFile, File targetFile) throws IOException {
+        BufferedInputStream inBuff = null;
+        BufferedOutputStream outBuff = null;
+        try {
+            // 新建文件输入流并对它进行缓冲
+            inBuff = new BufferedInputStream(new FileInputStream(sourceFile));
+            // 新建文件输出流并对它进行缓冲
+            outBuff = new BufferedOutputStream(new FileOutputStream(targetFile));
+            // 缓冲数组
+            byte[] b = new byte[1024 * 5];
+            int len;
+            while ((len = inBuff.read(b)) != -1) {
+                outBuff.write(b, 0, len);
+            }
+            // 刷新此缓冲的输出流
+            outBuff.flush();
+        } finally {
+            // 关闭流
+            if (inBuff != null)
+                inBuff.close();
+            if (outBuff != null)
+                outBuff.close();
+        }
+    }
+}

+ 303 - 0
incremental_packet/src/com/hy/TiQuUtil.java

@@ -0,0 +1,303 @@
+package com.hy;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+
+public class TiQuUtil {
+
+	public static String patchFile="C:/Users/Administrator/Desktop/20190214/147/接口订单号.txt";//补丁文件路径
+	public static String patchFile1="C:/Users/Administrator/Desktop/20190214/147/出票成功订单.txt";//补丁文件路径
+	
+	/**
+	 * @param args
+	 * @throws Exception 
+	 */
+	public static void main(String[] args) throws Exception {
+		b();
+	}
+
+	@SuppressWarnings("unused")
+	private static void a5() throws Exception {
+		String line;
+		String errorInfo = "";
+		
+		FileInputStream f = new FileInputStream("C:/Users/Administrator/Desktop/数据整理/test.txt");
+		BufferedReader dr = new BufferedReader(new InputStreamReader(f,"utf-8"));
+		while((line=dr.readLine())!=null){
+			line=line.replaceAll("\\s*", "");
+			/*String mainOrderId = line.split(",")[0];
+			String agentId = line.split(",")[2];
+			System.out.println("update TrainOrderOffline set agentid="+agentId+" where OrderNumber = '"+mainOrderId+"';");*/
+			System.out.print("'"+line+"',");
+		}
+	}
+	
+
+	@SuppressWarnings("unused")
+	private static void a3() throws Exception {
+		String line;
+		String errorInfo = "";
+		
+		FileInputStream f = new FileInputStream("C:/Users/Administrator/Desktop/数据整理/下单接受成功未入库ID.txt");
+		BufferedReader dr = new BufferedReader(new InputStreamReader(f,"utf-8"));
+		while((line=dr.readLine())!=null){
+			line=line.replaceAll("\\s*", "");
+			String mainOrderId = line.split(",")[0];
+			String id = line.split(",")[1];
+			FileInputStream f1 = new FileInputStream("C:/Users/Administrator/Desktop/数据整理/线下票_公共出票部分_panDuanChupiao.log");
+			BufferedReader dr1 = new BufferedReader(new InputStreamReader(f1,"utf-8"));
+			String chupaioData = "";
+			String line1 = "";
+			while((line1=dr1.readLine())!=null){
+				try {
+					if(line1.indexOf(id+"_出票点回填出票信息_车厢号:") != -1){
+						line1=line1.replaceAll("\\s*", "");
+						chupaioData += line1.substring(line1.indexOf(id+"_出票点回填出票信息_车厢号:")+18, line1.indexOf(";expressNum"))+",";
+					}
+				} catch (Exception e) {
+					errorInfo += line1+",";
+				}
+			}
+			if(chupaioData.equals("")){
+				System.out.println(line);
+			}else{
+				String[] strs = chupaioData.substring(0, chupaioData.length()-1).split(",");
+				for (int i = 0; i < strs.length; i++) {
+					String SeatNo =  "";
+					String Coach =  "";
+					String sealPrice =  "";
+					String ticketNo = "1";
+					String realSeat =  "";
+					String[] a = strs[i].split(";");
+					for (String str : a) {
+						if(str.indexOf("座位号") != -1) SeatNo = str.split(":")[1];
+						if(str.indexOf("车厢号") != -1) Coach = str.split(":")[1];
+						if(str.indexOf("出票价格") != -1) sealPrice = str.split(":")[1];
+						if(str.indexOf("票号") != -1) ticketNo = str.split(":")[1];
+						if(str.indexOf("realSeat") != -1) realSeat = str.split(":")[1];
+					}
+				}
+			}
+		}
+	}
+
+	@SuppressWarnings("unused")
+	private static void a2() throws Exception {
+		String line;
+		String ids = "";
+		String errorInfo = "";
+		
+		FileInputStream f = new FileInputStream("C:/Users/Administrator/Desktop/数据整理/下单接受成功未入库.txt");
+		BufferedReader dr = new BufferedReader(new InputStreamReader(f,"utf-8"));
+		/*while((line=dr.readLine())!=null){
+			try {
+				if(line.indexOf("reqData") != -1){
+					line=line.replaceAll("\\s*", "");
+					line=line.substring(line.indexOf("main_order_id")+15, line.length());
+					line=line.substring(0, line.indexOf("}"));
+					ids += "'"+line+"',";
+				}
+			} catch (Exception e) {
+				errorInfo += line+",";
+			}
+		}
+		System.out.println(ids.split(",").length);
+		System.out.println(ids);
+		System.out.println(errorInfo);*/
+		System.out.print("[");
+		while((line=dr.readLine())!=null){
+			try {
+				if(line.indexOf("reqData") != -1){
+					System.out.println(line.substring(line.indexOf("reqData")+10, line.length())+",");
+				}
+			} catch (Exception e) {
+				errorInfo += line+",";
+			}
+		}
+		System.out.print("]");
+	}
+
+	@SuppressWarnings("unused")
+	private static void a4() throws Exception {
+		String line;
+		String ids = "";
+		String errorInfo = "";
+		
+		FileInputStream f = new FileInputStream("C:/Users/Administrator/Desktop/数据整理/下单接受成功未入库数据.txt");
+		BufferedReader dr = new BufferedReader(new InputStreamReader(f,"utf-8"));
+		
+		System.out.print("[");
+		while((line=dr.readLine())!=null){
+			System.out.print(line);
+		}
+		System.out.print("]");
+	}
+
+	@SuppressWarnings("unused")
+	private static void a() throws Exception {
+		String line;
+		String ids = "";
+		String errorInfo = "";
+		
+		FileInputStream f = new FileInputStream(patchFile); 
+		BufferedReader dr = new BufferedReader(new InputStreamReader(f,"utf-8"));
+		while((line=dr.readLine())!=null){ 
+			try {
+				if(line.indexOf("main_order_id") != -1){
+					line=line.replaceAll("\\s*", "");
+					line=line.substring(line.indexOf("main_order_id")+14, line.length());
+					line=line.substring(0, line.indexOf(","));
+					ids += "'"+line+"',";
+				}
+			} catch (Exception e) {
+				errorInfo += line+",";
+			}
+		}
+		System.out.println(ids.split(",").length);
+		System.out.println(ids);
+		System.out.println(errorInfo);
+	}
+
+	@SuppressWarnings("unused")
+	private static void a1() throws Exception {
+		String line;
+		String ids = "";
+		String errorInfo = "";
+		
+		FileInputStream f = new FileInputStream("C:/Users/Administrator/Desktop/数据整理/下单接受成功未入库.txt"); 
+		BufferedReader dr = new BufferedReader(new InputStreamReader(f,"utf-8"));
+		/*while((line=dr.readLine())!=null){ 
+			try {
+				if(line.indexOf("reqData") != -1){
+					line=line.replaceAll("\\s*", "");
+					line=line.substring(line.indexOf("main_order_id")+15, line.length());
+					line=line.substring(0, line.indexOf("}"));
+					ids += "'"+line+"',";
+				}
+			} catch (Exception e) {
+				errorInfo += line+",";
+			}
+		}
+		System.out.println(ids.split(",").length);
+		System.out.println(ids);
+		System.out.println(errorInfo);*/
+		System.out.print("[");
+		while((line=dr.readLine())!=null){
+			try {
+				if(line.indexOf("reqData") != -1){
+					System.out.println(line.substring(line.indexOf("reqData")+10, line.length())+",");
+				}
+			} catch (Exception e) {
+				errorInfo += line+",";
+			}
+		}
+		System.out.print("]");
+	}
+	
+	/**
+	 * 提取出票失败的接口订单号
+	 * @throws Exception
+	 */
+	@SuppressWarnings("resource")
+	private static void b() throws Exception{
+		String line;
+		String ids = "";
+		String idss = "";
+		String errorInfo = "";
+		String noids = "";
+		
+		FileInputStream f = new FileInputStream("C:/Users/Administrator/Desktop/数据整理/test.txt"); 
+		BufferedReader dr = new BufferedReader(new InputStreamReader(f,"utf-8"));
+		while((line=dr.readLine())!=null){ 
+			/*try {
+				if(line.indexOf("main_order_id") != -1){
+					line=line.replaceAll("\\s*", "");
+					line=line.substring(line.indexOf("main_order_id")+14, line.length());
+					ids+=line.substring(0, line.indexOf(",")+1);
+				}
+			} catch (Exception e) {
+				errorInfo += line+",";
+			}*/
+			ids+=line+",";
+		}
+		FileInputStream f1 = new FileInputStream("C:/Users/Administrator/Desktop/数据整理/test1.txt"); 
+		BufferedReader dr1 = new BufferedReader(new InputStreamReader(f1,"utf-8"));
+		while((line=dr1.readLine()) != null){
+			try {
+				idss+=line.replaceAll("\\s*", "")+",";
+			} catch (Exception e) {
+				errorInfo += line+",";
+			}
+		}
+		for (String str : ids.split(",")) {
+			boolean is = false;
+			for (String strs : idss.split(",")) {
+				if(strs.equals(str)){
+					 is = true;
+					 break;
+				}
+			}
+			if(!is){
+				System.out.println(str);
+				noids += str+",";
+			}
+		}
+		System.out.println(noids.split(",").length);
+		System.out.println(noids);
+		System.out.println(errorInfo);
+	}
+	
+	/**
+	 * 
+	 * @throws Exception
+	 */
+	@SuppressWarnings("resource")
+	private static void c() throws Exception{
+		String line;
+		String ids = "";
+		String idss = "";
+		String errorInfo = "";
+		String noids = "";
+		
+		FileInputStream f = new FileInputStream(patchFile); 
+		BufferedReader dr = new BufferedReader(new InputStreamReader(f,"utf-8"));
+		while((line=dr.readLine())!=null){ 
+			try {
+				if(line.indexOf("main_order_id") != -1){
+					line=line.replaceAll("\\s*", "");
+					line=line.substring(line.indexOf("main_order_id")+14, line.length());
+					ids+=line.substring(0, line.indexOf(",")+1);
+				}
+			} catch (Exception e) {
+				errorInfo += line+",";
+			}
+		}
+		
+		FileInputStream f1 = new FileInputStream(patchFile1); 
+		BufferedReader dr1 = new BufferedReader(new InputStreamReader(f1,"utf-8"));
+		while((line=dr1.readLine()) != null){
+			try {
+				idss+=line.replaceAll("\\s*", "")+",";
+			} catch (Exception e) {
+				errorInfo += line+",";
+			}
+		}
+		for (String str : ids.split(",")) {
+			boolean is = false;
+			for (String strs : idss.split(",")) {
+				if(strs.equals(str)){
+					 is = true;
+					 break;
+				}
+			}
+			if(!is){
+				System.out.println(str);
+			}
+		}
+		System.out.println(noids.split(",").length);
+		System.out.println(noids);
+		System.out.println(errorInfo);
+	}
+	
+}