1.1.3监控单元修改

dev
zhouhy 1 year ago
parent 6d039e253b
commit 231697d090

@ -63,19 +63,28 @@ public class HwMonitorUnitController extends BaseController
} }
/** /**
* *
* @param hwMonitorUnits
* @return list
* @throws
* */ * */
@GetMapping("/treeList") @PostMapping("/treeList")
public TableDataInfo treeList(List<HwMonitorUnit> hwMonitorUnits){ public TableDataInfo treeList(List<HwMonitorUnit> hwMonitorUnits){
List<HwMonitorUnit> list = hwMonitorUnitService.selectTreeList(hwMonitorUnits); List<HwMonitorUnit> list = hwMonitorUnitService.selectTreeList(hwMonitorUnits);
return getDataTable(list); return getDataTable(list);
} }
//选择场景 // /**
@GetMapping("/selectHwSceneBySceneModeId") // *
public TableDataInfo selectHwSceneBySceneModeId(Long sceneModeId){ // * 选择场景
List<HwScene> hwScenes = hwSceneService.selectHwSceneBySceneModeId(sceneModeId); // * @param sceneModeId 场景id
return getDataTable(hwScenes); // * @return
} // */
//
// @PostMapping("/selectHwSceneBySceneModeId")
// public TableDataInfo selectHwSceneBySceneModeId(Long sceneModeId){
// List<HwScene> hwScenes = hwSceneService.selectHwSceneBySceneModeId(sceneModeId);
// return getDataTable(hwScenes);
// }
/** /**
* 3. * 3.
* */ * */
@ -84,21 +93,33 @@ public class HwMonitorUnitController extends BaseController
List<DeviceModeVo> maps = hwDeviceService.selectDeviceModeNameVo(); List<DeviceModeVo> maps = hwDeviceService.selectDeviceModeNameVo();
return getDataTable(maps); return getDataTable(maps);
} }
//获取有开关属性的设备 //
/**
*
* @param monitorUnitId id
* */
@PostMapping("/selectDeviceByDeviceModeByMonitorUnitId") @PostMapping("/selectDeviceByDeviceModeByMonitorUnitId")
public Map<String, Map<String, Object>> selectDeviceByDeviceModeByMonitorUnitId(Long monitorUnitId){ public Map<String, Map<String, Object>> selectDeviceByDeviceModeByMonitorUnitId(Long monitorUnitId){
startPage(); startPage();
Map<String, Map<String, Object>> maps = hwDeviceService.selectDeviceByDeviceModeByMonitorUnitId(monitorUnitId); Map<String, Map<String, Object>> maps = hwDeviceService.selectDeviceByDeviceModeByMonitorUnitId(monitorUnitId);
return maps; return maps;
} }
//获取直采变量的设备 /**
*
* @param monitorUnitId id
*/
@PostMapping("/selectDeviceModeFunctionByFunctionType") @PostMapping("/selectDeviceModeFunctionByFunctionType")
public Map<String, Map<String, Object>> selectDeviceModeFunctionByFunctionType(Long monitorUnitId){ public Map<String, Map<String, Object>> selectDeviceModeFunctionByFunctionType(Long monitorUnitId){
startPage(); startPage();
Map<String, Map<String, Object>> maps = hwDeviceService.selectDeviceModeFunctionByFunctionType(monitorUnitId); Map<String, Map<String, Object>> maps = hwDeviceService.selectDeviceModeFunctionByFunctionType(monitorUnitId);
return maps; return maps;
} }
//设备历史数据 //
/**
*
* @param deviceId id
* */
@PostMapping("/getHistoryData") @PostMapping("/getHistoryData")
public TableDataInfo getHistoryData(Long deviceId){ public TableDataInfo getHistoryData(Long deviceId){
startPage(); startPage();
@ -150,8 +171,9 @@ public class HwMonitorUnitController extends BaseController
} }
/** /**
* 线 * 线
* @param sceneId id
* */ * */
@GetMapping("/SubDevice") @PostMapping("/SubDevice")
public SubDeviceSumVo subDevice(Long sceneId){ public SubDeviceSumVo subDevice(Long sceneId){
SubDeviceSumVo subDeviceSumVos = hwMonitorUnitService.selectSubDeviceSum(sceneId); SubDeviceSumVo subDeviceSumVos = hwMonitorUnitService.selectSubDeviceSum(sceneId);
@ -159,6 +181,7 @@ public class HwMonitorUnitController extends BaseController
} }
/** /**
* *
* @param id
* */ * */
@PostMapping("/ElectronicNumVo") @PostMapping("/ElectronicNumVo")
public AjaxResult ElectronicNumVo(Long sceneId){ public AjaxResult ElectronicNumVo(Long sceneId){
@ -167,8 +190,9 @@ public class HwMonitorUnitController extends BaseController
} }
/** /**
* *
* @param id
* */ * */
@GetMapping("/selectMonitorUnitSub") @PostMapping("/selectMonitorUnitSub")
//ok //ok
public HwMonitorUnit selectMonitorUnitSub(Long monitorUnitId){ public HwMonitorUnit selectMonitorUnitSub(Long monitorUnitId){
HwMonitorUnit hwMonitorUnits = hwMonitorUnitService.selectHwMonitorUnitByMonitorUnitId(monitorUnitId); HwMonitorUnit hwMonitorUnits = hwMonitorUnitService.selectHwMonitorUnitByMonitorUnitId(monitorUnitId);
@ -177,6 +201,9 @@ public class HwMonitorUnitController extends BaseController
} }
/** /**
* 2. 线 * 2. 线
* @param beginTime
* @param endTime
* @param sceneId id
* */ * */
@PostMapping("/getDeviceOperations") @PostMapping("/getDeviceOperations")
public Integer selectTdengine(String beginTime,String endTime,Long sceneId){ public Integer selectTdengine(String beginTime,String endTime,Long sceneId){

Loading…
Cancel
Save