From a0765e814de4526fdd4d949d7e34fcd7e8529ced Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 02 八月 2024 23:11:07 +0800
Subject: [PATCH] 数采调整·完成
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 122 ++++++++++++++++------------------------
1 files changed, 50 insertions(+), 72 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 71f8b14..103fa68 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,19 +1,16 @@
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.exception.ErrorException;
-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.utils.DataAcquisition;
+import com.yuanchu.mom.service.PkMasterService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
@@ -50,6 +47,9 @@
@Autowired
private DataConfigService dataConfigService;
+ @Autowired
+ private PkMasterService pkMasterService;
+
@ValueClassify("璁惧")
@ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
@PostMapping("/selectDeviceParameter")
@@ -58,18 +58,21 @@
DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
}
+
@ValueClassify("璁惧")
@ApiOperation(value = "娣诲姞璁惧璇︽儏鍙傛暟")
@PostMapping("/addDeviceParameter")
public Result addDeviceParameter(@RequestBody Device itemParameter) {
return Result.success(deviceService.addDeviceParameter(itemParameter));
}
+
@ValueClassify("璁惧")
@ApiOperation(value = "鍒犻櫎璁惧璇︽儏鍙傛暟")
@PostMapping("/delDeviceParameter")
public Result<?> delDeviceParameter(Integer id) {
return Result.success(deviceService.delDeviceParameter(id));
}
+
@ValueClassify("璁惧")
@ApiOperation(value = "淇敼璁惧璇︽儏鍙傛暟")
@PostMapping("/upDeviceParameter")
@@ -147,31 +150,13 @@
return Result.success(deviceService.selectDeviceByCode(code));
}
-// @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("璁惧")
@ApiOperation("/鏁伴噰-鏁版嵁閲囬泦")
@GetMapping("/dataCollection")
public Result<?> dataAcquisition(HttpServletRequest request, @RequestParam("id") Integer id,
- @RequestParam("entrustCode") String entrustCode,
- @RequestParam("sampleCode") String sampleCode) {
+ @RequestParam("entrustCode") String entrustCode,
+ @RequestParam("sampleCode") String sampleCode) {
return deviceService.dataAcquisition(request, id, entrustCode, sampleCode);
}
@@ -179,52 +164,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 one = deviceService.getOne(Wrappers.<Device>lambdaQuery()
- .eq(Device::getIp, dataConfigList.getIp()));
- if (ObjectUtils.isNotEmpty(one)) {
- throw new ErrorException("璇P锛�" + dataConfigList.getIp() + "宸茬粡缁戝畾浜嗚澶囷細" + one.getDeviceName());
- }
- Device device = new Device();
- device.setId(deviceId);
- device.setCollectUrl(dataConfigList.getCollectUrl());
- device.setStorageUrl(dataConfigList.getStorageUrl());
- device.setIp(dataConfigList.getIp());
- device.setFileType(dataConfigList.getFileType());
- 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 = "鏌ヨ鏁伴噰閰嶇疆")
@@ -233,15 +182,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("璁惧")
@@ -253,5 +194,42 @@
dataConfigService.removeBatchByIds(collect);
return Result.success();
}
+
+ @ValueAuth
+ @ApiOperation(value = "鑿滃崟")
+ @PostMapping("/menu")
+ public Result menu() {
+ return Result.success(deviceService.menu());
+ }
+
+
+ @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 = "娓╁害寰幆鏁伴噰鎬讳綋")
+ @PostMapping("/temDataAcquisition2")
+ @ValueAuth
+ public Result<?> temDataAcquisition2(@RequestBody PkMaster pkMaster) {
+ return Result.success(pkMasterService.temDataAcquisition2(pkMaster));
+ }
+
+ @ApiOperation(value = "鏁伴噰-鍏紡璁＄畻")
+ @PostMapping("/formulaCalculation")
+ @ValueAuth
+ public Result<?> formulaCalculation(@RequestBody Map<String, Object> map) {
+ return Result.success(deviceService.formulaCalculation(map));
+ }
}
--
Gitblit v1.9.3