From 4696fd707f1c723970eac62d333588b51dffbd2b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 04 七月 2024 12:37:16 +0800
Subject: [PATCH] 检验对象导入完成
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 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 3d93f74..a0e7e8c 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
@@ -1,25 +1,26 @@
package com.yuanchu.mom.controller;
-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.dto.DeviceDto1;
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 org.springframework.beans.BeanUtils;
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.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;
@@ -30,14 +31,13 @@
@RestController
@RequestMapping("/deviceScope")
public class DeviceController {
-
-
@Resource
private DeviceService deviceService;
@Value("${file.path}")
private String filePath;
- @ValueClassify("璁惧宸ュ叿鏄庣粏")
+
+ @ValueClassify("璁惧")
@ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
@PostMapping("/selectDeviceParameter")
public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -45,19 +45,19 @@
DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
}
- @ValueClassify("璁惧宸ュ叿鏄庣粏")
+ @ValueClassify("璁惧")
@ApiOperation(value = "娣诲姞璁惧璇︽儏鍙傛暟")
@PostMapping("/addDeviceParameter")
public Result addDeviceParameter(@RequestBody Device itemParameter) {
return Result.success(deviceService.addDeviceParameter(itemParameter));
}
- @ValueClassify("璁惧宸ュ叿鏄庣粏")
+ @ValueClassify("璁惧")
@ApiOperation(value = "鍒犻櫎璁惧璇︽儏鍙傛暟")
@PostMapping("/delDeviceParameter")
public Result<?> delDeviceParameter(Integer id) {
return Result.success(deviceService.delDeviceParameter(id));
}
- @ValueClassify("璁惧宸ュ叿鏄庣粏")
+ @ValueClassify("璁惧")
@ApiOperation(value = "淇敼璁惧璇︽儏鍙傛暟")
@PostMapping("/upDeviceParameter")
public Result<?> upDeviceParameter(@RequestBody Device itemParameter) {
@@ -88,6 +88,7 @@
//鍥剧墖涓婁紶
@ApiOperation(value = "璁惧鍥剧墖涓婁紶")
@PostMapping("/uploadFile")
+ @ValueAuth
public Result uploadFile(MultipartFile file) {
String urlString;
String pathName;
@@ -98,7 +99,7 @@
if (!realpath.exists()) {
realpath.mkdirs();
}
- pathName = UUID.randomUUID() + "_" + file.getOriginalFilename();
+ pathName = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMdd")) + "-" + file.getOriginalFilename();
urlString = realpath + "/" + pathName;
file.transferTo(new File(urlString));
HashMap<String, String> map = new HashMap<>();
@@ -132,5 +133,23 @@
public Result selectDeviceByCode(String code) {
return Result.success(deviceService.selectDeviceByCode(code));
}
+
+ @ValueClassify("璁惧")
+ @ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
+ @PostMapping("/getNumberCollect")
+ public Result<?> getNumberCollect(Integer id) {
+ DeviceDto1 deviceDto1 = new DeviceDto1();
+ BeanUtils.copyProperties(deviceService.getById(id),deviceDto1);
+ return Result.success(deviceDto1);
+ }
+
+ @ValueClassify("璁惧")
+ @ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
+ @PostMapping("/numberCollect")
+ public Result<?> numberCollect(@RequestBody DeviceDto1 deviceDto1) {
+ Device device = new Device();
+ BeanUtils.copyProperties(deviceDto1,device);
+ return Result.success(deviceService.updateById(device));
+ }
}
--
Gitblit v1.9.3