From bc672038e88a24d9f0f7127cd45c656a15c231a2 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 09 八月 2023 09:10:49 +0800
Subject: [PATCH] MOM系统-8-9
---
standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index e408098..7a1724a 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -1,20 +1,17 @@
package com.yuanchu.mom.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yuanchu.mom.pojo.Device;
-import com.yuanchu.mom.pojo.dto.ProductDto;
import com.yuanchu.mom.service.DeviceService;
+import com.yuanchu.mom.service.RawInsProductService;
+import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@@ -35,6 +32,12 @@
@Autowired
private DeviceService deviceService;
+ @Autowired
+ private UserService userService;
+
+ @Autowired
+ private RawInsProductService rawInsProductService;
+
@ApiOperation(value = "鐐瑰嚮琛ㄦ牸涓殑閫夋嫨")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "deviceGroup", value = "璁惧缁�", dataTypeClass = String.class, required = true)
@@ -44,4 +47,50 @@
Map<String, Object> map = deviceService.selectTechnology(deviceGroup);
return Result.success(map);
}
+
+ @ApiOperation(value = "鏂板浠櫒璁惧", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
+ @PostMapping("/add")
+ public Result<?> addDevice(@RequestBody Device device){
+ Boolean isUpdateSuccess = deviceService.addDevice(device);
+ if (isUpdateSuccess){
+ return Result.success("娣诲姞鎴愬姛锛�");
+ }
+ return Result.fail("娣诲姞澶辫触锛�");
+ }
+
+ @ApiOperation(value = "鏂板浠櫒璁惧锛氫繚绠′汉涓嬫媺妗�", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
+ @GetMapping("/list_user")
+ public Result<?> selectUserIdAndName(){
+ List<Map<String, Object>> maps = userService.listUserIdAndName();
+ return Result.success(maps);
+ }
+
+ @ApiOperation(value = "浜岀骇鏍�", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = String.class)
+ })
+ @GetMapping("/two_tree")
+ public Result<?> deviceTwoTree(@RequestParam(defaultValue = "1") Integer type){
+ List<Map<String, Object>> mapList= deviceService.deviceTwoTree(type);
+ return Result.success(mapList);
+ }
+
+ @ApiOperation(value = "鏂板浠櫒璁惧锛氭楠岄」鐩笅鎷夋", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
+ @GetMapping("/listInspect")
+ public Result<?> selectInspectIdAndName(){
+ List<Map<String, Object>> mapList = rawInsProductService.selectInspectIdAndName();
+ return Result.success(mapList);
+ }
+
+ @ApiOperation(value = "鏂板浠櫒璁惧锛氭楠岄」鐩笅鎷夋", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageNo", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "codeOrNameOrModel", value = "缂栧彿鍚嶇О瑙勬牸鍨嬪彿", dataTypeClass = String.class)
+ })
+ @GetMapping("/page")
+ public Result<?> selectPageDevice(Integer pageNo, Integer pageSize, String codeOrNameOrModel){
+ IPage<Map<String, Object>> mapList = rawInsProductService.selectPageDevice(pageNo, pageSize, codeOrNameOrModel);
+ return Result.success(mapList);
+ }
}
--
Gitblit v1.9.3