xiatian 1 年之前
父節點
當前提交
5762d34dbe

+ 1 - 0
src/main/java/cn/com/qmth/importpaper/MyConsumer.java

@@ -70,6 +70,7 @@ public class MyConsumer extends Consumer<ConsumerDto> {
 		Map<String, String> params = Maps.newHashMap();
 		String courseCodes=StringUtils.join(cs,",");
 		params.put("rootOrgId", dto.getRootOrgId());
+		params.put("batch", dto.getBatch());
 		params.put("courseCodes",courseCodes);
 		Map<String, String> headers = Maps.newHashMap();
 		headers.put("key", dto.getKey());

+ 4 - 3
src/main/java/cn/com/qmth/importpaper/MyProducer.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.importpaper;
 
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.apache.log4j.LogManager;
@@ -25,6 +25,7 @@ public class MyProducer extends Producer {
 		String rootOrgId=param.get("rootOrgId").toString();
 		String key=param.get("key").toString();
 		String token=param.get("token").toString();
+		String batch=param.get("batch").toString();
 //		List<Course> cs = readSubject();
 		Map<String,ImportCourse> ics=readSubjectCodes();
 		if (ics.size()==0) {
@@ -34,13 +35,13 @@ public class MyProducer extends Producer {
 			logger.debug(ics.size() + "个课程");
 		}
 		for (ImportCourse ic : ics.values()) {
-			offer(new ConsumerDto(ic, sourceDir, host, rootOrgId, key, token));
+			offer(new ConsumerDto(ic, sourceDir, host, rootOrgId, key, token,batch));
 		}
 		logger.info("***************************任务生产结束");
 	}
 	
 	private static Map<String,ImportCourse> readSubjectCodes() {
-		Map<String,ImportCourse> map=new HashMap<>();
+		Map<String,ImportCourse> map=new LinkedHashMap<>();
 		XSSFWorkbook wb = null;
 		try {
 			wb = new XSSFWorkbook(sourceDir + "subject_info.xlsx");