From 22a4f2b58fa1baa233e621d1406df456b516b4b1 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 07 四月 2026 16:19:07 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss
---
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java | 5 +++--
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5109.java | 14 ++++++++------
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/dto/PSnapDto.java | 6 +++++-
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5108.java | 35 ++++++++++++++++++++++++-----------
4 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/dto/PSnapDto.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/dto/PSnapDto.java
index 0824be8..549b054 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/dto/PSnapDto.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/dto/PSnapDto.java
@@ -27,7 +27,11 @@
private String tags ;
- private Date snapTime;
+ private Double weight = 0.0;
+
+ private String name;
+
+ private Date time;
private String imgName;
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java
index 7b47747..ebc461a 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java
@@ -13,6 +13,7 @@
import com.fzzy.igds.app.v1.util.PhoneRespUtil;
import com.fzzy.igds.app.v1.util.PhoneUtil;
import com.fzzy.igds.service.SysDeptService;
+import com.fzzy.igds.utils.Base64Util;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDept;
@@ -121,8 +122,8 @@
AsyncManager.me().execute(AsyncFactory.recordLogininfor(param.getUsername(), Constants.LOGIN_FAIL, MessageUtils.message("user.blocked")));
throw new UserBlockedException();
}
-
- passwordService.validate(user, param.getPassword());
+ String password = Base64Util.decodeBase64Password(param.getPassword());
+ passwordService.validate(user, password);
AsyncManager.me().execute(AsyncFactory.recordLogininfor(param.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
PUserDto phoneUserDto = new PUserDto();
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);
}
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5109.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5109.java
index 0de2004..cac9ad7 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5109.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5109.java
@@ -12,7 +12,9 @@
import com.fzzy.igds.app.v1.util.PhoneRespUtil;
import com.fzzy.igds.domain.PatrolRecord;
import com.fzzy.igds.domain.SnapRecord;
+import com.fzzy.igds.domain.WeighbridgeSnap;
import com.fzzy.igds.mapper.SnapRecordMapper;
+import com.fzzy.igds.mapper.WeighbridgeSnapMapper;
import com.fzzy.igds.service.FileService;
import com.ruoyi.common.config.FrameworkConfig;
import org.apache.commons.lang3.StringUtils;
@@ -29,7 +31,7 @@
public class ServiceImpl5109 implements PhoneService {
@Resource
- private SnapRecordMapper snapRecordMapper;
+ private WeighbridgeSnapMapper weighbridgeSnapMapper;
@Resource
private FileService fileService;
@@ -50,11 +52,11 @@
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
param.setCompanyId(authUser.getCompanyId());
- SnapRecord snapRecord = snapRecordMapper.selectById(param.getId());
- if (StringUtils.isNotEmpty(snapRecord.getImgName())) {
- String imgData = Base64Util.getImageStr(snapRecord.getImgName().replace("/profile/", FrameworkConfig.getProfile()));
- snapRecord.setImgName(imgData);
+ WeighbridgeSnap weighbridgeSnap = weighbridgeSnapMapper.selectById(param.getId());
+ if (StringUtils.isNotEmpty(weighbridgeSnap.getImgName())) {
+ String imgData = Base64Util.getImageStr(weighbridgeSnap.getImgName().replace("/profile/", FrameworkConfig.getProfile()));
+ weighbridgeSnap.setImgName(imgData);
}
- return PhoneRespUtil.success(snapRecord, req);
+ return PhoneRespUtil.success(weighbridgeSnap, req);
}
}
--
Gitblit v1.9.3