diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java
index aeb8859..d4d53b5 100644
--- a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java
+++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java
@@ -78,7 +78,7 @@ public class Device extends EntityWithId {
     private Integer nvrId;
 
     @ApiModelProperty("仓库ID")
-    private Integer ckId;
+    private String ckId;
 
     @ApiModelProperty("子系统ID 电子围栏")
     private Integer sysId;
diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java
index 9646c92..8c2d3c9 100644
--- a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java
+++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java
@@ -75,5 +75,5 @@ public class DeviceImage extends EntityWithId {
     private String similarity;
 
     @ApiModelProperty("仓库ID")
-    private Integer ckId;
+    private String ckId;
 }
diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java
index ea296e6..a2234bc 100644
--- a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java
+++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java
@@ -15,21 +15,72 @@ import java.util.Date;
 public class WareHouse {
 
     @ApiModelProperty("ID，唯一编号")
-    private Integer id;
+    private String sid;
+
+    private String custerSid; // 名称
+
+    private String custerName; // 河北欣汇星网络科技有限公司
 
     @ApiModelProperty("仓库名称")
-    private String name; // 名称
-
-//    @ApiModelProperty("位置")
-//    private String position;
-//
-//    @ApiModelProperty("货架号")
-//    private String code;
-//
-//    @ApiModelProperty("联系人")
-//    private String lxr;
-//
-//    @ApiModelProperty("手机号")
-//    private String lxdh;
+    private String name;
+
+    private String simpleName; // 中通
+
+    private String code; // xhx01
+
+    @ApiModelProperty("省号")
+    private String provinceCode;
+
+    @ApiModelProperty("省名称")
+    private String provinceName;
+
+    @ApiModelProperty("市号")
+    private String cityCode;
+
+    @ApiModelProperty("市名称")
+    private String cityName;
+
+    @ApiModelProperty("区县号")
+    private String countyCode;
+
+    @ApiModelProperty("区县名称")
+    private String countyName;
+
+    @ApiModelProperty("地址拼接")
+    private String regionName;
+
+    @ApiModelProperty("地址")
+    private String address;
+
+    private String acreage; // 1350
+
+    private String storeyHeight; // 10m
+
+    private String monthlyPrice; // 27000
+
+    private String attributeCodes;
+
+    private String attributeNames; // 自营
+
+    private String housingResource; // 无
+
+    @ApiModelProperty("联系人名称")
+    private String linkerName;
+
+    @ApiModelProperty("联系人电话")
+    private String linkerPhone;
+
+    @ApiModelProperty("仓库图片")
+    private String picUrl;
+
+    @ApiModelProperty("经度")
+    private String lon;
+
+    @ApiModelProperty("纬度")
+    private String lat;
+
+    private String shSid;
+
+    private String projectSid;
 
 }
diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java
index 0b9bac5..4ad8d58 100644
--- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java
+++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java
@@ -62,9 +62,9 @@ public class YDeviceRest {
 
     @ApiOperation("获取状态数量")
     @GetMapping("/getStatusCount")
-    public ResultBean getStatusCount(String deviceType, String statusType) {
+    public ResultBean getStatusCount(String deviceType, String statusType, String ckId) {
         ResultBean rb = ResultBean.fireSuccess();
-        rb.setData(yDeviceService.getStatusCount(deviceType, statusType));
+        rb.setData(yDeviceService.getStatusCount(deviceType, statusType, ckId));
         return rb;
     }
 
diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java
index 81c16d4..fe63ad2 100644
--- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java
+++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java
@@ -83,7 +83,7 @@ public class YDeviceService extends ServiceImpl<YDeviceMapper, Device> {
     }
 
 
-    public Map<String, String> getStatusCount(String deviceType, String statusType) {
+    public Map<String, String> getStatusCount(String deviceType, String statusType, String ckId) {
         Map<String, String> map = new HashMap<>();
         QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
 
@@ -91,6 +91,7 @@ public class YDeviceService extends ServiceImpl<YDeviceMapper, Device> {
             queryWrapper.eq("type", deviceType);
         }
         queryWrapper.eq("isDelete", 0);
+        queryWrapper.eq("ckId", ckId);
         queryWrapper.isNotNull("status");
         queryWrapper.notIn("type", "4,5".split(","));
         queryWrapper.select("status", "count(status) as total");
@@ -118,12 +119,30 @@ public class YDeviceService extends ServiceImpl<YDeviceMapper, Device> {
     public List<WareHouse> getWareHouseList() {
 
         List<WareHouse> athleteBOIPage = null;
+        String url = "http://jianguan.yyundong.com/api/portal/v1/flow/storeHouseListPage";
+        String result = "";
+
         try {
-            athleteBOIPage = yDeviceMapper.getWareHouseList();
+            Map<String, Object> paramMap = new HashMap<>();
+            paramMap.put("current", "1");
+            paramMap.put("size", "1000");
+            paramMap.put("params", new Object());
+            String jsonParam = JSONObject.toJSONString(paramMap);
+            result = HttpUtils.sendPostJson(url, jsonParam, "");
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            JSONObject jsonData = (JSONObject) jsonObject.get("data");
+            String jsonRecords = jsonData.getString("records");
+            athleteBOIPage = JSONArray.parseArray(jsonRecords, WareHouse.class);
         } catch (Exception e) {
             System.out.println(e);
             athleteBOIPage = null;
         }
+//        try {
+//            athleteBOIPage = yDeviceMapper.getWareHouseList();
+//        } catch (Exception e) {
+//            System.out.println(e);
+//            athleteBOIPage = null;
+//        }
         return athleteBOIPage;
     }
 
@@ -160,9 +179,13 @@ public class YDeviceService extends ServiceImpl<YDeviceMapper, Device> {
         }
         JSONObject jsonObject = JSONObject.parseObject(result);
         JSONObject dataJson = (JSONObject) jsonObject.get("data");
+        IPage<Device> iPage = new Page<>();
+        if (dataJson == null) {
+            return iPage;
+        }
         JSONArray jsonArray = (JSONArray) dataJson.get("rows");
         String deviceSerial = "";
-        IPage<Device> iPage = new Page<>();
+
         List<Device> list = new ArrayList<>();
         String notIds = "";
         for (Object obj : jsonArray) {