From f736df1648a4d9bb8620d38cf4421cf36eacdfc0 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 04 三月 2022 14:37:39 +0800
Subject: [PATCH] 功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 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 9c8ffd5..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
@@ -12,6 +12,8 @@
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @AllArgsConstructor
 public class LEDProgramService extends BaseServiceImpl<LEDProgramMapper, LEDProgram> {
@@ -27,8 +29,9 @@
         }
         led.setName(receiveParam.getName());
         led.setPreview(receiveParam.getPreviewUrl());
+        led.setWidth(receiveParam.getWidth());
+        led.setHeight(receiveParam.getHeight());
         led.setPages(JSON.toJSONString(receiveParam.getPages()));
-//        led.setPages(JSONArray.fromObject(receiveParam.getPages()).toString());
         return save(led);
     }
 
@@ -45,7 +48,9 @@
         //led.setUserId(SecurityUtils.getClientId());
         led.setName(receiveParam.getName());
         led.setPreview(receiveParam.getPreviewUrl());
-        led.setPages(receiveParam.getPages().toString());
+        led.setWidth(receiveParam.getWidth());
+        led.setHeight(receiveParam.getHeight());
+        led.setPages(JSON.toJSONString(receiveParam.getPages()));
         return updateById(led);
     }
 
@@ -60,6 +65,21 @@
 
     }
 
+    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) {

--
Gitblit v1.9.3