boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat (farm): 设备中心

Browse Source 
- 设备监控
This commit is contained in:
达富斌
2025-10-24 17:39:31 +08:00
parent 2f22c7bbea
commit 72d55f3e52
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/DeviceInfoController.java
View File

@@ -192,7 +192,7 @@ public class DeviceInfoController {
} }
@GetMapping("/statistics") @GetMapping("/statistics")
@Operation(summary = "订阅设备上报并持久化") @Operation(summary = "设备统计信息")
@Parameter(name = "baseId", description = "基地编号") @Parameter(name = "baseId", description = "基地编号")
public CommonResult<DeviceStatisticsRespVO> getStatisticsInfo(@RequestParam("baseId") String baseId) { public CommonResult<DeviceStatisticsRespVO> getStatisticsInfo(@RequestParam("baseId") String baseId) {
DeviceStatisticsRespVO res = deviceInfoService.getStatisticsInfo(baseId); DeviceStatisticsRespVO res = deviceInfoService.getStatisticsInfo(baseId);

31
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java
View File

@@ -294,26 +294,19 @@ public class DictController {
List<BaseNamePlanRespVO> res = productionPlanService.getBaseNameAndPlanList(); List<BaseNamePlanRespVO> res = productionPlanService.getBaseNameAndPlanList();
return success(res); return success(res);
} }
//
// @GetMapping("/list/invest-goods") // @Operation(summary = "字典数据维护-下拉框列表-通用字典分类查询")
// @Operation(summary = "字典数据维护-下拉框列表-投入品") // @GetMapping("/list/{dictTypeCode}")
// public CommonResult<List<InputLibraryRespVO>> getInvestGoodsList() { // public CommonResult<List<SysDictRespVO>> getSysDictList(@PathVariable("dictTypeCode") String dictTypeCode) {
// List<InputLibraryRespVO> res = sysDictService.getInvestGoodsList(); // List<SysDictDO> res = sysDictService.getByTypeCode(dictTypeCode);
// return success(res); // return success(BeanUtils.toBean(res, SysDictRespVO.class));
// } // }
// //
@Operation(summary = "字典数据维护-下拉框列表-通用字典分类查询") // @Operation(summary = "字典数据维护-下拉框列表-字典分类名称")
@GetMapping("/list/{dictTypeCode}") // @GetMapping("/list")
public CommonResult<List<SysDictRespVO>> getSysDictList(@PathVariable("dictTypeCode") String dictTypeCode) { // public CommonResult<List<SysDictTypeCodeRespVO>> getSysDictList() {
List<SysDictDO> res = sysDictService.getByTypeCode(dictTypeCode); // List<SysDictDO> res = sysDictService.groupByTypeCode();
return success(BeanUtils.toBean(res, SysDictRespVO.class)); // return success(BeanUtils.toBean(res, SysDictTypeCodeRespVO.class));
} // }
@Operation(summary = "字典数据维护-下拉框列表-字典分类名称")
@GetMapping("/list")
public CommonResult<List<SysDictTypeCodeRespVO>> getSysDictList() {
List<SysDictDO> res = sysDictService.groupByTypeCode();
return success(BeanUtils.toBean(res, SysDictTypeCodeRespVO.class));
}
} }

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java
View File

@@ -526,6 +526,10 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
List<DeviceMonitorDataRespVO.Row> rows = new ArrayList<>(); List<DeviceMonitorDataRespVO.Row> rows = new ArrayList<>();
RealTimeDeviceDataRespVO realTimeDeviceDataRespVO = (RealTimeDeviceDataRespVO) wfInfo.getRealTimeData().getData(); RealTimeDeviceDataRespVO realTimeDeviceDataRespVO = (RealTimeDeviceDataRespVO) wfInfo.getRealTimeData().getData();
if (ObjectUtils.isEmpty(realTimeDeviceDataRespVO)) {
return rows;
}
List<RealTimeDeviceDataRespVO.DataRow> data = realTimeDeviceDataRespVO.getData(); List<RealTimeDeviceDataRespVO.DataRow> data = realTimeDeviceDataRespVO.getData();
for (RealTimeDeviceDataRespVO.DataRow d : data) { for (RealTimeDeviceDataRespVO.DataRow d : data) {
rows.add(new DeviceMonitorDataRespVO.Row(d.getPropertyName(), d.getFormatValue(), "")); rows.add(new DeviceMonitorDataRespVO.Row(d.getPropertyName(), d.getFormatValue(), ""));