admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2024-04-13 11:40:08 +08:00
parent bb3867ddf7
commit d3f05dd7ee
2 changed files with 55 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
View File

@ -326,13 +326,14 @@ public class HikvisionCall {
param.put("doorIndexCode", ufaceDev.getDevSn()); param.put("doorIndexCode", ufaceDev.getDevSn());
param.put("pageNo", 1); param.put("pageNo", 1);
Integer total = 0; Integer total = 0;
JSONArray listJa = new JSONArray();
do { do {
String rs = getDoorEventsForHttp(project, param); String rs = getDoorEventsForHttp(project, param);
JSONObject joData = HikvisionUtil.getJSONObjectData(rs); JSONObject joData = HikvisionUtil.getJSONObjectData(rs);
if (joData != null) { if (joData != null) {
total = joData.getInteger("total"); total = joData.getInteger("total");
if (!Objects.equals(total, 0)) { if (!Objects.equals(total, 0)) {
JSONArray listJa = joData.getJSONArray("list"); listJa = joData.getJSONArray("list");
for (int i = 0; i < listJa.size(); i++) { for (int i = 0; i < listJa.size(); i++) {
JSONObject listJo = listJa.getJSONObject(i); JSONObject listJo = listJa.getJSONObject(i);
String eventTime = listJo.getString("eventTime"); String eventTime = listJo.getString("eventTime");
@ -352,6 +353,7 @@ public class HikvisionCall {
Integer count = workerAttendanceMapper.selectCount(new LambdaQueryWrapper<WorkerAttendance>() Integer count = workerAttendanceMapper.selectCount(new LambdaQueryWrapper<WorkerAttendance>()
.eq(WorkerAttendance::getPersonSn, workerInfo.getPersonSn()) .eq(WorkerAttendance::getPersonSn, workerInfo.getPersonSn())
.eq(WorkerAttendance::getCreateTime, time) .eq(WorkerAttendance::getCreateTime, time)
.ne(WorkerAttendance::getImageUrl, "")
); );
if (count != 0) { if (count != 0) {
continue; continue;
@ -370,16 +372,35 @@ public class HikvisionCall {
rq.setSvrIndexCode(svrIndexCode); rq.setSvrIndexCode(svrIndexCode);
map.put("faceUrl", saveToLocal(getHikvisionEventsPicture(rq, project.getArtemisConfigHost(), project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret()))); map.put("faceUrl", saveToLocal(getHikvisionEventsPicture(rq, project.getArtemisConfigHost(), project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret())));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error("主动获取人脸图片失败>", e);
}
try {
List<WorkerAttendance> workerAttendanceList = workerAttendanceMapper.selectList(new LambdaQueryWrapper<WorkerAttendance>()
.eq(WorkerAttendance::getPersonSn, workerInfo.getPersonSn())
.eq(WorkerAttendance::getCreateTime, time)
);
if (CollUtil.isNotEmpty(workerAttendanceList)) {
for (WorkerAttendance workerAttendance : workerAttendanceList) {
workerAttendance.setImageUrl(MapUtils.getString(map, "faceUrl"));
workerAttendanceMapper.updateById(workerAttendance);
}
} else {
workerAttendanceService.saveExternalPassRecord(map);
}
} catch (Exception e) {
log.error("主动保存人员失败,time:{},>", time, e);
} }
workerAttendanceService.saveExternalPassRecord(map);
} }
param.put("pageNo", param.getIntValue("pageNo") + 1); param.put("pageNo", param.getIntValue("pageNo") + 1);
} }
} }
} while (total > 0); } while (total > 0 && listJa.size() > 0);
}
try {
workerAttendancePresenceService.addNowAllWorkerAttendancePresence(projectSn);
} catch (Exception e) {
log.error("主动更新在场人员失败,projectSn:{},>", projectSn, e);
} }
workerAttendancePresenceService.addNowAllWorkerAttendancePresence(projectSn);
} }
log.info("服务挂了主动获取门禁点事件的人员通行记录执行完成，startTime：{}，endTime：{}", startTime, endTime); log.info("服务挂了主动获取门禁点事件的人员通行记录执行完成，startTime：{}，endTime：{}", startTime, endTime);
if (SecurityUtils.getUser().getUserId() != null) { if (SecurityUtils.getUser().getUserId() != null) {
@ -428,13 +449,14 @@ public class HikvisionCall {
} }
param.put("parkSyscode", projectParkCode); param.put("parkSyscode", projectParkCode);
Integer total = 0; Integer total = 0;
JSONArray listJa = new JSONArray();
do { do {
String rs = getCrossRecordsForHttp(project, param); String rs = getCrossRecordsForHttp(project, param);
JSONObject joData = HikvisionUtil.getJSONObjectData(rs); JSONObject joData = HikvisionUtil.getJSONObjectData(rs);
if (joData != null) { if (joData != null) {
total = joData.getInteger("total"); total = joData.getInteger("total");
if (!Objects.equals(total, 0)) { if (!Objects.equals(total, 0)) {
JSONArray listJa = joData.getJSONArray("list"); listJa = joData.getJSONArray("list");
for (int i = 0; i < listJa.size(); i++) { for (int i = 0; i < listJa.size(); i++) {
JSONObject listJo = listJa.getJSONObject(i); JSONObject listJo = listJa.getJSONObject(i);
String plateNo = listJo.getString("plateNo"); String plateNo = listJo.getString("plateNo");
@ -453,6 +475,8 @@ public class HikvisionCall {
Integer count = carPassRecordMapper.selectCount(new LambdaQueryWrapper<CarPassRecord>() Integer count = carPassRecordMapper.selectCount(new LambdaQueryWrapper<CarPassRecord>()
.eq(CarPassRecord::getCarNumber, plateNo) .eq(CarPassRecord::getCarNumber, plateNo)
.eq(CarPassRecord::getPassTime, time) .eq(CarPassRecord::getPassTime, time)
.ne(CarPassRecord::getImageUrl, "")
.ne(CarPassRecord::getPanoramaUrl, "")
); );
if (count != 0) { if (count != 0) {
continue; continue;
@ -485,12 +509,22 @@ public class HikvisionCall {
} else { } else {
entity.setIsOpen(0); entity.setIsOpen(0);
} }
carPassRecordMapper.insert(entity); Integer count1 = carPassRecordMapper.selectCount(new LambdaQueryWrapper<CarPassRecord>()
.eq(CarPassRecord::getCarNumber, plateNo)
.eq(CarPassRecord::getPassTime, time)
);
if (count1 != 0) {
carPassRecordMapper.update(entity, new LambdaQueryWrapper<CarPassRecord>()
.eq(CarPassRecord::getCarNumber, plateNo)
.eq(CarPassRecord::getPassTime, time));
} else {
carPassRecordMapper.insert(entity);
}
} }
param.put("pageNo", param.getIntValue("pageNo") + 1); param.put("pageNo", param.getIntValue("pageNo") + 1);
} }
} }
} while (total > 0); } while (total > 0 && listJa.size() > 0);
} }
log.info("服务挂了主动获取车辆事件的车辆通行记录执行完成，startTime：{}，endTime：{}", startTime, endTime); log.info("服务挂了主动获取车辆事件的车辆通行记录执行完成，startTime：{}，endTime：{}", startTime, endTime);
if (SecurityUtils.getUser().getUserId() != null) { if (SecurityUtils.getUser().getUserId() != null) {

26
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendancePresenceMapper.xml
View File

@ -2,21 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.worker.mapper.WorkerAttendancePresenceMapper"> <mapper namespace="com.zhgd.xmgl.modules.worker.mapper.WorkerAttendancePresenceMapper">
<insert id="addNowAllPresenceWorkerAttendance"> <insert id="addNowAllPresenceWorkerAttendance">
Insert into worker_attendance_presence(person_sn,create_time,project_sn) Insert into worker_attendance_presence(id,person_sn,create_time,project_sn)
SELECT DISTINCT SELECT DISTINCT
`b`.`person_sn` AS `person_sn`, `b`.`id` AS `id`,
`b`.`create_time` AS `create_time`, `b`.`person_sn` AS `person_sn`,
`b`.`project_sn` AS `project_sn` `b`.`create_time` AS `create_time`,
`b`.`project_sn` AS `project_sn`
FROM FROM
(SELECT `worker_attendance`.`person_sn` AS `person_sn`,max(`create_time`) AS `create_time` (SELECT `worker_attendance`.`person_sn` AS `person_sn`,max(`create_time`) AS `create_time`
FROM `worker_attendance` FROM `worker_attendance`
WHERE `create_time` >= concat(date_format(now(), '%Y-%m-%d'),' 00:00:00') WHERE `create_time` >= concat(date_format(now(), '%Y-%m-%d'),' 00:00:00')
GROUP BY `worker_attendance`.`person_sn` GROUP BY `worker_attendance`.`person_sn`
) `tp` ) `tp`
JOIN `worker_attendance` `b` ON (`tp`.`create_time` = `b`.`create_time` AND `tp`.`person_sn` = `b`.`person_sn` JOIN `worker_attendance` `b` ON (`tp`.`create_time` = `b`.`create_time` AND `tp`.`person_sn` = `b`.`person_sn`)
)
WHERE b.`create_time` >= concat(date_format(now(), '%Y-%m-%d'),' 00:00:00') AND (`b`.`pass_type` = 1) WHERE b.`create_time` >= concat(date_format(now(), '%Y-%m-%d'),' 00:00:00') AND (`b`.`pass_type` = 1)
and `b`.`project_sn`=#{projectSn} and `b`.`project_sn`=#{projectSn}
</insert> </insert>
<delete id="deleteAttendancePresence"> <delete id="deleteAttendancePresence">
@ -32,4 +32,4 @@
delete from worker_attendance_presence delete from worker_attendance_presence
where project_sn=#{projectSn} where project_sn=#{projectSn}
</delete> </delete>
</mapper> </mapper>