From ce5c5e897b288a27f00804b68e73647fdfc5b6a7 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 29 四月 2025 10:15:11 +0800
Subject: [PATCH] 数采，成束释放
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 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 5f0ab10..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
@@ -3,9 +3,8 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.excel.StructureTestObjectData;
-import com.ruoyi.basic.excel.StructureTestObjectListener;
import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.LocalDateTimeStringConverters;
import com.ruoyi.device.dto.DataConfigDto;
import com.ruoyi.device.dto.DeviceCollectionDto;
import com.ruoyi.device.dto.DeviceDto;
@@ -16,7 +15,6 @@
import com.ruoyi.device.service.DeviceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
@@ -27,7 +25,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -56,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));
}
@@ -140,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 = "閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃")
@@ -153,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 = "缁存姢鏁伴噰閰嶇疆")
@@ -170,6 +174,12 @@
return dataConfigService.queryDataAcquisitionConfiguration(dataConfig);
}
+ @ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
+ @GetMapping("/queryDataAcquisitionConfigurationTwo")
+ public Result<?> queryDataAcquisitionConfigurationTwo(DataConfig dataConfig) {
+ return dataConfigService.queryDataAcquisitionConfigurationTwo(dataConfig);
+ }
+
@ApiOperation(value = "鍒犻櫎鏁伴噰閰嶇疆")
@DeleteMapping("/deleteDataAcquisitionConfiguration")
@@ -179,7 +189,6 @@
dataConfigService.removeBatchByIds(collect);
return Result.success();
}
-
@ApiOperation(value = "宸︿晶璁惧鏍戝舰鏍�")
@@ -192,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 = "浠櫒璁惧涓�瑙堣〃瀵煎嚭")
@@ -203,17 +212,26 @@
/**
* 瀵煎叆璁惧
+ *
* @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)).sheet().doRead();
+ EasyExcel.read(file.getInputStream(), Device.class, new DeviceListener(deviceService))
+ .registerConverter(new LocalDateTimeStringConverters())
+ .sheet().doRead();
} catch (IOException e) {
// 杩欓噷鍙互鏍规嵁瀹為檯鎯呭喌杩涜鏇村畬鍠勭殑閿欒澶勭悊锛屾瘮濡傝褰曟棩蹇楃瓑
System.err.println("璇诲彇鏂囦欢鏃跺彂鐢熼敊璇�: " + e.getMessage());
}
return Result.success();
}
+
+ @ApiOperation(value = "鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�")
+ @GetMapping("/determineWhetherToCollectData")
+ public Result<?> determineWhetherToCollectData(@RequestParam(value = "managementNumber", defaultValue = "") String managementNumber, HttpServletRequest request) {
+ return deviceService.determineWhetherToCollectData(managementNumber, request);
+ }
}
--
Gitblit v1.9.3