增加设备图片

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GasCommonController.java

@@ -26,6 +26,7 @@ import com.ruoyi.system.domain.IllegalInfo;
 import com.ruoyi.system.domain.IllegalShipData;
 import com.ruoyi.system.domain.MonitorInfo;
 import com.ruoyi.system.domain.SyncPost;
+import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.domain.vo.AisShipInfo;
 import com.ruoyi.system.domain.vo.ShipEepReportRecInfo;
 import com.ruoyi.system.service.IAisDatabase;
@@ -163,8 +164,13 @@ public class GasCommonController {
         List<DeviceBo> so2 = so2Service.queryDeviceList(monitor);
         List<DeviceBo> ais = aisDatabase.queryDeviceList(monitor);
         List<DeviceBo> heiyan = heiYanService.queryDeviceList(monitor);
+        // 设备图片
+        List<SysConfig> list = configService.selectRightList("device.");
+        Map<String, String> collect = list.stream().collect(Collectors.toMap(SysConfig::getConfigKey, SysConfig::getConfigValue));
+
         for (DeviceBo deviceBo : so2) {
             deviceBo.setOrgName(orgMap.get(deviceBo.getMonitorName()));
+            deviceBo.setDevicePhoto(StrUtil.split(collect.get("device.guangpu"), ","));
             switch (deviceBo.getMonitorName()) {
                 case "南京三桥":
                     njsanq.add(deviceBo);
@@ -188,6 +194,7 @@ public class GasCommonController {
         }
         for (DeviceBo deviceBo : ais) {
             deviceBo.setOrgName(orgMap.get(deviceBo.getMonitorName()));
+            deviceBo.setDevicePhoto(StrUtil.split(collect.get("device.xiutan"), ","));
             switch (deviceBo.getMonitorName()) {
                 case "南京三桥":
                     njsanq.add(deviceBo);
@@ -210,6 +217,7 @@ public class GasCommonController {
             }
         }
         for (DeviceBo deviceBo : heiyan) {
+            deviceBo.setDevicePhoto(StrUtil.split(collect.get("device.heiyan"), ","));
             switch (deviceBo.getMonitorName()) {
                 case "南京三桥":
                     njsanq.add(deviceBo);

ruoyi-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: C:/cbwq/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

ruoyi-system/src/main/java/com/ruoyi/system/domain/DeviceBo.java

@@ -44,4 +44,6 @@ public class DeviceBo {
 
     private String liveStreamUrl;
 
+    private String[] devicePhoto;
+
 }