From 0d930cdcf56bb92e67afabf45ec860689baf0282 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 十二月 2024 13:07:22 +0800
Subject: [PATCH] 人员修改
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 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 2725613..4754723 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
@@ -7,10 +7,8 @@
import com.yuanchu.mom.dto.DataConfigDto;
import com.yuanchu.mom.dto.DeviceDto;
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.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
@@ -47,8 +45,16 @@
@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 = "鏌ヨ璁惧璇︽儏鍒楄〃")
@@ -203,13 +209,6 @@
}
- @ValueClassify("璁惧")
- @ApiOperation(value = "娓╁害寰幆鏁伴噰")
- @PostMapping("/temDataAcquisition")
- public Result<?> temDataAcquisition(@RequestBody PkMaster pkMaster) {
- return Result.success(pkMasterService.temDataAcquisition(pkMaster));
- }
-
@ApiOperation(value = "宸︿晶璁惧鏍戝舰鏍�")
@GetMapping("/treeDevice")
@ValueAuth
@@ -217,11 +216,4 @@
return Result.success(deviceService.treeDevice(deviceName));
}
-
- @ApiOperation(value = "娓╁害寰幆鏁伴噰鎬讳綋")
- @PostMapping("/temDataAcquisition2")
- @ValueAuth
- public Result<?> temDataAcquisition2(@RequestBody PkMaster pkMaster) {
- return Result.success(pkMasterService.temDataAcquisition2(pkMaster));
- }
}
\ No newline at end of file
--
Gitblit v1.9.3