From 23fce2cf3f14a827911a53a910b35a09d6b01330 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 02 四月 2026 09:53:37 +0800
Subject: [PATCH] APP密码加密，抓拍改为地磅抓拍
---
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5108.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5108.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5108.java
index 4c724de..e98c9ea 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5108.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5108.java
@@ -11,12 +11,13 @@
import com.fzzy.igds.app.v1.dto.PSnapDto;
import com.fzzy.igds.app.v1.service.PhoneService;
import com.fzzy.igds.app.v1.util.PhoneRespUtil;
-import com.fzzy.igds.domain.Dept;
-import com.fzzy.igds.domain.PatrolRecord;
-import com.fzzy.igds.domain.SnapRecord;
+import com.fzzy.igds.domain.*;
import com.fzzy.igds.mapper.SnapRecordMapper;
+import com.fzzy.igds.mapper.WeighbridgeSnapMapper;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.FileService;
+import com.fzzy.igds.service.InoutConfService;
+import com.fzzy.igds.service.SecCameraService;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
import org.apache.commons.lang3.StringUtils;
@@ -29,6 +30,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @Author: YYC
@@ -39,9 +41,11 @@
public class ServiceImpl5108 implements PhoneService {
@Resource
- private SnapRecordMapper snapRecordMapper;
+ private WeighbridgeSnapMapper weighbridgeSnapMapper;
@Resource
private CoreDeptService deptService;
+ @Resource
+ private InoutConfService inoutConfService;
@Override
@@ -64,22 +68,31 @@
if (null == param.getDateTime()) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
- QueryWrapper<SnapRecord> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<WeighbridgeSnap> queryWrapper = new QueryWrapper<>();
param.setCompanyId(ContextUtil.getCompanyId());
queryWrapper.eq("company_id", param.getCompanyId());
queryWrapper.likeRight("dept_id", param.getDeptId());
- queryWrapper.ge("snap_time", DateUtil.getCurZero(param.getDateTime()));
- queryWrapper.le("snap_time", DateUtil.getNextZero(param.getDateTime()));
+ queryWrapper.ge("time", DateUtil.getCurZero(param.getDateTime()));
+ queryWrapper.le("time", DateUtil.getNextZero(param.getDateTime()));
- List<SnapRecord> list = snapRecordMapper.selectList(queryWrapper);
+ List<WeighbridgeSnap> list = weighbridgeSnapMapper.selectList(queryWrapper);
PSnapDto snapDto;
Dept dept;
List<PSnapDto> snapDtoList = new ArrayList<>();
- for (SnapRecord snapRecord:list){
+ List<InoutConf> collect;
+ //鑾峰彇鐩戞帶璁惧
+ List<InoutConf> inoutConfs = inoutConfService.getInoutConfList(ContextUtil.getCompanyId(), param.getDeptId());
+ for (WeighbridgeSnap weighbridgeSnap : list) {
snapDto = new PSnapDto();
- BeanUtils.copyProperties(snapRecord,snapDto);
- dept = deptService.getDeptById(snapRecord.getDeptId());
+ BeanUtils.copyProperties(weighbridgeSnap, snapDto);
+
+ //鏄犲皠鐩戞帶璁惧鍚嶇О
+ collect = inoutConfs.stream().filter(camera -> camera.getId().equals(weighbridgeSnap.getSerId())).collect(Collectors.toList());
+ if (!collect.isEmpty()) {
+ snapDto.setCameraId(collect.get(0).getName());
+ }
+ dept = deptService.getDeptById(weighbridgeSnap.getDeptId());
snapDto.setDeptName(dept.getKqmc());
snapDtoList.add(snapDto);
}
--
Gitblit v1.9.3