提交

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppPersonnelInfoBo.java

@@ -25,6 +25,11 @@ public class AppPersonnelInfoBo extends BaseEntity {
      */
     private Long id;
 
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+
     /**
      * 设备id
      */

fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml

@@ -5,8 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.fuyuanshen.app.mapper.AppDeviceShareMapper">
 
     <select id="otherDeviceShareList" resultType="com.fuyuanshen.app.domain.vo.AppDeviceShareVo">
-        select d.device_name, d.device_name,
-        d.device_name,
+        select d.device_name,
         d.device_mac,
         d.device_sn,
         d.device_imei,
@@ -25,8 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ad.phonenumber = #{bo.phonenumber}
     </select>
     <select id="selectAppDeviceShareList" resultType="com.fuyuanshen.app.domain.vo.AppDeviceShareVo">
-        select d.device_name, d.device_name,
-        d.device_name,
+        select d.device_name,
         d.device_mac,
         d.device_sn,
         d.device_imei,
@@ -42,7 +40,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join app_user u on ad.create_by = u.user_id
         inner join device_type dt on d.device_type = dt.id
         inner join app_device_bind_record c on d.id = c.device_id
-
         where ad.create_by = #{bo.createBy}
         <if test="bo.deviceId != null">
             and ad.device_id = #{bo.deviceId}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/AppDeviceSendMsgBo.java

@@ -14,9 +14,16 @@ public class AppDeviceSendMsgBo {
 
     private List<Long> deviceIds;
 
+    private List<String> deviceImeiList;
+
     /**
      *  下发指令
      */
     private String instructValue;
 
+    /**
+     * 批次号
+     */
+    private String batchId;
+
 }