From f86fd019e49a4331c18bd5d736096af09f2a73ad Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 18 四月 2022 15:09:47 +0800
Subject: [PATCH] 节目/文件归属问题
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java | 7 ++-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 9 ++--
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 73 ------------------------------------
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java | 6 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java | 8 ++--
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 6 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 4 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java | 6 +++
8 files changed, 32 insertions(+), 87 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
index e04c73a..cdbd46d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -206,79 +206,6 @@
commonPage.setTotalPage(size / baseConditionVO.getPageSize());
}
return ResponseUtil.success(commonPage);
-
-
-// if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
-// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
-// }
-// PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-// LambdaQueryWrapper<PoleLightemitEntity> wrapper = Wrappers.lambdaQuery(PoleLightemitEntity.class);
-// if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
-// boolean clientId = clientService.findClientId();
-// if (clientId) {
-// wrapper = wrapper.eq(PoleLightemitEntity::getUserId, SecurityUtils.getUserId());
-// }
-// wrapper = wrapper.eq(PoleLightemitEntity::getClientId, clientService.getClientId());
-// }
-// wrapper = Wrappers.lambdaQuery(PoleLightemitEntity.class);
-// if (StrUtil.isNotBlank(keyword)) {
-// wrapper.like(PoleLightemitEntity::getLightemitName, keyword).or(
-// lambdaQueryWrapper -> {
-// lambdaQueryWrapper.like(PoleLightemitEntity::getLightemitControlCode, keyword);
-// }
-// );
-// }
-// List<PoleBinding> bindings = bindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceType, 1));
-// List<PoleLightemitEntity> list = poleLightemitService.list(wrapper);
-// if (isOnLine) {
-// List<PoleLightemitEntity> results = poleLightemitService.ledOnline(list);
-// results.forEach(
-// led -> {
-// bindings.forEach(
-// bind -> {
-// if (bind.getDeviceCode() != null && led.getLightemitControlCode() == bind.getDeviceCode()) {
-// led.setStreetlightId(bind.getPoleId());
-// System.out.println("鏈夋病鏈夎繍琛屽埌杩欓噷?---------------" + bind.getPoleId());
-// led.setStreetlightName(poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, bind.getPoleId())).getPoleName());
-// }
-// }
-// );
-// }
-// );
-// CommonPage commonPage = CommonPage.restPage(results);
-// int size = results.size();
-// commonPage.setTotal((long) size);
-// commonPage.setTotalPage(size / baseConditionVO.getPageSize() + 1);
-// if (size % baseConditionVO.getPageSize() == 0) {
-// commonPage.setTotalPage(size / baseConditionVO.getPageSize());
-// }
-// return ResponseUtil.success(commonPage);
-// } else {
-// poleLightemitService.ledOnlineCheck(list);
-// list.forEach(
-// led -> {
-// bindings.forEach(
-// bind -> {
-// if (bind.getDeviceCode() != null && led.getLightemitControlCode().equals(bind.getDeviceCode())) {
-// led.setStreetlightId(bind.getPoleId());
-// System.out.println("鏈夋病鏈夎繍琛屽埌杩欓噷?---------------" + bind.getPoleId());
-// led.setStreetlightName(poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, bind.getPoleId())).getPoleName());
-// }
-// }
-// );
-// }
-// );
-// CommonPage commonPage = CommonPage.restPage(list);
-// int size = list.size();
-// commonPage.setTotal((long) size);
-// commonPage.setTotalPage(size / baseConditionVO.getPageSize() + 1);
-// if (size % baseConditionVO.getPageSize() == 0) {
-// commonPage.setTotalPage(size / baseConditionVO.getPageSize());
-// }
-// return ResponseUtil.success(commonPage);
-// // return ResponseUtil.success(list);
-// }
-//// return ResponseUtil.success(poleLightemitService.list(wrapper));
}
/**
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
index 2168ff7..0dc076b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
@@ -22,13 +22,13 @@
public boolean addProgramFile(LEDProgramFileParam param) {
LEDProgramFile file = new LEDProgramFile();
BeanUtils.copyProperties(param, file);
- file.setUserId(SecurityUtils.getClientId());
if (SecurityUtils.getClientId() != null) {
+ file.setUserId(SecurityUtils.getUserId());
file.setUserName(SecurityUtils.getUsername());
+ if (clientService.findClientId()) {
+ file.setClientId(clientService.getClientId());
+ }
}
-// if("mp4".equals(fileUploadDto.getFileType())){
-// fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
-// }
return save(file);
}
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 e8116b9..ac3a1ea 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
@@ -18,13 +18,17 @@
@AllArgsConstructor
public class LEDProgramService extends BaseServiceImpl<LEDProgramMapper, LEDProgram> {
+ private final ClientService clientService;
public boolean addProgram(LEDProgramParam receiveParam) {
LEDProgram led = new LEDProgram();
- led.setUserId(SecurityUtils.getClientId());
if (SecurityUtils.getClientId() != null) {
+ led.setUserId(SecurityUtils.getUserId());
led.setUserName(SecurityUtils.getUsername());
+ if (clientService.findClientId()) {
+ led.setClientId(clientService.getClientId());
+ }
}
led.setName(receiveParam.getName());
led.setPreview(receiveParam.getPreviewUrl());
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
index a7c9027..33e6d89 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
@@ -26,6 +26,7 @@
private final LedSFileMapper ledSFileMapper;
private final AliOssFileServiceImpl aliOssFileService;
private final FileOperationRecordService fileOperationRecordService;
+ private final ClientService clientService;
public boolean addProgramFile(MultipartFile file) {
FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
@@ -42,11 +43,13 @@
BeanUtils.copyProperties(fileUploadDto, sFile);
sFile.setCilentId(SecurityUtils.getClientId());
if (SecurityUtils.getClientId() != null) {
+ sFile.setUserId(SecurityUtils.getUserId());
sFile.setUserName(SecurityUtils.getUsername());
+ if (clientService.findClientId()) {
+ sFile.setCilentId(clientService.getClientId());
+ }
}
-// save(sFile);
return save(sFile);
-// return fileUploadDto;
}
public boolean deleteFile(Long id) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
index 27b46dc..aeb3311 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
@@ -83,6 +83,12 @@
String json = JSON.toJSONString(taskSchedules, SerializerFeature.WriteMapNullValue);
// String json = new Gson().toJson(taskSchedules);
ledScheduleEntity.setSchedule(json);
+ if (SecurityUtils.getClientId() != null) {
+ ledScheduleEntity.setUserId(SecurityUtils.getUserId());
+ if (clientService.findClientId()) {
+ ledScheduleEntity.setClientId(clientService.getClientId());
+ }
+ }
return this.save(ledScheduleEntity);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
index 17d41a4..8afa9c4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
@@ -33,12 +33,16 @@
private final LedPlayerEntityService ledPlayerEntityService;
private VnnoxAPIUtil vnnoxAPIUtil;
private final LEDProgramService ledProgramService;
+ private final ClientService clientService;
public boolean addPlan(PlayPlanParam playPlanParam) {
PlayPlanNv playPlan = new PlayPlanNv();
- if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ if (SecurityUtils.getClientId()!=null){
playPlan.setUserId(SecurityUtils.getUserId());
+ if(clientService.findClientId()){
+ playPlan.setClientId(clientService.getClientId());
+ }
}
playPlan.setName(playPlanParam.getName());
playPlan.setLedProgramName(playPlanParam.getLedProgramName());
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index 0e5c4a1..51697b0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -131,8 +131,8 @@
}
list = list(wrapper);
List<Pole> poles = isOnLine(list);
- result.put("onlineCount",poles.size());
- result.put("totalCount",list.size());
+ result.put("poleOnlineCount",poles.size());
+ result.put("poleTotalCount",list.size());
return result;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
index a26a427..e827f30 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
@@ -81,11 +81,12 @@
poleXixunPlayer.setScreenShot(programPro.getScreenShot());
// poleXixunPlayer.setCreatTime(sdf.format(date));
poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
- if (!clientService.findClientId()) {
- poleXixunPlayer.setClientId(clientService.getClientId());
+ if (SecurityUtils.getClientId() != null) {
+ poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
+ if (clientService.findClientId()) {
+ poleXixunPlayer.setClientId(clientService.getClientId());
+ }
}
-
-
return this.save(poleXixunPlayer);
}
--
Gitblit v1.9.3