From b2c291bf6fef5f485330131354a3aea6aa58882c Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 14 三月 2022 11:48:55 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 2 +-
dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java | 3 ---
ximon-admin/src/test/java/com/sandu/ximon/admin/tests/LedSFileControllerTests.java | 10 ++++------
ximon-admin/src/main/resources/application-dev.yml | 5 ++++-
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
index 2beb140..961bfcf 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
@@ -85,9 +85,6 @@
@TableField(exist = false)
private Long streetlightId;
- @TableField(exist = false)
- private String poleName;
-
/**
*
*/
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
index 46dbea4..c0664d0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -257,7 +257,7 @@
bind -> {
if (bind.getDeviceCode() != null && led.getLightemitControlCode().equals(bind.getDeviceCode())) {
led.setStreetlightId(bind.getPoleId());
- led.setPoleName(poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, bind.getPoleId())).getPoleName());
+ led.setStreetlightName(poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, bind.getPoleId())).getPoleName());
}
}
);
diff --git a/ximon-admin/src/main/resources/application-dev.yml b/ximon-admin/src/main/resources/application-dev.yml
index d1bab03..ae1ed17 100644
--- a/ximon-admin/src/main/resources/application-dev.yml
+++ b/ximon-admin/src/main/resources/application-dev.yml
@@ -14,7 +14,7 @@
password: Sandu.520.ifzdm # Redis鏈嶅姟鍣ㄨ繛鎺ュ瘑鐮侊紙榛樿涓虹┖锛�
timeout: 300ms # 杩炴帴瓒呮椂鏃堕棿锛堟绉掞級
server:
- port: 8080
+ port: 20017
sandu:
jwt:
header: Authorization
@@ -36,4 +36,7 @@
quartz:
enable: true
+listenter:
+ isOpen: false
+
diff --git a/ximon-admin/src/test/java/com/sandu/ximon/admin/tests/LedSFileControllerTests.java b/ximon-admin/src/test/java/com/sandu/ximon/admin/tests/LedSFileControllerTests.java
index 4c66bed..dd2ce6b 100644
--- a/ximon-admin/src/test/java/com/sandu/ximon/admin/tests/LedSFileControllerTests.java
+++ b/ximon-admin/src/test/java/com/sandu/ximon/admin/tests/LedSFileControllerTests.java
@@ -1,8 +1,6 @@
package com.sandu.ximon.admin.tests;
import com.sandu.ximon.admin.base.BaseTest;
-import com.sun.activation.registries.MailcapFile;
-import org.junit.Test;
/**
* @Author liuhaonan
@@ -10,8 +8,8 @@
* @Version 1.0
*/
public class LedSFileControllerTests extends BaseTest {
- @Test
- public void testAdd() throws Exception {
- checkPost("/v1/xixun/file/add",new MailcapFile("aaa.jpg"));
- }
+// @Test
+// public void testAdd() throws Exception {
+// checkPost("/v1/xixun/file/add",new MailcapFile("aaa.jpg"));
+// }
}
--
Gitblit v1.9.3