From 68f6642d4d1fff10c6bd898d69dd7bff27adbc16 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 24 九月 2023 15:18:29 +0800
Subject: [PATCH] 修改2.0 9.24
---
inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java
index eb96345..dc31efe 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java
@@ -22,7 +22,7 @@
* @author zss
* @since 2023-08-01 13:52:30
*/
-@Api(tags = "QMS绠＄悊-->鍘熸潗鏂欐楠�-->妫�楠岄」鐩�")
+@Api(tags = "QMS绠＄悊-->鍘熸潗鏂欐楠�")
@RestController
@RequestMapping("/rawInsProduct")
public class RawInsProductController {
@@ -36,30 +36,36 @@
@Resource
Jwt jwt;
- @ApiOperation(value = "鏌ヨ鎵�鏈夎澶�")
+ @ApiOperation(value = "閫夋嫨妫�楠岃澶�")
@GetMapping("/selectDevice")
public Result selectDevice() {
- return Result.success(deviceService.selectDevice());
+ return Result.success(deviceService.chooseDevice());
}
- @ApiOperation("閫夋嫨璁惧淇℃伅")
+ @ApiOperation(value = "鏇存柊妫�楠岄」鐩�(濉啓妫�楠屽��,妫�楠岃澶�)")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "璁惧ID", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "rpId", value = "鍘熸潗鏂欐楠岄」鐩甶d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "testValue", value = "妫�娴嬪��", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "DevId", value = "璁惧id", dataTypeClass = Integer.class,required = true)
})
- @GetMapping("/selectDeviceById")
- public Result selectDeviceById(Integer id) {
- return Result.success( deviceService.getDeviceNameById(id));
- }
-
-
- @ApiOperation(value = "鏇存柊妫�楠岄」鐩�")
@PostMapping("/updaterawInsProduct")
- public Result updaterawInsProduct(@RequestHeader("token") String token, @RequestBody RawInsProduct rawInsProduct) throws Exception {
+ public Result updaterawInsProduct(@RequestHeader("token") String token,Integer rpId ,String testValue,Integer devId) throws Exception {
Map<String, String> map = jwt.readJWT(token);
String data = map.get("data");
JSONObject jsonObject = new JSONObject(data);
int userId = Integer.parseInt(jsonObject.getString("id"));
- rawInsProductService.updaterawInsProduct(userId,rawInsProduct);
+ rawInsProductService.updaterawInsProduct(userId,rpId,testValue,devId);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鏇存敼璁惧")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "rpId", value = "鍘熸潗鏂欐楠岄」鐩甶d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "DevId", value = "璁惧id", dataTypeClass = Integer.class,required = true)
+ })
+ @PostMapping("/updateDevByRpId")
+ public Result updateDevByRpId(Integer rpId ,Integer devId) {
+ rawInsProductService.updateDevByRpId(rpId,devId);
return Result.success();
}
}
--
Gitblit v1.9.3