diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
index 001c160..001b2da 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -68,7 +68,7 @@
     /**
      * 批量导入SMI
      */
-    @RequestMapping(value = "/batchimport")
+    @RequestMapping(value = "/batchImport")
     @ResponseBody
     public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
         return deviceImeiService.importImeiList(uploadFile);

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
index 001c160..001b2da 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -68,7 +68,7 @@
     /**
      * 批量导入SMI
      */
-    @RequestMapping(value = "/batchimport")
+    @RequestMapping(value = "/batchImport")
     @ResponseBody
     public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
         return deviceImeiService.importImeiList(uploadFile);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index 848ec75..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
index 001c160..001b2da 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -68,7 +68,7 @@
     /**
      * 批量导入SMI
      */
-    @RequestMapping(value = "/batchimport")
+    @RequestMapping(value = "/batchImport")
     @ResponseBody
     public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
         return deviceImeiService.importImeiList(uploadFile);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index 848ec75..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
index e6fccd4..136d858 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
@@ -16,8 +15,4 @@
     List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
                                               @Param("devcode") String devcode);
 
-
-
-
-
 }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
index 001c160..001b2da 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -68,7 +68,7 @@
     /**
      * 批量导入SMI
      */
-    @RequestMapping(value = "/batchimport")
+    @RequestMapping(value = "/batchImport")
     @ResponseBody
     public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
         return deviceImeiService.importImeiList(uploadFile);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index 848ec75..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
index e6fccd4..136d858 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
@@ -16,8 +15,4 @@
     List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
                                               @Param("devcode") String devcode);
 
-
-
-
-
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..444d468
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,logtime
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
index 001c160..001b2da 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -68,7 +68,7 @@
     /**
      * 批量导入SMI
      */
-    @RequestMapping(value = "/batchimport")
+    @RequestMapping(value = "/batchImport")
     @ResponseBody
     public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
         return deviceImeiService.importImeiList(uploadFile);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index 848ec75..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
index e6fccd4..136d858 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
@@ -16,8 +15,4 @@
     List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
                                               @Param("devcode") String devcode);
 
-
-
-
-
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..444d468
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,logtime
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
index abd9048..9544f57 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -7,6 +7,8 @@
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class DeviceImei extends Model<DeviceImei> {
 
@@ -15,18 +17,16 @@
     /**
      * Smi主键 自增
      */
-    @ExcelProperty("设备类型名称")
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
-    @ExcelProperty("设备编号")
-    private Long deviceId;
 
-    @ExcelProperty("传感器Id")
-    private Long sensorId;
+    private String devcode;
 
-    @ExcelProperty("设备类型名称")
-    private Long active;
+    private String imei;
 
+    private String iccid;
+
+    private Date logtime;
 
 }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
index 001c160..001b2da 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
@@ -68,7 +68,7 @@
     /**
      * 批量导入SMI
      */
-    @RequestMapping(value = "/batchimport")
+    @RequestMapping(value = "/batchImport")
     @ResponseBody
     public Object importImei(@RequestParam("file") MultipartFile uploadFile) {
         return deviceImeiService.importImeiList(uploadFile);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index 848ec75..bf06228 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -36,7 +36,6 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
-
 //    /**
 //     * 获取列表
 //     */
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
index e6fccd4..136d858 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface DeviceImeiMapper   extends BaseMapper<DeviceImei> {
@@ -16,8 +15,4 @@
     List<DeviceImei> getImeiListPage(@Param("page") Page<DeviceImei> page,
                                               @Param("devcode") String devcode);
 
-
-
-
-
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
new file mode 100644
index 0000000..444d468
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DeviceImeiMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEVICE_ID AS "deviceId", WELL_ID AS "wellId", TS AS ts, VALID AS valid
+    </sql>
+
+    <select id="getImeiListPage" resultType="com.casic.missiles.modular.system.model.DeviceImei">
+        SELECT id,devcode,imei,iccid,logtime
+        FROM bus_imei_iccid
+        WHERE 1=1
+        <if test="devcode != null and devcode !=''">
+            AND DEVCODE = #{devcode}
+        </if>
+    </select>
+
+</mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
index abd9048..9544f57 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
@@ -7,6 +7,8 @@
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class DeviceImei extends Model<DeviceImei> {
 
@@ -15,18 +17,16 @@
     /**
      * Smi主键 自增
      */
-    @ExcelProperty("设备类型名称")
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
-    @ExcelProperty("设备编号")
-    private Long deviceId;
 
-    @ExcelProperty("传感器Id")
-    private Long sensorId;
+    private String devcode;
 
-    @ExcelProperty("设备类型名称")
-    private Long active;
+    private String imei;
 
+    private String iccid;
+
+    private Date logtime;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
index a8583aa..06ed785 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.base.service.IBaseExportService;
@@ -49,7 +50,7 @@
             responseData.setMessage("新增成功");
             responseData.setCode(200);
         } catch (DataAccessException dex) {
-            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDeviceId(), dex);
+            log.error("主题：smi新增出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
             responseData.setCode(500);
             responseData.setMessage("数据库异常");
         }
@@ -68,7 +69,7 @@
                 responseData.setMessage("更新成功");
                 responseData.setCode(200);
             } catch (DataAccessException dex) {
-                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDeviceId(), dex);
+                log.error("主题：smi更新出现异常，设备编号{},异常信息为{}", deviceImei.getDevcode(), dex);
                 responseData.setCode(500);
                 responseData.setMessage("数据库异常");
             }
@@ -128,13 +129,14 @@
         Map<String, Object> stringMap = new HashMap<>();
 //        try {
 //            for (int i = 0; i < deviceImeiList.size(); i++) {
-//                if (!RegUtil.isNumOrLetter(deviceImeiList.get(i).getId().toString())) {
+//                if (!StrUtil.isEmpty(deviceImeiList.get(i).getDevcode())) {
 //                    stringMap.put("success", false);
-//                    stringMap.put("msg", "第" + (i + 2) + "行，smi必填且为数字");
+//                    stringMap.put("msg", "第" + (i + 2) + "行，不能为空");
 //                    return stringMap;
 //                } else {//校验设备编号是否在系统中存在
-//                    Device device = iDeviceService.getDeviceByDevCode(busConfigDTOList.get(i).getDevcode());
-//                    if (null == device) {
+//
+//                   List<DeviceImei> deviceImei = this.baseMapper.selectOne(busConfigDTOList.get(i).getDevcode());
+//                    if (null == deviceImei) {
 //                        stringMap.put("success", false);
 //                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
 //                        return stringMap;
@@ -172,8 +174,8 @@
 //            stringMap.put("success", false);
 //            stringMap.put("msg", "导入异常！");
 //        }
-//        stringMap.put("success", true);
-//        stringMap.put("msg", "导入成功");
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
         return stringMap;
     }
 }