通讯方式

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java

@@ -83,6 +83,7 @@ public class DeviceQueryCriteria extends BaseEntity {
 
     /**
      * 通讯方式 0:4G;1:蓝牙
+     * communication_mode
      */
     private Integer communicationMode;
 

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml

@@ -74,6 +74,9 @@
             <if test="criteria.groupId != null">
                 and d.group_id = #{criteria.groupId}
             </if>
+            <if test="criteria.communicationMode != null">
+                and t.communication_mode = #{criteria.communicationMode}
+            </if>
             <if test="criteria.params.beginTime != null and criteria.params.endTime != null">
                 and da.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime}
             </if>
@@ -280,7 +283,7 @@
         </if>
     </select>
     <select id="getLocationHistory" resultType="com.fuyuanshen.equipment.domain.vo.LocationHistoryVo">
-        select a.id,a.device_name,a.device_type,b.type_name deviceTypeName,a.device_imei,a.device_mac  from device a
+        select a.id,a.device_name,a.device_type,b.type_name deviceTypeName,a.device_imei,a.device_mac from device a
         inner join device_type b on a.device_type = b.id
 
         <if test="bo.deviceType != null">