From 19f5b30009b57c010ff517db273ab60388516a3e Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 10 十二月 2021 17:12:21 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java | 189 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 168 insertions(+), 21 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
index 8e3c282..f5da99b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
@@ -1,64 +1,211 @@
package com.sandu.ximon.admin.service;
+import com.aliyuncs.iot.model.v20180120.BatchGetDeviceStateResponse;
+import com.aliyuncs.iot.model.v20180120.QueryDeviceDetailResponse;
+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.manager.iot.frame.A1Frame;
+import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
+import com.sandu.ximon.admin.manager.iot.frame.inner.request.A1TernaryCodeReqInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.request.EmptyRequestInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1DeviceMacRespInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1TernaryCodeRespInnerFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
+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.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.LampPostParam;
import com.sandu.ximon.admin.security.CountSet;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.LampCount;
import com.sandu.ximon.dao.domain.LampPost;
+import com.sandu.ximon.dao.mapper.ClientMapper;
import com.sandu.ximon.dao.mapper.LampPostMapper;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service
+@Slf4j
@AllArgsConstructor
public class LampPostService extends BaseServiceImpl<LampPostMapper, LampPost> {
private final CountSet countSet;
private final LampCountService lampCountService;
+ private final ClientMapper clientMapper;
+ private final LampPostMapper lampPostMapper;
- public void addLamp(LampPostParam lampPostParam){
- LampPost lampPost=new LampPost();
+ public boolean addLamp(LampPostParam lampPostParam) {
+ LampPost lampPost = new LampPost();
+ // lampPost.setId(snowflake.nextId());
Long userId = SecurityUtils.getUserId();
lampPost.setUserId(userId);
lampPost.setLampId(countSet.aVoid());
lampPost.setName(lampPostParam.getName());
- lampPost.setMacCode("铏氭嫙鐏潌");
- lampPost.setGroup(null);
- lampPost.setState("姝ｅ父");
- lampPost.setBound(null);
- lampPost.setBelongs(lampPostParam.getBelongs());
- boolean save = save(lampPost);
+ lampPost.setAddress(lampPostParam.getAddress());
+ if (lampPostParam.getBelongsClient() != null) {
+ Long clientId = clientMapper.findClientIdByName(lampPostParam.getBelongsClient());
+ lampPost.setBelongsClient(lampPostParam.getBelongsClient());
+ lampPost.setClientId(clientId);
+ }
+ lampPost.setState(1);
+ /* if (lampPostParam.getMacCode() == null) {
+ lampPost.setMacCode("铏氭嫙鐏潌");
+ } else {
+ lampPost.setMacCode(lampPostParam.getMacCode());
+ }*/
+ String baseMac = "baseDevice";
+ A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(baseMac, a1Frame);
+ if(commonFrame == null){
+ throw new BusinessException("璇诲彇璁惧鍞竴ID澶辫触");
+ }
+ A1DeviceMacRespInnerFrame a1DeviceMacRespInnerFrame = new A1DeviceMacRespInnerFrame().transformFrame(commonFrame.getPayload());
+ log.info(commonFrame.toString());
+ String uniqueMac = a1DeviceMacRespInnerFrame.getMac();
+ uniqueMac = uniqueMac.toLowerCase();
+ log.info("鍞竴鐮亄}",uniqueMac);
- if(!save){
+ // 2 浠庨樋閲屾敞鍐�
+ MainBoardInvokeSyncService.getInstance().registerDevice(uniqueMac);
+
+ // 3 鑾峰彇璁惧璇︽儏
+ QueryDeviceDetailResponse.Data deviceDetail = MainBoardInvokeSyncService.getInstance().queryDeviceDetail(uniqueMac, null);
+ if(deviceDetail == null){
+ throw new BusinessException("娉ㄥ唽澶辫触");
+ }
+ log.info(deviceDetail.toString());
+
+ // 4 閰嶇疆Mac鈶�
+ WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> productKeyResp = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(baseMac,
+ FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(MainBoardInvokeSyncService.getInstance().getProductKey()))
+ .orderType(A1OrderEnum.REQUEST_SET_PRODUCT_KEY.getCode()).build(),
+ A1TernaryCodeRespInnerFrame.class);
+ A1TernaryCodeRespInnerFrame responseInnerFrame = productKeyResp.getResponseInnerFrame();
+ if(!MainBoardInvokeSyncService.getInstance().getProductKey().equals(responseInnerFrame.getTernaryCode())){
+ throw new BusinessException("璁惧閰嶇疆ProductKey澶辫触");
+ }
+
+ // 5 閰嶇疆Mac鈶�
+ WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(baseMac,
+ FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(uniqueMac))
+ .orderType(A1OrderEnum.REQUEST_SET_DEVICE_NAME.getCode()).build(),
+ A1TernaryCodeRespInnerFrame.class);
+ A1TernaryCodeRespInnerFrame deviceNameFrame = responseCommonFrame.getResponseInnerFrame();
+ if(!uniqueMac.equals(deviceNameFrame.getTernaryCode())){
+ throw new BusinessException("璁惧閰嶇疆鍚嶅け璐�");
+ }
+
+ // 6 閰嶇疆Mac鈶�
+ WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> wrapResponseCommonFrame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(baseMac,
+ FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(deviceDetail.getDeviceSecret()))
+ .orderType(A1OrderEnum.REQUEST_SET_DEVICE_SECRET.getCode()).build(),
+ A1TernaryCodeRespInnerFrame.class);
+ A1TernaryCodeRespInnerFrame deviceSecretFrame = wrapResponseCommonFrame.getResponseInnerFrame();
+ if (!deviceDetail.getDeviceSecret().equals(deviceSecretFrame.getTernaryCode())) {
+ throw new BusinessException("璁惧瀵嗛挜澶辫触");
+ }
+
+ boolean save=true;
+ // 7 閲嶅惎璁惧 骞朵娇鐢ㄦ柊鐨凪ac
+ CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(baseMac,
+ FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
+ .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
+ if (rebootFrame.getPayload().equals("00")) {
+ lampPost.setMacCode(uniqueMac);
+ save= save(lampPost);
+
+ System.out.println("閲嶅惎鎴愬姛");
+ }
+
+
+
+ //boolean save = save(lampPost);
+
+ if (!save) {
LampCount lampCount = lampCountService.list().get(0);
- lampCount.setCount(lampCount.getCount()-1);
+ lampCount.setCount(lampCount.getCount() - 1);
lampCountService.updateById(lampCount);
}
+ return save;
+
}
- public void updateLamp(Long id,LampPostParam lampPostParam){
-
-
+ public boolean updateLamp(Long id, LampPostParam lampPostParam) {
+ LampPost lampPost = new LampPost();
+ LampPost byId = getById(id);
+ if (byId == null) {
+ throw new BusinessException("鏈壘鍒拌鐏潌");
+ }
+ lampPost.setId(id);
+ lampPost.setName(lampPostParam.getName());
+ lampPost.setAddress(lampPostParam.getAddress());
+ if (lampPostParam.getBelongsClient() != null) {
+ Long clientId = clientMapper.findClientIdByName(lampPostParam.getBelongsClient());
+ lampPost.setBelongsClient(lampPostParam.getBelongsClient());
+ lampPost.setClientId(clientId);
+ }
+ /* if (lampPostParam.getMacCode() == null) {
+ lampPost.setMacCode("铏氭嫙鐏潌");
+ } else {
+ lampPost.setMacCode(lampPostParam.getMacCode());
+ }*/
+ return updateById(lampPost);
}
/**
- *
* @param group
- * @param lampPosts
- *缂栬緫鍒嗙粍--閫夋嫨鐏潌
+ * @param Id 缂栬緫鍒嗙粍--閫夋嫨鐏潌
*/
- public void setGroup(String group, List<LampPost> lampPosts){
- for (LampPost lamp:lampPosts
- ) {
- lamp.setGroup(group);
- updateById(lamp);
+ public void setGroup(String group, List<Long> Id) {
+ // List<LampPost> update=new ArrayList<>();
+ for (Long id : Id
+ ) {
+ lampPostMapper.serGroup(group, id);
}
+ // return updateBatchById(update);
+ }
+
+ public List<LampPost> listLamp() {
+ List<LampPost> list = lampPostMapper.listLamp();
+ // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class));
+ return list;
+
+ }
+
+ public List<LampPost> queryStates() {
+ // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class).eq(LampPost::getClientId, SecurityUtils.getUserId()));
+ List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class));
+ List<String> MacCodes = new ArrayList<>();
+
+ for (LampPost post : list) {
+ MacCodes.add(post.getMacCode());
+ }
+ List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(MacCodes);
+ for (LampPost post : list) {
+ for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
+ if(post.getMacCode().equals(deviceStatus.getDeviceName())){
+ post.setOnLineState(deviceStatus.getStatus());
+ }
+ }
+ MacCodes.add(post.getMacCode());
+ }
+
+
+ return list;
}
--
Gitblit v1.9.3