From 51ec98113c6d49d0f7eec4e3c030e55e337e97db Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 五月 2025 15:47:16 +0800
Subject: [PATCH] 芯导软件（江苏）有限公司 delete
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 117 +++++++++++++++++-----------------------------------------
1 files changed, 34 insertions(+), 83 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 96dd926..959a9a5 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -1,20 +1,14 @@
package com.yuanchu.mom.controller;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.DataConfigDto;
import com.yuanchu.mom.dto.DeviceDto;
-import com.yuanchu.mom.pojo.DataConfig;
import com.yuanchu.mom.pojo.Device;
-import com.yuanchu.mom.pojo.PkMaster;
import com.yuanchu.mom.service.DataConfigService;
import com.yuanchu.mom.service.DeviceService;
-import com.yuanchu.mom.service.PkMasterService;
-import com.yuanchu.mom.utils.DataAcquisition;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
@@ -26,6 +20,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -51,16 +46,24 @@
@Autowired
private DataConfigService dataConfigService;
- @Autowired
- private PkMasterService pkMasterService;
+ /**
+ * 鑾峰彇浜哄憳淇℃伅
+ * @return
+ * @throws Exception
+ */
+ @ValueAuth
+ @GetMapping("/selectUserList")
+ public Result selectUserList() {
+ return Result.success(deviceService.selectUserList());
+ }
@ValueClassify("璁惧")
@ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
@PostMapping("/selectDeviceParameter")
- public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
+ public Result selectDeviceParameter(@RequestBody Map<String, Object> data,@RequestParam(value = "laboratoryNameIsNull", required = false) Boolean laboratoryNameIsNull) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
- return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
+ return Result.success(deviceService.selectDeviceParameter(page, itemParameter,laboratoryNameIsNull));
}
@ValueClassify("璁惧")
@@ -148,29 +151,11 @@
}
@ApiOperation(value = "閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃")
- @PostMapping("/selectDeviceByCode")
+ @GetMapping("/selectDeviceByCode")
@ValueAuth
- public Result selectDeviceByCode(String code) {
- return Result.success(deviceService.selectDeviceByCode(code));
+ public Result selectDeviceByCode(Integer id) {
+ return Result.success(deviceService.selectDeviceByCode(id));
}
-
-// @ValueClassify("璁惧")
-// @ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
-// @PostMapping("/getNumberCollect")
-// public Result<?> getNumberCollect(Integer id) {
-// DeviceDto1 deviceDto1 = new DeviceDto1();
-// BeanUtils.copyProperties(deviceService.getById(id),deviceDto1);
-// return Result.success(deviceDto1);
-// }
-//
-// @ValueClassify("璁惧")
-// @ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
-// @PostMapping("/numberCollect")
-// public Result<?> numberCollect(@RequestBody DeviceDto1 deviceDto1) {
-// Device device = new Device();
-// BeanUtils.copyProperties(deviceDto1,device);
-// return Result.success(deviceService.updateById(device));
-// }
@ValueAuth
@ValueClassify("璁惧")
@@ -186,49 +171,16 @@
@ApiOperation(value = "鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�")
@GetMapping("/determineWhetherToCollectData")
public Result<?> determineWhetherToCollectData(@RequestParam("managementNumber") String managementNumber, HttpServletRequest request) {
- String ip = DataAcquisition.getIp(request);
- Device device = deviceService.getOne(Wrappers.<Device>lambdaQuery()
- .eq(Device::getManagementNumber, managementNumber)
- .eq(Device::getIp, ip));
- if (ObjectUtils.isEmpty(device)) {
- return Result.success(false);
- }
- if (ObjectUtils.isEmpty(device.getFileType()) || ObjectUtils.isEmpty(device.getCollectUrl())) {
- return Result.success(false);
- } else {
- return Result.success(true);
- }
+ return deviceService.determineWhetherToCollectData(managementNumber, request);
}
@ValueClassify("璁惧")
@ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
@PostMapping("/saveDataAcquisitionConfiguration")
public Result<?> saveDataAcquisitionConfiguration(@RequestParam(value = "deviceId") Integer deviceId, @RequestBody DataConfigDto dataConfigList) {
- if (dataConfigList.getIsDevice()) {
- Device device = new Device();
- device.setId(deviceId);
- device.setCollectUrl(dataConfigList.getCollectUrl());
- device.setStorageUrl(dataConfigList.getStorageUrl());
- device.setIp(dataConfigList.getIp());
- device.setFileType(dataConfigList.getFileType());
- device.setMdbEntrustCode(dataConfigList.getMdbEntrustCode());
- device.setMdbSampleCode(dataConfigList.getMdbSampleCode());
- deviceService.updateById(device);
- } else {
- dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
- }
+ dataConfigService.saveDataAcquisitionConfiguration(deviceId, dataConfigList);
return Result.success();
}
-
-// @ValueClassify("璁惧")
-// @ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
-// @GetMapping("/queryDataAcquisitionConfiguration")
-// public Result<?> queryDataAcquisitionConfiguration(@RequestParam("deviceId") Integer deviceId, @RequestParam("insProductItem") String insProductItem) {
-// List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
-// .eq(DataConfig::getDeviceId, deviceId)
-// .eq(DataConfig::getInsProductItem, insProductItem));
-// return Result.success(list);
-// }
@ValueClassify("璁惧")
@ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
@@ -237,15 +189,7 @@
@RequestParam("isDevice") Boolean isDevice,
@RequestParam(value = "inspectionItem", required = false) String inspectionItem,
@RequestParam(value = "inspectionItemSubclass", required = false) String inspectionItemSubclass) {
- if (isDevice) {
- List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
- .eq(DataConfig::getDeviceId, deviceId)
- .eq(DataConfig::getInspectionItem, inspectionItem)
- .eq(DataConfig::getInspectionItemSubclass, inspectionItemSubclass));
- return Result.success(list);
- } else {
- return Result.success(dataConfigService.selectDataConfigList(deviceId));
- }
+ return dataConfigService.queryDataAcquisitionConfiguration(deviceId, isDevice, inspectionItem, inspectionItemSubclass);
}
@ValueClassify("璁惧")
@@ -266,18 +210,25 @@
}
- @ValueClassify("璁惧")
- @ApiOperation(value = "娓╁害寰幆鏁伴噰")
- @PostMapping("/temDataAcquisition")
- public Result<?> temDataAcquisition(@RequestBody PkMaster pkMaster) {
- return Result.success(pkMasterService.temDataAcquisition(pkMaster));
- }
-
@ApiOperation(value = "宸︿晶璁惧鏍戝舰鏍�")
@GetMapping("/treeDevice")
@ValueAuth
public Result treeDevice(String deviceName) {
return Result.success(deviceService.treeDevice(deviceName));
}
-}
+ @ApiOperation(value = "璁惧妗ｆ瀵煎嚭")
+ @GetMapping("/exportDeviceFile")
+ @ValueAuth
+ public void exportDeviceFile(@RequestParam Integer deviceId, HttpServletResponse response) throws Exception {
+ deviceService.exportDeviceFile(deviceId,response);
+ }
+
+ @ApiOperation(value = "浠櫒璁惧涓�瑙堣〃瀵煎嚭")
+ @GetMapping("/exportEquipmentDetails")
+ @ValueAuth
+ public void exportEquipmentDetails(HttpServletResponse response) throws Exception {
+ deviceService.exportEquipmentDetails(response);
+ }
+
+}
--
Gitblit v1.9.3