From 0fef782539e375d8a3e6dbe376663d09c32ce77e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 17 六月 2022 10:01:48 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/RemoteUpdateService.java | 80 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 21 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RemoteUpdateService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RemoteUpdateService.java
index e3fcbd2..8dc2415 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RemoteUpdateService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RemoteUpdateService.java
@@ -11,6 +11,8 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.RemoteUpdateTypeEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.manager.iot.rrpc.util.FileProcessingUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
+import com.sandu.ximon.admin.utils.StringUtil;
import com.sandu.ximon.dao.domain.RemoteUpdateFile;
import com.sandu.ximon.dao.mapper.RemoteUpdateFileMapper;
import org.springframework.stereotype.Service;
@@ -47,6 +49,29 @@
}
/**
+ * 淇敼鍥轰欢鍗囩骇鏂囦欢鍚嶇О
+ *
+ * @param remoteFileId
+ * @param remoteFileName
+ * @return
+ */
+ public String updateRemoteFileName(String remoteFileId, String remoteFileName) {
+ if (remoteFileId == null || StringUtil.strIsNullOrEmpty(remoteFileName)) {
+ throw new BusinessException("鍙傛暟閿欒锛�");
+ }
+ RemoteUpdateFile remoteUpdateFile = getById(remoteFileId);
+ if (remoteUpdateFile == null) {
+ throw new BusinessException("鍥轰欢鍗囩骇鏂囦欢涓嶅瓨鍦紒");
+ }
+ remoteUpdateFile.setFilename(remoteFileName);
+ boolean update = updateById(remoteUpdateFile);
+ if(!update){
+ throw new BusinessException("淇敼鍥轰欢鍗囩骇鏂囦欢鍚嶅け璐ワ紒");
+ }
+ return "淇敼鍥轰欢鍗囩骇鏂囦欢鍚嶆垚鍔燂紒";
+ }
+
+ /**
* 鍥轰欢鍗囩骇鏂囦欢
*
* @return
@@ -78,6 +103,7 @@
A5Frame a5Frame = new A5Frame(orderType, remoteStartUpdateReqInnerFrame);
System.out.println(a5Frame + " a5Frame");
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(mac, "鍥轰欢鍗囩骇-鍚姩杩滅▼鍗囩骇", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
RemoteStartUpdateReportInnerFrame remoteStartUpdateReportInnerFrame
@@ -118,29 +144,30 @@
* @param filePath 鏂囦欢璺緞鍦板潃
*/
public RemoteFileDto UpdateFileInfo(String orderType, String mac, String filePath) {
- try {
- RemoteFileDto remoteFileDto = FileProcessingUtils.read(filePath);
- RemoteSendFileReqInnerFrame remoteSendFileReqInnerFrame
- = new RemoteSendFileReqInnerFrame(remoteFileDto.getListSize(), remoteFileDto.getList().size(), 512, remoteFileDto.getFileHexStr());
-
- A5Frame a5Frame = new A5Frame(orderType, remoteSendFileReqInnerFrame);
- System.out.println(a5Frame + " a5Frame");
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame);
- System.out.println(commonFrame + " -----commonFrame");
-
- RemoteUpdateFileInfoReportInnerFrame remoteUpdateFileInfoReportInnerFrame
- = new RemoteUpdateFileInfoReportInnerFrame().transformFrame(commonFrame.getPayload());
- //纭OK
- if (remoteUpdateFileInfoReportInnerFrame != null && remoteUpdateFileInfoReportInnerFrame.isFlag()) {
- return remoteFileDto;
- } else {
- return null;
- }
- } catch (IOException e) {
- e.printStackTrace();
+ RemoteFileDto remoteFileDto = FileProcessingUtils.read(filePath);
+ if (remoteFileDto == null) {
+ throw new BusinessException("鏂囦欢涓嶅瓨鍦�");
}
- return null;
+
+ RemoteSendFileReqInnerFrame remoteSendFileReqInnerFrame
+ = new RemoteSendFileReqInnerFrame(remoteFileDto.getListSize(), remoteFileDto.getList().size(), 512, remoteFileDto.getFileHexStr());
+
+ A5Frame a5Frame = new A5Frame(orderType, remoteSendFileReqInnerFrame);
+ System.out.println(a5Frame + " a5Frame");
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(mac, "鍥轰欢鍗囩骇-鍗囩骇鏂囦欢淇℃伅", a5Frame, commonFrame);
+
+ System.out.println(commonFrame + " -----commonFrame");
+
+ RemoteUpdateFileInfoReportInnerFrame remoteUpdateFileInfoReportInnerFrame
+ = new RemoteUpdateFileInfoReportInnerFrame().transformFrame(commonFrame.getPayload());
+ //纭OK
+ if (remoteUpdateFileInfoReportInnerFrame != null && remoteUpdateFileInfoReportInnerFrame.isFlag()) {
+ return remoteFileDto;
+ } else {
+ return null;
+ }
}
/**
@@ -156,10 +183,13 @@
CommonFrame commonFrame = null;
try {
commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame);
+
System.out.println(commonFrame + " -----commonFrame");
} catch (Exception e) {
System.out.println("鍙戦�佹暟鎹秴鏃舵垨澶辫触");
}
+
+ StoreOperationRecordsUtils.storeInnerFrameData(mac, "鍥轰欢鍗囩骇-鍗囩骇鍖呮暟鎹�", a5Frame, commonFrame);
//FE B2 0004 0056 01 00 AE2C4474
}
@@ -171,6 +201,8 @@
A5Frame a5Frame = new A5Frame(orderType, remoteSearchLoseDataReqInnerFrame);
System.out.println(a5Frame + " a5Frame");
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(mac, "鍥轰欢鍗囩骇-鏌ヨ婕忓寘甯�", a5Frame, commonFrame);
+
System.out.println(commonFrame + " -----commonFrame");
RemoteSearchLoseDataReportInnerFrame remoteSearchLoseDataReportInnerFrame = new RemoteSearchLoseDataReportInnerFrame().transformFrame(commonFrame.getPayload());
@@ -196,6 +228,8 @@
A5Frame a5Frame = new A5Frame(orderType, remoteFinishUpdateReqInnerFrame);
System.out.println(a5Frame + " a5Frame");
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(mac, "鍥轰欢鍗囩骇-鍗囩骇缁撴潫", a5Frame, commonFrame);
+
System.out.println(commonFrame + " -----commonFrame");
RemoteFinishUpdateReportInnerFrame remoteFinishUpdateReportInnerFrame = new RemoteFinishUpdateReportInnerFrame().transformFrame(commonFrame.getPayload());
@@ -212,6 +246,8 @@
A5Frame a5Frame = new A5Frame(orderType, remoteSearchUpdateResultReqInnerFrame);
System.out.println(a5Frame + " a5Frame");
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(mac, "鍥轰欢鍗囩骇-鍗囩骇缁撴灉鏌ヨ", a5Frame, commonFrame);
+
System.out.println(commonFrame + " -----commonFrame");
RemoteSearchUpdateResultReportInnerFrame innerFrame = new RemoteSearchUpdateResultReportInnerFrame().transformFrame(commonFrame.getPayload());
@@ -227,6 +263,8 @@
A5Frame a5Frame = new A5Frame(orderType, remoteStopUpdateReqInnerFrame);
System.out.println(a5Frame + " a5Frame");
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(mac, "鍥轰欢鍗囩骇-绱ф�ヤ腑鏂�", a5Frame, commonFrame);
+
System.out.println(commonFrame + " -----commonFrame");
RemoteStopUpdateReportInnerFrame innerFrame = new RemoteStopUpdateReportInnerFrame().transformFrame(commonFrame.getPayload());
--
Gitblit v1.9.3