From 0e2e829f10a5e5b239d6583d6be3afbcaed0dcc0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 31 七月 2024 17:58:30 +0800
Subject: [PATCH] PK8000处理调试+各种bug调试优化
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 63 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 9 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 6a73257..3b65002 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
@@ -10,8 +10,11 @@
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;
@@ -48,6 +51,9 @@
@Autowired
private DataConfigService dataConfigService;
+ @Autowired
+ private PkMasterService pkMasterService;
+
@ValueClassify("璁惧")
@ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
@PostMapping("/selectDeviceParameter")
@@ -56,18 +62,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")
@@ -168,19 +177,21 @@
@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);
}
@ValueAuth
@ApiOperation(value = "鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�")
@GetMapping("/determineWhetherToCollectData")
- public Result<?> determineWhetherToCollectData(@RequestParam("managementNumber") String managementNumber) {
+ 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::getManagementNumber, managementNumber)
+ .eq(Device::getIp, ip));
if (ObjectUtils.isEmpty(device)) {
- return Result.fail("璁惧缂栧彿閿欒锛�");
+ return Result.success(false);
}
if (ObjectUtils.isEmpty(device.getFileType()) || ObjectUtils.isEmpty(device.getCollectUrl())) {
return Result.success(false);
@@ -199,7 +210,9 @@
device.setCollectUrl(dataConfigList.getCollectUrl());
device.setStorageUrl(dataConfigList.getStorageUrl());
device.setIp(dataConfigList.getIp());
- device.setFileType(device.getFileType());
+ device.setFileType(dataConfigList.getFileType());
+ device.setMdbEntrustCode(dataConfigList.getMdbEntrustCode());
+ device.setMdbSampleCode(dataConfigList.getMdbSampleCode());
deviceService.updateById(device);
} else {
dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
@@ -222,11 +235,13 @@
@GetMapping("/queryDataAcquisitionConfiguration")
public Result<?> queryDataAcquisitionConfiguration(@RequestParam("deviceId") Integer deviceId,
@RequestParam("isDevice") Boolean isDevice,
- @RequestParam(value = "insProductItem", required = false) String insProductItem) {
+ @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::getInsProductItem, insProductItem));
+ .eq(DataConfig::getDeviceId, deviceId)
+ .eq(DataConfig::getInspectionItem, inspectionItem)
+ .eq(DataConfig::getInspectionItemSubclass, inspectionItemSubclass));
return Result.success(list);
} else {
return Result.success(dataConfigService.selectDataConfigList(deviceId));
@@ -242,5 +257,35 @@
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));
+ }
}
--
Gitblit v1.9.3