From b5dbf63b29317422cda4005c17f22a6c06b28289 Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期五, 08 三月 2024 12:43:39 +0800
Subject: [PATCH] 6 设备工具明细 功能调整
---
system-run/src/main/resources/application-dev.yml | 4 ++--
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 1 +
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 1 -
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 5 ++---
4 files changed, 5 insertions(+), 6 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 98b92c8..fee39a8 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
@@ -10,7 +10,6 @@
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
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;
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index 317afd5..a5d0e97 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -132,15 +132,14 @@
@ApiModelProperty(value = "鏍″噯璇佷功")
private String calibrationCerticate;
- @ValueTableShow(27)
@ApiModelProperty(value = "鐘舵��")
private Integer status;
- @ValueTableShow(28)
+ @ValueTableShow(27)
@ApiModelProperty(value = "鍥剧墖涓婁紶")
private String imageUpload;
- @ValueTableShow(29)
+ @ValueTableShow(28)
@ApiModelProperty(value = "鍥剧墖澶囨敞")
private String imageName;
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 42b0aa6..8b6882a 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -18,7 +18,7 @@
# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
file:
- path: D:/Download
+ path: /Users/gaoaoy/webapp/images
# 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
allowed: png,jpg,jpeg,gif
@@ -59,7 +59,7 @@
# redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
database: 0
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
- host: 127.0.0.1
+ host: 192.168.0.134
# redis绔彛锛堥粯璁や负6379锛�
port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index 5e3ecf2..1504f8d 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -141,6 +141,7 @@
}
//鑾峰彇璁惧璐熻矗浜�
+ @ValueAuth
@ApiOperation(value = "鑾峰彇璁惧璐熻矗浜�")
@GetMapping("/getDeviceManager")
public Result<?> getDeviceManager() {
--
Gitblit v1.9.3