Sfoglia il codice sorgente

农业增加绑定摄像头

hanfucheng 10 mesi fa
parent
commit
76113008a5

+ 14 - 1
src/main/java/com/sooka/sponest/mobile/data/digitalagriculture/controller/BreedingFarmController.java

@@ -5,10 +5,13 @@ import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableSupport;
 import com.sooka.sponest.data.api.digitalagriculture.domain.FarmBreedingFarm;
 import com.sooka.sponest.data.api.digitalagriculture.service.RemoteBreedingFarmService;
+import com.sooka.sponest.mobile.system.camera.service.AppCameraService;
+import com.sooka.sponest.mobile.utils.PictureReplaceAll;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 养殖场Controller
@@ -23,6 +26,9 @@ public class BreedingFarmController{
     @Resource
     RemoteBreedingFarmService remoteBreedingFarmService;
 
+    @Resource
+    AppCameraService appCameraService;
+
     /**
      * 查询养殖场列表
      */
@@ -40,7 +46,14 @@ public class BreedingFarmController{
      */
     @GetMapping("/BreedingFarm/edit")
     public AjaxResult breedingFarmEdit(String id) {
-        return remoteBreedingFarmService.selectBreedingFarmById(id);
+        AjaxResult ajaxResult = remoteBreedingFarmService.selectBreedingFarmById(id);
+        if("200".equals(ajaxResult.get("code").toString())){
+            Map<String, Object> info = (Map<String, Object>) ajaxResult.get("data");
+            PictureReplaceAll.StringToList(info);
+            return appCameraService.selectCameraByIds(info);
+        }else{
+            return ajaxResult;
+        }
     }
 
     /**

+ 14 - 1
src/main/java/com/sooka/sponest/mobile/data/digitalagriculture/controller/CesspitCollectController.java

@@ -5,10 +5,13 @@ import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableSupport;
 import com.sooka.sponest.data.api.digitalagriculture.domain.FarmCesspitCollect;
 import com.sooka.sponest.data.api.digitalagriculture.service.RemoteCesspitCollectService;
+import com.sooka.sponest.mobile.system.camera.service.AppCameraService;
+import com.sooka.sponest.mobile.utils.PictureReplaceAll;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 粪污收集点Controller
@@ -21,6 +24,9 @@ public class CesspitCollectController {
     @Resource
     RemoteCesspitCollectService remoteCesspitCollectService;
 
+    @Resource
+    AppCameraService appCameraService;
+
     /**
      * 查询粪污收集点列表
      */
@@ -36,7 +42,14 @@ public class CesspitCollectController {
      */
     @GetMapping("/CesspitCollect/edit")
     public AjaxResult cesspitCollectEdit(String id) {
-        return remoteCesspitCollectService.selectCesspitCollectById(id);
+        AjaxResult ajaxResult = remoteCesspitCollectService.selectCesspitCollectById(id);
+        if("200".equals(ajaxResult.get("code").toString())){
+            Map<String, Object> info = (Map<String, Object>) ajaxResult.get("data");
+            PictureReplaceAll.StringToList(info);
+            return appCameraService.selectCameraByIds(info);
+        }else{
+            return ajaxResult;
+        }
     }
 
     /**

+ 14 - 1
src/main/java/com/sooka/sponest/mobile/data/digitalagriculture/controller/GarbageTransferController.java

@@ -5,10 +5,13 @@ import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableSupport;
 import com.sooka.sponest.data.api.digitalagriculture.domain.FarmGarbageTransfer;
 import com.sooka.sponest.data.api.digitalagriculture.service.RemoteGarbageTransferInfoService;
+import com.sooka.sponest.mobile.system.camera.service.AppCameraService;
+import com.sooka.sponest.mobile.utils.PictureReplaceAll;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 垃圾转输站
@@ -20,6 +23,9 @@ public class GarbageTransferController {
     @Resource
     RemoteGarbageTransferInfoService remoteGarbageTransferInfoService;
 
+    @Resource
+    AppCameraService appCameraService;
+
 
     /**
      * 新增垃圾转输站
@@ -72,6 +78,13 @@ public class GarbageTransferController {
      */
     @GetMapping("/GarbageTransferInfo/edit")
     public AjaxResult garbageTransferInfoEdit(String id) {
-        return remoteGarbageTransferInfoService.garbageTransferInfoEdit(id);
+        AjaxResult ajaxResult = remoteGarbageTransferInfoService.garbageTransferInfoEdit(id);
+        if("200".equals(ajaxResult.get("code").toString())){
+            Map<String, Object> info = (Map<String, Object>) ajaxResult.get("data");
+            PictureReplaceAll.StringToList(info);
+            return appCameraService.selectCameraByIds(info);
+        }else{
+            return ajaxResult;
+        }
     }
 }

+ 14 - 1
src/main/java/com/sooka/sponest/mobile/data/digitalagriculture/controller/TrashCanController.java

@@ -5,10 +5,13 @@ import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableSupport;
 import com.sooka.sponest.data.api.digitalagriculture.domain.FarmTrashCan;
 import com.sooka.sponest.data.api.digitalagriculture.service.RemoteTrashCanService;
+import com.sooka.sponest.mobile.system.camera.service.AppCameraService;
+import com.sooka.sponest.mobile.utils.PictureReplaceAll;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 垃圾桶Controller
@@ -19,6 +22,9 @@ public class TrashCanController {
     @Resource
     RemoteTrashCanService remoteTrashCanService;
 
+    @Resource
+    AppCameraService appCameraService;
+
     /**
      * 获取垃圾桶列表
      *
@@ -44,7 +50,14 @@ public class TrashCanController {
      */
     @GetMapping("/trash/edit")
     public AjaxResult trashEdit(String id) {
-        return remoteTrashCanService.trashEdit(id);
+        AjaxResult ajaxResult = remoteTrashCanService.trashEdit(id);
+        if("200".equals(ajaxResult.get("code").toString())){
+            Map<String, Object> info = (Map<String, Object>) ajaxResult.get("data");
+            PictureReplaceAll.StringToList(info);
+            return appCameraService.selectCameraByIds(info);
+        }else{
+            return ajaxResult;
+        }
     }
 
     /**