From e99a7c85fa0864e7b326b8d3ae7234d228f5cdb1 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 13 十二月 2021 11:49:14 +0800
Subject: [PATCH] 细节调整
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java | 194 +++++++++++++++++++++++++++++++++---------------
1 files changed, 132 insertions(+), 62 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 f5da99b..b407bc9 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
@@ -7,7 +7,9 @@
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.IRequestFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.A1TernaryCodeReqInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.request.A5LightResetReqInnerFrame;
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;
@@ -15,12 +17,15 @@
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.enums.A5OrderEnum;
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.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.LampPostTypeEnums;
import com.sandu.ximon.dao.mapper.ClientMapper;
import com.sandu.ximon.dao.mapper.LampPostMapper;
import lombok.AllArgsConstructor;
@@ -43,7 +48,10 @@
LampPost lampPost = new LampPost();
// lampPost.setId(snowflake.nextId());
Long userId = SecurityUtils.getUserId();
- lampPost.setUserId(userId);
+ if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getClientId())){
+ lampPost.setUserId(userId);
+ }
+ boolean save=true;
lampPost.setLampId(countSet.aVoid());
lampPost.setName(lampPostParam.getName());
lampPost.setAddress(lampPostParam.getAddress());
@@ -58,75 +66,81 @@
} 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);
- // 2 浠庨樋閲屾敞鍐�
- MainBoardInvokeSyncService.getInstance().registerDevice(uniqueMac);
+ if(LampPostTypeEnums.ENTITY_LIGHT_POLE.getCode().equals(lampPostParam.getDeviceType())){
+ 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);
- // 3 鑾峰彇璁惧璇︽儏
- QueryDeviceDetailResponse.Data deviceDetail = MainBoardInvokeSyncService.getInstance().queryDeviceDetail(uniqueMac, null);
- if(deviceDetail == null){
- throw new BusinessException("娉ㄥ唽澶辫触");
- }
- log.info(deviceDetail.toString());
+ // 2 浠庨樋閲屾敞鍐�
+ MainBoardInvokeSyncService.getInstance().registerDevice(uniqueMac);
- // 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澶辫触");
- }
+ // 3 鑾峰彇璁惧璇︽儏
+ QueryDeviceDetailResponse.Data deviceDetail = MainBoardInvokeSyncService.getInstance().queryDeviceDetail(uniqueMac, null);
+ if(deviceDetail == null){
+ throw new BusinessException("娉ㄥ唽澶辫触");
+ }
+ log.info(deviceDetail.toString());
- // 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("璁惧閰嶇疆鍚嶅け璐�");
- }
+ // 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澶辫触");
+ }
- // 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("璁惧瀵嗛挜澶辫触");
- }
+ // 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("璁惧閰嶇疆鍚嶅け璐�");
+ }
- 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);
+ // 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("璁惧瀵嗛挜澶辫触");
+ }
- System.out.println("閲嶅惎鎴愬姛");
- }
+ // 7 閲嶅惎璁惧 骞朵娇鐢ㄦ柊鐨凪ac
+ CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(baseMac,
+ FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
+ .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
+ if ("00".equals(rebootFrame.getPayload())) {
+ lampPost.setMacCode(uniqueMac);
+ save= save(lampPost);
+
+ System.out.println("閲嶅惎鎴愬姛");
+ }
+ }/*else if(LampPostTypeEnums.VIRTUAL_LIGHT_POLE.getCode().equals(lampPostParam.getDeviceType())){lampPost.setMacCode(uniqueMac);
+
+ }*/
+
+ save= save(lampPost);
//boolean save = save(lampPost);
@@ -161,6 +175,20 @@
lampPost.setMacCode(lampPostParam.getMacCode());
}*/
return updateById(lampPost);
+ }
+
+
+ /**
+ * 鍒犻櫎鐏潌
+ * @param id
+ * @return
+ */
+ public boolean deleteLampPost(Long id){
+ LampPost byId = getById(id);
+ if (byId == null) {
+ throw new BusinessException("鏈壘鍒拌鐏潌");
+ }
+ return removeById(id);
}
@@ -208,5 +236,47 @@
return list;
}
+ public boolean LightReset(Long id){
+ LampPost byId = getById(id);
+ String deviceName = byId.getMacCode();
+ if (byId == null) {
+ throw new BusinessException("鏈壘鍒拌鐏潌");
+ }
+ if(byId.getMacCode().isEmpty()){
+ throw new BusinessException("璇ョ伅鏉哅ca涓虹┖");
+ }
+ IRequestFrame build = FrameBuilder.builderA5()
+ .orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode())
+ .innerFrame(new A5LightResetReqInnerFrame())
+ .build();
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(deviceName, build);
+ System.out.println(commonFrame.toString());
+ CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(deviceName,
+ FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
+ .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
+ if ("00".equals(rebootFrame.getPayload())) {
+ System.out.println("閲嶅惎鎴愬姛");
+ }
+
+ CommonFrame result = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(deviceName,
+ FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
+ .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
+
+ boolean b=false;
+ if ("00".equals(result.getPayload())) {
+ byId.setMacCode(null);
+ b = updateById(byId);
+ System.out.println("閲嶅惎鎴愬姛");
+ }
+ return b;
+ }
+
+
+
+
+
}
--
Gitblit v1.9.3