海康数据同步，排课数据同步报错解决

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

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.hikvision.util;
 
-import cn.hutool.db.Entity;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -12,11 +11,9 @@ import com.xjrsoft.module.base.entity.BaseGrade;
 import com.xjrsoft.module.hikvision.mapper.HikvisionDataMapper;
 import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.personnel.entity.CarMessageApply;
-import com.xjrsoft.module.system.entity.DictionaryDetail;
 import lombok.extern.slf4j.Slf4j;
 import lombok.var;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -52,23 +49,22 @@ public class DataUtil {
         Map<String, String> idCodeMap = new HashMap<>();
         for (Integer level : levelSet) {
             JsonArray dataArray = new JsonArray();
-            for (Map<String, Object> map : dataList) {
-                Department department = SqlRunnerAdapterUtil.convertMapToEntity(map, Department.class);
-                if(tableData != null && tableData.containsKey(department.getId().toString())){
+            for (Map<String, Object> department : dataList) {
+                if(tableData != null && tableData.containsKey(department.get("id").toString())){
                     continue;
                 }
-                if(department.getHierarchy().length() == level){
+                if(department.get("hierarchy").toString().length() == level){
                     JsonObject paramJson = new JsonObject();
-                    paramJson.addProperty("clientId", department.getCode());
-                    paramJson.addProperty("orgIndexCode", department.getId().toString());
-                    paramJson.addProperty("orgName", department.getName());
-                    paramJson.addProperty("parentIndexCode", department.getParentId().toString());
-                    if(department.getParentId() == 0){
+                    paramJson.addProperty("clientId", department.get("code").toString());
+                    paramJson.addProperty("orgIndexCode", department.get("id").toString());
+                    paramJson.addProperty("orgName", department.get("name").toString());
+                    paramJson.addProperty("parentIndexCode", department.get("parent_id").toString());
+                    if(Long.parseLong(department.get("parent_id").toString()) == 0){
                         paramJson.addProperty("parentIndexCode", "root000000");
                     }
-                    paramJson.addProperty("orgCode", department.getCode());
+                    paramJson.addProperty("orgCode", department.get("code").toString());
                     dataArray.add(paramJson);
-                    idCodeMap.put(department.getCode(), department.getId().toString());
+                    idCodeMap.put(department.get("code").toString(), department.get("id").toString());
                 }
             }
             String result = apiUtil.doPost(apiPath, dataArray.toString(), null, null);
@@ -95,7 +91,7 @@ public class DataUtil {
         Map<String, String> idMap = new HashMap<>();
         //1、查询字典，将走读住读、班级类型先推送过去
         String sql = "SELECT * FROM xjr_dictionary_detail WHERE delete_mark = 0 AND item_id = 2023000000000000030";
-        List<Map<String, Object>> detailList = SqlRunnerAdapter.db().selectList(sql, DictionaryDetail.class);
+        List<Map<String, Object>> detailList = SqlRunnerAdapter.db().selectList(sql);
 
         String apiPath = "/api/resource/v1/org/batch/add";
         JsonParser jsonParser = new JsonParser();
@@ -106,20 +102,19 @@ public class DataUtil {
 
         Set<String> stduyStatus = new HashSet<>();
 
-        for (Map<String, Object> map : detailList) {
-            DictionaryDetail dict = SqlRunnerAdapterUtil.convertMapToEntity(map, DictionaryDetail.class);
-            if(tableData != null && tableData.containsKey(dict.getId().toString())){
-                stduyStatus.add(dict.getId().toString());
+        for (Map<String, Object> dict : detailList) {
+            if(tableData != null && tableData.containsKey(dict.get("id").toString())){
+                stduyStatus.add(dict.get("id").toString());
                 continue;
             }
             JsonObject paramJson = new JsonObject();
             paramJson.addProperty("clientId", clientId);
-            paramJson.addProperty("orgIndexCode", dict.getCode());
-            paramJson.addProperty("orgName", dict.getName() + "学生");
+            paramJson.addProperty("orgIndexCode", dict.get("code").toString());
+            paramJson.addProperty("orgName", dict.get("name").toString() + "学生");
             paramJson.addProperty("parentIndexCode", "root000000");
-            paramJson.addProperty("orgCode", dict.getCode());
+            paramJson.addProperty("orgCode", dict.get("code").toString());
             dataArray.add(paramJson);
-            idCodeMap.put(clientId, dict.getCode());
+            idCodeMap.put(clientId, dict.get("code").toString());
             clientId ++;
         }
         String result = apiUtil.doPost(apiPath, dataArray.toString(), null, null);
@@ -136,24 +131,23 @@ public class DataUtil {
         }
         //推送班级类型
         sql = "SELECT * FROM xjr_dictionary_detail WHERE delete_mark = 0 AND item_id = 2023000000000000039";
-        detailList = SqlRunnerAdapter.db().selectList(sql, DictionaryDetail.class);
+        detailList = SqlRunnerAdapter.db().selectList(sql);
         dataArray = new JsonArray();
         Set<String> classTypeSet = new HashSet<>();
         for (String status : stduyStatus) {
-            for (Map<String, Object> map : detailList) {
-                DictionaryDetail dict = SqlRunnerAdapterUtil.convertMapToEntity(map, DictionaryDetail.class);
-                if(tableData != null && tableData.containsKey(dict.getCode())){
-                    classTypeSet.add(dict.getCode());
+            for (Map<String, Object> dict : detailList) {
+                if(tableData != null && tableData.containsKey(dict.get("code").toString())){
+                    classTypeSet.add(dict.get("code").toString());
                     continue;
                 }
                 JsonObject paramJson = new JsonObject();
                 paramJson.addProperty("clientId", clientId);
-                paramJson.addProperty("orgIndexCode", dict.getCode() + "-" + status);
-                paramJson.addProperty("orgName", dict.getName());
+                paramJson.addProperty("orgIndexCode", dict.get("code").toString() + "-" + status);
+                paramJson.addProperty("orgName", dict.get("name").toString());
                 paramJson.addProperty("parentIndexCode", status);
-                paramJson.addProperty("orgCode", dict.getCode());
+                paramJson.addProperty("orgCode", dict.get("code").toString());
                 dataArray.add(paramJson);
-                idCodeMap.put(clientId, dict.getCode() + "-" + status);
+                idCodeMap.put(clientId, dict.get("code").toString() + "-" + status);
                 clientId ++;
             }
         }
@@ -171,25 +165,24 @@ public class DataUtil {
         }
 
         //推送年级
-        sql = "SELECT * FROM base_grade WHERE delete_mark = 0 AND STATUS = 1";
+        sql = "SELECT * FROM base_grade WHERE delete_mark = 0 AND status = 1";
         List<Map<String, Object>> gradeList = SqlRunnerAdapter.db().selectList(sql, BaseGrade.class);
         Map<Long, String> gradeNameMap = new HashMap<>();
         dataArray = new JsonArray();
         for (String classType : classTypeSet) {
-            for (Map<String, Object> gradeMap : gradeList) {
-                BaseGrade baseGrade = SqlRunnerAdapterUtil.convertMapToEntity(gradeMap, BaseGrade.class);
-                gradeNameMap.put(baseGrade.getId(), baseGrade.getName().replaceAll("级", ""));
-                if(tableData != null && tableData.containsKey(baseGrade.getId().toString())){
+            for (Map<String, Object> baseGrade : gradeList) {
+                gradeNameMap.put(Long.parseLong(baseGrade.get("id").toString()), baseGrade.get("name").toString().replaceAll("级", ""));
+                if(tableData != null && tableData.containsKey(baseGrade.get("id").toString())){
                     continue;
                 }
                 JsonObject paramJson = new JsonObject();
                 paramJson.addProperty("clientId", clientId);
-                paramJson.addProperty("orgIndexCode", baseGrade.getName().replaceAll("级", "") + "-" + classType);
-                paramJson.addProperty("orgName", baseGrade.getName());
+                paramJson.addProperty("orgIndexCode", baseGrade.get("name").toString().replaceAll("级", "") + "-" + classType);
+                paramJson.addProperty("orgName", baseGrade.get("name").toString());
                 paramJson.addProperty("parentIndexCode", classType);
                 paramJson.addProperty("orgCode", clientId);
                 dataArray.add(paramJson);
-                idCodeMap.put(clientId, baseGrade.getName().replaceAll("级", "") + "-" + classType);
+                idCodeMap.put(clientId, baseGrade.get("name").toString().replaceAll("级", "") + "-" + classType);
                 clientId ++;
             }
         }
@@ -214,27 +207,26 @@ public class DataUtil {
         dataArray = new JsonArray();
         for (String grade : gradeSet) {
             String[] gradeGroup = grade.split("-");
-            for (Map<String, Object> baseClassMap : classList) {
-                BaseClass baseClass = SqlRunnerAdapterUtil.convertMapToEntity(baseClassMap, BaseClass.class);
-                if(tableData != null && tableData.containsKey(baseClass.getId().toString())){
+            for (Map<String, Object> baseClass : classList) {
+                if(tableData != null && tableData.containsKey(baseClass.get("id").toString())){
                     continue;
                 }
-                String gradeName = gradeNameMap.get(baseClass.getGradeId());
+                String gradeName = gradeNameMap.get(Long.parseLong(baseClass.get("grade_id").toString()));
                 if(!gradeGroup[0].equals(gradeName)){
                     continue;
                 }
 
-                if(!gradeGroup[1].equals(baseClass.getClassType())){
+                if(!gradeGroup[1].equals(baseClass.get("class_type").toString())){
                     continue;
                 }
                 JsonObject paramJson = new JsonObject();
                 paramJson.addProperty("clientId", clientId);
-                paramJson.addProperty("orgIndexCode", baseClass.getId() + "-" + grade);
-                paramJson.addProperty("orgName", baseClass.getName());
+                paramJson.addProperty("orgIndexCode", baseClass.get("grade_id").toString() + "-" + grade);
+                paramJson.addProperty("orgName", baseClass.get("name").toString());
                 paramJson.addProperty("parentIndexCode", grade);
                 paramJson.addProperty("orgCode", clientId);
                 dataArray.add(paramJson);
-                idCodeMap.put(clientId, baseClass.getId() + "-" + grade);
+                idCodeMap.put(clientId, baseClass.get("grade_id").toString() + "-" + grade);
                 clientId ++;
             }
         }

src/main/java/com/xjrsoft/module/job/HikvisionBaseDataTask.java

@@ -3,7 +3,6 @@ package com.xjrsoft.module.job;
 import cn.hutool.extra.spring.SpringUtil;
 import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
 import com.xjrsoft.common.utils.SqlRunnerAdapterUtil;
-import com.xjrsoft.module.hikvision.entity.HikvisionData;
 import com.xjrsoft.module.hikvision.mapper.HikvisionDataMapper;
 import com.xjrsoft.module.hikvision.util.DataUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -41,14 +40,14 @@ public class HikvisionBaseDataTask {
         log.info("开始推送海康威视基础数据");
         try {
             String sql = "SELECT distinct table_name FROM hikvision_data WHERE 1 = 1";
-            List<Map<String, Object>> maps = SqlRunnerAdapter.db().selectList(sql, HikvisionData.class);
+            List<Map<String, Object>> maps = SqlRunnerAdapter.db().selectList(sql);
             Set<String> tables = new HashSet<>();
             for (Map<String, Object> map : maps) {
                 String[] strings = SqlRunnerAdapterUtil.convertMapToStringArray(map);
                 tables.add(strings[0]);
             }
             sql = "SELECT * FROM hikvision_data WHERE 0 = 0";
-            List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql, HikvisionData.class);
+            List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
             Map<String, Map<String, String>> dataMap = new HashMap<>();
             for (String table : tables) {
                 Map<String, String> tableData = new HashMap<>();
@@ -70,7 +69,7 @@ public class HikvisionBaseDataTask {
             try {
                 department = dataUtil.insertDepartment(tableName, dataMap.get(tableName));
             }catch (Exception e){
-                log.info("推送组织机构报错", e);
+                log.error("推送组织机构报错", e);
             }
             if(department.isEmpty() && dataMap.get(tableName) != null){
                 department = dataMap.get(tableName);
@@ -82,7 +81,7 @@ public class HikvisionBaseDataTask {
             try {
                 dataUtil.insertTeacher(tableName, dataMap.get(tableName), department);
             }catch (Exception e){
-                log.info("推送教职工报错", e);
+                log.error("推送教职工报错", e);
             }
 
             //推送车辆
@@ -91,7 +90,7 @@ public class HikvisionBaseDataTask {
             try {
                 dataUtil.insertCar(carTableName, baseCar, hikvisionDataMapper);
             }catch (Exception e){
-                log.info("同步车辆数据报错", e);
+                log.error("同步车辆数据报错", e);
             }
 
 
@@ -100,7 +99,7 @@ public class HikvisionBaseDataTask {
             try {
                 dataUtil.insertClass(tableName, baseClass);
             }catch (Exception e){
-                log.info("同步车辆数据报错", e);
+                log.error("同步班级数据报错", e);
             }
 
 

src/main/java/com/xjrsoft/module/job/JianyuekbBaseDataTask.java

@@ -41,7 +41,7 @@ public class JianyuekbBaseDataTask {
                 String[] strings = SqlRunnerAdapterUtil.convertMapToStringArray(queryMap);
                 tables.add(strings[0]);
             }
-            sql = "SELECT * FROM jianyue_data WHERE 0 = 0";
+            sql = "SELECT * FROM jianyue_data WHERE source_id IS NOT NULL AND jianyue_id != ''";
             List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql, JianyueData.class);
             Map<String, Map<String, String>> dataMap = new HashMap<>();
             for (String table : tables) {

src/main/java/com/xjrsoft/module/job/JianyuekbScheduleTask.java

@@ -79,7 +79,7 @@ public class JianyuekbScheduleTask {
         for (Map<String, Object> jianyueData : query) {
             tables.add(jianyueData.get("table_name").toString());
         }
-        sql = "SELECT * FROM jianyue_data WHERE 0 = 0";
+        sql = "SELECT * FROM jianyue_data WHERE source_id IS NOT NULL AND jianyue_id != ''";
         List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
         Map<String, Map<String, String>> dataMap = new HashMap<>();
         for (String table : tables) {