diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 06024bf..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -43,7 +49,11 @@
casic-iris-support
${casic.version}
-
+
+ com.casic
+ casic-iris-device
+ ${casic.version}
+
org.springframework.boot
spring-boot-starter-aop
@@ -76,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 06024bf..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -43,7 +49,11 @@
casic-iris-support
${casic.version}
-
+
+ com.casic
+ casic-iris-device
+ ${casic.version}
+
org.springframework.boot
spring-boot-starter-aop
@@ -76,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/constant/DoorConst.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/constant/DoorConst.java
new file mode 100644
index 0000000..84adc4e
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/constant/DoorConst.java
@@ -0,0 +1,8 @@
+package com.casic.missiles.modular.system.constant;
+
+public class DoorConst {
+ /**
+ * 门添加日志Key
+ */
+ public static final String DOOR_ADD_LOG_KEY = "doorCode,doorName";
+}
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 06024bf..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -43,7 +49,11 @@
casic-iris-support
${casic.version}
-
+
+ com.casic
+ casic-iris-device
+ ${casic.version}
+
org.springframework.boot
spring-boot-starter-aop
@@ -76,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/constant/DoorConst.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/constant/DoorConst.java
new file mode 100644
index 0000000..84adc4e
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/constant/DoorConst.java
@@ -0,0 +1,8 @@
+package com.casic.missiles.modular.system.constant;
+
+public class DoorConst {
+ /**
+ * 门添加日志Key
+ */
+ public static final String DOOR_ADD_LOG_KEY = "doorCode,doorName";
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java
new file mode 100644
index 0000000..c7f1533
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java
@@ -0,0 +1,141 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+//import com.casic.missiles.core.result.ResultData;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.annotion.BussinessLog;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.exception.GunsException;
+import com.casic.missiles.core.exception.GunsExceptionEnum;
+import com.casic.missiles.core.log.LogObjectHolder;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.system.dict.DoorDict;
+import com.casic.missiles.modular.system.warpper.DoorWarpper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+
+import java.util.List;
+import java.util.Map;
+
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.modular.system.model.Door;
+import com.casic.missiles.modular.system.service.IDoorService;
+
+import javax.validation.Valid;
+
+import static com.casic.missiles.modular.system.constant.DoorConst.DOOR_ADD_LOG_KEY;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2019-11-29 15:35:38
+ */
+@Controller
+@RequestMapping("/door")
+public class DoorController extends BaseController {
+ private static final Logger logger = LoggerFactory.getLogger(DoorController.class);
+
+ @Autowired
+ private IDoorService doorService;
+ @Autowired
+ private ICommonPermissionService permissionService;
+
+ /**
+ * 获取门禁列表,不分页
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(){
+ DataScope dataScope = permissionService.getCurrUserDataScope();
+ List