code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-17 16:36:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

大屏展示404问题修复

Browse Source
This commit is contained in:
kerwincui
2024-04-26 11:04:45 +08:00
parent 653fe8bc1f
commit 55a3b95a97
7 changed files with 65 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceLogController.java
View File

@@ -46,4 +46,17 @@ public class DeviceLogController extends BaseController
return getDataTable(list);
}
/**
* 查询设备日志列表
*/
@ApiOperation("查询设备日志列表")
@PreAuthorize("@ss.hasPermi('iot:device:list')")
@GetMapping("/list")
public TableDataInfo list(DeviceLog deviceLog)
{
startPage();
List<DeviceLog> list = deviceLogService.selectDeviceLogList(deviceLog);
return getDataTable(list);
}
}

7
springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/DeviceLogMapper.java
View File

@@ -82,5 +82,12 @@ public interface DeviceLogMapper
*/
public int deleteDeviceLogByDeviceNumber(String deviceNumber);
/**
* 查询设备日志列表
*
* @param deviceLog 设备日志
* @return 设备日志集合
*/
public List<DeviceLog> selectDeviceLogList(DeviceLog deviceLog);
}

8
springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/IDeviceLogService.java
View File

@@ -24,4 +24,12 @@ public interface IDeviceLogService
*/
public List<MonitorModel> selectMonitorList(DeviceLog deviceLog);
/**
* 查询设备日志列表
*
* @param deviceLog 设备日志
* @return 设备日志集合
*/
public List<DeviceLog> selectDeviceLogList(DeviceLog deviceLog);
}

14
springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceLogServiceImpl.java
View File

@@ -38,4 +38,18 @@ public class DeviceLogServiceImpl implements IDeviceLogService
return logService.selectMonitorList(deviceLog);
}
/**
* 查询设备日志列表
*
* @param deviceLog 设备日志
* @return 设备日志
*/
@Override
public List<DeviceLog> selectDeviceLogList(DeviceLog deviceLog)
{
if(deviceLog.getIsMonitor()==null){
deviceLog.setIsMonitor(0);
}
return logService.selectDeviceLogList(deviceLog);
}
}

3
springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/tdengine/service/ILogService.java
View File

@@ -31,5 +31,8 @@ public interface ILogService {
/** 查询监测数据列表 **/
List<MonitorModel> selectMonitorList(DeviceLog deviceLog);
/** 查询物模型日志列表 **/
List<DeviceLog> selectDeviceLogList(DeviceLog deviceLog);
}

8
springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/tdengine/service/impl/MySqlLogServiceImpl.java
View File

@@ -52,4 +52,12 @@ public class MySqlLogServiceImpl implements ILogService {
return deviceLogMapper.selectMonitorList(deviceLog);
}
/***
* 日志列表
* @return
*/
@Override
public List<DeviceLog> selectDeviceLogList(DeviceLog deviceLog) {
return deviceLogMapper.selectDeviceLogList(deviceLog);
}
}

12
springboot/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceLogMapper.xml
View File

@@ -143,4 +143,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from iot_device_log where serial_number = #{deviceNumber}
</delete>
<select id="selectDeviceLogList" parameterType="com.fastbee.iot.domain.DeviceLog" resultMap="DeviceLogResult">
<include refid="selectDeviceLogVo"/>
<where>
<if test="isMonitor != null"> and is_monitor = #{isMonitor}</if>
<if test="deviceId != null and deviceId !=0"> and device_id = #{deviceId}</if>
<if test="serialNumber != null and serialNumber !=''"> and serial_number = #{serialNumber}</if>
<if test="logType != null "> and log_type = #{logType}</if>
<if test="identity != null and identity != ''"> and identity like concat('%', #{identity}, '%')</if>
</where>
order by create_time desc
</select>
</mapper>