From db2b41de1911ec09bb3567c4d85b029ce9a356ca Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 08 五月 2024 07:27:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 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 4536e8b..9ad8cfc 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
@@ -4,16 +4,21 @@
import cn.hutool.core.lang.UUID;
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.DeviceDto;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.utils.JackSonUtil;
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 lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
@@ -22,34 +27,35 @@
* 璁惧(DeviceController)琛ㄦ帶鍒跺眰
*/
@Api(tags = "璁惧")
-@AllArgsConstructor
@RestController
@RequestMapping("/deviceScope")
public class DeviceController {
-
-
+ @Resource
private DeviceService deviceService;
+ @Value("${file.path}")
+ private String filePath;
+ @ValueAuth
@ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
@PostMapping("/selectDeviceParameter")
public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- Device itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Device.class);
+ 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")
public Result<?> upDeviceParameter(@RequestBody Device itemParameter) {
@@ -78,16 +84,15 @@
}
//鍥剧墖涓婁紶
- @ApiOperation(value = "鍥剧墖涓婁紶")
+ @ApiOperation(value = "璁惧鍥剧墖涓婁紶")
@PostMapping("/uploadFile")
+ @ValueAuth
public Result uploadFile(MultipartFile file) {
-
- System.out.println(file.getOriginalFilename());
- String urlString = null;
- String pathName = null;
+ String urlString;
+ String pathName;
String filename = file.getOriginalFilename();
try {
- String path = "/Users/gaoaoy/webapp/images";
+ String path = filePath;
File realpath = new File(path);
if (!realpath.exists()) {
realpath.mkdirs();
@@ -95,7 +100,6 @@
pathName = UUID.randomUUID() + "_" + file.getOriginalFilename();
urlString = realpath + "/" + pathName;
file.transferTo(new File(urlString));
- System.out.println(pathName);
HashMap<String, String> map = new HashMap<>();
map.put("name", filename);
map.put("url", pathName);
@@ -113,5 +117,19 @@
public Result selectDevicePrincipal() {
return Result.success(deviceService.selectDevicePrincipal());
}
+
+ @ApiOperation(value = "閫氳繃椤圭洰鑾峰彇璁惧鍒楄〃")
+ @PostMapping("/selectDeviceByCategory")
+ @ValueAuth
+ public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass) {
+ return Result.success(deviceService.selectDeviceByCategory(inspectionItem, inspectionItemSubclass));
+ }
+
+ @ApiOperation(value = "閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃")
+ @PostMapping("/selectDeviceByCode")
+ @ValueAuth
+ public Result selectDeviceByCode(String code) {
+ return Result.success(deviceService.selectDeviceByCode(code));
+ }
}
--
Gitblit v1.9.3