From 8b4d7246fb735d965195201e80178b5d1528a486 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 18 四月 2025 14:48:49 +0800
Subject: [PATCH] 1.设备使用授权导出 2.设备维护保养导出
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 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 36b2341..9a58b5b 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
@@ -49,13 +49,14 @@
@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){
@@ -134,12 +135,6 @@
}
}
- @ApiOperation(value = "鑾峰彇璁惧璐熻矗浜�")
- @GetMapping("/selectDevicePrincipal")
- public Result selectDevicePrincipal() {
- return Result.success(deviceService.selectDevicePrincipal());
- }
-
@ApiOperation(value = "閫氳繃椤圭洰鑾峰彇璁惧鍒楄〃")
@GetMapping("/selectDeviceByCategory")
public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass,String laboratory) {
@@ -159,10 +154,10 @@
return deviceService.dataAcquisition(request, dto);
}
- @ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
- @PostMapping("/saveDataAcquisitionConfiguration")
- public Result<?> saveDataAcquisitionConfiguration(@RequestParam(value = "deviceId") Integer deviceId, @RequestBody DataConfigDto dataConfigList) {
- dataConfigService.saveDataAcquisitionConfiguration(deviceId, dataConfigList);
+ @ApiOperation(value = "缁存姢璁惧鏂囦欢閰嶇疆")
+ @PostMapping("/saveDeviceFileConfiguration")
+ public Result<?> saveDeviceFileConfiguration(@RequestBody DataConfigDto dataConfigList) {
+ dataConfigService.saveDeviceFileConfiguration(dataConfigList);
return Result.success();
}
@@ -172,6 +167,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")
@@ -182,8 +196,6 @@
return Result.success();
}
-
-
@ApiOperation(value = "宸︿晶璁惧鏍戝舰鏍�")
@GetMapping("/treeDevice")
public Result treeDevice(String deviceName) {
@@ -193,13 +205,13 @@
@ApiOperation(value = "璁惧妗ｆ瀵煎嚭")
@GetMapping("/exportDeviceFile")
- public void exportDeviceFile(@RequestParam Integer deviceId, HttpServletResponse response) throws Exception {
+ public void exportDeviceFile(@RequestParam Integer deviceId, HttpServletResponse response){
deviceService.exportDeviceFile(deviceId,response);
}
@ApiOperation(value = "浠櫒璁惧涓�瑙堣〃瀵煎嚭")
@GetMapping("/exportEquipmentDetails")
- public void exportEquipmentDetails(HttpServletResponse response) throws Exception {
+ public void exportEquipmentDetails(HttpServletResponse response){
deviceService.exportEquipmentDetails(response);
}
}
--
Gitblit v1.9.3