From de775139ac660c9d2e38ae54364f25e6724ca668 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 28 八月 2026 15:41:38 +0800
Subject: [PATCH] feat(device): 1.添加设备导入导出功能并优化数据库关联查询 2.计量溯源性-标准物质清单导入导出
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
index d7925c9..d1d30c5 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
@@ -26,7 +26,6 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -51,7 +50,7 @@
@ApiOperation(value = "鏌ヨ璁惧璇︽儏")
@GetMapping("/getDeviceById")
- public Result getDeviceById(Integer deviceId){
+ public Result getDeviceById(Integer deviceId) {
return Result.success(deviceService.getById(deviceId));
}
@@ -59,7 +58,7 @@
//璁惧宸ュ叿鏄庣粏
@ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
@GetMapping("/selectDeviceParameter")
- public Result selectDeviceParameter(Page page, DeviceDto itemParameter, Boolean laboratoryNameIsNull){
+ public Result selectDeviceParameter(Page page, DeviceDto itemParameter, Boolean laboratoryNameIsNull) {
return Result.success(deviceService.selectDeviceParameter(page, itemParameter, laboratoryNameIsNull));
}
@@ -137,8 +136,8 @@
@ApiOperation(value = "閫氳繃椤圭洰鑾峰彇璁惧鍒楄〃")
@GetMapping("/selectDeviceByCategory")
- public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass,String laboratory) {
- return Result.success(deviceService.selectDeviceByCategory(inspectionItem, inspectionItemSubclass,laboratory));
+ public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass, String laboratory) {
+ return Result.success(deviceService.selectDeviceByCategory(inspectionItem, inspectionItemSubclass, laboratory));
}
@ApiOperation(value = "閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃")
@@ -150,7 +149,7 @@
@ApiOperation("/鏁伴噰-鏁版嵁閲囬泦")
@PostMapping("/dataCollection")
- public Result<?> dataAcquisition(HttpServletRequest request,@RequestBody DeviceCollectionDto dto) {
+ public Result<?> dataAcquisition(HttpServletRequest request, @RequestBody DeviceCollectionDto dto) {
return deviceService.dataAcquisition(request, dto);
}
@@ -188,7 +187,7 @@
}
@ApiOperation(value = "鍒犻櫎鏁伴噰閰嶇疆")
- @DeleteMapping("/ ")
+ @DeleteMapping("/deleteDataAcquisitionConfiguration")
public Result<?> deleteDataAcquisitionConfiguration(@RequestParam("ids") String ids) {
List<String> split = Arrays.asList(ids.split(","));
List<String> collect = split.stream().distinct().collect(Collectors.toList());
@@ -205,13 +204,25 @@
@ApiOperation(value = "璁惧妗ｆ瀵煎嚭")
@GetMapping("/exportDeviceFile")
- public void exportDeviceFile(@RequestParam Integer deviceId, HttpServletResponse response){
- deviceService.exportDeviceFile(deviceId,response);
+ public void exportDeviceFile(@RequestParam Integer deviceId, HttpServletResponse response) {
+ deviceService.exportDeviceFile(deviceId, response);
}
@ApiOperation(value = "浠櫒璁惧涓�瑙堣〃瀵煎嚭")
@GetMapping("/exportEquipmentDetails")
- public void exportEquipmentDetails(HttpServletResponse response){
+ public void exportEquipmentDetails(HttpServletResponse response) {
deviceService.exportEquipmentDetails(response);
}
+
+ @ApiOperation(value = "涓嬭浇璁惧瀵煎叆妯℃澘")
+ @GetMapping("/importTemplate")
+ public void importTemplate(HttpServletResponse response) {
+ deviceService.downloadImportTemplate(response);
+ }
+
+ @ApiOperation(value = "瀵煎叆璁惧")
+ @PostMapping("/importDevice")
+ public Result importDevice(MultipartFile file) {
+ return Result.success(deviceService.importDevice(file));
+ }
}
--
Gitblit v1.9.3