diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DevController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DevController.java
new file mode 100644
index 0000000..e272c4f
--- /dev/null
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DevController.java
@@ -0,0 +1,70 @@
+package com.bonus.base.basic.controller;
+
+import com.bonus.base.basic.domain.vo.DeviceVo;
+import com.bonus.base.basic.service.IDevService;
+import com.bonus.common.core.web.controller.BaseController;
+import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.common.core.web.page.TableDataInfo;
+import com.bonus.common.log.annotation.SysLog;
+import com.bonus.common.log.enums.OperaType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author 黑子
+ */
+@Api(tags = "设备管理")
+@RestController
+@RequestMapping("/dev/")
+public class DevController extends BaseController {
+
+    @Resource(name = "IDevService")
+    private IDevService service;
+
+    @ApiOperation(value = "查询设备数据")
+//    @RequiresPermissions("basic:dev:list")
+    @SysLog(title = "设备管理", businessType = OperaType.QUERY, logType = 1,module = "设备管理->查询设备数据")
+    @GetMapping("queryDevList")
+    public TableDataInfo queryDevList(DeviceVo vo) {
+        startPage();
+        List<DeviceVo> list = service.queryDevList(vo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "新增设备")
+//    @PreventRepeatSubmit
+//    @RequiresPermissions("basic:dev:add")
+    @SysLog(title = "设备管理", businessType = OperaType.INSERT, logType = 1,module = "设备管理->新增设备")
+    @PostMapping("addDev")
+    public AjaxResult addDev(@RequestBody DeviceVo vo) {
+        return service.addDev(vo);
+    }
+
+    @ApiOperation(value = "设备详情")
+    @GetMapping("detailDev")
+    public AjaxResult detailDev(DeviceVo vo) {
+        return service.detailDev(vo);
+    }
+
+    @ApiOperation(value = "修改设备")
+//    @PreventRepeatSubmit
+//    @RequiresPermissions("basic:dev:edit")
+    @SysLog(title = "设备管理", businessType = OperaType.UPDATE, logType = 1,module = "设备管理->修改设备")
+    @PostMapping("editDev")
+    public AjaxResult editDev(@RequestBody DeviceVo vo) {
+        return service.editDev(vo);
+    }
+
+    @ApiOperation(value = "删除设备")
+//    @PreventRepeatSubmit
+//    @RequiresPermissions("basic:dev:del")
+    @SysLog(title = "设备管理", businessType = OperaType.UPDATE, logType = 1,module = "设备管理->删除设备")
+    @PostMapping("delDev")
+    public AjaxResult delDev(@RequestBody DeviceVo vo) {
+        return service.delDev(vo);
+    }
+}
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelBlackServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelBlackServiceImpl.java
index 65e6928..4d5a6f4 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelBlackServiceImpl.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelBlackServiceImpl.java
@@ -7,14 +7,14 @@ import com.bonus.base.basic.mapper.TtPersonnelBlackMapper;
 import com.bonus.base.basic.service.IBmFileInfoService;
 import com.bonus.base.basic.service.TtPersonnelBlackService;
 import lombok.extern.log4j.Log4j;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 
-@Log4j
+@Slf4j
 @Service
 public class TtPersonnelBlackServiceImpl implements TtPersonnelBlackService {
 
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelEntryExitServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelEntryExitServiceImpl.java
index f5a0bfe..4980912 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelEntryExitServiceImpl.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtPersonnelEntryExitServiceImpl.java
@@ -4,13 +4,14 @@ import com.bonus.base.basic.domain.vo.TtPersonnelEntryExitVo;
 import com.bonus.base.basic.mapper.TtPersonnelEntryExitMapper;
 import com.bonus.base.basic.service.TtPersonnelEntryExitService;
 import lombok.extern.log4j.Log4j;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 
-@Log4j
+@Slf4j
 @Service
 public class TtPersonnelEntryExitServiceImpl implements TtPersonnelEntryExitService {