From 97a90aef9561782d60546c7a2a98cb75b2fc34f4 Mon Sep 17 00:00:00 2001
From: LHN <31457034@qq.com>
Date: 星期四, 20 十月 2022 12:01:29 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentNongGengController.java | 3
dao/src/main/resources/mapper/LightReportErrorMapper.xml | 6
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java | 3
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 169 +++++++++++++++++++++---------------------
dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java | 1
5 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java b/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
index 1df944d..dd6f01c 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
@@ -33,6 +33,7 @@
PLAYPLAN_LIST("鎾斁璁″垝鍒楄〃"),
LED_FILE_S_LIST("LED灞忕礌鏉愬垪琛�"),
AIR_EQUIPMENT_LIST("澶ф皵璁惧鍒楄〃"),
+ AIR_EQUIPMENT_INFO("澶ф皵璁惧璇︽儏"),
AIR_DATA_LIST("澶ф皵鏁版嵁鍒楄〃"),
AIR_DATA_LIST_HISTORY("澶ф皵鏁版嵁鍘嗗彶"),
AIR_EQUIPMENT_NONG_GENG_LIST("澶ф皵璁惧鍐滆�曞垪琛�"),
diff --git a/dao/src/main/resources/mapper/LightReportErrorMapper.xml b/dao/src/main/resources/mapper/LightReportErrorMapper.xml
index 965f330..bd3db61 100644
--- a/dao/src/main/resources/mapper/LightReportErrorMapper.xml
+++ b/dao/src/main/resources/mapper/LightReportErrorMapper.xml
@@ -52,11 +52,11 @@
light_report_error t1
LEFT JOIN pole t3 ON t1.device_code = t3.device_code
WHERE
- <if test="userid != null">
- t3.client_id = #{userId} OR t3.user_id = #{userId} AND
- </if>
t1.light_report_error_id IN ( SELECT t.max_id FROM ( SELECT Max( light_report_error.light_report_error_id ) AS
max_id FROM light_report_error GROUP BY light_report_error.device_code ) AS t )
+ <if test="userid != null">
+ AND t3.client_id = #{userId} OR t3.user_id = #{userId}
+ </if>
ORDER BY
t1.create_time DESC
</select>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentNongGengController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentNongGengController.java
index 53daaff..eed4f74 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentNongGengController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentNongGengController.java
@@ -52,6 +52,9 @@
@GetMapping("/getAirEquipment/{mac}")
public ResponseVO<Object> getAirEquipment(@PathVariable String mac) {
+ if (!permissionConfig.check(MenuEnum.AIR_EQUIPMENT_INFO.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(airEquipmentNongGengService.getAirEquipment(mac));
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java
index 1d918fb..4f1fdb2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java
@@ -2,15 +2,12 @@
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.CommonPage;
-import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3QueryReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightErrorCodeReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightOperationReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.A5LightCleanErrorCodeInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.C3QueryAddressReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.LightErrorEnum;
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 8e258bb..1eeb4e2 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
@@ -435,91 +435,90 @@
&& !Objects.equals(ledProgram.getUserId(), SecurityUtils.getUserId())) {
throw new BusinessException("璇蜂笉瑕佹搷浣滃叾浠栦汉鐨勮妭鐩�");
}
- return null;
-// String pages = ledProgram.getPages();
-//
-//
-// List<String> success = new ArrayList<>();
-// List<String> fail = new ArrayList<>();
-// //鎷兼帴鎴愬姛澶辫触鐨勭粨鏋�
-// Map<String, Object> result = new HashMap<>();
-// List<NovaPushResultVO> successList = new ArrayList<>();
-// List<NovaPushResultVO> faileList = new ArrayList<>();
-//
-//
-// List<List<String>> split = CollectionUtil.split(nova.stream().map(NovaPushResultVO::getPlayerId).collect(Collectors.toList()), 100);
-//
-// for (List<String> playerIds : split) {
-// PlayerProgram program = new PlayerProgram();
-// List<PlayerPage> programDtos = JSON.parseArray(pages, PlayerPage.class);
-// programDtos.forEach(
-// programDto -> {
-// programDto.getWidgets().forEach(
-// widget -> {
-// if (PlayerWidgetType.PICTURE.equals(widget.getType()) || PlayerWidgetType.VIDEO.equals(widget.getType())) {
-// String url = widget.getUrl();
-// LEDProgramFile one = fileService.getOne(Wrappers.lambdaQuery(LEDProgramFile.class).eq(LEDProgramFile::getFileUrl, url));
-// if (one == null) {
-// throw new BusinessException("鑺傜洰鏂囦欢宸插け鏁�");
-// }
-// widget.setMd5(one.getMd5());
-// widget.setSize(Long.parseLong(one.getSize()));
-// }
-// }
-// );
-// }
-// );
-// program.setPlayerIds(playerIds);
-// //鑾峰彇鑺傜洰瀹炰綋
-// program.setPages(programDtos);
-//
-// program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
-// VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.pushProgram(program);
-//
-// if (vnnoxResultResponse == null || vnnoxResultResponse.getData() == null) {
-// throw new BusinessException("鎺ㄩ�佸け璐�");
-// }
-//
-//
-// if (vnnoxResultResponse.getData() != null) {
-// success = vnnoxResultResponse.getData().getSuccess();
-// fail = vnnoxResultResponse.getData().getFail();
-// }
-//
-// List<String> finalSuccess = success;
-// List<String> finalFail = fail;
-// nova.forEach(n -> {
-// if (finalSuccess.contains(n.getPlayerId())) {
-// successList.add(n);
-// } else if (finalFail.contains(n.getPlayerId())) {
-// faileList.add(n);
-// }
-// });
-// }
-//
-// result.put("success", successList);
-// result.put("fail", faileList);
-//
-// /**
-// * 璇虹摝鎺ㄩ�佽妭鐩棩蹇楄褰曞紑濮�
-// */
-// List<LedPlayerEntity> list = SpringContextHolder.getBean(LedPlayerEntityService.class)
-// .list(Wrappers.lambdaQuery(LedPlayerEntity.class).in(LedPlayerEntity::getId, nova.stream().map(NovaPushResultVO::getPlayerId).toArray()));
-// List<String> listCode = new ArrayList<>();
-// for (LedPlayerEntity temp : list) {
-// listCode.add(temp.getSn());
-// }
-//
-// String content = "{鑺傜洰ID锛�" + pid
-// + "锛� 鑺傜洰鍚嶇О锛�" + ledProgram.getName()
-// + "}," + " 鎺ㄩ�佺粨鏋滐細" + result
-// + " }";
-// StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝鎺ㄩ�佽妭鐩�", content);
-// /**
-// * 璇虹摝鎺ㄩ�佽妭鐩棩蹇楄褰曠粨鏉�
-// */
-//
-// return result;
+ String pages = ledProgram.getPages();
+
+
+ List<String> success = new ArrayList<>();
+ List<String> fail = new ArrayList<>();
+ //鎷兼帴鎴愬姛澶辫触鐨勭粨鏋�
+ Map<String, Object> result = new HashMap<>();
+ List<NovaPushResultVO> successList = new ArrayList<>();
+ List<NovaPushResultVO> faileList = new ArrayList<>();
+
+
+ List<List<String>> split = CollectionUtil.split(nova.stream().map(NovaPushResultVO::getPlayerId).collect(Collectors.toList()), 100);
+
+ for (List<String> playerIds : split) {
+ PlayerProgram program = new PlayerProgram();
+ List<PlayerPage> programDtos = JSON.parseArray(pages, PlayerPage.class);
+ programDtos.forEach(
+ programDto -> {
+ programDto.getWidgets().forEach(
+ widget -> {
+ if (PlayerWidgetType.PICTURE.equals(widget.getType()) || PlayerWidgetType.VIDEO.equals(widget.getType())) {
+ String url = widget.getUrl();
+ LEDProgramFile one = fileService.getOne(Wrappers.lambdaQuery(LEDProgramFile.class).eq(LEDProgramFile::getFileUrl, url));
+ if (one == null) {
+ throw new BusinessException("鑺傜洰鏂囦欢宸插け鏁�");
+ }
+ widget.setMd5(one.getMd5());
+ widget.setSize(Long.parseLong(one.getSize()));
+ }
+ }
+ );
+ }
+ );
+ program.setPlayerIds(playerIds);
+ //鑾峰彇鑺傜洰瀹炰綋
+ program.setPages(programDtos);
+
+ program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
+ VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.pushProgram(program);
+
+ if (vnnoxResultResponse == null || vnnoxResultResponse.getData() == null) {
+ throw new BusinessException("鎺ㄩ�佸け璐�");
+ }
+
+
+ if (vnnoxResultResponse.getData() != null) {
+ success = vnnoxResultResponse.getData().getSuccess();
+ fail = vnnoxResultResponse.getData().getFail();
+ }
+
+ List<String> finalSuccess = success;
+ List<String> finalFail = fail;
+ nova.forEach(n -> {
+ if (finalSuccess.contains(n.getPlayerId())) {
+ successList.add(n);
+ } else if (finalFail.contains(n.getPlayerId())) {
+ faileList.add(n);
+ }
+ });
+ }
+
+ result.put("success", successList);
+ result.put("fail", faileList);
+
+ /**
+ * 璇虹摝鎺ㄩ�佽妭鐩棩蹇楄褰曞紑濮�
+ */
+ List<LedPlayerEntity> list = SpringContextHolder.getBean(LedPlayerEntityService.class)
+ .list(Wrappers.lambdaQuery(LedPlayerEntity.class).in(LedPlayerEntity::getId, nova.stream().map(NovaPushResultVO::getPlayerId).toArray()));
+ List<String> listCode = new ArrayList<>();
+ for (LedPlayerEntity temp : list) {
+ listCode.add(temp.getSn());
+ }
+
+ String content = "{鑺傜洰ID锛�" + pid
+ + "锛� 鑺傜洰鍚嶇О锛�" + ledProgram.getName()
+ + "}," + " 鎺ㄩ�佺粨鏋滐細" + result
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝鎺ㄩ�佽妭鐩�", content);
+ /**
+ * 璇虹摝鎺ㄩ�佽妭鐩棩蹇楄褰曠粨鏉�
+ */
+
+ return result;
}
--
Gitblit v1.9.3