From 39f6f31b5b5c6f646b60cf344c1300bb72c59147 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 08 九月 2022 11:23:33 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
index 4fdaa93..762fd44 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -1,7 +1,9 @@
package com.sandu.ximon.admin.service;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.service.impl.BaseServiceImpl;
@@ -12,8 +14,10 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.*;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
+import com.sandu.ximon.dao.domain.LedSFile;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
+import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.PoleLightemitEntityMapper;
@@ -49,6 +53,9 @@
@Autowired
PoleLightemitEntityMapper poleLightemitDao;
+
+ @Autowired
+ LedSFileService xiXunFileService;
@PostConstruct
public void init() {
@@ -121,6 +128,23 @@
}
}
return temp;
+ }
+
+ /**
+ * 鐔欒璁惧鍒楄〃锛堢敤浜庨椤垫暟鎹粺璁★級
+ *
+ * @return
+ */
+ public List<PoleLightemitEntity> listLedOnHome() {
+ List<PoleLightemitEntity> poleLightemitEntityList;
+ //瓒呯
+ if (SecurityUtils.getClientId() == null) {
+ poleLightemitEntityList = poleLightemitDao.listLed(null, null, null);
+ } else {
+ poleLightemitEntityList = poleLightemitDao.listLed(null, SecurityUtils.getUserId(), null);
+ }
+
+ return poleLightemitEntityList;
}
@@ -530,4 +554,14 @@
lightemitUtils.setBrightness(lightemitControlCode, brightness);
}
+ public Object getProgram(Long lightemitId) {
+ PoleLightemitEntity xiXun = getById(lightemitId);
+
+ String requestBody = xiXun.getRequestBody();
+
+ Map map = JSON.parseObject(requestBody, Map.class);
+ ProgramPro pro;
+
+ return map;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3