From 54cd0ca82059cdad4e9ee5b9b1c7164d443ab46f Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 11 二月 2022 11:26:52 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java | 60 ++++++++++++++++++++----------------------------------------
1 files changed, 20 insertions(+), 40 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..028fdfa 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,5 +1,6 @@
package com.sandu.ximon.admin.service;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
@@ -9,50 +10,45 @@
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.setWidth(receiveParam.getWidth());
+ led.setHeight(receiveParam.getHeight());
+ led.setPages(JSON.toJSONString(receiveParam.getPages()));
return save(led);
}
- public boolean updateProgram(LEDProgramParam receiveParam) {
+ public boolean updateProgram(Long pid,LEDProgramParam receiveParam) {
- LEDProgram byId = getById(receiveParam.getId());
+ LEDProgram byId = getById(pid);
if (byId == null) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
LEDProgram led = new LEDProgram();
- led.setId(receiveParam.getId());
+ led.setId(pid);
//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.setWidth(receiveParam.getWidth());
+ led.setHeight(receiveParam.getHeight());
+ led.setPages(JSON.toJSONString(receiveParam.getPages()));
return updateById(led);
}
@@ -69,27 +65,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