fix

src/main/java/cn/com/qmth/export/ExportPaperByCourseCode.java → src/main/java/cn/com/qmth/ex/ExportPaperByCourseCode.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex;
 
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -6,6 +6,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 
+import cn.com.qmth.ex.bean.MyConsumer;
+import cn.com.qmth.ex.bean.MyProducer;
+
 public class ExportPaperByCourseCode {
 	private static Logger logger = LogManager.getLogger(ExportPaperByCourseCode.class);
 	private static AtomicInteger count=new AtomicInteger(0);

src/main/java/cn/com/qmth/export/ExportProperty.java → src/main/java/cn/com/qmth/ex/ExportProperty.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,6 +24,10 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import com.alibaba.fastjson.JSONObject;
 
+import cn.com.qmth.ex.bean.FileUtil;
+import cn.com.qmth.ex.bean.PropertyDto;
+import cn.com.qmth.ex.config.Param;
+
 public class ExportProperty {
 	private static Logger logger = LogManager.getLogger(ExportProperty.class);
 	public static void main(String[] args) {

src/main/java/cn/com/qmth/export/SetRootId.java → src/main/java/cn/com/qmth/ex/SetRootId.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -11,6 +11,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import cn.com.qmth.ex.bean.Knowledge;
+import cn.com.qmth.ex.config.Param;
+
 public class SetRootId {
 	public static void main(String[] args) {
 		System.out.println("开始处理");

src/main/java/cn/com/qmth/export/Answer.java → src/main/java/cn/com/qmth/ex/bean/Answer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 public class Answer {
 	private Long questionId;

src/main/java/cn/com/qmth/export/BatchGetDataUtil.java → src/main/java/cn/com/qmth/ex/bean/BatchGetDataUtil.java

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

src/main/java/cn/com/qmth/export/Course.java → src/main/java/cn/com/qmth/ex/bean/Course.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 public class Course {
 	private String ecCode;

src/main/java/cn/com/qmth/export/FileUtil.java → src/main/java/cn/com/qmth/ex/bean/FileUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;

src/main/java/cn/com/qmth/export/IdBase.java → src/main/java/cn/com/qmth/ex/bean/IdBase.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 
 import java.io.Serializable;

src/main/java/cn/com/qmth/export/KdDetail.java → src/main/java/cn/com/qmth/ex/bean/KdDetail.java

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

src/main/java/cn/com/qmth/export/KdPaper.java → src/main/java/cn/com/qmth/ex/bean/KdPaper.java

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

src/main/java/cn/com/qmth/export/KdQuesOption.java → src/main/java/cn/com/qmth/ex/bean/KdQuesOption.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 public class KdQuesOption {
 	private Boolean select;

src/main/java/cn/com/qmth/export/KdQuestion.java → src/main/java/cn/com/qmth/ex/bean/KdQuestion.java

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

src/main/java/cn/com/qmth/export/Knowledge.java → src/main/java/cn/com/qmth/ex/bean/Knowledge.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 public class Knowledge {
 	/**

src/main/java/cn/com/qmth/export/MediaNotFoundException.java → src/main/java/cn/com/qmth/ex/bean/MediaNotFoundException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 public class MediaNotFoundException extends RuntimeException{
 

src/main/java/cn/com/qmth/export/MyConsumer.java → src/main/java/cn/com/qmth/ex/bean/MyConsumer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 import java.io.File;
 import java.io.IOException;
@@ -21,6 +21,10 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.alibaba.fastjson.JSONObject;
 
+import cn.com.qmth.ex.ExportPaperByCourseCode;
+import cn.com.qmth.ex.config.Param;
+import cn.com.qmth.ex.multithread.Consumer;
+
 public class MyConsumer extends Consumer<PaperExportDto> {
 	private static String[] sucStr = new String[] { "对", "正确", "√", "是", "True" };
 	private static String[] errStr = new String[] { "错", "错误", "×", "不正确", "否", "False" };

src/main/java/cn/com/qmth/export/MyProducer.java → src/main/java/cn/com/qmth/ex/bean/MyProducer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,6 +12,9 @@ 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.ex.config.Param;
+import cn.com.qmth.ex.multithread.Producer;
+
 
 public class MyProducer extends Producer {
 	private static Logger logger = LogManager.getLogger(MyProducer.class);

src/main/java/cn/com/qmth/export/PaperExportDto.java → src/main/java/cn/com/qmth/ex/bean/PaperExportDto.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 public class PaperExportDto {
 	private String courseCode;

src/main/java/cn/com/qmth/export/PicCompress.java → src/main/java/cn/com/qmth/ex/bean/PicCompress.java

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

src/main/java/cn/com/qmth/export/PropertyDto.java → src/main/java/cn/com/qmth/ex/bean/PropertyDto.java

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

src/main/java/cn/com/qmth/export/QuesStructType.java → src/main/java/cn/com/qmth/ex/bean/QuesStructType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 public enum QuesStructType {
 

src/main/java/cn/com/qmth/export/Question.java → src/main/java/cn/com/qmth/ex/bean/Question.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 public class Question {
 	private String body;

src/main/java/cn/com/qmth/export/QuestionProp.java → src/main/java/cn/com/qmth/ex/bean/QuestionProp.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 public class QuestionProp {
 	private Long questionId;

src/main/java/cn/com/qmth/export/StatusException.java → src/main/java/cn/com/qmth/ex/bean/StatusException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 /**
  * 状态异常类<br>

src/main/java/cn/com/qmth/export/YunkaiDifficulty.java → src/main/java/cn/com/qmth/ex/bean/YunkaiDifficulty.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 public enum YunkaiDifficulty {
 	

src/main/java/cn/com/qmth/export/YunkaiQuesStructType.java → src/main/java/cn/com/qmth/ex/bean/YunkaiQuesStructType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.bean;
 
 public enum YunkaiQuesStructType {
 	

src/main/java/cn/com/qmth/ex/config/Param.java

@@ -0,0 +1,14 @@
+package cn.com.qmth.ex.config;
+
+public class Param {
+
+    public static String dbUser = "root";
+
+    public static String dbPass = "123456";
+
+    public static String dbName = "yunkai_240913";
+
+    public static String dataDir = "d:/yunkai";
+
+    public static String paperPrefix = "(240913)";
+}

src/main/java/cn/com/qmth/export/Basket.java → src/main/java/cn/com/qmth/ex/multithread/Basket.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.multithread;
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
@@ -8,6 +8,8 @@ import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import cn.com.qmth.ex.bean.StatusException;
+
 public class Basket {
 	private static final Logger LOG = LoggerFactory.getLogger(Basket.class);
 	/**

src/main/java/cn/com/qmth/export/Consumer.java → src/main/java/cn/com/qmth/ex/multithread/Consumer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.multithread;
 
 import java.util.Map;
 
@@ -6,6 +6,8 @@ import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.logging.log4j.ThreadContext;
 
+import cn.com.qmth.ex.bean.MyProducer;
+
 
 public abstract class Consumer<T>  extends Thread{
 	private static Logger LOG = LogManager.getLogger(MyProducer.class);

src/main/java/cn/com/qmth/export/EndObject.java → src/main/java/cn/com/qmth/ex/multithread/EndObject.java

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

src/main/java/cn/com/qmth/export/Producer.java → src/main/java/cn/com/qmth/ex/multithread/Producer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.ex.multithread;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,6 +8,9 @@ import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.logging.log4j.ThreadContext;
 
+import cn.com.qmth.ex.bean.MyProducer;
+import cn.com.qmth.ex.bean.StatusException;
+
 public abstract class Producer {
 
 	private static Logger LOG = LogManager.getLogger(MyProducer.class);

src/main/java/cn/com/qmth/export/Param.java

@@ -1,11 +0,0 @@
-package cn.com.qmth.export;
-
-public class Param {
-	
-	public static String dbUser="root";
-	public static String dbPass="123456";
-	
-	public static String dbName="yunkai_240618";
-	public static String dataDir="d:/yunkai";
-	public static String paperPrefix ="(240618)";
-}