From feac6e0c2db4e60d55417fde1971a0bc6d703566 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 15:58:28 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 349 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 185 insertions(+), 164 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 ae99367..0a387e4 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
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.redis.RedisService;
@@ -24,18 +25,20 @@
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.*;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.*;
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.LightemitUtils;
+import com.sandu.ximon.admin.utils.ListPagingUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.response.VnnoxResult;
import com.sandu.ximon.admin.vo.PoleBindVO;
import com.sandu.ximon.dao.bo.*;
import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.PoleMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -67,7 +70,17 @@
BeanUtils.copyProperties(param, pole);
pole.setPoleCode(generatePoleCode());
pole.setDeviceType(-1);
- return save(pole);
+ boolean save = save(pole);
+
+ /**
+ * 鏂板铏氭嫙鐏潌鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鐏潌ID锛�" + pole.getId() + "锛� 鐏潌鍚嶏細" + param.getPoleName() + "}";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鏂板铏氭嫙鐏潌", content);
+ /**
+ * 鏂板铏氭嫙鐏潌鏃ュ織璁板綍缁撴潫
+ */
+ return save;
}
public boolean updatePole(Long poleId, PoleParam param) {
@@ -75,9 +88,24 @@
if (pole == null) {
throw new BusinessException("鏈壘鍒拌鐏潌");
}
+ Long clientId = SecurityUtils.getClientId();
+ //闈炶秴绠�
+ if (clientId != null) {
+ if (!Objects.equals(SecurityUtils.getUserId(), pole.getUserId()) && !Objects.equals(SecurityUtils.getUserId(), pole.getClientId())) {
+ throw new BusinessException("璇ョ伅鏉嗕笉灞炰簬鎮�");
+ }
+ }
Pole update = new Pole();
BeanUtils.copyProperties(param, update);
update.setId(poleId);
+ /**
+ * 淇敼鐏潌鏃ュ織璁板綍寮�濮�
+ */
+ String content = "缂栬緫鐏潌锛�" + poleId;
+ StoreOperationRecordsUtils.storeOperationData(null, null, "缂栬緫鐏潌", content);
+ /**
+ * 淇敼鐏潌鏃ュ織璁板綍缁撴潫
+ */
return updateById(update);
}
@@ -91,6 +119,16 @@
}
// 鍒犻櫎鐏潌缁戝畾鍏崇郴
poleBindingService.remove(Wrappers.<PoleBinding>lambdaQuery().eq(PoleBinding::getPoleId, poleId));
+
+ /**
+ * 鍒犻櫎鐏潌鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鐏潌Code锛�" + pole.getDeviceCode() + "锛� 鐏潌鍚嶇О锛�" + pole.getPoleName() + " }";
+
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎鐏潌", content);
+ /**
+ * 鍒犻櫎鐏潌鏃ュ織璁板綍缁撴潫
+ */
return removeById(poleId);
}
@@ -125,10 +163,9 @@
if (SecurityUtils.getClientId() == null) {
wrapper = Wrappers.lambdaQuery(Pole.class);
} else {
- wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(
- w -> {
- w.eq(Pole::getUserId, SecurityUtils.getUserId());
- });
+ wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(Pole::getUserId, SecurityUtils.getUserId());
+ });
}
//鐏潌
List<Pole> list = list(wrapper);
@@ -152,8 +189,7 @@
BroadcastTerminalV2Param broadcastTerminalV2Param = new BroadcastTerminalV2Param();
broadcastTerminalV2Param.setBindingState(2);
broadcastTerminalV2Param.setWorkState(2);
- List<BroadcastTerminalV2EntityBo> broadcastTerminalList
- = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalList(null, broadcastTerminalV2Param);
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalList = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalList(null, null, null, broadcastTerminalV2Param);
for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
if (bean.getStatus() == 1 || bean.getStatus() == 0) {
number++;
@@ -167,9 +203,9 @@
MonitorParam monitorParam = new MonitorParam();
monitorParam.setEquipmentState(2);
monitorParam.setBindingState(2);
- List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, monitorParam).getList();
+ List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null,null,null, monitorParam).getList();
monitorParam.setEquipmentState(1);
- List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, monitorParam).getList();
+ List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null,null,null, monitorParam).getList();
result.put("monitorOnlineCount", online.size());
result.put("monitorTotalCount", monitorBos.size());
@@ -218,12 +254,10 @@
result.put("AirEquipmentNongGengTotalCount", airEquipmentNongGengBos.size());
//姘磋川
number = 0;
- List<WaterQualityEquipmentBo> waterQualityEquipments
- = SpringContextHolder.getBean(WaterQualityEquipmentService.class).listWaterQualityEquipmentByKeyword(null, null);
+ List<WaterQualityEquipmentBo> waterQualityEquipments = SpringContextHolder.getBean(WaterQualityEquipmentService.class).listWaterQualityEquipmentByKeyword(null, null);
for (WaterQualityEquipmentBo waterQualityEquipmentBo : waterQualityEquipments) {
- WaterQualityDataDto waterQualityDataDto
- = SpringContextHolder.getBean(WaterQualityDataService.class).getWaterQualityDataInfo(waterQualityEquipmentBo.getWaterQualityEquipmentCode());
+ WaterQualityDataDto waterQualityDataDto = SpringContextHolder.getBean(WaterQualityDataService.class).getWaterQualityDataInfo(waterQualityEquipmentBo.getWaterQualityEquipmentCode());
if (waterQualityDataDto != null) {
number++;
}
@@ -232,8 +266,7 @@
result.put("WaterQualityEquipmentTotalCount", waterQualityEquipments.size());
//鐏潌鍊炬枩
number = 0;
- List<LightPoleHeeling> lightPoleHeelings
- = SpringContextHolder.getBean(LightPoleHeelingService.class).listLightPoleHeelingByKeyword(null, null);
+ List<LightPoleHeeling> lightPoleHeelings = SpringContextHolder.getBean(LightPoleHeelingService.class).listLightPoleHeelingByKeyword(null, null);
for (LightPoleHeeling lightPoleHeeling : lightPoleHeelings) {
if (RedisUtils.getBean().get(LightPoleHeelingEnum.LIGHT_POLE_HEELING_STATE.getCode() + lightPoleHeeling.getMac()) != null) {
@@ -245,7 +278,7 @@
//鐔欒
List<PoleLightemitEntity> poleLightemitEntities = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, false);
- List<PoleLightemitEntity> poleLightemitEntityOnlineList = SpringContextHolder.getBean(PoleLightemitService.class).ledOnline(poleLightemitEntities);
+ List<PoleLightemitEntity> poleLightemitEntityOnlineList = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, true);
result.put("XiXunOnlineCount", poleLightemitEntityOnlineList.size());
result.put("XiXunTotalCount", poleLightemitEntities.size());
@@ -253,80 +286,77 @@
return result;
}
- public List<Pole> queryAllStatesAndList(Integer pageNo, Integer pageSize, PoleStatesParam param) {
+ public CommonPage queryAllStatesAndList(Integer pageNo, Integer pageSize, PoleStatesParam param, Integer order, Integer seq) {
+ if (param == null) {
+ param = new PoleStatesParam();
+ }
- List<Pole> list = new ArrayList<>();
- LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
+ //鎺掑簭瀛楁
+ String orderByResult = OrderByEnums.POLE_ID.getCode();
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.POLE_NAME.getCode();
+ break;
+ case 2:
+ orderByResult = OrderByEnums.POLE_ID.getCode();
+ break;
+ case 3:
+ orderByResult = OrderByEnums.POLE_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = OrderByEnums.ASC.getCode();
+ break;
+ case 2:
+ orderBySeq = OrderByEnums.DESC.getCode();
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = "t1." + orderByResult + " " + orderBySeq;
+
+ List<Pole> poleList;
if (SecurityUtils.getClientId() == null) {
- wrapper = Wrappers.lambdaQuery(Pole.class);
+ poleList = poleMapper.queryPoleOnLineStatesList(null, param.getIsTrue(),
+ param.getBingStates(), param.getGroupid(), param.getKeyword(), orderBy);
} else {
- wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(
- w -> {
- w.eq(Pole::getUserId, SecurityUtils.getUserId());
- });
- }
- if (param.getKeyword() != null && !param.getKeyword().isEmpty()) {
- wrapper.like(Pole::getPoleCode, param.getKeyword()).or(
- wrappers -> {
- wrappers.like(Pole::getPoleName, param.getKeyword());
- }
- );
+ poleList = poleMapper.queryPoleOnLineStatesList(SecurityUtils.getUserId(),
+ param.getIsTrue(), param.getBingStates(), param.getGroupid(), param.getKeyword(), orderBy);
}
- PageHelper.startPage(pageNo, pageSize);
- list = list(wrapper);
- if (param.getGroupid() != null) {
- // List<Long> poleIds = new ArrayList<>();
- List<Pole> pole = new ArrayList<>();
- List<PoleGroupRelation> relations = groupRelationService.list(Wrappers.lambdaQuery(PoleGroupRelation.class)
- .eq(PoleGroupRelation::getPoleGroupId, param.getGroupid()));
- relations.forEach(relation -> {
- pole.add(getById(relation.getPoleId()));
- }
- );
- list = pole;
- }
+ List<Pole> PoleResult = isOnLine(poleList, param);
+ setCount(PoleResult);
- if (param.getBingStates() != 2) {//鏄惁缁戝畾
- list = isBind(list, param);// 缁戝畾/鏈粦瀹�
- if (param.getIsTrue() != 2) {//宸茬粦瀹氱殑鏄惁鏄湡瀹炵伅鏉�
- list = isTrue(list, param);
- if (param.getOnLineStates() != 2) {//缁戝畾鐨勭湡瀹炵伅鏉嗘槸鍚﹀湪绾�
- list = isOnLine(list, param);
- }
- } else {//鍏ㄩ儴鐏潌 瀹炰綋/铏氭嫙
- if (param.getOnLineStates() != 2) { //鏌ヨ鍏ㄩ儴鐏潌鏄惁鍦ㄧ嚎
- list = isOnLine(list, param);
- }
- }
- } else {//鍏ㄩ儴 缁戝畾/鏈粦瀹�
- if (param.getIsTrue() != 2) {// 鍒ゆ柇鐏潌绫诲瀷
- list = isTrue(list, param);// 瀹炰綋/铏氭嫙
- if (param.getOnLineStates() != 2) {// 鐏潌鐨勫湪绾垮垽鏂�
- list = isOnLine(list, param);//鍦ㄧ嚎/绂荤嚎
- }
- } else {//鍏ㄧ被鍨嬬伅鏉�
- if (param.getOnLineStates() != 2) {//鍒ゆ柇鍦ㄧ嚎鐘舵��
- list = isOnLine(list, param);//鍦ㄧ嚎/绂荤嚎
- }
- }
- }
+ CommonPage commonPage = ListPagingUtils.pages(PoleResult, pageNo, pageSize);
- setCount(list);
- return list;
+ return commonPage;
}
/**
- * 璁剧疆缁戝畾璁惧鏁伴噺
+ * 鑾峰彇缁戝畾璁惧璇︽儏
*
* @param list
* @return
*/
public List<Pole> setCount(List<Pole> list) {
- for (Pole post : list) {
- int size = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, post.getId())).size();
-// System.out.println("size:----------------------"+size);
- post.setBindingCount(size);
+ BindEquipments bindEquipments;
+ for (Pole pole : list) {
+ bindEquipments = new BindEquipments();
+ List<PoleBinding> poleBindings = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, pole.getId()));
+ pole.setBindingCount(poleBindings.size());
+ for (PoleBinding poleBinding : poleBindings) {
+ bindEquipments.setInfo(poleBinding.getDeviceType());
+ }
+ pole.setBindEquipments(bindEquipments);
}
return list;
}
@@ -408,11 +438,14 @@
}
public List<Pole> isTrue(List<Pole> list, PoleStatesParam param) {
- List<Pole> isTrue = new ArrayList<>();//瀹炰綋鐏潌
- List<Pole> isFalse = new ArrayList<>();//铏氭嫙鐏潌
+ //瀹炰綋鐏潌
+ List<Pole> isTrue = new ArrayList<>();
+ //铏氭嫙鐏潌
+ List<Pole> isFalse = new ArrayList<>();
list.forEach(bindwarpper -> {
// Long clientId = bindwarpper.getClientId();
- if (bindwarpper.getDeviceCode() == null) {
+ //鍒ゆ柇鏄惁缁戝畾
+ if (bindwarpper.getDeviceType() == -1) {
isFalse.add(bindwarpper);
} else {
isTrue.add(bindwarpper);
@@ -447,16 +480,13 @@
if (deviceStatuses != null) {
for (Pole post : list) {
for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
-// System.out.println("DeviceCode:---------------------"+post.getDeviceCode());
-// System.out.println("DeviceName:---------------------"+deviceStatus.getDeviceName());
+
if (post.getDeviceCode() != null && post.getDeviceCode().equals(deviceStatus.getDeviceName())) {
post.setOnLineState(deviceStatus.getStatus());
-// int size = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, post.getId())).size();
-//// System.out.println("size:----------------------"+size);
-// post.setBindingCount(size);
+
}
}
- // MacCodes.add(post.getDeviceCode());
+
}
}
@@ -470,8 +500,6 @@
* @return
*/
public List<Pole> queryStatesAndList(Integer pageNo, Integer pageSize, String keyword, Long groupid) {
- // 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<>();
LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
@@ -481,11 +509,9 @@
wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId());
}
if (!keyword.isEmpty()) {
- wrapper.like(Pole::getPoleCode, keyword).or(
- wrappers -> {
- wrappers.like(Pole::getPoleName, keyword);
- }
- );
+ wrapper.like(Pole::getPoleCode, keyword).or(wrappers -> {
+ wrappers.like(Pole::getPoleName, keyword);
+ });
}
list = list(wrapper);
List<String> MacCodes = new ArrayList<>();
@@ -496,16 +522,12 @@
List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(MacCodes);
for (Pole post : list) {
for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
-// System.out.println("DeviceCode:---------------------"+post.getDeviceCode());
-// System.out.println("DeviceName:---------------------"+deviceStatus.getDeviceName());
if (post.getDeviceCode() != null && post.getDeviceCode().equals(deviceStatus.getDeviceName())) {
post.setOnLineState(deviceStatus.getStatus());
int size = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, post.getId())).size();
-// System.out.println("size:----------------------"+size);
post.setBindingCount(size);
}
}
- // MacCodes.add(post.getDeviceCode());
}
@@ -553,20 +575,14 @@
if (deviceName.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);
+ IRequestFrame build = FrameBuilder.builderA5().orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode()).innerFrame(new A5LightResetReqInnerFrame()).build();
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceName, build);
+ StoreOperationRecordsUtils.storeInnerFrameData(deviceName, "鐏潌鎭㈠鍑哄巶璁剧疆", build, commonFrame);
System.out.println(commonFrame.toString());
-
- CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(deviceName,
- FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
- .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
-
+ IRequestFrame iRequestFrame = FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame()).orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build();
+ CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceName, iRequestFrame);
+ StoreOperationRecordsUtils.storeInnerFrameData(deviceName, "鐏潌閲嶅惎", iRequestFrame, commonFrame);
boolean b = false;
if ("00".equals(rebootFrame.getPayload())) {
@@ -574,6 +590,14 @@
b = updateById(byId);
System.out.println("閲嶅惎鎴愬姛");
}
+ /**
+ * 鐏潌鎭㈠鍑哄巶璁剧疆鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鐏潌ID锛�" + id + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐏潌鎭㈠鍑哄巶璁剧疆", content);
+ /**
+ * 鐏潌鎭㈠鍑哄巶璁剧疆鏃ュ織璁板綍缁撴潫
+ */
return b;
}
@@ -582,17 +606,12 @@
* 缁欑伅鏉嗘敞鍐屼笁鍏冪爜
*/
public boolean setMac(String baseMac) {
- // public boolean setMac() {
- //Pole pole = getById(poleId);
- /* if (pole == null) {
- throw new BusinessException("鏈壘鍒拌鐏潌");
- }*/
-
boolean setMac = false;
//String baseMac = "baseDevice";
A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac, a1Frame);
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, a1Frame);
+ //瀛樺偍鎸褰�
+ StoreOperationRecordsUtils.storeInnerFrameData(baseMac, "娉ㄥ唽涓夊厓鐮�", a1Frame, commonFrame);
if (commonFrame == null) {
throw new BusinessException("璇诲彇璁惧鍞竴ID澶辫触");
}
@@ -617,44 +636,46 @@
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();
+ IRequestFrame build1 = FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(MainBoardInvokeSyncService.getInstance().getProductKey())).orderType(A1OrderEnum.REQUEST_SET_PRODUCT_KEY.getCode()).build();
+ CommonFrame commonFrame1 = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, build1);
+ //瀛樺偍鎸褰�
+ StoreOperationRecordsUtils.storeInnerFrameData(baseMac, "璁惧閰嶇疆ProductKey", build1, commonFrame1);
+
+ A1TernaryCodeRespInnerFrame responseInnerFrame = new A1TernaryCodeRespInnerFrame().transformFrame(commonFrame1.getPayload());
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())) {
+ IRequestFrame build2 = FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(uniqueMac)).orderType(A1OrderEnum.REQUEST_SET_DEVICE_NAME.getCode()).build();
+ CommonFrame commonFrame2 = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, build2);
+ //瀛樺偍鎸褰�
+ StoreOperationRecordsUtils.storeInnerFrameData(baseMac, "璁惧閰嶇疆鍚�", build2, commonFrame2);
+
+ A1TernaryCodeRespInnerFrame a1TernaryCodeRespInnerFrame = new A1TernaryCodeRespInnerFrame().transformFrame(commonFrame2.getPayload());
+ if (!uniqueMac.equals(a1TernaryCodeRespInnerFrame.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();
+ IRequestFrame build3 = FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(deviceDetail.getDeviceSecret())).orderType(A1OrderEnum.REQUEST_SET_DEVICE_SECRET.getCode()).build();
+ CommonFrame commonFrame3 = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, build3);
+ //瀛樺偍鎸褰�
+ StoreOperationRecordsUtils.storeInnerFrameData(baseMac, "璁惧瀵嗛挜", build3, commonFrame3);
+
+ A1TernaryCodeRespInnerFrame deviceSecretFrame = new A1TernaryCodeRespInnerFrame().transformFrame(commonFrame3.getPayload());
+
if (!deviceDetail.getDeviceSecret().equals(deviceSecretFrame.getTernaryCode())) {
throw new BusinessException("璁惧瀵嗛挜澶辫触");
}
// 7 閲嶅惎璁惧 骞朵娇鐢ㄦ柊鐨凪ac
- CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac,
- FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
- .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
+ IRequestFrame build4 = FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame()).orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build();
+ CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, build4);
+ //瀛樺偍鎸褰�
+ StoreOperationRecordsUtils.storeInnerFrameData(baseMac, "閲嶅惎璁惧", build4, rebootFrame);
+
if ("00".equals(rebootFrame.getPayload())) {
// pole.setDeviceCode(uniqueMac);
@@ -663,7 +684,11 @@
System.out.println("閲嶅惎鎴愬姛");
}
- Pole pole = new Pole();
+
+ Pole pole = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, uniqueMac));
+ if (pole == null) {
+ pole = new Pole();
+ }
/* String type = uniqueMac.substring(uniqueMac.length() - 2, uniqueMac.length());
String Code = uniqueMac.substring(0, uniqueMac.length() - 2);*/
pole.setDeviceCode(uniqueMac);
@@ -676,16 +701,20 @@
}
pole.setPoleCode(generatePoleCode());
- Pole one = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, uniqueMac));
// setMac = save(pole);
- if (one == null) {
- return save(pole);
- } else {
- pole.setId(one.getId());
- return updateById(pole);
- }
+ boolean result = saveOrUpdate(pole);
+ /**
+ * 瀹炰綋鐏潌娉ㄥ唽鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鐏潌ID锛�" + pole.getId() + ",鐏潌缂栧彿锛�" + pole.getPoleCode() + ",鐏潌鍚嶇О锛�" + pole.getPoleName() + ",鐏潌绫诲瀷锛�" + pole.getDeviceType() + ",鐏潌MAC锛�" + pole.getDeviceCode() + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "瀹炰綋鐏潌娉ㄥ唽", content);
+ /**
+ * 瀹炰綋鐏潌娉ㄥ唽鏃ュ織璁板綍缁撴潫
+ */
+
+ return result;
}
public List<String> listDeviceCodeByIds(List<Long> poleIdList) {
@@ -693,8 +722,7 @@
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());
+ return list.stream().filter(Objects::nonNull).map(Pole::getDeviceCode).filter(StrUtil::isNotEmpty).collect(Collectors.toList());
}
/**
@@ -758,12 +786,9 @@
eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getUserId, cilentId);
} else {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId)
- .or(
- pole -> {
- pole.eq(Pole::getUserId, cilentId);
- }
- );
+ eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId).or(pole -> {
+ pole.eq(Pole::getUserId, cilentId);
+ });
}
// }else {
@@ -772,15 +797,11 @@
// }
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
if (!keyword.isEmpty()) {
- eq.like(Pole::getPoleName, keyword).or(
- code -> {
- code.like(Pole::getPoleCode, keyword);
- }
- ).or(
- deviceCode -> {
- deviceCode.like(Pole::getDeviceCode, keyword);
- }
- );
+ eq.like(Pole::getPoleName, keyword).or(code -> {
+ code.like(Pole::getPoleCode, keyword);
+ }).or(deviceCode -> {
+ deviceCode.like(Pole::getDeviceCode, keyword);
+ });
}
List<Pole> list;
list = list(eq);
--
Gitblit v1.9.3