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 | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 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 ce99c4d..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
@@ -1,13 +1,15 @@
package com.sandu.ximon.admin.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.LEDProgramParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.LEDProgram;
-import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.LEDProgramMapper;
import lombok.AllArgsConstructor;
+import nova.traffic.utils.NovaTraffic;
import org.springframework.stereotype.Service;
@Service
@@ -19,11 +21,12 @@
public boolean addProgram(LEDProgramParam receiveParam) {
LEDProgram led = new LEDProgram();
- if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getClientId())) {
- led.setUserId(SecurityUtils.getUserId());
- }
+ led.setUserId(SecurityUtils.getClientId());
+ led.setPixel(receiveParam.getPixel());
+ led.setSize(receiveParam.getSize());
led.setName(receiveParam.getName());
led.setKind(receiveParam.getKind());
+ led.setProgramBase64(receiveParam.getProgramBase64());
return save(led);
}
@@ -38,15 +41,12 @@
LEDProgram led = new LEDProgram();
led.setId(receiveParam.getId());
- led.setUserId(SecurityUtils.getClientId());
+ //led.setUserId(SecurityUtils.getClientId());
+ led.setPixel(receiveParam.getPixel());
+ led.setSize(receiveParam.getSize());
led.setName(receiveParam.getName());
led.setKind(receiveParam.getKind());
- if (receiveParam.getPixel() != null) {
- led.setPixel(receiveParam.getPixel());
- }
- if (receiveParam.getSize() != null) {
- led.setSize(receiveParam.getSize());
- }
+ led.setProgramBase64(receiveParam.getProgramBase64());
return updateById(led);
}
@@ -62,4 +62,28 @@
}
+ public LambdaQueryWrapper<LEDProgram> listProgram() {
+ // 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 Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId,SecurityUtils.getClientId());
+ }else {
+ 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