From 878b6958363308a7d07b7b8197dc19662f3e1198 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 15:40:22 +0800
Subject: [PATCH] 获取出入库id，逻辑优化调整
---
fzzy-igdss-web/src/main/java/com/fzzy/inout/manager/InoutManager.java | 78 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/inout/manager/InoutManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/inout/manager/InoutManager.java
index fe19eea..7babc80 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/inout/manager/InoutManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/inout/manager/InoutManager.java
@@ -1,6 +1,10 @@
package com.fzzy.inout.manager;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fzzy.common.manager.CommonManager;
+import com.fzzy.igds.camera.ApiCameraManager;
+import com.fzzy.igds.camera.data.ApiCameraData;
+import com.fzzy.igds.camera.data.ApiCameraResp;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.*;
@@ -8,16 +12,19 @@
import com.fzzy.igds.service.*;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.SystemUtil;
+import com.fzzy.work.data.WorkStatus;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
-import lombok.extern.slf4j.Slf4j;
import com.ruoyi.common.utils.StringUtils;
-import org.springframework.scheduling.annotation.Async;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
/**
* @Description 鍑哄叆搴撲笟鍔″鐞�
@@ -40,6 +47,10 @@
private DicAreaService dicAreaService;
@Resource
private InoutNoticeService inoutNoticeService;
+ @Resource
+ private CommonManager commonManager;
+ @Resource
+ private ApiCameraManager apiCameraManager;
/**
* 鏍规嵁鐢ㄦ埛璇锋眰淇℃伅锛屾牴鎹綋鍓嶅鎴风數鑴慖P锛岃幏鍙栧嚭鍏ュ簱绉伴噸涓婃閫夋嫨鐨勫湴纾�
@@ -220,7 +231,7 @@
data.setRegisterUser(ContextUtil.getLoginUserName());
data.setRegisterTime(new Date());
- num = inoutRecordService.addInoutRecord(data);
+ num = inoutRecordService.addInoutRecord(data,true);
if (num == 0) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "鐧昏澶辫触锛�", data);
@@ -510,6 +521,7 @@
}
param.setDeptId(ContextUtil.subDeptId(user));
param.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
+ param.setAuditStatus(WorkStatus.STATUS_50.getCode());
List<InoutNoticeIn> list = inoutNoticeService.getNoticeIn(param);
if (null == list || list.isEmpty()) {
@@ -530,6 +542,7 @@
}
param.setDeptId(ContextUtil.subDeptId(user));
param.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
+ param.setAuditStatus(WorkStatus.STATUS_50.getCode());
List<InoutNoticeOut> list = inoutNoticeService.getNoticeOut(param);
if (null == list || list.isEmpty()) {
@@ -538,4 +551,61 @@
return new PageResponse<>(RespCodeEnum.CODE_0000, list);
}
+
+ /**
+ * 鏍规嵁鍙傛暟鑾峰彇鍑哄叆搴撶殑鍥剧墖
+ *
+ * @param id
+ * @return
+ */
+ public List<FileInfo> cutImgList(String id) {
+
+ if (StringUtils.isBlank(id)){
+ return null;
+ }
+
+ List<FileInfo> files = fileService.listFile(ContextUtil.getCompanyId(), id);
+ if (null == files) {
+ return null;
+ }
+ for (FileInfo file : files) {
+ file.setFilePath(commonManager.isImgExit(file.getFilePath(), null));
+ }
+ return files;
+ }
+
+
+ /**
+ * 鑾峰彇鎾斁淇℃伅
+ *
+ * @param camera
+ * @return
+ */
+ public ApiCameraResp getPlayAddr(InoutConf camera) {
+
+ //閫氳繃缁熶竴鍏ュ彛鑾峰彇鎾斁鍦板潃
+ ApiCameraData apiCameraData = new ApiCameraData();
+ apiCameraData.setCompanyId(camera.getCompanyId());
+ apiCameraData.setDeptId(camera.getDeptId());
+ apiCameraData.setCameraId(camera.getSn());
+ apiCameraData.setIp(camera.getIp());
+ apiCameraData.setCtrlPort(camera.getPortCtrl());
+ apiCameraData.setWebPort(camera.getPort());
+ apiCameraData.setPlayType(camera.getPlayType());
+ apiCameraData.setSnapType(camera.getSnapType());
+ apiCameraData.setSn(camera.getSn());
+ apiCameraData.setChannel(camera.getChanNum());
+ apiCameraData.setLoginId(camera.getLoginId());
+ apiCameraData.setPwd(camera.getPwd());
+ apiCameraData.setUrlIn(camera.getUrlIn());
+ apiCameraData.setUrlOut(camera.getUrlOut());
+ apiCameraData.setMediaAddr(camera.getMediaAddr());
+
+ //鏍规嵁鎾斁鏂瑰紡鑾峰彇瀵瑰簲鐨勬挱鏀惧湴鍧�
+ ApiCameraResp resp = apiCameraManager.getApiCameraService(apiCameraData.getPlayType()).getPlayAddr(apiCameraData);
+ resp.setPlayType(camera.getPlayType());
+ resp.setSnapType(camera.getSnapType());
+ resp.setCameraId(camera.getSn());
+ return resp;
+ }
}
--
Gitblit v1.9.3