From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
index 5938bb0..f3945cc 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
@@ -40,6 +40,7 @@
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.param.FwDevicePageParam;
import org.sxkj.fw.device.service.IFwDeviceService;
+import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO;
import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
@@ -86,12 +87,14 @@
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "列表", notes = "传入isAreaSelect、areaId、status")
+ @ApiOperation(value = "列表", notes = "传入isAreaSelect、areaId、areaIds、status")
public R<List<FwDeviceVO>> list(@RequestParam(value = "isAreaSelect", required = false) Integer isAreaSelect,
@RequestParam(value = "areaId", required = false) Long areaId,
+ @RequestParam(value = "areaIds", required = false) String areaIds,
@RequestParam(value = "status", required = false) Integer status,
@RequestParam(value = "isTrack", required = false) Integer isTrack) {
- List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, status, isTrack);
+ List<Long> areaIdList = Func.toLongList(areaIds);
+ List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, areaIdList, status, isTrack);
FwDeviceWrapper wrapper = FwDeviceWrapper.build();
return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
}
@@ -127,6 +130,7 @@
public R submit(@Valid @RequestBody FwDeviceDTO fwDevice) {
return R.status(fwDeviceService.saveOrUpdateDevice(FwDeviceWrapper.build().entityDTO(fwDevice)));
}
+
/**
* 设备表 新增或修改
*/
@@ -134,7 +138,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "修改设备出入库状态", notes = "传入fwDevice")
public R updateTrackStatus(@ApiParam(value = "", required = true) @RequestParam Long deviceId) {
- return R.status(fwDeviceService.updateTrackStatusByDeviceId(deviceId,0));
+ return R.status(fwDeviceService.updateTrackStatusByDeviceId(deviceId, 0, "", ""));
}
/**
@@ -149,6 +153,7 @@
/**
* 设备类型统计
+ *
* @return 统计数据
*/
@GetMapping("/statisticalDeviceType")
@@ -160,6 +165,7 @@
/**
* 设备出库去向统计
+ *
* @return 统计数据
*/
@GetMapping("/statisticalDeviceOut")
@@ -174,6 +180,7 @@
/**
* 设备生产厂商统计
+ *
* @return 统计数据
*/
@GetMapping("/statisticalDeviceManufacturer")
@@ -185,8 +192,9 @@
/**
* 查询非本部门区域的设备
+ *
* @param regionCode 区域编码，用于查询不在该区域内的设备
- * @param deptId 机构ID，用于限定查询范围
+ * @param deptId 机构ID，用于限定查询范围
* @return 设备列表
*/
@GetMapping("/nonDeptAreaDevices")
@@ -197,8 +205,8 @@
@ApiImplicitParam(name = "deptId", value = "机构ID", paramType = "query", dataType = "string", required = true)
})
public R<List<FwDeviceVO>> getNonDeptAreaDevices(
- @ApiParam(value = "区域编码", required = true) @RequestParam String regionCode,
- @ApiParam(value = "机构ID", required = true) @RequestParam String deptId) {
+ @ApiParam(value = "区域编码", required = true) @RequestParam String regionCode,
+ @ApiParam(value = "机构ID", required = true) @RequestParam String deptId) {
return R.data(fwDeviceService.getNonDeptAreaDevices(regionCode, deptId));
}
@@ -225,12 +233,19 @@
@ApiIgnore
public void exportFwDevice(@ApiIgnore @RequestParam Map<String, Object> fwDevice, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<FwDeviceEntity> queryWrapper = Condition.getQueryWrapper(fwDevice, FwDeviceEntity.class);
- //if (!AuthUtil.isAdministrator()) {
+ // if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(FwDevice::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(FwDeviceEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<FwDeviceExcel> list = fwDeviceService.exportFwDevice(queryWrapper);
ExcelUtil.export(response, "设备表数据" + DateUtil.time(), "设备表数据表", list, FwDeviceExcel.class);
}
-
+ // 任务调度使用
+ @GetMapping("/listByTask")
+ @ApiOperationSupport(order = 10)
+ @ApiOperation(value = "任务调度使用")
+ public R<IPage<CockpitFwDeviceVO>> listByTask(FwDeviceDTO fwDevice, Query query) {
+ IPage<CockpitFwDeviceVO> pages = fwDeviceService.selectCockpitDevicePage(Condition.getPage(query), fwDevice);
+ return R.data(pages);
+ }
}
--
Gitblit v1.9.3