|
|
@@ -111,8 +111,8 @@ class JianyuekbBaseDataTaskTest {
|
|
|
sql = "SELECT * FROM base_class WHERE delete_mark = 0" +
|
|
|
" and id not in (SELECT source_id FROM jianyue_data WHERE table_name = 'base_class' AND source_id IS NOT NULL)";
|
|
|
|
|
|
- tableName = "base_semester";
|
|
|
- dataUtil.insertSemester(tableName, dataMap.get(tableName));
|
|
|
+ tableName = "base_class";
|
|
|
+ dataUtil.insertClass(tableName, gradeMap, teacherMap, currenSemeter, dataMap.get(tableName), classroomMap);
|
|
|
} catch (Exception e) {
|
|
|
}
|
|
|
}
|
|
|
@@ -166,6 +166,55 @@ class JianyuekbBaseDataTaskTest {
|
|
|
SqlRunnerAdapter.db().dynamicInsertBatch(tableName, insertList);
|
|
|
}
|
|
|
|
|
|
+ @Test
|
|
|
+ void deleteClass() throws Exception {
|
|
|
+ long timestamp = System.currentTimeMillis();
|
|
|
+ String sign = ScheduleUtil.createSign(timestamp);
|
|
|
+ String url = ScheduleUtil.apiUrl + "Class/page";
|
|
|
+
|
|
|
+ DataUtil dataUtil = new DataUtil();
|
|
|
+ String currenSemeter = dataUtil.getCurrenSemeter();
|
|
|
+ JsonObject pageJson = new JsonObject();
|
|
|
+ JsonArray semesterSerialNos = new JsonArray();
|
|
|
+ semesterSerialNos.add(currenSemeter);
|
|
|
+ JsonObject paramJson = new JsonObject();
|
|
|
+ paramJson.add("semesterSerialNos", semesterSerialNos);
|
|
|
+ pageJson.addProperty("pageSize", 2000);
|
|
|
+ pageJson.addProperty("pageIndex", 1);
|
|
|
+ JsonParser parser = new JsonParser();
|
|
|
+ String doPost = ScheduleUtil.doPost(url, pageJson.toString(), sign, timestamp);
|
|
|
+ JsonArray dataList = parser.parse(doPost).getAsJsonObject().get("data").getAsJsonObject().get("dataList").getAsJsonArray();
|
|
|
+ List<String> ids = new ArrayList<>();
|
|
|
+
|
|
|
+ for (JsonElement jsonElement : dataList) {
|
|
|
+ JsonObject object = jsonElement.getAsJsonObject();
|
|
|
+ if(!object.get("semesterSerialNo").getAsString().equals(currenSemeter)){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ ids.add(object.get("serialNo").getAsString());
|
|
|
+ }
|
|
|
+
|
|
|
+// url = ScheduleUtil.apiUrl + "Class/del";
|
|
|
+// timestamp = System.currentTimeMillis();
|
|
|
+// sign = ScheduleUtil.createSign(timestamp);
|
|
|
+// int maxNum = 100;
|
|
|
+// int cishu = ids.size() / maxNum + 1;
|
|
|
+// if(ids.size() < maxNum){
|
|
|
+// maxNum = ids.size();
|
|
|
+// }
|
|
|
+// for (int i = 0; i < cishu; i++){
|
|
|
+// JsonArray delArray = new JsonArray();
|
|
|
+// for (int j = 0 + (i * maxNum); j < maxNum; j ++){
|
|
|
+// delArray.add(ids.get(j));
|
|
|
+// }
|
|
|
+//
|
|
|
+// String delResult = ScheduleUtil.doPost(url, delArray.toString(), sign, timestamp);
|
|
|
+//
|
|
|
+// System.out.println(delResult);
|
|
|
+// }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
@Test
|
|
|
void updateGrade() throws Exception {
|
|
|
String url = ScheduleUtil.apiUrl + "EduYear/page";
|