camera工程添加production依赖

backend/xyst.dinas.camera/build.gradle

@@ -20,7 +20,7 @@ dependencies {
     compile project(":inz.basis")
     compile project(":inz.authentication")
     compile project(":xyst.dinas.biz")
-    compile project(":xyst.dinas.project")
+    compile project(":xyst.dinas.production")
     compile project(":xyst.dinas.transport")
 
 

backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/web/WatershedCameraPlayController.java

@@ -7,6 +7,7 @@ import com.xyst.dinas.biz.service.SandMiningAreaService;
 import com.xyst.dinas.biz.service.ShipInfoService;
 import com.xyst.dinas.camera.entity.RegionalCompanyWatershedCameraTree;
 import com.xyst.dinas.camera.service.CameraInfoService;
+import com.xyst.dinas.production.service.SandMiningService;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -28,6 +29,8 @@ public class WatershedCameraPlayController {
 
     @Autowired
     private ShipInfoService shipInfoService;
+    @Autowired
+    private SandMiningService sandMiningService;
 
     /**
      * 获取摄像头树列表
@@ -56,7 +59,9 @@ public class WatershedCameraPlayController {
     @GetMapping(value = "/getAllShipByRegionalCompanyIds")
     public ResponseObj<List<Map<String,Object>>> getAllShipByRegionalCompanyIds(@RequestParam(name = "uuidList",required = false) List<UUID> uuidList) throws Exception {
         List<KObject> allShipByRegionalCompanyIds = shipInfoService.getAllShipByRegionalCompanyIds(uuidList);
-        return ResponseObj.response(200, "查询成功",shipInfoService.getShipsTracking(allShipByRegionalCompanyIds) );
+        List<Map<String, Object>> shipsTracking = shipInfoService.getShipsTracking(allShipByRegionalCompanyIds);
+        List<Map<String, Object>> sandMining= sandMiningService.queryByShip(shipsTracking);
+        return ResponseObj.response(200, "查询成功", sandMining);
     }