From b34d941094d11e21e21a2ceead8a9fdeee640e2d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 11:20:55 +0800
Subject: [PATCH] 列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java | 90 ++++++++++++++++++++++++++------------------
1 files changed, 53 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 6e31dca..7fab106 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,52 +1,56 @@
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.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
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.mapper.LEDProgramMapper;
import lombok.AllArgsConstructor;
-import nova.traffic.utils.NovaTraffic;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service
@AllArgsConstructor
public class LEDProgramService extends BaseServiceImpl<LEDProgramMapper, LEDProgram> {
- private final LEDProgramMapper ledProgramMapper;
+ private final ClientService clientService;
public boolean addProgram(LEDProgramParam receiveParam) {
LEDProgram led = new LEDProgram();
- led.setUserId(SecurityUtils.getClientId());
- led.setPixel(receiveParam.getPixel());
- led.setSize(receiveParam.getSize());
+ led.setUserId(SecurityUtils.getUserId());
+ led.setUserName(SecurityUtils.getUsername());
+ if (clientService.findClientId()) {
+ led.setClientId(clientService.getClientId());
+ }
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 save(led);
}
- public boolean updateProgram(LEDProgramParam receiveParam) {
+ public boolean updateProgram(Long pid, LEDProgramParam receiveParam) {
- LEDProgram byId = getById(receiveParam.getId());
- if (byId == null) {
+ LEDProgram led = getById(pid);
+ if (led == null) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
- 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.setWidth(receiveParam.getWidth());
+ led.setHeight(receiveParam.getHeight());
+ led.setPages(JSON.toJSONString(receiveParam.getPages()));
return updateById(led);
}
@@ -61,29 +65,41 @@
}
-
- 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 LEDProgramParam getByPid(Long id) {
+ LEDProgram byId = getById(id);
+ if (byId == null) {
+ throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
+ LEDProgramParam param = new LEDProgramParam();
+ param.setId(byId.getId());
+ param.setHeight(byId.getHeight());
+ param.setWidth(byId.getWidth());
+ param.setName(byId.getName());
+ param.setPreviewUrl(byId.getPreview());
+ param.setPages(JSON.parseObject(byId.getPages(), List.class));
+ return param;
+ }
-
+ public List<LEDProgram> listProgram(BaseConditionVO baseConditionVO, String keyword) {
+ LambdaQueryWrapper<LEDProgram> wrapper = listPrograms();
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
+ if (keyword != null && !keyword.isEmpty()) {
+ wrapper.like(LEDProgram::getName, keyword);
+ }
+ return list(wrapper);
}
- public void NovaTraffic(String ip, int port){
- NovaTraffic novaTraffic = new NovaTraffic("192.168.0.220", 5000);
-
-
-
+ public LambdaQueryWrapper<LEDProgram> listPrograms() {
+ if (SecurityUtils.getClientId() == null) {
+ return Wrappers.lambdaQuery(LEDProgram.class);
+ } else {
+ return Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId, SecurityUtils.getUserId())
+ .or(w -> {
+ w.eq(LEDProgram::getClientId, SecurityUtils.getClientId());
+ });
+ }
}
-
}
--
Gitblit v1.9.3