diff --git a/pom.xml b/pom.xml
index 55887f1..95bdf41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -764,7 +764,7 @@
         </dependencies>
     </dependencyManagement>
     <build>
-        <finalName>ems-web</finalName>
+        <finalName>ems</finalName>
         <plugins>
           <!--  <plugin>
                 &lt;!&ndash;

diff --git a/pom.xml b/pom.xml
index 55887f1..95bdf41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -764,7 +764,7 @@
         </dependencies>
     </dependencyManagement>
     <build>
-        <finalName>ems-web</finalName>
+        <finalName>ems</finalName>
         <plugins>
           <!--  <plugin>
                 &lt;!&ndash;
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 2384ba7..61ab1eb 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -717,6 +717,18 @@
 
             book.close();
             this.getSession().clear();
+            // 检查markerid重复
+            Set<String> newMarkerIds = new HashSet<>();
+            for(MarkerDto markerDto:markerDtos){
+                if(this.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){
+                    return 6;
+                }
+                if(newMarkerIds.contains(markerDto.getMarkerId())){
+                    return 7;
+                }else{
+                    newMarkerIds.add(markerDto.getMarkerId());
+                }
+            }
             batchSave(markerDtos, userCompanyId);
         } catch (BiffException e) {
             logger.error(e.getMessage());

diff --git a/pom.xml b/pom.xml
index 55887f1..95bdf41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -764,7 +764,7 @@
         </dependencies>
     </dependencyManagement>
     <build>
-        <finalName>ems-web</finalName>
+        <finalName>ems</finalName>
         <plugins>
           <!--  <plugin>
                 &lt;!&ndash;
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 2384ba7..61ab1eb 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -717,6 +717,18 @@
 
             book.close();
             this.getSession().clear();
+            // 检查markerid重复
+            Set<String> newMarkerIds = new HashSet<>();
+            for(MarkerDto markerDto:markerDtos){
+                if(this.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){
+                    return 6;
+                }
+                if(newMarkerIds.contains(markerDto.getMarkerId())){
+                    return 7;
+                }else{
+                    newMarkerIds.add(markerDto.getMarkerId());
+                }
+            }
             batchSave(markerDtos, userCompanyId);
         } catch (BiffException e) {
             logger.error(e.getMessage());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index 41513ff..bfd8f8f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -124,6 +124,16 @@
             map.put("message", "操作失败，要保存的信息为空，请仔细检查表单值");
             return map;
         }
+        if (null == markerDto.getMarkerId()) {
+            map.put("message", "无标识器ID");
+            map.put("success", "false");
+            return map;
+        }
+        if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) {
+            map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]");
+            map.put("success", "false");
+            return map;
+        }
         User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
         Long companyId = user.getCompany().getId();
         try {
@@ -158,6 +168,16 @@
                 map.put("message", "操作失败，要保存的信息为空，请仔细检查表单值");
                 return map;
             }
+            if (null == marker.getMarkerId()) {
+                map.put("message", "无标识器ID");
+                map.put("success", "false");
+                return map;
+            }
+            if (markerManager.getMarkerByMarkerId(marker.getMarkerId()).size() > 0) {
+                map.put("message", "已安装过该标识器[" + marker.getMarkerId() + "]");
+                map.put("success", "false");
+                return map;
+            }
             String[] fileNames = new String[3];
             String[] fileBuffers = new String[3];
             if (fileBuffer1 != null) {
@@ -355,6 +375,21 @@
                 User user = (User) session.getAttribute(StringUtils.SYS_USER);
                 companyId = user.getCompany().getId();
             }
+            Set<String> newMarkerIds = new HashSet<>();
+            for(MarkerDto markerDto:markers){
+                if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){
+                    map.put("message", "标识器已存在,请勿重复安装");
+                    map.put("success", "false");
+                    return map;
+                }
+                if(newMarkerIds.contains(markerDto.getMarkerId())){
+                    map.put("message", "标识器ID重复");
+                    map.put("success", "false");
+                    return map;
+                }else{
+                    newMarkerIds.add(markerDto.getMarkerId());
+                }
+            }
 
             boolean result = markerManager.batchSave(markers, companyId);
             if (!result) {
@@ -389,11 +424,20 @@
             if (companyId == null) {
                 return map;
             }
+            Set<String> newMarkerIds = new HashSet<>();
             for(MarkerDto markerDto:markers){
                 if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){
                     map.put("message", "标识器已存在,请勿重复安装");
+                    map.put("success", "false");
                     return map;
                 }
+                if(newMarkerIds.contains(markerDto.getMarkerId())){
+                    map.put("message", "标识器ID重复");
+                    map.put("success", "false");
+                    return map;
+                }else{
+                    newMarkerIds.add(markerDto.getMarkerId());
+                }
             }
             boolean result = markerManager.batchSave(markers, companyId);
             if (!result) {
@@ -425,12 +469,14 @@
             }.getType());
             if (CollectionUtils.isEmpty(markers)) {//批量导入数据不存在，直接返回
                 map.put("message", "批量导入数据不存在");
+                map.put("success", "false");
                 return map;
             }
 
             Long companyId = markers.get(0).getCompanyId();
             if (companyId == null) {
                 map.put("message", "未找到所属公司属性");
+                map.put("success", "false");
                 return map;
             }
 
@@ -443,6 +489,21 @@
                     }
                 }
             }
+            Set<String> newMarkerIds = new HashSet<>();
+            for(MarkerDto markerDto:markerDtoForSave){
+                if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){
+                    map.put("message", "标识器已存在,请勿重复安装");
+                    map.put("success", "false");
+                    return map;
+                }
+                if(newMarkerIds.contains(markerDto.getMarkerId())){
+                    map.put("message", "标识器ID重复");
+                    map.put("success", "false");
+                    return map;
+                }else{
+                    newMarkerIds.add(markerDto.getMarkerId());
+                }
+            }
             boolean result = markerManager.batchSave(markerDtoForSave, companyId);
             if (!result) {
                 return map;
@@ -494,7 +555,6 @@
 
 
     /**
-     * TODO 数据权限
      * 客户端调用服务器端的导出功能，需要同步的时候，点击同步，调用此方法，服务器将标识器信息下载到指定的目录
      */
     @RequestMapping("exportMarker")
@@ -541,7 +601,7 @@
         int flag = 0;
         //保存
         try {
-            flag = markerManager.readExcel(file.getInputStream(), companyId);
+            flag = markerManager.readExcel(file.getInputStream(), companyId); // todo save
         } catch (IOException e) {
 //            e.printStackTrace();
             res.put("message", e.getMessage());
@@ -566,6 +626,14 @@
                 res.put("message", "编号应该为数字，请保持导出的文件中的值不要进行修改！如果修改，则可能导致丢失数据。导入失败");
                 return res;
             }
+            if (flag == 6) {
+                res.put("message", "标识器已存在,请勿重复安装");
+                return res;
+            }
+            if (flag == 7) {
+                res.put("message", "导入标识器ID重复");
+                return res;
+            }
             return res;
         }
         res.put("success", true);