Merge remote-tracking branch 'origin/dyf-device'

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java

@@ -1,5 +1,6 @@
 package com.fuyuanshen.equipment.domain.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
@@ -21,4 +22,9 @@ public class AppDeviceVo {
      * 设备MAC
      */
     private String deviceMac;
+
+    /**
+     * 通讯方式 0:4G;1:蓝牙
+     */
+    private Integer communicationMode;
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java

@@ -504,8 +504,8 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
         if(device == null){
             throw new RuntimeException("请先将设备入库！！！");
         }
-        DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
+//        DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
-        String mode = deviceType.getCommunicationMode();
+//        String mode = deviceType.getCommunicationMode();
         UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
         deviceUpdateWrapper.eq("id", device.getId())
                 .set("binding_status", BindingStatusEnum.UNBOUND.getCode());

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

@@ -95,11 +95,9 @@
     </select>
     <select id="queryAppDeviceList" resultType="com.fuyuanshen.equipment.domain.vo.AppDeviceVo">
         select
-        d.id, d.device_name, d.device_pic, d.device_mac, d.device_sn,
+        d.id, d.device_name, d.device_mac, d.device_sn,
-        d.device_status, d.create_time, d.update_time, d.longitude, d.latitude,
+        d.device_imei, d.device_mac ,dt.communication_mode
-        d.customer_id, d.current_owner_id, d.original_owner_id, d.customer_name,
+        from device d inner join device_type dt  on d.device_type = dt.id
-        d.device_imei, d.tenant_id
-        from device d
         where d.binding_user_id  = #{criteria.bindingUserId}
     </select>