From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/RemoteUpdateService.java | 124 +++++++++++++++++++++++++++++++++-------
1 files changed, 101 insertions(+), 23 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..c53148c 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
@@ -1,7 +1,10 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.RemoteFileDto;
import com.sandu.ximon.admin.dto.RemoteUpdateTypeDto;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
@@ -11,12 +14,19 @@
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.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
+import com.sandu.ximon.admin.utils.StringUtil;
+import com.sandu.ximon.dao.bo.RemoteUpdateFileBo;
+import com.sandu.ximon.dao.domain.Admin;
+import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.RemoteUpdateFile;
import com.sandu.ximon.dao.mapper.RemoteUpdateFileMapper;
import org.springframework.stereotype.Service;
import java.io.IOException;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -25,6 +35,8 @@
*/
@Service
public class RemoteUpdateService extends BaseServiceImpl<RemoteUpdateFileMapper, RemoteUpdateFile> {
+ private RemoteUpdateFileMapper remoteUpdateFileMapper;
+
/**
* 娣诲姞鏂囦欢鏇存柊鍐呭
*
@@ -39,6 +51,8 @@
RemoteUpdateFile remoteUpdateFile = new RemoteUpdateFile();
remoteUpdateFile.setAliAddress(aliAddress);
remoteUpdateFile.setFileType(fileType);
+ remoteUpdateFile.setUploadUserId(SecurityUtils.getUserId());
+ remoteUpdateFile.setUploadUserType(SecurityUtils.getClientId() == null ? 0 : 1);
remoteUpdateFile.setSoftwareVersion(new BigDecimal(softwareVersion).setScale(2, BigDecimal.ROUND_DOWN));
remoteUpdateFile.setHardwareVersion(new BigDecimal(hardwareVersion).setScale(2, BigDecimal.ROUND_DOWN));
remoteUpdateFile.setFilename(filename);
@@ -47,12 +61,63 @@
}
/**
+ * 淇敼鍥轰欢鍗囩骇鏂囦欢鍚嶇О
+ *
+ * @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
*/
- public List<RemoteUpdateFile> getRemoteFileList() {
- return list();
+ public List<RemoteUpdateFileBo> getRemoteFileList() {
+ List<RemoteUpdateFile> list = list();
+ List<Admin> adminList = SpringContextHolder.getBean(AdminService.class).list();
+ List<Client> clientList = SpringContextHolder.getBean(ClientService.class).list();
+
+ List<RemoteUpdateFileBo> remoteUpdateFileBoList = new ArrayList<>();
+ RemoteUpdateFileBo remoteUpdateFileBo;
+ for (RemoteUpdateFile bean : list) {
+ remoteUpdateFileBo = new RemoteUpdateFileBo();
+ BeanUtil.copyProperties(bean, remoteUpdateFileBo);
+ if (bean.getUploadUserType() == 0) {
+ for (Admin admin : adminList) {
+ if (bean.getUploadUserId().equals(admin.getId())) {
+ remoteUpdateFileBo.setUploadName(admin.getNickName());
+ }
+ }
+
+ } else if (bean.getUploadUserType() == 1) {
+ for (Client client : clientList) {
+ if (bean.getUploadUserId().equals(client.getId())) {
+ remoteUpdateFileBo.setUploadName(client.getClientName());
+ }
+ }
+ } else {
+ remoteUpdateFileBo.setUploadName("鏈煡鐢ㄦ埛锛�");
+ }
+ remoteUpdateFileBoList.add(remoteUpdateFileBo);
+ }
+
+ return remoteUpdateFileBoList;
}
@@ -78,6 +143,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 +184,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 +223,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 +241,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 +268,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 +286,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 +303,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