排课数据同步bug修复

src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -15,7 +15,6 @@ import com.xjrsoft.module.base.entity.BaseGrade;
 import com.xjrsoft.module.base.entity.BaseLabel;
 import com.xjrsoft.module.base.entity.BaseSemester;
 import com.xjrsoft.module.organization.entity.Department;
-import com.xjrsoft.module.schedule.vo.ClassroomJianyuekbVo;
 import com.xjrsoft.module.schedule.vo.StudentJianyuekbVo;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import lombok.extern.slf4j.Slf4j;
@@ -131,30 +130,29 @@ public class DataUtil {
         String sql = "SELECT t1.name, t1.capacity AS people_count,t2.name AS location, t1.floor_num AS floor, t1.id AS extendId FROM " + tableName + " t1" +
                 " INNER JOIN base_office_build t2 ON t1.office_build_id = t2.id" +
                 " WHERE t1.delete_mark = 0 AND t2.delete_mark = 0";
-        List<Map<String, Object>> dataList = SqlRunnerAdapter.db().selectList(sql, ClassroomJianyuekbVo.class);
+        List<Map<String, Object>> dataList = SqlRunnerAdapter.db().selectList(sql);
 
         JsonParser jsonParser = new JsonParser();
         Map<String, String> idMap = new HashMap<>();
-        for (Map<String, Object> classroomMap : dataList) {
-            ClassroomJianyuekbVo classroom = SqlRunnerAdapterUtil.convertMapToEntity(classroomMap, ClassroomJianyuekbVo.class);
+        for (Map<String, Object> classroom : dataList) {
             String url  = ScheduleUtil.apiUrl + "classroom/create";
             JsonObject paramJson = new JsonObject();
             paramJson.addProperty("schoolDistrictId", schoolDistrictId);
-            paramJson.addProperty("name", classroom.getName());
+            paramJson.addProperty("name", classroom.get("name").toString());
 
             paramJson.addProperty("peopleCount", 50);
-            paramJson.addProperty("location", classroom.getLocation());
-            paramJson.addProperty("extendId", classroom.getExtendId());
-            paramJson.addProperty("floor", classroom.getFloor());
+            paramJson.addProperty("location", classroom.get("location")==null?"":classroom.get("location").toString());
+            paramJson.addProperty("extendId", classroom.get("extendId").toString());
+            paramJson.addProperty("floor", classroom.get("floor")==null?0:Integer.parseInt(classroom.get("floor").toString()));
 
             //获取时间戳
             long timestamp = System.currentTimeMillis();
             //生成签名
             String sign = ScheduleUtil.createSign(timestamp);
 
-            if(ids != null && ids.get(classroom.getExtendId().toString()) != null){
+            if(ids != null && ids.get(classroom.get("extendId").toString()) != null){
                 url  = ScheduleUtil.apiUrl + "classroom/update";
-                paramJson.addProperty("serialNo", ids.get(classroom.getExtendId().toString()));
+                paramJson.addProperty("serialNo", ids.get(classroom.get("extendId").toString()));
                 ScheduleUtil.doPost(url, paramJson.toString(), sign, timestamp);
                 continue;
             }
@@ -164,7 +162,7 @@ public class DataUtil {
                 continue;
             }
             JsonObject resultJson = jsonParser.parse(result).getAsJsonObject();
-            idMap.put(classroom.getExtendId().toString(), resultJson.get("data").getAsString());
+            idMap.put(classroom.get("extendId").toString(), resultJson.get("data").getAsString());
         }
         //插入记录表
         insertRecord(tableName, idMap);
@@ -183,28 +181,28 @@ public class DataUtil {
 
         JsonParser jsonParser = new JsonParser();
         Map<String, String> idMap = new HashMap<>();
-        for (Map<String, Object> studentMap : dataList) {
-            StudentJianyuekbVo student = SqlRunnerAdapterUtil.convertMapToEntity(studentMap, StudentJianyuekbVo.class);
+        for (Map<String, Object> student : dataList) {
             String url  = ScheduleUtil.apiUrl + "student/create";
             JsonObject paramJson = new JsonObject();
-            paramJson.addProperty("registerNo", student.getRegisterNo());
-            if("SB10001".equals(student.getGender())){
+            paramJson.addProperty("registerNo", student.get("register_no").toString());
+            String gender = student.get("gender")==null?"SB10001":student.get("gender").toString();
+            if("SB10001".equals(gender)){
                 paramJson.addProperty("gender", 1);
-            }else if("SB10002".equals(student.getGender())){
+            }else if("SB10002".equals(gender)){
                 paramJson.addProperty("gender", 2);
             }
 
-            paramJson.addProperty("realName", student.getRealName());
-            paramJson.addProperty("alias", student.getAlias());
-            paramJson.addProperty("extendId", student.getExtendId());
-            paramJson.addProperty("gradeSerialNo", gradeMap.get(student.getGradeSerialNo().toString()));
+            paramJson.addProperty("realName", student.get("real_name").toString());
+            paramJson.addProperty("alias", student.get("alias")==null?"":student.get("alias").toString());
+            paramJson.addProperty("extendId", student.get("extend_id").toString());
+            paramJson.addProperty("gradeSerialNo", gradeMap.get(student.get("grade_serial_no").toString()));
             //获取时间戳
             long timestamp = System.currentTimeMillis();
             //生成签名
             String sign = ScheduleUtil.createSign(timestamp);
 
-            if(ids != null && ids.get(student.getExtendId().toString()) != null){
-                paramJson.addProperty("serialNo", ids.get(student.getExtendId().toString()));
+            if(ids != null && ids.get(student.get("extend_id").toString()) != null){
+                paramJson.addProperty("serialNo", ids.get(student.get("extend_id").toString()));
                 url  = ScheduleUtil.apiUrl + "student/update";
                 ScheduleUtil.doPost(url, paramJson.toString(), sign, timestamp);
                 continue;
@@ -215,7 +213,7 @@ public class DataUtil {
                 continue;
             }
             JsonObject resultJson = jsonParser.parse(result).getAsJsonObject();
-            idMap.put(student.getExtendId().toString(), resultJson.get("data").getAsString());
+            idMap.put(student.get("extend_id").toString(), resultJson.get("data").getAsString());
         }
         //插入记录表
         insertRecord(tableName, idMap);