Newspaper 1 年之前
父節點
當前提交
31688d4a78

+ 5 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BaseBuildingController.java

@@ -75,6 +75,11 @@ public class BaseBuildingController {
         return baseBuildingService.listTreeBuilding(map);
         return baseBuildingService.listTreeBuilding(map);
     }
     }
 
 
+    @PostMapping("/listAppBuilding")
+    public Result listAppBuilding(@RequestBody Map<String, String> map){
+        return baseBuildingService.listAppBuilding(map);
+    }
+
     @PostMapping("/listTreeDuckBuilding")
     @PostMapping("/listTreeDuckBuilding")
     public Result listTreeDuckBuilding(@RequestBody Map<String, String> map){
     public Result listTreeDuckBuilding(@RequestBody Map<String, String> map){
         return baseBuildingService.listTreeDuckBuilding(map);
         return baseBuildingService.listTreeDuckBuilding(map);

+ 2 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/IBaseBuildingService.java

@@ -41,4 +41,6 @@ public interface IBaseBuildingService extends IService<BaseBuilding> {
     Result listScreenDuck(Map<String, String> map);
     Result listScreenDuck(Map<String, String> map);
 
 
     Result listTreeDuckBuilding(Map<String, String> map);
     Result listTreeDuckBuilding(Map<String, String> map);
+
+    Result listAppBuilding(Map<String, String> map);
 }
 }

+ 12 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseBuildingServiceImpl.java

@@ -294,6 +294,18 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
         return new Result(ResultCode.SUCCESS,treeBaseBuildings);
         return new Result(ResultCode.SUCCESS,treeBaseBuildings);
     }
     }
 
 
+    @Override
+    public Result listAppBuilding(Map<String, String> map) {
+        String farmId = map.get("farmId");
+        List<BaseBuilding> baseBuildings = this.list(new QueryWrapper<BaseBuilding>()
+                .eq("farm_id", farmId)
+                .orderByAsc("id"));
+        baseBuildings.removeIf(baseBuilding -> envDeviceMapper.selectCount(new QueryWrapper<EnvDevice>().lambda()
+                .eq(EnvDevice::getUnitId, baseBuilding.getId())
+                .in(EnvDevice::getDeviceType, 1, 4)) == 0);
+        return new Result(ResultCode.SUCCESS,baseBuildings);
+    }
+
 
 
 //    @Override
 //    @Override
 //    public Result list(String farmCode, String buildName, String stageCode) {
 //    public Result list(String farmCode, String buildName, String stageCode) {