From bf2026a38d4d36371060673d4651b6e05ca90632 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 01 九月 2026 17:07:30 +0800
Subject: [PATCH] feat(device): 1.更新设备导入验证逻辑和检验任务功能 2.报告编制
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java | 70 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 23 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 574cb60..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;
/**
@@ -49,16 +48,17 @@
@Autowired
private DataConfigService dataConfigService;
+ @ApiOperation(value = "鏌ヨ璁惧璇︽儏")
+ @GetMapping("/getDeviceById")
+ public Result getDeviceById(Integer deviceId) {
+ return Result.success(deviceService.getById(deviceId));
+ }
- @ApiOperation(value = "鏌ョ湅璁惧浜岀淮鐮佹寜閽�")
- @GetMapping("/showDeviceQrCodeButton")
- public void showDeviceQrCodeButton() { }
//璁惧宸ュ叿鏄庣粏
-
@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));
}
@@ -136,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 = "閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃")
@@ -149,14 +149,14 @@
@ApiOperation("/鏁伴噰-鏁版嵁閲囬泦")
@PostMapping("/dataCollection")
- public Result<?> dataAcquisition(HttpServletRequest request,@RequestBody DeviceCollectionDto dto) {
+ public Result<?> dataAcquisition(HttpServletRequest request, @RequestBody DeviceCollectionDto dto) {
return deviceService.dataAcquisition(request, dto);
}
- @ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
- @PostMapping("/saveDataAcquisitionConfiguration")
- public Result<?> saveDataAcquisitionConfiguration(@RequestBody DataConfigDto dataConfigList) {
- dataConfigService.saveDataAcquisitionConfiguration(dataConfigList.getDeviceId(), dataConfigList);
+ @ApiOperation(value = "缁存姢璁惧鏂囦欢閰嶇疆")
+ @PostMapping("/saveDeviceFileConfiguration")
+ public Result<?> saveDeviceFileConfiguration(@RequestBody DataConfigDto dataConfigList) {
+ dataConfigService.saveDeviceFileConfiguration(dataConfigList);
return Result.success();
}
@@ -166,6 +166,25 @@
return dataConfigService.queryDataAcquisitionConfiguration(dataConfig);
}
+ @ApiOperation(value = "鏌ヨ妫�楠岄」鏁伴噰閰嶇疆")
+ @GetMapping("/queryProductConfiguration")
+ public Result<?> queryProductConfiguration(DataConfig dataConfig) {
+ return dataConfigService.queryProductConfiguration(dataConfig);
+ }
+
+ @ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
+ @PostMapping("/saveDataAcquisitionConfiguration")
+ public Result<?> saveDataAcquisitionConfiguration(@RequestBody DataConfigDto dataConfigList) {
+ dataConfigService.saveDataAcquisitionConfiguration(dataConfigList);
+ return Result.success();
+ }
+
+
+ @ApiOperation(value = "鏌ヨ缁戝畾浜嗕絾鏄病鏈夐厤缃殑妫�楠岄」")
+ @GetMapping("/getNoConfigProduct")
+ public Result<?> getNoConfigProduct(Page page, Integer deviceId) {
+ return Result.success(dataConfigService.getNoConfigProduct(page, deviceId));
+ }
@ApiOperation(value = "鍒犻櫎鏁伴噰閰嶇疆")
@DeleteMapping("/deleteDataAcquisitionConfiguration")
@@ -174,13 +193,6 @@
List<String> collect = split.stream().distinct().collect(Collectors.toList());
dataConfigService.removeBatchByIds(collect);
return Result.success();
- }
-
-
- @ApiOperation(value = "鏌ヨ缁戝畾浜嗕絾鏄病鏈夐厤缃殑妫�楠岄」")
- @GetMapping("/getNoConfigProduct")
- public Result<?> getNoConfigProduct(Integer deviceId) {
- return Result.success(dataConfigService.getNoConfigProduct(deviceId));
}
@ApiOperation(value = "宸︿晶璁惧鏍戝舰鏍�")
@@ -192,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