From ed037879103f9051f9f7381f02f9d93dc681ea42 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 09 三月 2022 15:44:21 +0800
Subject: [PATCH] 功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java |   61 ++++++++++++++++++++++--------
 1 files changed, 44 insertions(+), 17 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..a03e5d8 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.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 org.springframework.stereotype.Service;
+
+import java.util.List;
 
 @Service
 @AllArgsConstructor
 public class LEDProgramService extends BaseServiceImpl<LEDProgramMapper, LEDProgram> {
 
-    private final LEDProgramMapper ledProgramMapper;
+
 
     public boolean addProgram(LEDProgramParam receiveParam) {
 
         LEDProgram led = new LEDProgram();
-        if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getClientId())) {
-            led.setUserId(SecurityUtils.getUserId());
+        led.setUserId(SecurityUtils.getClientId());
+        if (SecurityUtils.getClientId() != null) {
+            led.setUserName(SecurityUtils.getUsername());
         }
         led.setName(receiveParam.getName());
-        led.setKind(receiveParam.getKind());
-
+        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.setUserId(SecurityUtils.getClientId());
+        led.setId(pid);
+        //led.setUserId(SecurityUtils.getClientId());
         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.setPreview(receiveParam.getPreviewUrl());
+        led.setWidth(receiveParam.getWidth());
+        led.setHeight(receiveParam.getHeight());
+        led.setPages(JSON.toJSONString(receiveParam.getPages()));
         return updateById(led);
     }
 
@@ -61,5 +65,28 @@
 
     }
 
+    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 LambdaQueryWrapper<LEDProgram> listProgram() {
+        if (SecurityUtils.getClientId() != null) {
+            return Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId, SecurityUtils.getClientId());
+        } else {
+            return Wrappers.lambdaQuery(LEDProgram.class);
+        }
+    }
 
 }

--
Gitblit v1.9.3