From d58e983ad7dec5672e0562f020b3a457614e0983 Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期五, 07 三月 2025 11:37:20 +0800
Subject: [PATCH] 监测平台后端提交
---
src/main/java/com/hxzkmonitor/controller/TbUserController.java | 2 +-
src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java | 2 +-
src/main/resources/application.yml | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java b/src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java
index 33c5ba0..ce25004 100644
--- a/src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java
+++ b/src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java
@@ -65,7 +65,7 @@
}
@PostMapping("/api/addorupEquipment")
- public R addorupEquipment(TbEquipment tbEquipment) {
+ public R addorupEquipment(TbEquipment tbEquipment) throws Exception{
if (tbEquipmentService.addorupEquipment(tbEquipment) == -1) {
return R.failed("褰撳墠缂栧彿宸插瓨鍦�");
} else {
diff --git a/src/main/java/com/hxzkmonitor/controller/TbUserController.java b/src/main/java/com/hxzkmonitor/controller/TbUserController.java
index c0eff8f..4b704af 100644
--- a/src/main/java/com/hxzkmonitor/controller/TbUserController.java
+++ b/src/main/java/com/hxzkmonitor/controller/TbUserController.java
@@ -89,7 +89,7 @@
}
- if (tbUser.getId()!=null){
+ if (tbUser.getId()==null){
TbUser phone = tbUserService.findPhoneUser(tbUser.getAdminphone());
if (phone==null){
return R.ok(tbUserService.addorupUser(tbUser));
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ba93043..a02b402 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -48,12 +48,12 @@
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://192.168.31.112:3306/hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
- url: jdbc:mysql:///hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://192.168.31.98:3306/hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql:///hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
username: root
# password: hxzk20151102
-# password: 123456
- password: blueiot
+ password: 123456
+# password: blueiot
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
--
Gitblit v1.9.3