From a3ba94e23fec4281502a94221f65cc0567eb02a8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 11 七月 2024 16:57:16 +0800
Subject: [PATCH] 温度循环报告完成
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 17cd875..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,23 +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.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;
@@ -96,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<>();
@@ -130,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