From ac3d3e016125892964104f9b4d06978fa8d71063 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 14 Jan 2026 14:57:34 +0800
Subject: [PATCH] add-6.设备-类型分析，7.设备-出库去向统计8.设备-产商统计
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 94 insertions(+), 25 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 42d7a6a..f6d72d5 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
@@ -16,36 +16,42 @@
*/
package org.sxkj.fw.device.controller;
-import com.github.xiaoymin.knife4j.annotations.Ignore;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
+import org.sxkj.fw.common.GenericConverter;
+import org.sxkj.fw.common.IdParam;
import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
-import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.excel.FwDeviceExcel;
-import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
+import org.sxkj.fw.device.param.FwDevicePageParam;
import org.sxkj.fw.device.service.IFwDeviceService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
+import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO;
+import org.sxkj.fw.device.vo.FwDeviceVO;
+import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
import springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
+
import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 设备表 控制器
@@ -67,27 +73,58 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入fwDevice")
- public R<FwDeviceVO> detail(FwDeviceDTO fwDevice) {
- FwDeviceEntity detail = fwDeviceService.getOne(Condition.getQueryWrapper(FwDeviceWrapper.build().entityDTO(fwDevice)));
+ public R<FwDeviceVO> detail(@Valid IdParam fwDevice) {
+ FwDeviceEntity detail = fwDeviceService.getOne(Condition.getQueryWrapper(GenericConverter.convert(fwDevice, FwDeviceEntity.class)));
+
+ if (detail == null) {
+ return R.fail("该设备不存在");
+ }
+
return R.data(FwDeviceWrapper.build().entityVO(detail));
+ }
+
+ /**
+ * 设备表 列表
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "列表", notes = "传入isAreaSelect和区域id")
+ public R<List<FwDeviceVO>> list(@RequestParam(value = "isAreaSelect", required = false) Integer isAreaSelect,
+ @RequestParam(value = "areaId", required = false) Long areaId) {
+ List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId);
+ FwDeviceWrapper wrapper = FwDeviceWrapper.build();
+ return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
}
/**
* 设备表 自定义分页
*/
@GetMapping("/page")
- @ApiOperationSupport(order = 2)
+ @ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入fwDevice")
- public R<IPage<FwDeviceVO>> page(FwDeviceDTO fwDevice, Query query) {
- IPage<FwDeviceVO> pages = fwDeviceService.selectFwDevicePage(Condition.getPage(query), fwDevice);
- return R.data(pages);
+ public R<IPage<FwDeviceVO>> page(FwDevicePageParam fwDevice, Query query) {
+ IPage<FwDeviceEntity> pages = fwDeviceService.selectFwDevicePage(Condition.getPage(query), GenericConverter.convert(fwDevice, FwDeviceDTO.class));
+ IPage<FwDeviceVO> result = FwDeviceWrapper.build().pageVO(pages);
+ List<FwDeviceVO> records = result.getRecords();
+ if (records != null && !records.isEmpty()) {
+ List<Long> deviceIds = records.stream()
+ .map(FwDeviceVO::getId)
+ .filter(id -> id != null)
+ .collect(Collectors.toList());
+ Map<Long, String> sceneNameMap = fwDeviceService.selectSceneNameByDeviceIds(deviceIds);
+ for (FwDeviceVO record : records) {
+ String sceneName = sceneNameMap.get(record.getId());
+ record.setSceneName(StringUtil.isBlank(sceneName) ? "/" : sceneName);
+ }
+ }
+ return R.data(result);
}
/**
* 设备表 新增或修改
*/
@PostMapping("/submit")
- @ApiOperationSupport(order = 3)
+ @ApiOperationSupport(order = 4)
@ApiOperation(value = "新增或修改", notes = "传入fwDevice")
public R submit(@Valid @RequestBody FwDeviceDTO fwDevice) {
return R.status(fwDeviceService.saveOrUpdate(FwDeviceWrapper.build().entityDTO(fwDevice)));
@@ -97,20 +134,52 @@
* 设备表 删除
*/
@PostMapping("/remove")
- @ApiOperationSupport(order = 4)
+ @ApiOperationSupport(order = 5)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(fwDeviceService.deleteLogic(Func.toLongList(ids)));
}
+ /**
+ * 设备类型统计
+ * @return 统计数据
+ */
+ @GetMapping("/statisticalDeviceType")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "设备类型统计", notes = "设备类型统计")
+ public R<List<DeviceTypeStatisticsVO>> statisticalDeviceType() {
+ return R.data(fwDeviceService.getDeviceTypeStatistics());
+ }
+
+ /**
+ * 设备类型统计
+ * @return 统计数据
+ */
+ @GetMapping("/statisticalDeviceOut")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "设备出库去向统计", notes = "设备出库去向统计")
+ public R<List<DeviceStatisticsVO>> statisticalDeviceOut() {
+ return R.data(fwDeviceService.getDeviceOutStatistics());
+ }
+
+ /**
+ * 设备生产厂商统计
+ * @return 统计数据
+ */
+ @GetMapping("/statisticalDeviceManufacturer")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "设备生产厂商统计", notes = "设备生产厂商统计")
+ public R<List<DeviceStatisticsVO>> statisticalDeviceManufacturer() {
+ return R.data(fwDeviceService.getDeviceManufacturerStatistics());
+ }
/**
* 导出数据
*/
@GetMapping("/export-fwDevice")
- @ApiOperationSupport(order = 5)
+ @ApiOperationSupport(order = 99)
@ApiOperation(value = "导出数据", notes = "传入fwDevice")
- @Ignore
+ @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()) {
--
Gitblit v1.9.3