From 5faf6530e8fa01a5afc80e508863baca87f38b0f Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 18 十二月 2025 11:33:47 +0800
Subject: [PATCH] 增加文件是否存在校验，不存在给默认图
---
fzzy-igdss-web/src/main/resources/static/img/img-fail.jpg | 0
fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolSuper.view.xml | 18 +++++++-
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java | 2
fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/EventInfoManager.java | 8 ++++
fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolRecordManager.java | 15 +++++++
fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SnapRecordManager.java | 7 +++
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java | 4 ++
fzzy-igdss-view/src/main/java/models/core.model.xml | 2
fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java | 23 ++++++++---
fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/file/FileManager.java | 1
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FileService.java | 19 +++++++++
11 files changed, 84 insertions(+), 15 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FileService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FileService.java
index c6c9507..accef06 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FileService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FileService.java
@@ -233,6 +233,23 @@
ImageIO.write(compressedImage, "jpg", new File(outputPath));
}
-
+ /**
+ * 鍒ゆ柇璺緞涓嬫枃浠舵槸鍚﹀瓨鍦紝涓嶅瓨鍦ㄥ垯缁欓粯璁�
+ * @param imgPath
+ * @return
+ */
+ public String isImgExit(String imgPath, String tag) {
+ String path = "/img/img-fail.jpg";
+ if(StringUtils.isNotBlank(tag) && "dept".equals(tag)){
+ path = "/img/deptImg.jpg";
+ }
+ if(StringUtils.isNotBlank(imgPath)){
+ File file = new File(imgPath.replace("/profile", FrameworkConfig.getProfile()));
+ if(file.exists()){
+ path = imgPath;
+ }
+ }
+ return path;
+ }
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolSuper.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolSuper.view.xml
index 4844c17..2147c7d 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolSuper.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolSuper.view.xml
@@ -61,7 +61,7 @@
</DataType>
</Model>
<View layout="padding:10">
- <ClientEvent name="onClick">
+ <ClientEvent name="onReady">
/**
* 鏌ョ湅璇︽儏
*/
@@ -72,6 +72,19 @@
var panelId = window.parent.frameElement.getAttribute('data-id');
window.parent.parent.$.modal.openTab("宸℃洿璇︽儏", url,false, panelId);
};
+
+renderStatus = function(arg){
+ var txt = arg.data.getText("isPatrol");
+ if(!txt) return true;
+ var htm = "<span class='s2'>"+txt+"</span>";
+ if(txt.includes("N")){
+ htm = "<span class='s3'>"+txt+"</span>";
+ }
+ if(txt.includes("Y")){
+ htm = "<span class='s1'>"+txt+"</span>";
+ }
+ arg.dom.innerHTML = htm;
+}
</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
@@ -106,8 +119,7 @@
<Property name="width">150</Property>
</DataColumn>
<DataColumn name="isPatrol">
- <ClientEvent name="onRenderCell">arg.dom.style.background = arg.data.get("isPatrol")== 'Y' ?"":"#FF5722";
- arg.processDefault = true;</ClientEvent>
+ <ClientEvent name="onRenderCell">renderStatus(arg);</ClientEvent>
<Property name="property">isPatrol</Property>
<Property name="align">center</Property>
<Property name="width">120</Property>
diff --git a/fzzy-igdss-view/src/main/java/models/core.model.xml b/fzzy-igdss-view/src/main/java/models/core.model.xml
index f3c14ec..6d366b6 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -66,7 +66,7 @@
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
- <Property name="label">缁勭粐缂栫爜</Property>
+ <Property name="label">鏀跺偍鍏徃</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("companyPR#getData").getResult()}</Property>
<Property name="keyProperty">id</Property>
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java
index d60c74e..5524ca2 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java
@@ -1,6 +1,7 @@
package com.fzzy.sys.controller.file;
import com.fzzy.igds.data.PageResponse;
+import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.file.FileManager;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
@@ -28,6 +29,8 @@
@Resource
private FileManager fileManager;
+ @Resource
+ private CommonManager commonManager;
/**
* 楦熺灠鍥鹃瑙堥〉闈�
@@ -38,6 +41,7 @@
public String deptImg(@RequestParam(value = "imgPath", required = true) String imgPath,
ModelMap view) {
+ imgPath = commonManager.isImgExit(imgPath, "dept");
view.put("imgPath", imgPath);
return "common/preview-img";
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
index 7504a74..5d57da7 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
@@ -89,7 +89,7 @@
if ("1".equals(type)) {
viewUrl = prefix + "/video-aerial-dept";
- view.put("backgroundImg", commonManager.getDeptImg(deptId));
+ view.put("backgroundImg", commonManager.isDeptImgExit(deptId));
}
if ("2".equals(type)) {
viewUrl = prefix + "/video-list-dept";
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
index 366f99f..08149d9 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
@@ -41,7 +41,8 @@
private ISysUserService userService;
@Resource
private ISysDeptService iSysDeptService;
-
+ @Resource
+ private FileService fileService;
@Resource
private CoreCompanyService coreCompanyService;
/**
@@ -60,14 +61,22 @@
* @param deptId
* @return
*/
- public String getDeptImg(String deptId) {
+ public String isDeptImgExit(String deptId) {
- String imgPath = "/img/deptImg.jpg"; //榛樿鍥�
Dept dept = coreDeptService.getDeptById(deptId);
- if(null != dept && StringUtils.isNotEmpty(dept.getImgPath())){
- imgPath = dept.getImgPath();
- }
- return imgPath;
+
+ String imgPath = (dept == null ? null : dept.getImgPath());
+ return isImgExit(imgPath, "dept");
+ }
+
+ /**
+ * 鍒ゆ柇璺緞涓嬫枃浠舵槸鍚﹀瓨鍦紝涓嶅瓨鍦ㄥ垯缁欓粯璁�
+ * @param imgPath
+ * @param tag
+ * @return
+ */
+ public String isImgExit(String imgPath, String tag) {
+ return fileService.isImgExit(imgPath, tag);
}
/**
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/file/FileManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/file/FileManager.java
index 6318747..c7fab1c 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/file/FileManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/file/FileManager.java
@@ -15,7 +15,6 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.util.Date;
/**
* @Description 鍑哄叆搴撹澶囩浉鍏冲姛鑳�
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/EventInfoManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/EventInfoManager.java
index a1b365e..6f83bc0 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/EventInfoManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/EventInfoManager.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.EventInfo;
+import com.fzzy.igds.domain.SnapRecord;
import com.fzzy.igds.service.EventInfoService;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.sys.manager.common.CommonManager;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -18,6 +20,8 @@
@Resource
private EventInfoService eventInfoService;
+ @Resource
+ private CommonManager commonManager;
/**
* 鍒嗛〉鏌ヨ鏁版嵁
@@ -36,6 +40,10 @@
if (null == corePage.getRecords() || corePage.getRecords().isEmpty()) {
return corePage.setRecords(new ArrayList<>());
}
+ //鍒ゆ柇鏂囦欢鏄惁瀛樺湪
+ for (EventInfo record : corePage.getRecords()) {
+ record.setImgName(commonManager.isImgExit( record.getImgName(), null));
+ }
return corePage;
}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolRecordManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolRecordManager.java
index 344cca7..fbf892f 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolRecordManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/PatrolRecordManager.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.PatrolRecord;
+import com.fzzy.igds.domain.SnapRecord;
import com.fzzy.igds.service.PatrolRecordService;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.sys.manager.common.CommonManager;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -19,6 +21,8 @@
@Resource
private PatrolRecordService patrolRecordService;
+ @Resource
+ private CommonManager commonManager;
/**
* 鍒嗛〉鏌ヨ鏁版嵁
@@ -52,6 +56,15 @@
param.setCompanyId(ContextUtil.getCompanyId());
}
- return patrolRecordService.listAll(param);
+ List<PatrolRecord> patrolRecords = patrolRecordService.listAll(param);
+
+ if(null != patrolRecords && !patrolRecords.isEmpty()){
+ //鍒ゆ柇鏂囦欢鏄惁瀛樺湪
+ for (PatrolRecord record : patrolRecords) {
+ record.setImgName(commonManager.isImgExit( record.getImgName(), null));
+ }
+ }
+
+ return patrolRecords;
}
}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SnapRecordManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SnapRecordManager.java
index dc0403b..3d8c092 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SnapRecordManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SnapRecordManager.java
@@ -5,6 +5,7 @@
import com.fzzy.igds.domain.SnapRecord;
import com.fzzy.igds.service.SnapRecordService;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.sys.manager.common.CommonManager;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -18,6 +19,8 @@
@Resource
private SnapRecordService snapRecordService;
+ @Resource
+ private CommonManager commonManager;
/**
* 鍒嗛〉鏌ヨ鏁版嵁
@@ -36,6 +39,10 @@
if (null == corePage.getRecords() || corePage.getRecords().isEmpty()) {
return corePage.setRecords(new ArrayList<>());
}
+ //鍒ゆ柇鏂囦欢鏄惁瀛樺湪
+ for (SnapRecord record : corePage.getRecords()) {
+ record.setImgName(commonManager.isImgExit( record.getImgName(), null));
+ }
return corePage;
}
diff --git a/fzzy-igdss-web/src/main/resources/static/img/img-fail.jpg b/fzzy-igdss-web/src/main/resources/static/img/img-fail.jpg
new file mode 100644
index 0000000..b642daf
--- /dev/null
+++ b/fzzy-igdss-web/src/main/resources/static/img/img-fail.jpg
Binary files differ
--
Gitblit v1.9.3