Merge branch 'pre'

src/main/java/com/xjrsoft/module/attendance/controller/TeacherStatisticsController.java

@@ -168,9 +168,10 @@ public class TeacherStatisticsController {
                     continue;
                 }
                 List<TeacherOutInRecord> outInRecords = teacherOutInRecordService.list(
-                    new QueryWrapper<TeacherOutInRecord>().lambda()
-                            .between(TeacherOutInRecord::getRecordTime, startTime, endTime)
+                    new MPJLambdaWrapper<TeacherOutInRecord>()
+                            .le(TeacherOutInRecord::getRecordTime, startTime)
                             .eq(TeacherOutInRecord::getStatus, 1)
+                            .eq("DATE_FORMAT(record_time, '%Y-%m-%d')", startTime.toLocalDate())
                             .eq(TeacherOutInRecord::getUserId, record.getUserId())
                             .orderByAsc(TeacherOutInRecord::getRecordTime)
                 );
@@ -184,16 +185,21 @@ public class TeacherStatisticsController {
                     //查询该教师是否通过车辆进入
                     List<CarOutInRecord> list = carOutInRecordService.list(
                             new MPJLambdaWrapper<CarOutInRecord>()
-                                    .select(CarMessageApply.class, x -> VoToColumnUtil.fieldsToColumns(CarMessageApply.class).contains(x.getProperty()))
+                                    .select(CarOutInRecord.class, x -> VoToColumnUtil.fieldsToColumns(CarOutInRecord.class).contains(x.getProperty()))
                                     .leftJoin(CarMessageApply.class, CarMessageApply::getId, CarOutInRecord::getCarMessageApplyId)
-                                    .between(CarOutInRecord::getRecordTime, startTime, endTime)
+                                    .le(TeacherOutInRecord::getRecordTime, endTime)
+                                    .eq("DATE_FORMAT(record_time, '%Y-%m-%d')", endTime.toLocalDate())
+                                    .eq(CarMessageApply::getUserId, record.getUserId())
                                     .orderByAsc(CarOutInRecord::getRecordTime)
                     );
                     if(!list.isEmpty()){
                         CarOutInRecord outInRecord = list.get(0);
-                        if(outInRecord != null){
+                        if(outInRecord != null && outInRecord.getRecordTime().isBefore(startTime)){
                             record.setRecordTime(outInRecord.getRecordTime());
-                            record.setStatus(outInRecord.getAttendanceStatus());
+                            record.setStatus("到校");
+                        }else if(outInRecord != null && outInRecord.getRecordTime().isAfter(startTime)){
+                            record.setRecordTime(outInRecord.getRecordTime());
+                            record.setStatus("迟到");
                         }
                     }
                 }

src/main/java/com/xjrsoft/module/hikvision/controller/EventController.java

@@ -208,9 +208,12 @@ public class EventController {
         ApiUtil apiUtil = new ApiUtil();
         JsonArray eventList = new JsonArray();
 //*******手动更改****************************************************
-//        eventList.add(196893);
-        eventList.add(771760130);
-        eventList.add(771760133);
+        eventList.add(196893);
+//        eventList.add(197151);
+        eventList.add(1392513025); //访客登记
+        eventList.add(1392513026); //访客签离
+//        eventList.add(771760130);
+//        eventList.add(771760133);
 //******************************************************************
         JsonObject paramJson = new JsonObject();
         paramJson.add("eventTypes", eventList);

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

@@ -281,9 +281,9 @@ public class DataUtil {
             paramJson.addProperty("personId", objectMap.get("id").toString());
             paramJson.addProperty("personName", objectMap.get("name").toString());
             paramJson.addProperty("orgIndexCode", objectMap.get("orgIndexCode").toString());
-            paramJson.addProperty("phoneNo", objectMap.get("mobile").toString());
+            paramJson.addProperty("phoneNo", objectMap.get("mobile")==null?"":objectMap.get("mobile").toString());
             paramJson.addProperty("jobNo", objectMap.get("user_name").toString());
-            paramJson.addProperty("birthday", objectMap.get("birthday").toString());
+            paramJson.addProperty("birthday", objectMap.get("birthday")==null?"":objectMap.get("birthday").toString());
             paramJson.addProperty("personType", 2);
 
             int gender;
@@ -321,7 +321,7 @@ public class DataUtil {
         return idMap;
     }
 
-    public Map<String, String> insertStudent(String tableName, Map<String, String> tableData) throws Exception {
+    public Map<String, String> insertStudent(String tableName, Map<String, String> tableData) {
         String sql = "SELECT t1.id,t1.name,CONCAT(t3.id,'-',t4.name,'-',t3.class_type,'-',t2.stduy_status)," +
                 " t1.user_name,t1.gender,t1.birth_date,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" +
@@ -407,22 +407,22 @@ public class DataUtil {
         JsonArray paramArray = new JsonArray();
         Map<Integer, String> clientMap = new HashMap<>();
         for(int i = 0; i < list.size(); i ++){
-            String[] el = SqlRunnerAdapterUtil.convertMapToStringArray(list.get(i));
-            if(tableData != null && tableData.containsKey(el[0])){
+            Map<String, Object> objectMap = list.get(i);
+            if(tableData != null && tableData.containsKey(objectMap.get("id").toString())){
                 continue;
             }
             JsonObject paramJson = new JsonObject();
             paramJson.addProperty("clientId", i);
-            paramJson.addProperty("personId", el[0]);
-            paramJson.addProperty("personName", el[1]);
-            paramJson.addProperty("orgIndexCode", deptMap.get(el[3]));
-            paramJson.addProperty("phoneNo", el[5]);
-            paramJson.addProperty("jobNo", el[9]);
-            paramJson.addProperty("birthday", el[4]);
+            paramJson.addProperty("personId", objectMap.get("id").toString());
+            paramJson.addProperty("personName", objectMap.get("name").toString());
+            paramJson.addProperty("orgIndexCode", objectMap.get("dept_id").toString());
+            paramJson.addProperty("phoneNo", objectMap.get("mobile")==null?"":objectMap.get("mobile").toString());
+            paramJson.addProperty("jobNo", objectMap.get("user_name").toString());
+            paramJson.addProperty("birthday", objectMap.get("birth_date")==null?"":objectMap.get("birth_date").toString());
             paramJson.addProperty("personType", 1);
 
             int gender;
-            switch (el[2]) {
+            switch (objectMap.get("gender").toString()) {
                 case "SB10001":
                     gender = 1;
                     break;
@@ -436,7 +436,7 @@ public class DataUtil {
             paramJson.addProperty("gender", gender);
             paramArray.add(paramJson);
 
-            clientMap.put(i, el[0]);
+            clientMap.put(i, objectMap.get("id").toString());
         }
 
         String apiPath = "/api/resource/v1/person/batch/add";

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

@@ -489,8 +489,11 @@ public class OutInRecordUtil {
         ApiUtil apiUtil = new ApiUtil();
         String apiPath = "/api/acs/v2/door/events";
         JsonObject paramJson = new JsonObject();
+        JsonArray eventList = new JsonArray();
+        eventList.add(196893);
         paramJson.addProperty("pageNo", pageNo.get());
         paramJson.addProperty("pageSize", pageSize);
+        paramJson.add("eventTypes", eventList);
 
         return apiUtil.doPost(apiPath, String.valueOf(paramJson), null);
     }
@@ -616,7 +619,7 @@ public class OutInRecordUtil {
                     }
 
                     String statusStr = dataObject.get("roadwayName").getAsString();
-                    int statusInt = 0;
+                    int statusInt = 1;
                     if (statusStr.contains("入")) {
                         statusInt = 0;
                     } else if (statusStr.contains("出")) {

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

@@ -154,9 +154,9 @@ public class AttenDanceWarnNoticeTask {
 
             JSONObject const12 = new JSONObject();
             if(status == 1){
-                const12.put("value", "未打卡");
-            }else{
                 const12.put("value", "待打卡");
+            }else{
+                const12.put("value", "未打卡");
             }
             //查询这个用户最新的考勤状态
             AttendanceUserRelation userRelation = allUserStatus.get(xjrUser.getId());
@@ -183,7 +183,7 @@ public class AttenDanceWarnNoticeTask {
      * 判断所有规则，哪些需要发送
      * @param judgeTime
      * @param ruleDetailsList
-     * @return 0：不需要提醒，1：未打卡，2：待打卡
+     * @return 0：不需要提醒，1：待打卡，2：未打卡
      */
     Map<Long, Integer> judgeExecuteNotice(LocalDateTime judgeTime, List<AttendanceRuleDetails> ruleDetailsList, LocalDateTime recentlyTime){
         Map<Long, Integer> result = new HashMap<>();

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

@@ -177,8 +177,8 @@ class HikvisionBaseDataTaskTest {
                 " INNER JOIN base_class t3 ON t2.class_id = t3.id" +
                 " INNER JOIN base_grade t4 ON t3.grade_id = t4.id" +
                 " WHERE t1.delete_mark = 0 AND t2.delete_mark = 0" +
-                " AND t3.class_type IS NOT NULL" +
-                " AND t1.name IN ('白江龙')";
+                " AND t3.class_type IS NOT NULL";
+                //" AND t1.name IN ('宋成男','白江龙','李松阳')";
         List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql, String[].class);
         Map<Integer, String> clientMap = new HashMap<>();
 
@@ -188,7 +188,7 @@ class HikvisionBaseDataTaskTest {
         Map<String, String> header = new HashMap<>();
         header.put("tagId", "insert_student");
 
-        for(int i = 0; i < list.size(); i ++){
+        for(int i = 1; i < list.size(); i ++){
             Map<String, Object> objectMap = list.get(i);
             String apiPath = "/api/resource/v2/person/single/add";
 
@@ -197,9 +197,9 @@ class HikvisionBaseDataTaskTest {
             paramJson.addProperty("personId", objectMap.get("id").toString());
             paramJson.addProperty("personName", objectMap.get("name").toString());
             paramJson.addProperty("orgIndexCode", objectMap.get("orgIndexCode").toString());
-            paramJson.addProperty("phoneNo", objectMap.get("mobile").toString());
+            paramJson.addProperty("phoneNo", objectMap.get("mobile")==null?"":objectMap.get("mobile").toString());
             paramJson.addProperty("jobNo", objectMap.get("user_name").toString());
-            paramJson.addProperty("birthday", objectMap.get("birthday").toString());
+            paramJson.addProperty("birthday", objectMap.get("birthday")==null?"":objectMap.get("birthday").toString());
             paramJson.addProperty("personType", 2);
 
             int gender;
@@ -218,7 +218,7 @@ class HikvisionBaseDataTaskTest {
 
             if(tableData != null && tableData.containsKey(objectMap.get("id").toString())){
                 apiPath = "/api/resource/v1/person/single/update";
-                String doPost = apiUtil.doPost(apiPath, paramJson.toString(), null, header);
+                apiUtil.doPost(apiPath, paramJson.toString(), null, header);
                 continue;
             }