Merge branch 'master' into tb-alipay

device-api-service/src/main/java/com/xy/alipay/ApiDeviceServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
+import com.xy.annotate.RestMappingController;
 import com.xy.config.DeviceThreadPoolConfig;
 import com.xy.consumer.connected.ConnectedMqttConfiguration;
 import com.xy.consumer.connected.ConnectedProducer;
@@ -11,6 +12,7 @@ import com.xy.consumer.disconnect.DisconnectedMqttConfiguration;
 import com.xy.consumer.disconnect.DisconnectedProducer;
 import com.xy.dto.DeviceDetailDTO;
 import com.xy.entity.DeviceStatus;
+import com.xy.mapper.DeviceStatusMapper;
 import com.xy.service.AlipayDeviceService;
 import com.xy.service.DeviceStatusServiceImpl;
 import com.xy.utils.R;
@@ -38,9 +40,10 @@ import java.util.List;
 @Component
 @AllArgsConstructor
 @Api(tags = "支付宝设备API")
+@RestMappingController("/api/device")
 public class ApiDeviceServiceImpl {
 
-    private DeviceStatusServiceImpl deviceStatusService;
+    private DeviceStatusMapper deviceStatusMapper;
 
     private AlipayDeviceService alipayDeviceService;
 
@@ -55,8 +58,8 @@ public class ApiDeviceServiceImpl {
      */
     @XxlJob("alipayDeviceDetail")
     public ReturnT<String> alipayDeviceDetail() {
-        //查询离线设备
-        List<DeviceStatus> deviceStatuses = deviceStatusService.list(new LambdaQueryWrapper<DeviceStatus>().eq(DeviceStatus::getNetState, 2));
+        //查询离线支付宝设备
+        List<DeviceStatus> deviceStatuses = deviceStatusMapper.aliPayNotNetWorkDevice();
         if (deviceStatuses.size() == 0) {
             return ReturnT.SUCCESS;
         }

device-api-service/src/main/java/com/xy/mapper/DeviceStatusMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xy.entity.DeviceStatus;
 import com.xy.mapper.entity.DeviceStatusCount;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备-状态 Mapper 接口
@@ -20,4 +22,11 @@ public interface DeviceStatusMapper extends BaseMapper<DeviceStatus> {
      * @return
      */
     DeviceStatusCount statusCount();
+
+    /**
+     * 离线的支付宝设备
+     *
+     * @return
+     */
+    List<DeviceStatus> aliPayNotNetWorkDevice();
 }

device-api-service/src/main/resources/mapper/DeviceStatusMapper.xml

@@ -15,4 +15,12 @@
         from dual
     </select>
 
+    <!-- 离线的支付宝设备 -->
+    <select id="aliPayNotNetWorkDevice" resultType="com.xy.entity.DeviceStatus">
+        select ds.*
+        from device_info di
+        join device_status ds on(di.device_id = ds.device_id)
+        where
+        di.device_type = 5 and ds.net_state = 2
+    </select>
 </mapper>