Merge branch 'master' into test

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

@@ -1,8 +1,11 @@
 package com.xy.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xy.dto.DeviceNetRecordDto;
 import com.xy.entity.DeviceNetRecord;
 
+import java.util.List;
+
 /**
  * <p>
  * 机器-联网记录 Mapper 接口
@@ -13,4 +16,12 @@ import com.xy.entity.DeviceNetRecord;
  */
 public interface DeviceNetRecordMapper extends BaseMapper<DeviceNetRecord> {
 
+    /**
+     * 离线设备列表
+     *
+     * @param offLineDevice
+     * @return
+     */
+    List<DeviceNetRecordDto.OffLineDeviceVo> offLineDevice(DeviceNetRecordDto.OffLineDevice offLineDevice);
+
 }

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

@@ -0,0 +1,27 @@
+<?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.xy.mapper.DeviceNetRecordMapper">
+
+    <!-- 离线设备列表 -->
+    <select id="offLineDevice" resultType="com.xy.dto.DeviceNetRecordDto$OffLineDeviceVo">
+        SELECT nd.device_id deviceId, nd.create_time createTime, di.device_name deviceName, di.merc_id mercId, di.merc_name mercName FROM (
+        SELECT a.device_id, a.create_time
+        FROM (
+                SELECT device_id, MAX(create_time) AS create_time
+                FROM device_net_record
+                WHERE net_status = 2 and create_time >= #{beginTime} and create_time &lt;= #{endTime}
+                GROUP BY device_id
+        ) a
+        LEFT JOIN (
+                SELECT device_id
+                FROM device_net_record
+                WHERE net_status = 1 and create_time >= #{beginTime} and create_time &lt;= #{endTime}
+                GROUP BY device_id
+        ) b ON a.device_id = b.device_id
+        WHERE b.device_id IS NULL
+        ORDER BY a.create_time DESC
+    ) nd
+    join device_info di on(nd.device_id = di.device_id)
+    </select>
+
+</mapper>

device-api-service/src/main/java/com/xy/service/DeviceNetRecordServiceImpl.java

@@ -47,7 +47,6 @@ public class DeviceNetRecordServiceImpl extends ServiceImpl<DeviceNetRecordMappe
         return R.ok();
     }
 
-
     @Override
     @ApiOperation("分页查询")
     public R<PageBean<DeviceNetRecordDto.Vo>> page(@RequestBody DeviceNetRecordDto.Page page) {
@@ -73,4 +72,11 @@ public class DeviceNetRecordServiceImpl extends ServiceImpl<DeviceNetRecordMappe
         List<DeviceNetRecord> list = list(lambdaQueryWrapper);
         return R.ok(copy(DeviceNetRecordDto.Vo.class, list));
     }
+
+    @PostMapping("offLineDevice")
+    @ApiOperation("离线设备列表")
+    public R<List<DeviceNetRecordDto.OffLineDeviceVo>> offLineDevice(@RequestBody @Validated DeviceNetRecordDto.OffLineDevice offLineDevice) {
+        List<DeviceNetRecordDto.OffLineDeviceVo> offLineDeviceVos = baseMapper.offLineDevice(offLineDevice);
+        return R.ok(offLineDeviceVos);
+    }
 }