From d90445938cc9472b099bd9d8f437c6d6863e1c1e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 23 十二月 2021 15:54:37 +0800
Subject: [PATCH] 水质数据、水质设备

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 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..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
@@ -1,11 +1,12 @@
 package com.sandu.ximon.admin.service;
 
+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;
@@ -14,17 +15,18 @@
 @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.setPages(receiveParam.getPages());
         return save(led);
     }
 
@@ -38,15 +40,10 @@
 
         LEDProgram led = new LEDProgram();
         led.setId(receiveParam.getId());
-        led.setUserId(SecurityUtils.getClientId());
+        //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.setPages(receiveParam.getPages());
         return updateById(led);
     }
 
@@ -62,4 +59,12 @@
     }
 
 
+    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