From 525166acab2b1219417f1e3953c0b7836995bc2c Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 11 三月 2024 13:41:18 +0800
Subject: [PATCH] 修改事件

---
 src/main/java/com/whyc/service/CarCameraHisService.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/whyc/service/CarCameraHisService.java b/src/main/java/com/whyc/service/CarCameraHisService.java
index 799b846..6e98beb 100644
--- a/src/main/java/com/whyc/service/CarCameraHisService.java
+++ b/src/main/java/com/whyc/service/CarCameraHisService.java
@@ -1,15 +1,17 @@
 package com.whyc.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.whyc.dto.Login;
 import com.whyc.mapper.CarCameraHisMapper;
-import com.whyc.pojo.CarCamera;
+import com.whyc.peopleCamera.Acs.AcsMain;
 import com.whyc.pojo.CarCameraHis;
+import com.whyc.pojo.PeopleCarmera;
 import com.whyc.pojo.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.UnsupportedEncodingException;
 import java.util.List;
 
 @Service
@@ -17,6 +19,12 @@
     @Autowired(required = false)
     private CarCameraHisMapper hisMapper;
 
+    @Autowired(required = false)
+    private AcsMain acsMain_p;
+
+    @Autowired(required = false)
+    private com.whyc.carCamera.Acs.AcsMain acsMain;
+
     //鑾峰彇闂ㄧ鍘嗗彶鏁版嵁
     public Response getCarCameraHis(int carCameraId,int pageCurr,int pageSize) {
         PageHelper.startPage(pageCurr,pageSize);
@@ -24,4 +32,18 @@
         PageInfo pageInfo=new PageInfo(list);
         return new Response().setII(1,list.size()>0,pageInfo,"鑾峰彇闂ㄧ鍘嗗彶鏁版嵁");
     }
+
+    //浠庝互浜轰负涓績鑾峰彇浜嬩欢
+    public Response getCarCameraHis_people(Login login) throws UnsupportedEncodingException, InterruptedException {
+        List<PeopleCarmera> list=acsMain_p.getCarCameraHis_people(login);
+        if(list!=null){
+            for (PeopleCarmera pc:list) {
+                String carId=pc.getCarId();
+                acsMain.getFaceCInfo(login,carId);
+            }
+            return new Response().setII(1,true,list,"鑾峰彇闂ㄧ鍘嗗彶鏁版嵁");
+        }else{
+            return new Response().set(1,false,"鑾峰彇澶辫触");
+        }
+    }
 }

--
Gitblit v1.9.1