From 70189eed5b6e57530e17dc74288a52c1af6f18cf Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 11 三月 2024 13:43:45 +0800
Subject: [PATCH] 修改事件
---
src/main/java/com/whyc/service/CarCameraHisService.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/CarCameraHisService.java b/src/main/java/com/whyc/service/CarCameraHisService.java
index eec7d26..f9a1335 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,14 +19,31 @@
@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);
- QueryWrapper wrapper=new QueryWrapper();
- wrapper.eq("carcamera_id",carCameraId);
- wrapper.orderByDesc("record_time");
- List<CarCameraHis> list=hisMapper.selectList(wrapper);
+ List<CarCameraHis> list=hisMapper.getCarCameraHis(carCameraId);
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();
+ pc.setFacepath(acsMain.getFaceCInfo(login,carId));
+ }
+ return new Response().setII(1,true,list,"鑾峰彇闂ㄧ鍘嗗彶鏁版嵁");
+ }else{
+ return new Response().set(1,false,"鑾峰彇澶辫触");
+ }
+ }
}
--
Gitblit v1.9.1