瀏覽代碼

可视化资源详情添加图片

lyq 1 年之前
父節點
當前提交
85daeb6297

+ 11 - 0
src/main/java/com/sooka/sponest/middleware/base/config/ParamConfig.java

@@ -6,10 +6,21 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @Configuration
 public class ParamConfig {
 public class ParamConfig {
 
 
+    private static String dataDB;
+
     private static String monitorDB;
     private static String monitorDB;
 
 
     private static String systemDB;
     private static String systemDB;
 
 
+    public static String getDataDB() {
+        return dataDB;
+    }
+
+    @Value("${sooka.database.data}")
+    public void setDataDB(String dataDB) {
+        ParamConfig.dataDB = dataDB;
+    }
+
     public static String getMonitorDB() {
     public static String getMonitorDB() {
         return monitorDB;
         return monitorDB;
     }
     }

+ 4 - 0
src/main/java/com/sooka/sponest/middleware/base/controller/BaseESController.java

@@ -58,6 +58,10 @@ public class BaseESController {
         return baseESService.getCameraList(pointList);
         return baseESService.getCameraList(pointList);
     }
     }
 
 
+    public List<String> getPictureList(String busId) {
+        return baseESService.getPictureList(busId);
+    }
+
     @Autowired
     @Autowired
     private RestHighLevelClient restHighLevelClient;
     private RestHighLevelClient restHighLevelClient;
 
 

+ 2 - 0
src/main/java/com/sooka/sponest/middleware/base/dao/BaseMapper.java

@@ -19,4 +19,6 @@ public interface BaseMapper {
     List<Long> getDeptAndChildIds(@Param("systemDB") String systemDB, @Param("deptId") Long deptId);
     List<Long> getDeptAndChildIds(@Param("systemDB") String systemDB, @Param("deptId") Long deptId);
 
 
     List<CameraVO> getCameraList(@Param("monitorDB") String monitorDB, @Param("ids") List<String> ids);
     List<CameraVO> getCameraList(@Param("monitorDB") String monitorDB, @Param("ids") List<String> ids);
+
+    List<String> getPictureList(@Param("dataDB") String dataDB, @Param("systemDB") String systemDB, @Param("busId") String busId);
 }
 }

+ 2 - 0
src/main/java/com/sooka/sponest/middleware/base/service/IBaseESService.java

@@ -19,4 +19,6 @@ public interface IBaseESService {
     List<Long> getDeptAndChildIds(Long deptId);
     List<Long> getDeptAndChildIds(Long deptId);
 
 
     List<CameraVO> getCameraList(List<JSONObject> pointList);
     List<CameraVO> getCameraList(List<JSONObject> pointList);
+
+    List<String> getPictureList(String busId);
 }
 }

+ 5 - 0
src/main/java/com/sooka/sponest/middleware/base/service/impl/BaseESServiceImpl.java

@@ -46,4 +46,9 @@ public class BaseESServiceImpl implements IBaseESService {
         List<String> ids = pointList.get(0).getJSONArray("deviceList").toJavaList(String.class);
         List<String> ids = pointList.get(0).getJSONArray("deviceList").toJavaList(String.class);
         return baseMapper.getCameraList(ParamConfig.getMonitorDB(), ids);
         return baseMapper.getCameraList(ParamConfig.getMonitorDB(), ids);
     }
     }
+
+    @Override
+    public List<String> getPictureList(String busId) {
+        return baseMapper.getPictureList(ParamConfig.getDataDB(), ParamConfig.getSystemDB(), busId);
+    }
 }
 }

+ 1 - 0
src/main/java/com/sooka/sponest/middleware/data/visual/controller/VisualController.java

@@ -277,6 +277,7 @@ public class VisualController extends BaseESController {
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("detail", linkedHashMap);
         resultMap.put("detail", linkedHashMap);
         resultMap.put("cameras", getCameraList(pointList));
         resultMap.put("cameras", getCameraList(pointList));
+        resultMap.put("pictures", getPictureList(pointList.get(0).getString("id")));
         return R.ok(resultMap);
         return R.ok(resultMap);
     }
     }
 }
 }