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 3ccd620..6b644d1 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
@@ -16,7 +16,7 @@ public class Device extends EntityWithId {
     // `id`使用继承的
 
     @ApiModelProperty("记录创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime = new Date(); // 记录创建时间
 
     @ApiModelProperty("备注说明")
@@ -35,7 +35,7 @@ public class Device extends EntityWithId {
     private String state;
 
     @ApiModelProperty("是否删除")
-    private String isDelte;
+    private String isDelete;
 
     @ApiModelProperty("修改时间")
     private String modifyTime;
@@ -51,4 +51,7 @@ public class Device extends EntityWithId {
 
     @ApiModelProperty("验证码")
     private String vCode;
+
+    @ApiModelProperty("位置")
+    private String position;
 }
diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/YxtSuperviseMonitorApplication.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/YxtSuperviseMonitorApplication.java
index a2c2238..2aea2e5 100644
--- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/YxtSuperviseMonitorApplication.java
+++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/YxtSuperviseMonitorApplication.java
@@ -3,6 +3,7 @@ package com.yxt.supervise.monitor;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * @author dimengzhe
@@ -12,6 +13,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
         "com.yxt.supervise.monitor",
         "demo.rocketmq"
 })
+// 启用自带定时任务
+@EnableScheduling
 public class YxtSuperviseMonitorApplication {
     public static void main(String[] args) {
         SpringApplication.run(YxtSuperviseMonitorApplication.class, args);
diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceRest.java
index cdf27ca..e4fb03e 100644
--- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceRest.java
+++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceRest.java
@@ -31,10 +31,11 @@ public class YDeviceRest {
 
     @ApiOperation("分页获取设备列表")
     @GetMapping("/getDevicePage")
-    public String getDevicePage(@RequestParam Map<String,String> searchVo,
-                                @ModelAttribute PageVo pageVo) {
-        yDeviceService.getDevicePage(searchVo);
-        return null;
+    public ResultBean getDevicePage(@RequestParam Map<String, String> searchVo,
+                                    @ModelAttribute PageVo pageVo) {
+        ResultBean rb = ResultBean.fireSuccess();
+        rb.setData(yDeviceService.getDevicePage(searchVo, pageVo));
+        return rb;
     }
 
     @ApiOperation("添加设备组")
@@ -49,4 +50,22 @@ public class YDeviceRest {
     public ResultBean createDevice(Device device) {
         return yDeviceService.createDevice(device);
     }
+
+
+    @ApiOperation("更新设备")
+    @PostMapping("/updateDevice")
+    public ResultBean updateDevice(Device device) {
+        ResultBean rb = ResultBean.fireSuccess();
+        rb.setData(yDeviceService.updateById(device));
+        return rb;
+    }
+
+
+    @ApiOperation("通过ID获取一条")
+    @GetMapping("/getInfoById")
+    public ResultBean getInfoById(String id) {
+        ResultBean rb = ResultBean.fireSuccess();
+        rb.setData(yDeviceService.getById(id));
+        return rb;
+    }
 }
diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java
new file mode 100644
index 0000000..acb4575
--- /dev/null
+++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java
@@ -0,0 +1,63 @@
+package com.yxt.supervise.monitor.biz.scheduled;
+
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class SyncService {
+
+//    @Scheduled(fixedDelay = 1000 * 60 * 120) //间隔120分钟执行一次
+//    public void pushPersonHospital() {
+//        try {
+//            System.out.println("推送老人出入院记录和评估照片");
+//            iCityPlatformService.pushPersonHospital();
+//        } catch (Exception ex) {
+//            log.error("推送老人出入院记录和评估照片出错:" + ex);
+//        }
+//    }
+//
+//
+//    /**
+//     * 删除三个月前的日志 (每月1号执行一次)
+//     */
+//    @Async
+//    @Scheduled(cron = "0 0 0 1 * ?")
+//    public void removeLog() {
+//        try {
+//            System.out.println("删除三个月前的日志");
+//            iCityPlatformService.removeLog();
+//        } catch (Exception ex) {
+//            log.error("删除三个月前的日志出错:" + ex);
+//        }
+//    }
+//
+
+    @Async
+    @Scheduled(fixedDelay = 1000 * 20 * 1) //间隔20秒一次
+//    @Scheduled(cron = "0 10 9 * * ?")
+    public void pushEmail() {
+        try {
+            System.out.println(1111);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+
+//    @Async
+//    @Scheduled(fixedDelay = 1000 * 60 * 1) //间隔1分钟执行一次
+////    @Scheduled(cron = "0 10 9 * * ?")
+//    public void tempPush() {
+//        try {
+//            iCityPlatformService.pushEmail();
+//        } catch (Exception ex) {
+//            log.error("临时同步" + ex);
+//            ex.printStackTrace();
+//        }
+//    }
+
+
+}
diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceService.java
index 054cd6e..9d6829f 100644
--- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceService.java
+++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceService.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.monitor.api.demoidentity.DemoIdentity;
 import com.yxt.supervise.monitor.api.entity.Device;
+import com.yxt.supervise.monitor.api.vo.PageVo;
 import com.yxt.supervise.monitor.biz.demoidentity.DemoIdentityMapper;
 import com.yxt.supervise.monitor.biz.mapper.YDeviceMapper;
 import com.yxt.supervise.monitor.biz.service.impl.IYDeviceServiceImpl;
@@ -16,7 +17,7 @@ import java.util.Map;
 @Service
 public interface YDeviceService extends IService<Device> {
 
-    IPage<Device> getDevicePage(Map<String,String> searchVo);
+    IPage<Device> getDevicePage(Map<String, String> searchVo, PageVo pageVo);
 
     ResultBean createDevice(Device device);
 
diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceServiceImpl.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceServiceImpl.java
index d131903..7acb9b7 100644
--- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceServiceImpl.java
+++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceServiceImpl.java
@@ -1,10 +1,14 @@
 package com.yxt.supervise.monitor.biz.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.monitor.api.entity.Device;
+import com.yxt.supervise.monitor.api.vo.PageVo;
 import com.yxt.supervise.monitor.biz.mapper.YDeviceMapper;
 import com.yxt.supervise.monitor.biz.service.YDeviceService;
 import com.yxt.supervise.monitor.biz.util.HttpUtils;
@@ -23,8 +27,29 @@ public class IYDeviceServiceImpl extends ServiceImpl<YDeviceMapper, Device> impl
 
 
     @Override
-    public IPage<Device> getDevicePage(Map<String, String> searchVo) {
-        return yDeviceMapper.getDevicePage();
+    public IPage<Device> getDevicePage(Map<String, String> searchVo, PageVo pageVo) {
+        IPage<Device> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>();
+        page.setSize(pageVo.getSize());
+        page.setCurrent((long) pageVo.getCurrent());
+
+        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+
+        if (StrUtil.isNotBlank(searchVo.get("name"))) {
+            queryWrapper.like("name", searchVo.get("name"));
+        }
+        if (StrUtil.isNotBlank(searchVo.get("type"))) {
+            queryWrapper.eq("type", searchVo.get("type"));
+        }
+        queryWrapper.eq("isDelete", 0);
+
+        IPage<Device> athleteBOIPage = null;
+        try {
+            athleteBOIPage = baseMapper.selectPage(page, queryWrapper);
+        } catch (Exception e) {
+            System.out.println(e);
+            athleteBOIPage = null;
+        }
+        return athleteBOIPage;
     }
 
     @Override