若依微服务2.0.2

修改金瑞铭以下问题:
1、Web新增设备-无法新增已删除的设备编号
2、告警规则设置无生效
3、模型显示问题,将模型某项数据设置为不显示无生效
dev
xins 7 months ago
parent f53be7b70d
commit 1a202e65e6

@ -102,7 +102,7 @@ public class HwMonitorPlatformController extends BaseController {
@RequiresPermissions("business:monitor:index") @RequiresPermissions("business:monitor:index")
@GetMapping("/getDeviceOperations/{sceneId}") @GetMapping("/getDeviceOperations/{sceneId}")
public AjaxResult selectDeviceStatus(@PathVariable("sceneId") Long sceneId) { public AjaxResult selectDeviceStatus(@PathVariable("sceneId") Long sceneId) {
System.out.println(("sceneid:" + sceneId)); // System.out.println(("sceneid:" + sceneId));
return AjaxResult.success(hwDeviceService.getOnlineDevicesCount(sceneId)); return AjaxResult.success(hwDeviceService.getOnlineDevicesCount(sceneId));
} }
@ -280,7 +280,7 @@ public class HwMonitorPlatformController extends BaseController {
TdReturnDataVo returnDataVo = hwMonitorPlatformService.getHistoryData(deviceHistoryData); TdReturnDataVo returnDataVo = hwMonitorPlatformService.getHistoryData(deviceHistoryData);
if (returnDataVo != null) { if (returnDataVo != null) {
List<DeviceDataColumnVo> deviceDataColumnVos = hwMonitorPlatformService. List<DeviceDataColumnVo> deviceDataColumnVos = hwMonitorPlatformService.
getDeviceDataColumns(deviceHistoryData.getDeviceModeId(), returnDataVo.getDataList()); getDeviceDataColumns(deviceHistoryData.getDeviceModeId());
returnObj.put("deviceDataColumns", deviceDataColumnVos); returnObj.put("deviceDataColumns", deviceDataColumnVos);
returnObj.put("historyData", returnDataVo); returnObj.put("historyData", returnDataVo);
} }

@ -44,5 +44,5 @@ public interface IHwMonitorPlatformService {
* @author xins * @author xins
* @date 2023-09-25 15:40 * @date 2023-09-25 15:40
*/ */
public List<DeviceDataColumnVo> getDeviceDataColumns(Long deviceModeId, List<Map<String, Object>> latestDataMaps); public List<DeviceDataColumnVo> getDeviceDataColumns(Long deviceModeId);
} }

Loading…
Cancel
Save