From 1745d9034cca3e68d7ebae2a0215aa1e71596e65 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 21 七月 2023 08:51:36 +0800
Subject: [PATCH] mac
---
src/main/java/com/whyc/service/MacService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/MacService.java b/src/main/java/com/whyc/service/MacService.java
index 69df88c..558029a 100644
--- a/src/main/java/com/whyc/service/MacService.java
+++ b/src/main/java/com/whyc/service/MacService.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.dto.Response;
+import com.whyc.mapper.MacInitMapper;
import com.whyc.mapper.MacMapper;
import com.whyc.pojo.Mac;
+import com.whyc.pojo.MacInit;
import com.whyc.util.ActionUtil;
import com.whyc.util.MacUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +27,9 @@
public class MacService {
@Autowired(required = false)
private MacMapper mapper;
+
+ @Autowired(required = false)
+ private MacInitMapper initMapper;
//鏌ヨmac鍘嗗彶璁板綍
public Response searMacHis() {
@@ -50,6 +55,10 @@
startStr = Integer.toHexString(10001);
}
List<String> list = MacUtil.getMac(startStr, macNum);
+ //鑾峰彇鍒濆鍊�
+ QueryWrapper initwrapper = Wrappers.query();
+ initwrapper.last("limit 1");
+ MacInit macInit = initMapper.selectOne(initwrapper);
//瀵煎嚭csv
Date date = new Date();
String filename = "mac_" + ActionUtil.sdf.format(date).replace(" ", "_").replace(":", "_") + ".csv";
@@ -66,7 +75,7 @@
if (i == list.size() - 1) {
stopStr = list.get(i);
}
- byte[] buffer = (MacUtil.macStart + ":" + list.get(i)).getBytes();
+ byte[] buffer = (macInit.getMacStart() + ":" + list.get(i)).getBytes();
out.write(buffer, 0, buffer.length);
out.write("\r\n".getBytes());
}
--
Gitblit v1.9.1