From bdd0c41e7a022604d8c1cfd03559dfbc65481366 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期五, 17 十二月 2021 18:15:43 +0800
Subject: [PATCH] Merge branch 'master' of http://112.74.63.130:8088/r/XimengPole/XMPoleManager
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
index 711606e..6e31dca 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
@@ -9,6 +9,7 @@
import com.sandu.ximon.dao.domain.LEDProgram;
import com.sandu.ximon.dao.mapper.LEDProgramMapper;
import lombok.AllArgsConstructor;
+import nova.traffic.utils.NovaTraffic;
import org.springframework.stereotype.Service;
@Service
@@ -62,20 +63,27 @@
public LambdaQueryWrapper<LEDProgram> listProgram() {
- LambdaQueryWrapper<LEDProgram> wrapper= new LambdaQueryWrapper<>();
+ // LambdaQueryWrapper<LEDProgram> wrapper= new LambdaQueryWrapper<>();
/* if(SecurityUtils.getClientId()!=null){
return list(Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId, SecurityUtils.getClientId()));
}else {
return list(Wrappers.lambdaQuery(LEDProgram.class));
}*/
if(SecurityUtils.getClientId()!=null){
- return wrapper=Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId,SecurityUtils.getClientId());
+ return Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId,SecurityUtils.getClientId());
}else {
- return wrapper=Wrappers.lambdaQuery(LEDProgram.class);
+ return Wrappers.lambdaQuery(LEDProgram.class);
}
}
+ public void NovaTraffic(String ip, int port){
+ NovaTraffic novaTraffic = new NovaTraffic("192.168.0.220", 5000);
+
+
+
+ }
+
}
--
Gitblit v1.9.3