Explorar o código

修改同步数据到排课系统

fanxp hai 3 meses
pai
achega
6f192132dd

+ 6 - 1
src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -121,6 +121,11 @@ public class DataUtil {
             paramJson.addProperty("name", baseClass.getName());
 
             paramJson.addProperty("semesterSerialNo", semesterSerialNo);
+            String eduYearSerialNo = gradeMap.get(baseClass.getOrgId() + "_" + baseClass.getGradeId().toString());
+            if (eduYearSerialNo == null) {
+                ActiveSpan.tag("insertClassUpdateRequest", String.format("%s——>不存在", baseClass.getOrgId() + "_" + baseClass.getGradeId().toString()));
+                continue;
+            }
             paramJson.addProperty("eduYearSerialNo", gradeMap.get(baseClass.getOrgId() + "_" + baseClass.getGradeId().toString()));
             paramJson.addProperty("extendId", baseClass.getId());
             if (baseClass.getClassroomId() != null && classroomMap.get(baseClass.getClassroomId().toString()) != null) {
@@ -189,7 +194,7 @@ public class DataUtil {
             if (ids != null && ids.get(classroom.get("extendId").toString()) != null) {
                 url = ScheduleUtil.apiUrl + "classroom/update";
                 paramJson.addProperty("serialNo", ids.get(classroom.get("extendId").toString()));
-                String resultUpdate =ScheduleUtil.doPost(url, paramJson.toString(), sign, timestamp);
+                String resultUpdate = ScheduleUtil.doPost(url, paramJson.toString(), sign, timestamp);
                 ScheduleFlowResponseVo sfResponse = ScheduleUtil.ConvertResponse(resultUpdate);
                 if (sfResponse != null && sfResponse.getCode() == -1) {
                     ActiveSpan.tag("insertClassRoomUpdateRequest", paramJson.toString());

+ 6 - 6
src/main/resources/application-dev.yml

@@ -5,12 +5,12 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.150.10.136:3308/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false&testWhileIdle=true
-    username: data_tl
-    password: qwe123QWE
-#    url: jdbc:mysql://219.153.208.37:53256/smart_campus?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
-#    username: smart_campus
-#    password: W2Xk@8QFe3hYR7QZ?-yY
+#    url: jdbc:mysql://10.150.10.136:3308/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false&testWhileIdle=true
+#    username: data_tl
+#    password: qwe123QWE
+    url: jdbc:mysql://219.153.208.37:53256/smart_campus?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
+    username: smart_campus
+    password: W2Xk@8QFe3hYR7QZ?-yY
     druid:
       # 验证连接的有效性
       test-while-idle: true