From 58568157827e900d0bfb32efdd31ea1bf9254e5c Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 21 十二月 2021 15:41:13 +0800
Subject: [PATCH] LED节目完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java |   49 ++++++++++++-------------------------------------
 1 files changed, 12 insertions(+), 37 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 6dc208a..54112b9 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,31 +9,24 @@
 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
 @AllArgsConstructor
 public class LEDProgramService extends BaseServiceImpl<LEDProgramMapper, LEDProgram> {
 
-    private final LEDProgramMapper ledProgramMapper;
+
 
     public boolean addProgram(LEDProgramParam receiveParam) {
-  //  public boolean addProgram(String name,Integer kind,String url ) {
 
         LEDProgram led = new LEDProgram();
         led.setUserId(SecurityUtils.getClientId());
-        led.setPixel(receiveParam.getPixel());
-        led.setSize(receiveParam.getSize());
+        if (SecurityUtils.getClientId() != null) {
+            led.setUserName(SecurityUtils.getUsername());
+        }
         led.setName(receiveParam.getName());
-        led.setKind(receiveParam.getKind());
-        led.setProgramBase64(receiveParam.getProgramBase64());
-      /*  LEDProgram led = new LEDProgram();
-        led.setUserId(SecurityUtils.getClientId());
-        led.setName(name);
-        led.setKind(kind);
-        led.setProgramBase64(url);*/
-
+        led.setPreview(receiveParam.getPreviewUrl());
+        led.setPages(receiveParam.getPages());
         return save(led);
     }
 
@@ -48,11 +41,9 @@
         LEDProgram led = new LEDProgram();
         led.setId(receiveParam.getId());
         //led.setUserId(SecurityUtils.getClientId());
-        led.setPixel(receiveParam.getPixel());
-        led.setSize(receiveParam.getSize());
         led.setName(receiveParam.getName());
-        led.setKind(receiveParam.getKind());
-        led.setProgramBase64(receiveParam.getProgramBase64());
+        led.setPreview(receiveParam.getPreviewUrl());
+        led.setPages(receiveParam.getPages());
         return updateById(led);
     }
 
@@ -69,27 +60,11 @@
 
 
     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);
+        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