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; } } 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> 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> 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"; 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"; 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); } /** 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 出入库设备相关功能 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; } 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; } } 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; } fzzy-igdss-web/src/main/resources/static/img/img-fail.jpg
