修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -377,7 +377,7 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @GetMapping(value = "/{buildingId}/list")
     @ApiOperation(httpMethod = "GET", value = "查询指定建筑下的装备列表", notes = "查询指定建筑下的装备列表")
     public List<EquiplistSpecificBySystemVO> getListByWarehouseStructureId( @PathVariable Long buildingId){
-        return equipmentSpecificMapper.getListByWarehouseStructureId(buildingId);
+        return equipmentSpecificMapper.getListByWarehouseStructureId(buildingId, null);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -228,7 +228,13 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     Equipment getEquipmentBySpecificId(@Param("specificId") Long specificId);
 
-    List<EquiplistSpecificBySystemVO> getListByWarehouseStructureId(Long floorId);
+    /**
+     *
+     * @param floorId 建筑id
+     * @param isIot 是否物联设备
+     * @return
+     */
+    List<EquiplistSpecificBySystemVO> getListByWarehouseStructureId(Long floorId, Integer isIot);
 
 
     List<Map<String,String>> getStationInfo();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -1527,7 +1527,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 ////        String videoPointInScene = sourceScene.getVideoInScene() != null ? sourceScene.getVideoInScene() : "";
 
         //1.查询楼层下的所有装备list
-        List<EquiplistSpecificBySystemVO> equipmentSpecifics = equipmentSpecificMapper.getListByWarehouseStructureId(floorId);
+        List<EquiplistSpecificBySystemVO> equipmentSpecifics = equipmentSpecificMapper.getListByWarehouseStructureId(floorId, IsIotEnum.isIot.getStatus());
 
         equipmentSpecifics.forEach(e -> {
             //已经标记则为已绑定

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -1645,6 +1645,10 @@
             LEFT JOIN wl_equipment AS wle ON spe.equipment_code = wle.code
             LEFT JOIN wl_equipment_category AS wlec ON wlec.id = wle.category_id
             WHERE  det.amount > 0 and spe.warehouse_structure_id = #{floorId}
+              <if test="isIot != null and isIot != ''">
+                  and wle.is_iot = #{isIot}
+              </if>
+
      </select>
 
     <select id="getStationInfo" resultType="Map">