From 6c8973d78b04b1aa132dccbd478ba8abbcf2b6c1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 25 四月 2025 09:10:21 +0800
Subject: [PATCH] 1.国产网分仪 2.可靠性计划成品计划
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 8abd1a0..f757174 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
@@ -53,13 +53,14 @@
@ApiOperation(value = "鏌ョ湅璁惧浜岀淮鐮佹寜閽�")
@GetMapping("/showDeviceQrCodeButton")
- public void 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));
}
@@ -137,8 +138,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,8 +151,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("/鏁伴噰-鏁版嵁閲囬泦")
+ @PostMapping("/dataCollection1")
+ public Result<?> dataCollection1(HttpServletRequest request, @RequestBody DeviceCollectionDto dto) {
+ return deviceService.dataCollection1(request, dto);
}
@ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
@@ -167,6 +174,12 @@
return dataConfigService.queryDataAcquisitionConfiguration(dataConfig);
}
+ @ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
+ @GetMapping("/queryDataAcquisitionConfigurationTwo")
+ public Result<?> queryDataAcquisitionConfigurationTwo(DataConfig dataConfig) {
+ return dataConfigService.queryDataAcquisitionConfigurationTwo(dataConfig);
+ }
+
@ApiOperation(value = "鍒犻櫎鏁伴噰閰嶇疆")
@DeleteMapping("/deleteDataAcquisitionConfiguration")
@@ -176,7 +189,6 @@
dataConfigService.removeBatchByIds(collect);
return Result.success();
}
-
@ApiOperation(value = "宸︿晶璁惧鏍戝舰鏍�")
@@ -189,7 +201,7 @@
@ApiOperation(value = "璁惧妗ｆ瀵煎嚭")
@GetMapping("/exportDeviceFile")
public void exportDeviceFile(@RequestParam Integer deviceId, HttpServletResponse response) throws Exception {
- deviceService.exportDeviceFile(deviceId,response);
+ deviceService.exportDeviceFile(deviceId, response);
}
@ApiOperation(value = "浠櫒璁惧涓�瑙堣〃瀵煎嚭")
@@ -200,11 +212,12 @@
/**
* 瀵煎叆璁惧
+ *
* @return
*/
@ApiOperation(value = "瀵煎叆璁惧")
@PostMapping("/importDevice")
- public Result importDevice(@RequestParam("file") MultipartFile file){
+ public Result importDevice(@RequestParam("file") MultipartFile file) {
try {
EasyExcel.read(file.getInputStream(), Device.class, new DeviceListener(deviceService))
.registerConverter(new LocalDateTimeStringConverters())
@@ -218,7 +231,7 @@
@ApiOperation(value = "鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�")
@GetMapping("/determineWhetherToCollectData")
- public Result<?> determineWhetherToCollectData(@RequestParam(value = "managementNumber",defaultValue = "") String managementNumber, HttpServletRequest request) {
+ public Result<?> determineWhetherToCollectData(@RequestParam(value = "managementNumber", defaultValue = "") String managementNumber, HttpServletRequest request) {
return deviceService.determineWhetherToCollectData(managementNumber, request);
}
}
--
Gitblit v1.9.3