diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml index 18e1925..4f5b121 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml @@ -29,7 +29,7 @@ FROM acs_door door LEFT JOIN acs_permission per ON per.DOOR_CODE = door.DOOR_CODE - LEFT JOIN person_ext_view p ON per.PERSON_ID = p.ID + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID WHERE p.DELFLAG = '0' OR p.DELFLAG IS NULL GROUP BY door.DOOR_CODE @@ -49,7 +49,7 @@ per.ID AS permissionId FROM acs_permission per LEFT JOIN acs_door door ON door.DOOR_CODE = per.DOOR_CODE - LEFT JOIN person_ext_view p ON per.PERSON_ID = p.ID + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID LEFT JOIN acs_strategy stra ON per.STRATEGY_ID = stra.ID WHERE per.DOOR_CODE = #{doorCode} AND p.PERSON_TYPE = '1' @@ -76,7 +76,7 @@ per.ID AS permissionId FROM acs_permission per LEFT JOIN acs_door door ON door.DOOR_CODE = per.DOOR_CODE - LEFT JOIN person_ext_view p ON per.PERSON_ID = p.ID + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID LEFT JOIN acs_strategy stra ON per.STRATEGY_ID = stra.ID WHERE per.DOOR_CODE = #{doorCode} AND p.PERSON_TYPE = '0' @@ -100,7 +100,7 @@ ID_CARD_NO as idCard, REMARKS as remarks, PERSON_CODE AS personCode - FROM person_ext_view + FROM sys_person WHERE ID NOT IN (SELECT PERSON_ID FROM acs_permission WHERE DOOR_CODE = #{doorCode}) AND PERSON_TYPE = #{personType} AND DELFLAG = '0' diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml index 18e1925..4f5b121 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml @@ -29,7 +29,7 @@ FROM acs_door door LEFT JOIN acs_permission per ON per.DOOR_CODE = door.DOOR_CODE - LEFT JOIN person_ext_view p ON per.PERSON_ID = p.ID + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID WHERE p.DELFLAG = '0' OR p.DELFLAG IS NULL GROUP BY door.DOOR_CODE @@ -49,7 +49,7 @@ per.ID AS permissionId FROM acs_permission per LEFT JOIN acs_door door ON door.DOOR_CODE = per.DOOR_CODE - LEFT JOIN person_ext_view p ON per.PERSON_ID = p.ID + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID LEFT JOIN acs_strategy stra ON per.STRATEGY_ID = stra.ID WHERE per.DOOR_CODE = #{doorCode} AND p.PERSON_TYPE = '1' @@ -76,7 +76,7 @@ per.ID AS permissionId FROM acs_permission per LEFT JOIN acs_door door ON door.DOOR_CODE = per.DOOR_CODE - LEFT JOIN person_ext_view p ON per.PERSON_ID = p.ID + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID LEFT JOIN acs_strategy stra ON per.STRATEGY_ID = stra.ID WHERE per.DOOR_CODE = #{doorCode} AND p.PERSON_TYPE = '0' @@ -100,7 +100,7 @@ ID_CARD_NO as idCard, REMARKS as remarks, PERSON_CODE AS personCode - FROM person_ext_view + FROM sys_person WHERE ID NOT IN (SELECT PERSON_ID FROM acs_permission WHERE DOOR_CODE = #{doorCode}) AND PERSON_TYPE = #{personType} AND DELFLAG = '0' diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index a2265b9..df33fc6 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -118,7 +118,7 @@ FROM `recognition_records` re LEFT JOIN acs_door door ON door.DOOR_CODE = re.DOOR_CODE - LEFT JOIN person_ext_view p ON p.ID = re.PERSON_ID + LEFT JOIN sys_person p ON p.ID = re.PERSON_ID LEFT JOIN bus_device device ON device.DEV_CODE = re.DEV_CODE WHERE 1 = 1 @@ -162,7 +162,7 @@ FROM `recognition_records` re LEFT JOIN acs_door door ON door.DOOR_CODE = re.DOOR_CODE - LEFT JOIN person_ext_view p ON p.ID = re.PERSON_ID + LEFT JOIN sys_person p ON p.ID = re.PERSON_ID WHERE p.PERSON_TYPE = 1 @@ -190,7 +190,7 @@ FROM `recognition_records` re LEFT JOIN acs_door door ON door.DOOR_CODE = re.DOOR_CODE - LEFT JOIN person_ext_view p ON p.ID = re.PERSON_ID + LEFT JOIN sys_person p ON p.ID = re.PERSON_ID WHERE p.PERSON_TYPE = 1 AND re.INOUT_TYPE = #{inoutType} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml index 18e1925..4f5b121 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml @@ -29,7 +29,7 @@ FROM acs_door door LEFT JOIN acs_permission per ON per.DOOR_CODE = door.DOOR_CODE - LEFT JOIN person_ext_view p ON per.PERSON_ID = p.ID + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID WHERE p.DELFLAG = '0' OR p.DELFLAG IS NULL GROUP BY door.DOOR_CODE @@ -49,7 +49,7 @@ per.ID AS permissionId FROM acs_permission per LEFT JOIN acs_door door ON door.DOOR_CODE = per.DOOR_CODE - LEFT JOIN person_ext_view p ON per.PERSON_ID = p.ID + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID LEFT JOIN acs_strategy stra ON per.STRATEGY_ID = stra.ID WHERE per.DOOR_CODE = #{doorCode} AND p.PERSON_TYPE = '1' @@ -76,7 +76,7 @@ per.ID AS permissionId FROM acs_permission per LEFT JOIN acs_door door ON door.DOOR_CODE = per.DOOR_CODE - LEFT JOIN person_ext_view p ON per.PERSON_ID = p.ID + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID LEFT JOIN acs_strategy stra ON per.STRATEGY_ID = stra.ID WHERE per.DOOR_CODE = #{doorCode} AND p.PERSON_TYPE = '0' @@ -100,7 +100,7 @@ ID_CARD_NO as idCard, REMARKS as remarks, PERSON_CODE AS personCode - FROM person_ext_view + FROM sys_person WHERE ID NOT IN (SELECT PERSON_ID FROM acs_permission WHERE DOOR_CODE = #{doorCode}) AND PERSON_TYPE = #{personType} AND DELFLAG = '0' diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index a2265b9..df33fc6 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -118,7 +118,7 @@ FROM `recognition_records` re LEFT JOIN acs_door door ON door.DOOR_CODE = re.DOOR_CODE - LEFT JOIN person_ext_view p ON p.ID = re.PERSON_ID + LEFT JOIN sys_person p ON p.ID = re.PERSON_ID LEFT JOIN bus_device device ON device.DEV_CODE = re.DEV_CODE WHERE 1 = 1 @@ -162,7 +162,7 @@ FROM `recognition_records` re LEFT JOIN acs_door door ON door.DOOR_CODE = re.DOOR_CODE - LEFT JOIN person_ext_view p ON p.ID = re.PERSON_ID + LEFT JOIN sys_person p ON p.ID = re.PERSON_ID WHERE p.PERSON_TYPE = 1 @@ -190,7 +190,7 @@ FROM `recognition_records` re LEFT JOIN acs_door door ON door.DOOR_CODE = re.DOOR_CODE - LEFT JOIN person_ext_view p ON p.ID = re.PERSON_ID + LEFT JOIN sys_person p ON p.ID = re.PERSON_ID WHERE p.PERSON_TYPE = 1 AND re.INOUT_TYPE = #{inoutType} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index 8f6a715..f217cb0 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -295,6 +295,7 @@ record.setDoorCode(rs.getString("DOOR_CODE")); record.setInoutType(rs.getString("INOUT_TYPE")); record.setTemperature(rs.getString("TEMPERATURE")); + record.setSyncTime(new Date()); record.setDevIp(ip); recordsList.add(record); }