fix

src/main/java/cn/com/qmth/run/DeleteImportPaperQuestion.java → src/main/java/cn/com/qmth/im/DeleteImportPaperQuestion.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.run;
+package cn.com.qmth.im;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -15,10 +15,10 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import com.google.common.collect.Maps;
 
-import cn.com.qmth.im.HttpMethod;
-import cn.com.qmth.im.OKHttpUtil;
-import cn.com.qmth.im.QuestionId;
-import cn.com.qmth.param.Param;
+import cn.com.qmth.im.bean.HttpMethod;
+import cn.com.qmth.im.bean.OKHttpUtil;
+import cn.com.qmth.im.bean.QuestionId;
+import cn.com.qmth.im.config.Param;
 import okhttp3.Response;
 
 public class DeleteImportPaperQuestion {

src/main/java/cn/com/qmth/run/DeleteQuestionMulti.java → src/main/java/cn/com/qmth/im/DeleteQuestionMulti.java

@@ -1,11 +1,11 @@
-package cn.com.qmth.run;
+package cn.com.qmth.im;
 
 import java.util.Date;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import cn.com.qmth.im.DeleteQuestionProducer;
+import cn.com.qmth.im.bean.DeleteQuestionProducer;
 
 /**
  * 多线程删除小题。一个线程处理一个课程的数据

src/main/java/cn/com/qmth/run/ImportPaperByCourse.java → src/main/java/cn/com/qmth/im/ImportPaperByCourse.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.run;
+package cn.com.qmth.im;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -8,8 +8,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import cn.com.qmth.im.MyProducer;
-import cn.com.qmth.im.OKHttpUtil;
+import cn.com.qmth.im.bean.MyProducer;
+import cn.com.qmth.im.bean.OKHttpUtil;
 
 public class ImportPaperByCourse {
 

src/main/java/cn/com/qmth/run/ImportPropByCourse.java → src/main/java/cn/com/qmth/im/ImportPropByCourse.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.run;
+package cn.com.qmth.im;
 
 import java.io.File;
 import java.io.IOException;
@@ -19,12 +19,12 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import cn.com.qmth.im.Course;
-import cn.com.qmth.im.CourseDto;
-import cn.com.qmth.im.FormFilePart;
-import cn.com.qmth.im.HttpMethod;
-import cn.com.qmth.im.OKHttpUtil;
-import cn.com.qmth.param.Param;
+import cn.com.qmth.im.bean.Course;
+import cn.com.qmth.im.bean.CourseDto;
+import cn.com.qmth.im.bean.FormFilePart;
+import cn.com.qmth.im.bean.HttpMethod;
+import cn.com.qmth.im.bean.OKHttpUtil;
+import cn.com.qmth.im.config.Param;
 import okhttp3.Response;
 
 public class ImportPropByCourse {

src/main/java/cn/com/qmth/im/Temp.java

@@ -1,48 +0,0 @@
-package cn.com.qmth.im;
-
-import java.io.IOException;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-public class Temp {
-	private final static String sourceDir = "d:/guangkai/";
-	public static void main(String[] args) {
-		Set<String> ret=readId();
-		for(String s:ret) {
-			System.out.println(s);
-		}
-	}
-	
-	private static Set<String> readId() {
-		Set<String> list = new LinkedHashSet<>();
-		XSSFWorkbook wb = null;
-		try {
-			wb = new XSSFWorkbook(sourceDir + "ret.xlsx");
-			XSSFSheet sheet = wb.getSheetAt(0);
-			int rows = sheet.getLastRowNum();
-			for (int i = 1; i <= rows; i++) {
-				XSSFRow row = sheet.getRow(i);
-				String code = row.getCell(1).getStringCellValue().trim();
-				list.add(code);
-				if(i==2000) {
-					break;
-				}
-			}
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		} finally {
-			if (wb != null) {
-				try {
-					wb.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-		return list;
-	}
-}

src/main/java/cn/com/qmth/im/Calculator.java → src/main/java/cn/com/qmth/im/bean/Calculator.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.math.BigDecimal;
 import java.util.List;

src/main/java/cn/com/qmth/im/ClearProp.java → src/main/java/cn/com/qmth/im/bean/ClearProp.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.io.IOException;
 import java.util.Map;
@@ -9,7 +9,7 @@ import org.apache.logging.log4j.Logger;
 
 import com.google.common.collect.Maps;
 
-import cn.com.qmth.param.Param;
+import cn.com.qmth.im.config.Param;
 import okhttp3.Response;
 
 public class ClearProp {

src/main/java/cn/com/qmth/im/ConsumerDto.java → src/main/java/cn/com/qmth/im/bean/ConsumerDto.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 public class ConsumerDto {
 

src/main/java/cn/com/qmth/im/Course.java → src/main/java/cn/com/qmth/im/bean/Course.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 public class Course {
 	private Long id;

src/main/java/cn/com/qmth/im/CourseDto.java → src/main/java/cn/com/qmth/im/bean/CourseDto.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/cn/com/qmth/im/DateUtil.java → src/main/java/cn/com/qmth/im/bean/DateUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

src/main/java/cn/com/qmth/im/DeleteQuestionConsumer.java → src/main/java/cn/com/qmth/im/bean/DeleteQuestionConsumer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.io.IOException;
 import java.util.Map;
@@ -9,8 +9,8 @@ import org.apache.log4j.Logger;
 
 import com.google.common.collect.Maps;
 
-import cn.com.qmth.multithread.Consumer;
-import cn.com.qmth.param.Param;
+import cn.com.qmth.im.config.Param;
+import cn.com.qmth.im.multithread.Consumer;
 import okhttp3.Response;
 
 public class DeleteQuestionConsumer extends Consumer<DeleteQuestionDto> {

src/main/java/cn/com/qmth/im/DeleteQuestionDto.java → src/main/java/cn/com/qmth/im/bean/DeleteQuestionDto.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.util.List;
 

src/main/java/cn/com/qmth/im/DeleteQuestionProducer.java → src/main/java/cn/com/qmth/im/bean/DeleteQuestionProducer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -13,8 +13,8 @@ import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
-import cn.com.qmth.multithread.Producer;
-import cn.com.qmth.param.Param;
+import cn.com.qmth.im.config.Param;
+import cn.com.qmth.im.multithread.Producer;
 
 public class DeleteQuestionProducer extends Producer<DeleteQuestionDto, DeleteQuestionConsumer> {
 

src/main/java/cn/com/qmth/im/FileUtil.java → src/main/java/cn/com/qmth/im/bean/FileUtil.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.io.File;
 import java.io.FileInputStream;

src/main/java/cn/com/qmth/im/FormFilePart.java → src/main/java/cn/com/qmth/im/bean/FormFilePart.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.io.File;
 

src/main/java/cn/com/qmth/im/HttpMethod.java → src/main/java/cn/com/qmth/im/bean/HttpMethod.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/cn/com/qmth/im/JsonUtil.java → src/main/java/cn/com/qmth/im/bean/JsonUtil.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import cn.com.qmth.im.DateUtil.DatePatterns;
+import cn.com.qmth.im.bean.DateUtil.DatePatterns;
 
 /**
  * 类注释

src/main/java/cn/com/qmth/im/MyConsumer.java → src/main/java/cn/com/qmth/im/bean/MyConsumer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -14,9 +14,9 @@ import org.apache.log4j.Logger;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import cn.com.qmth.multithread.Consumer;
-import cn.com.qmth.param.Param;
-import cn.com.qmth.run.ImportPaperByCourse;
+import cn.com.qmth.im.ImportPaperByCourse;
+import cn.com.qmth.im.config.Param;
+import cn.com.qmth.im.multithread.Consumer;
 import okhttp3.Response;
 
 public class MyConsumer extends Consumer<ConsumerDto> {

src/main/java/cn/com/qmth/im/MyProducer.java → src/main/java/cn/com/qmth/im/bean/MyProducer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.io.IOException;
 import java.util.LinkedHashMap;
@@ -10,8 +10,8 @@ import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
-import cn.com.qmth.multithread.Producer;
-import cn.com.qmth.param.Param;
+import cn.com.qmth.im.config.Param;
+import cn.com.qmth.im.multithread.Producer;
 
 public class MyProducer extends Producer<ConsumerDto, MyConsumer> {
 

src/main/java/cn/com/qmth/im/NoPaperException.java → src/main/java/cn/com/qmth/im/bean/NoPaperException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/cn/com/qmth/im/OKHttpUtil.java → src/main/java/cn/com/qmth/im/bean/OKHttpUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.io.IOException;
 import java.util.List;

src/main/java/cn/com/qmth/im/QuestionId.java → src/main/java/cn/com/qmth/im/bean/QuestionId.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 public class QuestionId {
 

src/main/java/cn/com/qmth/im/ReWriteExcel.java → src/main/java/cn/com/qmth/im/bean/ReWriteExcel.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.io.File;
 import java.io.FileOutputStream;

src/main/java/cn/com/qmth/im/SSLSocketClient.java → src/main/java/cn/com/qmth/im/bean/SSLSocketClient.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import javax.net.ssl.*;
 import java.security.KeyStore;

src/main/java/cn/com/qmth/im/StatusException.java → src/main/java/cn/com/qmth/im/bean/StatusException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.im;
+package cn.com.qmth.im.bean;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/cn/com/qmth/param/Param.java → src/main/java/cn/com/qmth/im/config/Param.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.param;
+package cn.com.qmth.im.config;
 
 public class Param {
 

src/main/java/cn/com/qmth/multithread/Basket.java → src/main/java/cn/com/qmth/im/multithread/Basket.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.multithread;
+package cn.com.qmth.im.multithread;
 
 import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -8,8 +8,8 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import cn.com.qmth.im.Calculator;
-import cn.com.qmth.im.StatusException;
+import cn.com.qmth.im.bean.Calculator;
+import cn.com.qmth.im.bean.StatusException;
 
 public class Basket {
 

src/main/java/cn/com/qmth/multithread/Consumer.java → src/main/java/cn/com/qmth/im/multithread/Consumer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.multithread;
+package cn.com.qmth.im.multithread;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,7 +6,7 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.com.qmth.im.StatusException;
+import cn.com.qmth.im.bean.StatusException;
 
 public abstract class Consumer<T> extends Thread {
 

src/main/java/cn/com/qmth/multithread/EndObject.java → src/main/java/cn/com/qmth/im/multithread/EndObject.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.multithread;
+package cn.com.qmth.im.multithread;
 
 /**
  * 消费结束标识对象

src/main/java/cn/com/qmth/multithread/ProcessCount.java → src/main/java/cn/com/qmth/im/multithread/ProcessCount.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.multithread;
+package cn.com.qmth.im.multithread;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

src/main/java/cn/com/qmth/multithread/Producer.java → src/main/java/cn/com/qmth/im/multithread/Producer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.multithread;
+package cn.com.qmth.im.multithread;
 
 import java.lang.reflect.ParameterizedType;
 import java.util.ArrayList;
@@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.com.qmth.im.StatusException;
+import cn.com.qmth.im.bean.StatusException;
 
 public abstract class Producer<T, C extends Consumer<T>> {