预约进校调整

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

@@ -148,7 +148,7 @@ public class DataUtil {
                 paramJson.addProperty("parentIndexCode", status);
                 paramJson.addProperty("orgCode", dict.getCode());
                 dataArray.add(paramJson);
-                idCodeMap.put(clientId, dict.getCode());
+                idCodeMap.put(clientId, dict.getCode() + "-" + status);
                 clientId ++;
             }
         }
@@ -172,18 +172,18 @@ public class DataUtil {
         dataArray = new JsonArray();
         for (String classType : classTypeSet) {
             for (BaseGrade baseGrade : gradeList) {
-                gradeNameMap.put(baseGrade.getId(), baseGrade.getName());
+                gradeNameMap.put(baseGrade.getId(), baseGrade.getName().replaceAll("级", ""));
                 if(tableData != null && tableData.containsKey(baseGrade.getId().toString())){
                     continue;
                 }
                 JsonObject paramJson = new JsonObject();
                 paramJson.addProperty("clientId", clientId);
-                paramJson.addProperty("orgIndexCode", baseGrade.getName() + "-" + classType);
+                paramJson.addProperty("orgIndexCode", baseGrade.getName().replaceAll("级", "") + "-" + classType);
                 paramJson.addProperty("orgName", baseGrade.getName());
                 paramJson.addProperty("parentIndexCode", classType);
                 paramJson.addProperty("orgCode", clientId);
                 dataArray.add(paramJson);
-                idCodeMap.put(clientId, baseGrade.getName());
+                idCodeMap.put(clientId, baseGrade.getName().replaceAll("级", "") + "-" + classType);
                 clientId ++;
             }
         }
@@ -227,7 +227,7 @@ public class DataUtil {
                 paramJson.addProperty("parentIndexCode", grade);
                 paramJson.addProperty("orgCode", clientId);
                 dataArray.add(paramJson);
-                idCodeMap.put(clientId, baseClass.getId().toString());
+                idCodeMap.put(clientId, baseClass.getId() + "-" + grade);
                 clientId ++;
             }
         }
@@ -250,7 +250,7 @@ public class DataUtil {
     }
 
     public Map<String, String> insertStudentOne(Db db, String tableName, Map<String, String> tableData) throws Exception {
-        String sql = "SELECT t1.id,t1.name,CONCAT(t3.id,'-',t4.name,'-',t3.class_type,'-',t2.stduy_status)," +
+        String sql = "SELECT t1.id,t1.name,CONCAT(t3.id,'-',replace(t4.name,'级',''),'-',t3.class_type,'-',t2.stduy_status)," +
                 " t1.user_name,t1.gender,DATE_FORMAT(t1.birth_date, '%Y-%m-%d'),t1.mobile,t1.email,t1.credential_type,t1.credential_number FROM xjr_user t1" +
                 " INNER JOIN base_student_school_roll t2 ON t1.id = t2.user_id" +
                 " INNER JOIN base_class t3 ON t2.class_id = t3.id" +

src/main/java/com/xjrsoft/module/liteflow/node/ReservationSchoolNode.java

@@ -32,6 +32,8 @@ public class ReservationSchoolNode extends NodeComponent {
             dataObj.setStatus(1);
             dataObj.setExamStatus(1);
             reservationSchoolService.updateById(dataObj);
+
+            reservationSchoolService.registration(dataObj);
         }
     }
 }

src/main/java/com/xjrsoft/module/personnel/entity/ReservationSchoolPeople.java

@@ -109,5 +109,6 @@ public class ReservationSchoolPeople implements Serializable {
     @ApiModelProperty("车牌号")
     private String plateNumber;
 
-
+    @ApiModelProperty("记录海康登记结果")
+    private String registrationResult;
 }

src/main/java/com/xjrsoft/module/personnel/service/impl/ReservationSchoolServiceImpl.java

@@ -134,7 +134,10 @@ public class ReservationSchoolServiceImpl extends MPJBaseServiceImpl<Reservation
             visitorInfo.addProperty("certificateNo", people.getIdentityCard());
             paramJson.add("visitorInfo", visitorInfo);
 
-            apiUtil.doPost(apiPath, paramJson.toString(), null);
+            String result = apiUtil.doPost(apiPath, paramJson.toString(), null);
+
+            people.setRegistrationResult(result);
+            reservationSchoolPeopleMapper.updateById(people);
         }
 
         return true;

src/test/java/com/xjrsoft/module/job/HikvisionBaseDataTaskTest.java

@@ -80,11 +80,29 @@ class HikvisionBaseDataTaskTest {
 //        Map<String, String> classes = dataUtil.insertClass(use, tableName, baseClass);
 
 
-        tableName = "base_student";
-        Map<String, String> baseStudent = dataMap.get(tableName);
-        Map<String, String> student = insertStudentOne(use, tableName, baseStudent);
+//        tableName = "base_student";
+//        Map<String, String> baseStudent = dataMap.get(tableName);
+//        Map<String, String> student = dataUtil.insertStudentOne(use, tableName, baseStudent);
 
 //        selectOrg(use, "base_class");
+
+        //查询车辆
+//        String carTableName = "car_message_apply";
+//        selectCar(use, carTableName);
+
+    }
+
+    public static void selectCar(Db db, String tableName) throws SQLException {
+        String sql = "SELECT * FROM " + tableName + " WHERE delete_mark = 0";
+        List<Department> dataList = db.query(sql, Department.class);
+        String apiPath = "/api/resource/v2/vehicle/advance/vehicleList";
+        JsonObject jsonObject = new JsonObject();
+        jsonObject.addProperty("pageNo", 1);
+        jsonObject.addProperty("pageSize", 500);
+        ApiUtil apiUtil = new ApiUtil();
+        String result = apiUtil.doPost(apiPath, jsonObject.toString(), null);
+        System.out.println("-----------------------------------------------------");
+        System.out.println(result);
     }
 
     public static void insertRecord(Db db, String tableName, Map<?, String> idsMap) throws SQLException {