From d877cf557db5452093087fabb4479a10497ee218 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 28 二月 2022 18:25:32 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 92 insertions(+), 11 deletions(-)
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 a0b0fdd..2a6ae70 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
@@ -1,11 +1,15 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
import com.aliyuncs.iot.model.v20180120.BatchGetDeviceStateResponse;
import com.aliyuncs.iot.model.v20180120.QueryDeviceDetailResponse;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.redis.RedisService;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.dto.DeviceStatus;
import com.sandu.ximon.admin.manager.iot.frame.A1Frame;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
@@ -19,6 +23,7 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A1OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A2OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.DeviceStateEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.param.PoleParam;
@@ -30,11 +35,14 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 鐏潌鐩稿叧
@@ -82,7 +90,7 @@
/**
* 鐢熸垚鐏潌缂栧彿
*/
- private Long generatePoleCode() {
+ public Long generatePoleCode() {
StringBuilder sb = new StringBuilder();
String date = new SimpleDateFormat("yyMMdd").format(new Date());
sb.append(date);
@@ -103,9 +111,10 @@
*
* @return
*/
- public List<Pole> queryStatesAndList() {
+ public List<Pole> queryStatesAndList(Integer pageNo, Integer pageSize) {
// List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class).eq(LampPost::getClientId, SecurityUtils.getUserId()));
//List<Pole> list = list(Wrappers.lambdaQuery(Pole.class));
+ PageHelper.startPage(pageNo, pageSize);
List<Pole> list = new ArrayList<>();
if (SecurityUtils.getClientId() == null) {
list = list(Wrappers.lambdaQuery(Pole.class));
@@ -197,16 +206,15 @@
/**
* 缁欑伅鏉嗘敞鍐屼笁鍏冪爜
*/
-
-
- public boolean setMac(Long poleId) {
- Pole pole = getById(poleId);
- if (pole == null) {
+ public boolean setMac(String baseMac) {
+ // public boolean setMac() {
+ //Pole pole = getById(poleId);
+ /* if (pole == null) {
throw new BusinessException("鏈壘鍒拌鐏潌");
- }
+ }*/
boolean setMac = false;
- String baseMac = "baseDevice";
+ //String baseMac = "baseDevice";
A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(baseMac, a1Frame);
@@ -217,6 +225,10 @@
log.info(commonFrame.toString());
String uniqueMac = a1DeviceMacRespInnerFrame.getMac();
uniqueMac = uniqueMac.toLowerCase();
+
+ if (uniqueMac.isEmpty()) {
+ throw new BusinessException("璇诲彇璁惧鍞竴ID澶辫触!");
+ }
log.info("鍞竴鐮亄}", uniqueMac);
// 2 浠庨樋閲屾敞鍐�
@@ -269,12 +281,81 @@
FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
.orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
if ("00".equals(rebootFrame.getPayload())) {
- pole.setDeviceCode(uniqueMac);
+ // pole.setDeviceCode(uniqueMac);
- setMac = updateById(pole);
+ // setMac = updateById(pole);
System.out.println("閲嶅惎鎴愬姛");
}
+
+ Pole pole = new Pole();
+ String strh = uniqueMac.substring(uniqueMac.length() - 2, uniqueMac.length());
+ pole.setDeviceCode(strh);
+ pole.setPoleName(strh);
+ String strm = uniqueMac.substring(0, uniqueMac.length() - 2);
+ int i = Integer.parseInt(strm);
+ pole.setPoleCode(generatePoleCode());
+ pole.setDeviceType(i);
+ setMac = save(pole);
+
return setMac;
}
+
+ public List<String> listDeviceCodeByIds(List<Long> poleIdList) {
+ if (CollectionUtil.isEmpty(poleIdList)) {
+ return null;
+ }
+ List<Pole> list = list(Wrappers.lambdaQuery(Pole.class).in(Pole::getId, poleIdList).select(Pole::getDeviceCode));
+ return list
+ .stream().filter(Objects::nonNull).map(Pole::getDeviceCode).filter(StrUtil::isNotEmpty).collect(Collectors.toList());
+ }
+
+ /**
+ * 鎵归噺鑾峰彇闃块噷浜戣澶囩殑鐘舵��
+ *
+ * @param deviceCodeList 闃块噷浜戣澶囩爜
+ * @return 璁惧鐘舵�佸垪琛�
+ */
+ public List<DeviceStatus> listStatusByDeviceCode(ArrayList<String> deviceCodeList) {
+ // 鏈�澶у彧鑳芥煡50涓�
+ List<List<String>> split = CollectionUtil.split(deviceCodeList, 50);
+ List<DeviceStatus> statusList = new ArrayList<>();
+ for (List<String> list : split) {
+ List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(list);
+ if (CollectionUtil.isNotEmpty(deviceStatuses)) {
+ for (BatchGetDeviceStateResponse.DeviceStatus d : deviceStatuses) {
+ DeviceStatus deviceStatus = new DeviceStatus();
+ deviceStatus.setDeviceCode(d.getDeviceName());
+ deviceStatus.setStatus(DeviceStateEnum.getCode(d.getStatus()));
+ statusList.add(deviceStatus);
+ }
+ }
+ }
+ return statusList;
+ }
+
+ /**
+ * 鐢ㄦ埛缁戝畾鐏潌
+ *
+ * @param clientId 鐢ㄦ埛ID
+ * @param poleIds 鐏潌ID
+ * @return
+ */
+ public boolean ClientBindingPole(long clientId, int[] poleIds) {
+ boolean r=false;
+ for (int poleId:poleIds) {
+ Pole pole = getById(poleId);
+ if (pole == null) {
+ throw new BusinessException("鐏潌涓嶅瓨鍦�");
+ }
+ pole.setClientId(clientId);
+ r=updateById(pole);
+
+ if(!r){
+ throw new BusinessException("鐏潌ID涓�"+poleId+"璁剧疆澶辫触,鑷姩鍋滄");
+ }
+
+ }
+ return r;
+ }
}
--
Gitblit v1.9.3