diff --git a/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java b/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java deleted file mode 100644 index 6f32273..0000000 --- a/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -//package com.casic.missiles; -// -//import io.minio.MinioClient; -//import lombok.Data; -//import org.springframework.beans.factory.annotation.Value; -//import org.springframework.context.annotation.Bean; -//import org.springframework.stereotype.Component; -// -///** -// * @Description: -// * @Author: wangpeng -// * @Date: 2022/11/24 16:41 -// */ -//@Data -//@Component -//public class MinIoClientConfig { -// @Value("${minio.endpoint}") -// private String endpoint; -// @Value("${minio.accessKey}") -// private String accessKey; -// @Value("${minio.secretKey}") -// private String secretKey; -// -// /** -// * 注入minio 客户端 -// * @return -// */ -// @Bean -// public MinioClient minioClient(){ -// return MinioClient.builder() -// .endpoint(endpoint) -// .credentials(accessKey, secretKey) -// .build(); -// } -//} diff --git a/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java b/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java deleted file mode 100644 index 6f32273..0000000 --- a/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -//package com.casic.missiles; -// -//import io.minio.MinioClient; -//import lombok.Data; -//import org.springframework.beans.factory.annotation.Value; -//import org.springframework.context.annotation.Bean; -//import org.springframework.stereotype.Component; -// -///** -// * @Description: -// * @Author: wangpeng -// * @Date: 2022/11/24 16:41 -// */ -//@Data -//@Component -//public class MinIoClientConfig { -// @Value("${minio.endpoint}") -// private String endpoint; -// @Value("${minio.accessKey}") -// private String accessKey; -// @Value("${minio.secretKey}") -// private String secretKey; -// -// /** -// * 注入minio 客户端 -// * @return -// */ -// @Bean -// public MinioClient minioClient(){ -// return MinioClient.builder() -// .endpoint(endpoint) -// .credentials(accessKey, secretKey) -// .build(); -// } -//} diff --git a/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java b/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java index 1c0ce60..c0537c3 100644 --- a/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java +++ b/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java @@ -30,20 +30,19 @@ if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) { continue; } - String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString()); - if (StringUtils.isEmpty(name)) { - System.out.println(dictCodeField.cacheName() + "===" + field.get(object).toString()); - throw new BusinessException(500, dictCodeField.message()); - } + String destFieldName = field.getName() + "Name"; - Field destField = object.getClass().getDeclaredField(destFieldName); - if (destField == null) { - throw new BusinessException(500, "字典名称字段不存在"); + try { + Field destField = object.getClass().getDeclaredField(destFieldName); + + String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString()); + if (!destField.isAccessible()) { + destField.setAccessible(true); + } + destField.set(object, name); + } catch (NoSuchFieldException ignored) { + } - if (!destField.isAccessible()) { - destField.setAccessible(true); - } - destField.set(object, name); } } } diff --git a/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java b/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java deleted file mode 100644 index 6f32273..0000000 --- a/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -//package com.casic.missiles; -// -//import io.minio.MinioClient; -//import lombok.Data; -//import org.springframework.beans.factory.annotation.Value; -//import org.springframework.context.annotation.Bean; -//import org.springframework.stereotype.Component; -// -///** -// * @Description: -// * @Author: wangpeng -// * @Date: 2022/11/24 16:41 -// */ -//@Data -//@Component -//public class MinIoClientConfig { -// @Value("${minio.endpoint}") -// private String endpoint; -// @Value("${minio.accessKey}") -// private String accessKey; -// @Value("${minio.secretKey}") -// private String secretKey; -// -// /** -// * 注入minio 客户端 -// * @return -// */ -// @Bean -// public MinioClient minioClient(){ -// return MinioClient.builder() -// .endpoint(endpoint) -// .credentials(accessKey, secretKey) -// .build(); -// } -//} diff --git a/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java b/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java index 1c0ce60..c0537c3 100644 --- a/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java +++ b/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java @@ -30,20 +30,19 @@ if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) { continue; } - String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString()); - if (StringUtils.isEmpty(name)) { - System.out.println(dictCodeField.cacheName() + "===" + field.get(object).toString()); - throw new BusinessException(500, dictCodeField.message()); - } + String destFieldName = field.getName() + "Name"; - Field destField = object.getClass().getDeclaredField(destFieldName); - if (destField == null) { - throw new BusinessException(500, "字典名称字段不存在"); + try { + Field destField = object.getClass().getDeclaredField(destFieldName); + + String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString()); + if (!destField.isAccessible()) { + destField.setAccessible(true); + } + destField.set(object, name); + } catch (NoSuchFieldException ignored) { + } - if (!destField.isAccessible()) { - destField.setAccessible(true); - } - destField.set(object, name); } } } diff --git a/casic-iot-common/src/main/java/com/casic/missiles/util/ExportUtils.java b/casic-iot-common/src/main/java/com/casic/missiles/util/ExportUtils.java deleted file mode 100644 index 4658b0f..0000000 --- a/casic-iot-common/src/main/java/com/casic/missiles/util/ExportUtils.java +++ /dev/null @@ -1,71 +0,0 @@ -//package com.casic.missiles.util; -// -//import com.alibaba.excel.EasyExcel; -//import com.alibaba.excel.support.ExcelTypeEnum; -//import com.alibaba.excel.write.metadata.style.WriteCellStyle; -//import com.alibaba.excel.write.metadata.style.WriteFont; -//import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; -//import org.apache.poi.ss.usermodel.HorizontalAlignment; -//import org.apache.poi.ss.usermodel.IndexedColors; -//import org.apache.poi.ss.usermodel.VerticalAlignment; -//import org.springframework.mock.web.MockMultipartFile; -//import org.springframework.web.multipart.MultipartFile; -// -//import java.io.ByteArrayOutputStream; -//import java.util.List; -// -//public class ExportUtils { -// -// private static final String CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; -// -// private static final String SHEET_NAME = "sheet"; -// -// /** -// * 获取默认表头内容的样式 -// * @return -// */ -// private static HorizontalCellStyleStrategy getDefaultHorizontalCellStyleStrategy(){ -// // 表头样式 -// WriteCellStyle headWriteCellStyle = new WriteCellStyle(); -// // 背景色（浅灰色） -// headWriteCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex()); -// // 字体大小 -// WriteFont headWriteFont = new WriteFont(); -// headWriteFont.setFontHeightInPoints((short) 10); -// headWriteCellStyle.setWriteFont(headWriteFont); -// //设置表头居中对齐 -// headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); -// // 内容样式 -// WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); -// // 内容字体样式（名称、大小） -// WriteFont contentWriteFont = new WriteFont(); -// contentWriteFont.setFontName("宋体"); -// contentWriteFont.setFontHeightInPoints((short) 10); -// contentWriteCellStyle.setWriteFont(contentWriteFont); -// //设置内容垂直居中对齐 -// contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); -// //设置内容水平居中对齐 -// contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); -// // 头样式与内容样式合并 -// return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); -// } -// -// /** -// * EasyExcel -// * @param data -// * @param fileName -// * @param clazz -// * @return -// */ -// public static MultipartFile[] exportMultipartFile(List data, String fileName, Class clazz) { -// ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); -// EasyExcel.write(byteArrayOutputStream,clazz) -// .registerWriteHandler(getDefaultHorizontalCellStyleStrategy()) -// .excelType(ExcelTypeEnum.XLSX) -// .sheet(SHEET_NAME) -// .doWrite(data); -// MockMultipartFile mockMultipartFile = new MockMultipartFile(fileName, fileName + ".xlsx", CONTENT_TYPE, byteArrayOutputStream.toByteArray()); -// return new MultipartFile[]{mockMultipartFile}; -// } -// -//} diff --git a/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java b/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java deleted file mode 100644 index 6f32273..0000000 --- a/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -//package com.casic.missiles; -// -//import io.minio.MinioClient; -//import lombok.Data; -//import org.springframework.beans.factory.annotation.Value; -//import org.springframework.context.annotation.Bean; -//import org.springframework.stereotype.Component; -// -///** -// * @Description: -// * @Author: wangpeng -// * @Date: 2022/11/24 16:41 -// */ -//@Data -//@Component -//public class MinIoClientConfig { -// @Value("${minio.endpoint}") -// private String endpoint; -// @Value("${minio.accessKey}") -// private String accessKey; -// @Value("${minio.secretKey}") -// private String secretKey; -// -// /** -// * 注入minio 客户端 -// * @return -// */ -// @Bean -// public MinioClient minioClient(){ -// return MinioClient.builder() -// .endpoint(endpoint) -// .credentials(accessKey, secretKey) -// .build(); -// } -//} diff --git a/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java b/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java index 1c0ce60..c0537c3 100644 --- a/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java +++ b/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java @@ -30,20 +30,19 @@ if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) { continue; } - String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString()); - if (StringUtils.isEmpty(name)) { - System.out.println(dictCodeField.cacheName() + "===" + field.get(object).toString()); - throw new BusinessException(500, dictCodeField.message()); - } + String destFieldName = field.getName() + "Name"; - Field destField = object.getClass().getDeclaredField(destFieldName); - if (destField == null) { - throw new BusinessException(500, "字典名称字段不存在"); + try { + Field destField = object.getClass().getDeclaredField(destFieldName); + + String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString()); + if (!destField.isAccessible()) { + destField.setAccessible(true); + } + destField.set(object, name); + } catch (NoSuchFieldException ignored) { + } - if (!destField.isAccessible()) { - destField.setAccessible(true); - } - destField.set(object, name); } } } diff --git a/casic-iot-common/src/main/java/com/casic/missiles/util/ExportUtils.java b/casic-iot-common/src/main/java/com/casic/missiles/util/ExportUtils.java deleted file mode 100644 index 4658b0f..0000000 --- a/casic-iot-common/src/main/java/com/casic/missiles/util/ExportUtils.java +++ /dev/null @@ -1,71 +0,0 @@ -//package com.casic.missiles.util; -// -//import com.alibaba.excel.EasyExcel; -//import com.alibaba.excel.support.ExcelTypeEnum; -//import com.alibaba.excel.write.metadata.style.WriteCellStyle; -//import com.alibaba.excel.write.metadata.style.WriteFont; -//import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; -//import org.apache.poi.ss.usermodel.HorizontalAlignment; -//import org.apache.poi.ss.usermodel.IndexedColors; -//import org.apache.poi.ss.usermodel.VerticalAlignment; -//import org.springframework.mock.web.MockMultipartFile; -//import org.springframework.web.multipart.MultipartFile; -// -//import java.io.ByteArrayOutputStream; -//import java.util.List; -// -//public class ExportUtils { -// -// private static final String CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; -// -// private static final String SHEET_NAME = "sheet"; -// -// /** -// * 获取默认表头内容的样式 -// * @return -// */ -// private static HorizontalCellStyleStrategy getDefaultHorizontalCellStyleStrategy(){ -// // 表头样式 -// WriteCellStyle headWriteCellStyle = new WriteCellStyle(); -// // 背景色（浅灰色） -// headWriteCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex()); -// // 字体大小 -// WriteFont headWriteFont = new WriteFont(); -// headWriteFont.setFontHeightInPoints((short) 10); -// headWriteCellStyle.setWriteFont(headWriteFont); -// //设置表头居中对齐 -// headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); -// // 内容样式 -// WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); -// // 内容字体样式（名称、大小） -// WriteFont contentWriteFont = new WriteFont(); -// contentWriteFont.setFontName("宋体"); -// contentWriteFont.setFontHeightInPoints((short) 10); -// contentWriteCellStyle.setWriteFont(contentWriteFont); -// //设置内容垂直居中对齐 -// contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); -// //设置内容水平居中对齐 -// contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); -// // 头样式与内容样式合并 -// return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); -// } -// -// /** -// * EasyExcel -// * @param data -// * @param fileName -// * @param clazz -// * @return -// */ -// public static MultipartFile[] exportMultipartFile(List data, String fileName, Class clazz) { -// ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); -// EasyExcel.write(byteArrayOutputStream,clazz) -// .registerWriteHandler(getDefaultHorizontalCellStyleStrategy()) -// .excelType(ExcelTypeEnum.XLSX) -// .sheet(SHEET_NAME) -// .doWrite(data); -// MockMultipartFile mockMultipartFile = new MockMultipartFile(fileName, fileName + ".xlsx", CONTENT_TYPE, byteArrayOutputStream.toByteArray()); -// return new MultipartFile[]{mockMultipartFile}; -// } -// -//} diff --git a/casic-iot-common/src/main/java/com/casic/missiles/util/SerialPortUtil.java b/casic-iot-common/src/main/java/com/casic/missiles/util/SerialPortUtil.java deleted file mode 100644 index ab5033e..0000000 --- a/casic-iot-common/src/main/java/com/casic/missiles/util/SerialPortUtil.java +++ /dev/null @@ -1,210 +0,0 @@ -//package com.casic.missiles.util; -// -//import lombok.extern.slf4j.Slf4j; -// -//import java.io.IOException; -//import java.io.InputStream; -//import java.io.OutputStream; -//import java.util.ArrayList; -//import java.util.Enumeration; -//import java.util.List; -//import java.util.TooManyListenersException; -// -///** -// * @Description: USB串口通信工具 -// * @Author: wangpeng -// * @Date: 2023/4/4 16:19 -// */ -//@Slf4j -//public class SerialPortUtil { -// private static SerialPortUtil serialPortUtil = null; -// -// static { -// //在该类被ClassLoader加载时就初始化一个SerialTool对象 -// if (serialPortUtil == null) { -// serialPortUtil = new SerialPortUtil(); -// } -// } -// -// //私有化SerialTool类的构造方法，不允许其他类生成SerialTool对象 -// private SerialPortUtil() { -// } -// -// /** -// * 获取提供服务的SerialTool对象 -// * @return serialPortUtil -// */ -// public static SerialPortUtil getSerialPortUtil() { -// if (serialPortUtil == null) { -// serialPortUtil = new SerialPortUtil(); -// } -// return serialPortUtil; -// } -// -// /** -// * 查找所有可用端口 -// * @return 可用端口名称列表 -// */ -// public List findPort() { -// //获得当前所有可用串口 -// Enumeration portList = CommPortIdentifier.getPortIdentifiers(); -// List portNameList = new ArrayList<>(); -// //将可用串口名添加到List并返回该List -// while (portList.hasMoreElements()) { -// String portName = portList.nextElement().getName(); -// portNameList.add(portName); -// } -// return portNameList; -// } -// -// /** -// * 打开串口 -// * @param portName 端口名称 -// * @param baudrate 波特率 19200 -// * @param databits 数据位 8 -// * @param parity 校验位（奇偶位） NONE ：0 -// * @param stopbits 停止位 1 -// * @return 串口对象 -// */ -// public SerialPort openPort(String portName, int baudrate, int databits, int parity, int stopbits) { -// try { -// //通过端口名识别端口 -// CommPortIdentifier portIdentifier = CommPortIdentifier.getPortIdentifier(portName); -// //打开端口，并给端口名字和一个timeout（打开操作的超时时间） -// CommPort commPort = portIdentifier.open(portName, 2000); -// //判断是不是串口 -// if (commPort instanceof SerialPort) { -// SerialPort serialPort = (SerialPort) commPort; -// try { -// //设置一下串口的波特率等参数 -// serialPort.setSerialPortParams(baudrate, databits, stopbits, parity); -// } catch (UnsupportedCommOperationException e) { -// } -//// System.out.println("Open " + portName + " sucessfully !"); -// return serialPort; -// } else { -// log.error("串口通信工具-不是串口"); -// } -// } catch (NoSuchPortException e1) { -// log.error("串口通信工具-没有找到端口"); -// e1.printStackTrace(); -// } catch (PortInUseException e2) { -// log.error("串口通信工具-端口被占用"); -// e2.printStackTrace(); -// } -// return null; -// } -// -// /** -// * 关闭串口 -// * @param serialPort 待关闭的串口对象 -// */ -// public void closePort(SerialPort serialPort) { -// if (serialPort != null) { -// serialPort.close(); -// } -// } -// -// /** -// * 往串口发送数据 -// * @param serialPort 串口对象 -// * @param order 待发送数据 -// */ -// public void sendToPort(SerialPort serialPort, byte[] order) { -// OutputStream out = null; -// try { -// out = serialPort.getOutputStream(); -// out.write(order); -// out.flush(); -// } catch (IOException e) { -// e.printStackTrace(); -// } finally { -// try { -// if (out != null) { -// out.close(); -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } -// } -// -// /** -// * 从串口读取数据 -// * @param serialPort 当前已建立连接的SerialPort对象 -// * @return 读取到的数据 -// */ -// public byte[] readFromPort(SerialPort serialPort) { -// InputStream in = null; -// byte[] bytes = null; -// try { -// in = serialPort.getInputStream(); -// int bufflenth = in.available(); -// while (bufflenth != 0) { -// bytes = new byte[bufflenth]; -// in.read(bytes); -// bufflenth = in.available(); -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } finally { -// try { -// if (in != null) { -// in.close(); -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } -// return bytes; -// } -// -// /** -// * 添加监听器 -// * @param port 串口对象 -// * @param listener 串口监听器 -// */ -// public void addListener(SerialPort port, SerialPortEventListener listener) { -// try { -// //给串口添加监听器 -// port.addEventListener(listener); -// //设置当有数据到达时唤醒监听接收线程 -// port.notifyOnDataAvailable(true); -// //设置当通信中断时唤醒中断线程 -// port.notifyOnBreakInterrupt(true); -// } catch (TooManyListenersException e) { -//// throw new TooManyListeners(); -// log.error("串口通信工具-监听器设置过多"); -// e.printStackTrace(); -// } -// } -// -// /** -// * 删除监听器 -// * @param port 串口对象 -// * @param listener 串口监听器 -// */ -// public void removeListener(SerialPort port, SerialPortEventListener listener) { -// //删除串口监听器 -// port.removeEventListener(); -// } -// -// /** -// * 设置串口的Listener -// * @param serialPort -// * @param listener -// */ -// public static void setListenerToSerialPort(SerialPort serialPort, SerialPortEventListener listener){ -// try { -// //给串口添加事件监听 -// serialPort.addEventListener(listener); -// } catch (TooManyListenersException e) { -// e.printStackTrace(); -// } -// //串口有数据监听 -// serialPort.notifyOnDataAvailable(true); -// //中断事件监听 -// serialPort.notifyOnBreakInterrupt(true); -// } -// -//} diff --git a/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java b/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java deleted file mode 100644 index 6f32273..0000000 --- a/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -//package com.casic.missiles; -// -//import io.minio.MinioClient; -//import lombok.Data; -//import org.springframework.beans.factory.annotation.Value; -//import org.springframework.context.annotation.Bean; -//import org.springframework.stereotype.Component; -// -///** -// * @Description: -// * @Author: wangpeng -// * @Date: 2022/11/24 16:41 -// */ -//@Data -//@Component -//public class MinIoClientConfig { -// @Value("${minio.endpoint}") -// private String endpoint; -// @Value("${minio.accessKey}") -// private String accessKey; -// @Value("${minio.secretKey}") -// private String secretKey; -// -// /** -// * 注入minio 客户端 -// * @return -// */ -// @Bean -// public MinioClient minioClient(){ -// return MinioClient.builder() -// .endpoint(endpoint) -// .credentials(accessKey, secretKey) -// .build(); -// } -//} diff --git a/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java b/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java index 1c0ce60..c0537c3 100644 --- a/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java +++ b/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java @@ -30,20 +30,19 @@ if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) { continue; } - String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString()); - if (StringUtils.isEmpty(name)) { - System.out.println(dictCodeField.cacheName() + "===" + field.get(object).toString()); - throw new BusinessException(500, dictCodeField.message()); - } + String destFieldName = field.getName() + "Name"; - Field destField = object.getClass().getDeclaredField(destFieldName); - if (destField == null) { - throw new BusinessException(500, "字典名称字段不存在"); + try { + Field destField = object.getClass().getDeclaredField(destFieldName); + + String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString()); + if (!destField.isAccessible()) { + destField.setAccessible(true); + } + destField.set(object, name); + } catch (NoSuchFieldException ignored) { + } - if (!destField.isAccessible()) { - destField.setAccessible(true); - } - destField.set(object, name); } } } diff --git a/casic-iot-common/src/main/java/com/casic/missiles/util/ExportUtils.java b/casic-iot-common/src/main/java/com/casic/missiles/util/ExportUtils.java deleted file mode 100644 index 4658b0f..0000000 --- a/casic-iot-common/src/main/java/com/casic/missiles/util/ExportUtils.java +++ /dev/null @@ -1,71 +0,0 @@ -//package com.casic.missiles.util; -// -//import com.alibaba.excel.EasyExcel; -//import com.alibaba.excel.support.ExcelTypeEnum; -//import com.alibaba.excel.write.metadata.style.WriteCellStyle; -//import com.alibaba.excel.write.metadata.style.WriteFont; -//import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; -//import org.apache.poi.ss.usermodel.HorizontalAlignment; -//import org.apache.poi.ss.usermodel.IndexedColors; -//import org.apache.poi.ss.usermodel.VerticalAlignment; -//import org.springframework.mock.web.MockMultipartFile; -//import org.springframework.web.multipart.MultipartFile; -// -//import java.io.ByteArrayOutputStream; -//import java.util.List; -// -//public class ExportUtils { -// -// private static final String CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; -// -// private static final String SHEET_NAME = "sheet"; -// -// /** -// * 获取默认表头内容的样式 -// * @return -// */ -// private static HorizontalCellStyleStrategy getDefaultHorizontalCellStyleStrategy(){ -// // 表头样式 -// WriteCellStyle headWriteCellStyle = new WriteCellStyle(); -// // 背景色（浅灰色） -// headWriteCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex()); -// // 字体大小 -// WriteFont headWriteFont = new WriteFont(); -// headWriteFont.setFontHeightInPoints((short) 10); -// headWriteCellStyle.setWriteFont(headWriteFont); -// //设置表头居中对齐 -// headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); -// // 内容样式 -// WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); -// // 内容字体样式（名称、大小） -// WriteFont contentWriteFont = new WriteFont(); -// contentWriteFont.setFontName("宋体"); -// contentWriteFont.setFontHeightInPoints((short) 10); -// contentWriteCellStyle.setWriteFont(contentWriteFont); -// //设置内容垂直居中对齐 -// contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); -// //设置内容水平居中对齐 -// contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); -// // 头样式与内容样式合并 -// return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); -// } -// -// /** -// * EasyExcel -// * @param data -// * @param fileName -// * @param clazz -// * @return -// */ -// public static MultipartFile[] exportMultipartFile(List data, String fileName, Class clazz) { -// ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); -// EasyExcel.write(byteArrayOutputStream,clazz) -// .registerWriteHandler(getDefaultHorizontalCellStyleStrategy()) -// .excelType(ExcelTypeEnum.XLSX) -// .sheet(SHEET_NAME) -// .doWrite(data); -// MockMultipartFile mockMultipartFile = new MockMultipartFile(fileName, fileName + ".xlsx", CONTENT_TYPE, byteArrayOutputStream.toByteArray()); -// return new MultipartFile[]{mockMultipartFile}; -// } -// -//} diff --git a/casic-iot-common/src/main/java/com/casic/missiles/util/SerialPortUtil.java b/casic-iot-common/src/main/java/com/casic/missiles/util/SerialPortUtil.java deleted file mode 100644 index ab5033e..0000000 --- a/casic-iot-common/src/main/java/com/casic/missiles/util/SerialPortUtil.java +++ /dev/null @@ -1,210 +0,0 @@ -//package com.casic.missiles.util; -// -//import lombok.extern.slf4j.Slf4j; -// -//import java.io.IOException; -//import java.io.InputStream; -//import java.io.OutputStream; -//import java.util.ArrayList; -//import java.util.Enumeration; -//import java.util.List; -//import java.util.TooManyListenersException; -// -///** -// * @Description: USB串口通信工具 -// * @Author: wangpeng -// * @Date: 2023/4/4 16:19 -// */ -//@Slf4j -//public class SerialPortUtil { -// private static SerialPortUtil serialPortUtil = null; -// -// static { -// //在该类被ClassLoader加载时就初始化一个SerialTool对象 -// if (serialPortUtil == null) { -// serialPortUtil = new SerialPortUtil(); -// } -// } -// -// //私有化SerialTool类的构造方法，不允许其他类生成SerialTool对象 -// private SerialPortUtil() { -// } -// -// /** -// * 获取提供服务的SerialTool对象 -// * @return serialPortUtil -// */ -// public static SerialPortUtil getSerialPortUtil() { -// if (serialPortUtil == null) { -// serialPortUtil = new SerialPortUtil(); -// } -// return serialPortUtil; -// } -// -// /** -// * 查找所有可用端口 -// * @return 可用端口名称列表 -// */ -// public List findPort() { -// //获得当前所有可用串口 -// Enumeration portList = CommPortIdentifier.getPortIdentifiers(); -// List portNameList = new ArrayList<>(); -// //将可用串口名添加到List并返回该List -// while (portList.hasMoreElements()) { -// String portName = portList.nextElement().getName(); -// portNameList.add(portName); -// } -// return portNameList; -// } -// -// /** -// * 打开串口 -// * @param portName 端口名称 -// * @param baudrate 波特率 19200 -// * @param databits 数据位 8 -// * @param parity 校验位（奇偶位） NONE ：0 -// * @param stopbits 停止位 1 -// * @return 串口对象 -// */ -// public SerialPort openPort(String portName, int baudrate, int databits, int parity, int stopbits) { -// try { -// //通过端口名识别端口 -// CommPortIdentifier portIdentifier = CommPortIdentifier.getPortIdentifier(portName); -// //打开端口，并给端口名字和一个timeout（打开操作的超时时间） -// CommPort commPort = portIdentifier.open(portName, 2000); -// //判断是不是串口 -// if (commPort instanceof SerialPort) { -// SerialPort serialPort = (SerialPort) commPort; -// try { -// //设置一下串口的波特率等参数 -// serialPort.setSerialPortParams(baudrate, databits, stopbits, parity); -// } catch (UnsupportedCommOperationException e) { -// } -//// System.out.println("Open " + portName + " sucessfully !"); -// return serialPort; -// } else { -// log.error("串口通信工具-不是串口"); -// } -// } catch (NoSuchPortException e1) { -// log.error("串口通信工具-没有找到端口"); -// e1.printStackTrace(); -// } catch (PortInUseException e2) { -// log.error("串口通信工具-端口被占用"); -// e2.printStackTrace(); -// } -// return null; -// } -// -// /** -// * 关闭串口 -// * @param serialPort 待关闭的串口对象 -// */ -// public void closePort(SerialPort serialPort) { -// if (serialPort != null) { -// serialPort.close(); -// } -// } -// -// /** -// * 往串口发送数据 -// * @param serialPort 串口对象 -// * @param order 待发送数据 -// */ -// public void sendToPort(SerialPort serialPort, byte[] order) { -// OutputStream out = null; -// try { -// out = serialPort.getOutputStream(); -// out.write(order); -// out.flush(); -// } catch (IOException e) { -// e.printStackTrace(); -// } finally { -// try { -// if (out != null) { -// out.close(); -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } -// } -// -// /** -// * 从串口读取数据 -// * @param serialPort 当前已建立连接的SerialPort对象 -// * @return 读取到的数据 -// */ -// public byte[] readFromPort(SerialPort serialPort) { -// InputStream in = null; -// byte[] bytes = null; -// try { -// in = serialPort.getInputStream(); -// int bufflenth = in.available(); -// while (bufflenth != 0) { -// bytes = new byte[bufflenth]; -// in.read(bytes); -// bufflenth = in.available(); -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } finally { -// try { -// if (in != null) { -// in.close(); -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } -// return bytes; -// } -// -// /** -// * 添加监听器 -// * @param port 串口对象 -// * @param listener 串口监听器 -// */ -// public void addListener(SerialPort port, SerialPortEventListener listener) { -// try { -// //给串口添加监听器 -// port.addEventListener(listener); -// //设置当有数据到达时唤醒监听接收线程 -// port.notifyOnDataAvailable(true); -// //设置当通信中断时唤醒中断线程 -// port.notifyOnBreakInterrupt(true); -// } catch (TooManyListenersException e) { -//// throw new TooManyListeners(); -// log.error("串口通信工具-监听器设置过多"); -// e.printStackTrace(); -// } -// } -// -// /** -// * 删除监听器 -// * @param port 串口对象 -// * @param listener 串口监听器 -// */ -// public void removeListener(SerialPort port, SerialPortEventListener listener) { -// //删除串口监听器 -// port.removeEventListener(); -// } -// -// /** -// * 设置串口的Listener -// * @param serialPort -// * @param listener -// */ -// public static void setListenerToSerialPort(SerialPort serialPort, SerialPortEventListener listener){ -// try { -// //给串口添加事件监听 -// serialPort.addEventListener(listener); -// } catch (TooManyListenersException e) { -// e.printStackTrace(); -// } -// //串口有数据监听 -// serialPort.notifyOnDataAvailable(true); -// //中断事件监听 -// serialPort.notifyOnBreakInterrupt(true); -// } -// -//} diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/config/DestIPTag.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/config/DestIPTag.java index 2d7f4f0..1caca2b 100644 --- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/config/DestIPTag.java +++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/config/DestIPTag.java @@ -44,7 +44,7 @@ public String toProtocolString() { String result = ""; result += BirmmTagTypeEnums.DESTINATION_IP_TAG.getOid(); // OID - result += String.format("%04x", BytesUtil.stringToAsciiStr(ip).length()); // 长度 + result += String.format("%04x", ip.length()); // 长度 result += BytesUtil.stringToAsciiStr(ip); return result; diff --git a/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java b/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java deleted file mode 100644 index 6f32273..0000000 --- a/casic-iot-common/src/main/java/com/casic/missiles/MinIoClientConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -//package com.casic.missiles; -// -//import io.minio.MinioClient; -//import lombok.Data; -//import org.springframework.beans.factory.annotation.Value; -//import org.springframework.context.annotation.Bean; -//import org.springframework.stereotype.Component; -// -///** -// * @Description: -// * @Author: wangpeng -// * @Date: 2022/11/24 16:41 -// */ -//@Data -//@Component -//public class MinIoClientConfig { -// @Value("${minio.endpoint}") -// private String endpoint; -// @Value("${minio.accessKey}") -// private String accessKey; -// @Value("${minio.secretKey}") -// private String secretKey; -// -// /** -// * 注入minio 客户端 -// * @return -// */ -// @Bean -// public MinioClient minioClient(){ -// return MinioClient.builder() -// .endpoint(endpoint) -// .credentials(accessKey, secretKey) -// .build(); -// } -//} diff --git a/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java b/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java index 1c0ce60..c0537c3 100644 --- a/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java +++ b/casic-iot-common/src/main/java/com/casic/missiles/util/DictCodeUtils.java @@ -30,20 +30,19 @@ if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) { continue; } - String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString()); - if (StringUtils.isEmpty(name)) { - System.out.println(dictCodeField.cacheName() + "===" + field.get(object).toString()); - throw new BusinessException(500, dictCodeField.message()); - } + String destFieldName = field.getName() + "Name"; - Field destField = object.getClass().getDeclaredField(destFieldName); - if (destField == null) { - throw new BusinessException(500, "字典名称字段不存在"); + try { + Field destField = object.getClass().getDeclaredField(destFieldName); + + String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString()); + if (!destField.isAccessible()) { + destField.setAccessible(true); + } + destField.set(object, name); + } catch (NoSuchFieldException ignored) { + } - if (!destField.isAccessible()) { - destField.setAccessible(true); - } - destField.set(object, name); } } } diff --git a/casic-iot-common/src/main/java/com/casic/missiles/util/ExportUtils.java b/casic-iot-common/src/main/java/com/casic/missiles/util/ExportUtils.java deleted file mode 100644 index 4658b0f..0000000 --- a/casic-iot-common/src/main/java/com/casic/missiles/util/ExportUtils.java +++ /dev/null @@ -1,71 +0,0 @@ -//package com.casic.missiles.util; -// -//import com.alibaba.excel.EasyExcel; -//import com.alibaba.excel.support.ExcelTypeEnum; -//import com.alibaba.excel.write.metadata.style.WriteCellStyle; -//import com.alibaba.excel.write.metadata.style.WriteFont; -//import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; -//import org.apache.poi.ss.usermodel.HorizontalAlignment; -//import org.apache.poi.ss.usermodel.IndexedColors; -//import org.apache.poi.ss.usermodel.VerticalAlignment; -//import org.springframework.mock.web.MockMultipartFile; -//import org.springframework.web.multipart.MultipartFile; -// -//import java.io.ByteArrayOutputStream; -//import java.util.List; -// -//public class ExportUtils { -// -// private static final String CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; -// -// private static final String SHEET_NAME = "sheet"; -// -// /** -// * 获取默认表头内容的样式 -// * @return -// */ -// private static HorizontalCellStyleStrategy getDefaultHorizontalCellStyleStrategy(){ -// // 表头样式 -// WriteCellStyle headWriteCellStyle = new WriteCellStyle(); -// // 背景色（浅灰色） -// headWriteCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex()); -// // 字体大小 -// WriteFont headWriteFont = new WriteFont(); -// headWriteFont.setFontHeightInPoints((short) 10); -// headWriteCellStyle.setWriteFont(headWriteFont); -// //设置表头居中对齐 -// headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); -// // 内容样式 -// WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); -// // 内容字体样式（名称、大小） -// WriteFont contentWriteFont = new WriteFont(); -// contentWriteFont.setFontName("宋体"); -// contentWriteFont.setFontHeightInPoints((short) 10); -// contentWriteCellStyle.setWriteFont(contentWriteFont); -// //设置内容垂直居中对齐 -// contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); -// //设置内容水平居中对齐 -// contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); -// // 头样式与内容样式合并 -// return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); -// } -// -// /** -// * EasyExcel -// * @param data -// * @param fileName -// * @param clazz -// * @return -// */ -// public static MultipartFile[] exportMultipartFile(List data, String fileName, Class clazz) { -// ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); -// EasyExcel.write(byteArrayOutputStream,clazz) -// .registerWriteHandler(getDefaultHorizontalCellStyleStrategy()) -// .excelType(ExcelTypeEnum.XLSX) -// .sheet(SHEET_NAME) -// .doWrite(data); -// MockMultipartFile mockMultipartFile = new MockMultipartFile(fileName, fileName + ".xlsx", CONTENT_TYPE, byteArrayOutputStream.toByteArray()); -// return new MultipartFile[]{mockMultipartFile}; -// } -// -//} diff --git a/casic-iot-common/src/main/java/com/casic/missiles/util/SerialPortUtil.java b/casic-iot-common/src/main/java/com/casic/missiles/util/SerialPortUtil.java deleted file mode 100644 index ab5033e..0000000 --- a/casic-iot-common/src/main/java/com/casic/missiles/util/SerialPortUtil.java +++ /dev/null @@ -1,210 +0,0 @@ -//package com.casic.missiles.util; -// -//import lombok.extern.slf4j.Slf4j; -// -//import java.io.IOException; -//import java.io.InputStream; -//import java.io.OutputStream; -//import java.util.ArrayList; -//import java.util.Enumeration; -//import java.util.List; -//import java.util.TooManyListenersException; -// -///** -// * @Description: USB串口通信工具 -// * @Author: wangpeng -// * @Date: 2023/4/4 16:19 -// */ -//@Slf4j -//public class SerialPortUtil { -// private static SerialPortUtil serialPortUtil = null; -// -// static { -// //在该类被ClassLoader加载时就初始化一个SerialTool对象 -// if (serialPortUtil == null) { -// serialPortUtil = new SerialPortUtil(); -// } -// } -// -// //私有化SerialTool类的构造方法，不允许其他类生成SerialTool对象 -// private SerialPortUtil() { -// } -// -// /** -// * 获取提供服务的SerialTool对象 -// * @return serialPortUtil -// */ -// public static SerialPortUtil getSerialPortUtil() { -// if (serialPortUtil == null) { -// serialPortUtil = new SerialPortUtil(); -// } -// return serialPortUtil; -// } -// -// /** -// * 查找所有可用端口 -// * @return 可用端口名称列表 -// */ -// public List findPort() { -// //获得当前所有可用串口 -// Enumeration portList = CommPortIdentifier.getPortIdentifiers(); -// List portNameList = new ArrayList<>(); -// //将可用串口名添加到List并返回该List -// while (portList.hasMoreElements()) { -// String portName = portList.nextElement().getName(); -// portNameList.add(portName); -// } -// return portNameList; -// } -// -// /** -// * 打开串口 -// * @param portName 端口名称 -// * @param baudrate 波特率 19200 -// * @param databits 数据位 8 -// * @param parity 校验位（奇偶位） NONE ：0 -// * @param stopbits 停止位 1 -// * @return 串口对象 -// */ -// public SerialPort openPort(String portName, int baudrate, int databits, int parity, int stopbits) { -// try { -// //通过端口名识别端口 -// CommPortIdentifier portIdentifier = CommPortIdentifier.getPortIdentifier(portName); -// //打开端口，并给端口名字和一个timeout（打开操作的超时时间） -// CommPort commPort = portIdentifier.open(portName, 2000); -// //判断是不是串口 -// if (commPort instanceof SerialPort) { -// SerialPort serialPort = (SerialPort) commPort; -// try { -// //设置一下串口的波特率等参数 -// serialPort.setSerialPortParams(baudrate, databits, stopbits, parity); -// } catch (UnsupportedCommOperationException e) { -// } -//// System.out.println("Open " + portName + " sucessfully !"); -// return serialPort; -// } else { -// log.error("串口通信工具-不是串口"); -// } -// } catch (NoSuchPortException e1) { -// log.error("串口通信工具-没有找到端口"); -// e1.printStackTrace(); -// } catch (PortInUseException e2) { -// log.error("串口通信工具-端口被占用"); -// e2.printStackTrace(); -// } -// return null; -// } -// -// /** -// * 关闭串口 -// * @param serialPort 待关闭的串口对象 -// */ -// public void closePort(SerialPort serialPort) { -// if (serialPort != null) { -// serialPort.close(); -// } -// } -// -// /** -// * 往串口发送数据 -// * @param serialPort 串口对象 -// * @param order 待发送数据 -// */ -// public void sendToPort(SerialPort serialPort, byte[] order) { -// OutputStream out = null; -// try { -// out = serialPort.getOutputStream(); -// out.write(order); -// out.flush(); -// } catch (IOException e) { -// e.printStackTrace(); -// } finally { -// try { -// if (out != null) { -// out.close(); -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } -// } -// -// /** -// * 从串口读取数据 -// * @param serialPort 当前已建立连接的SerialPort对象 -// * @return 读取到的数据 -// */ -// public byte[] readFromPort(SerialPort serialPort) { -// InputStream in = null; -// byte[] bytes = null; -// try { -// in = serialPort.getInputStream(); -// int bufflenth = in.available(); -// while (bufflenth != 0) { -// bytes = new byte[bufflenth]; -// in.read(bytes); -// bufflenth = in.available(); -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } finally { -// try { -// if (in != null) { -// in.close(); -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } -// return bytes; -// } -// -// /** -// * 添加监听器 -// * @param port 串口对象 -// * @param listener 串口监听器 -// */ -// public void addListener(SerialPort port, SerialPortEventListener listener) { -// try { -// //给串口添加监听器 -// port.addEventListener(listener); -// //设置当有数据到达时唤醒监听接收线程 -// port.notifyOnDataAvailable(true); -// //设置当通信中断时唤醒中断线程 -// port.notifyOnBreakInterrupt(true); -// } catch (TooManyListenersException e) { -//// throw new TooManyListeners(); -// log.error("串口通信工具-监听器设置过多"); -// e.printStackTrace(); -// } -// } -// -// /** -// * 删除监听器 -// * @param port 串口对象 -// * @param listener 串口监听器 -// */ -// public void removeListener(SerialPort port, SerialPortEventListener listener) { -// //删除串口监听器 -// port.removeEventListener(); -// } -// -// /** -// * 设置串口的Listener -// * @param serialPort -// * @param listener -// */ -// public static void setListenerToSerialPort(SerialPort serialPort, SerialPortEventListener listener){ -// try { -// //给串口添加事件监听 -// serialPort.addEventListener(listener); -// } catch (TooManyListenersException e) { -// e.printStackTrace(); -// } -// //串口有数据监听 -// serialPort.notifyOnDataAvailable(true); -// //中断事件监听 -// serialPort.notifyOnBreakInterrupt(true); -// } -// -//} diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/config/DestIPTag.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/config/DestIPTag.java index 2d7f4f0..1caca2b 100644 --- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/config/DestIPTag.java +++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/config/DestIPTag.java @@ -44,7 +44,7 @@ public String toProtocolString() { String result = ""; result += BirmmTagTypeEnums.DESTINATION_IP_TAG.getOid(); // OID - result += String.format("%04x", BytesUtil.stringToAsciiStr(ip).length()); // 长度 + result += String.format("%04x", ip.length()); // 长度 result += BytesUtil.stringToAsciiStr(ip); return result; diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/config/DestPortTag.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/config/DestPortTag.java index 7dba55e..ece60d5 100644 --- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/config/DestPortTag.java +++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/config/DestPortTag.java @@ -44,7 +44,7 @@ public String toProtocolString() { String result = ""; result += BirmmTagTypeEnums.DESTINATION_PORT_TAG.getOid(); // OID - result += String.format("%04x", BytesUtil.stringToAsciiStr(port).length()); // 长度 + result += String.format("%04x", port.length()); // 长度 result += BytesUtil.stringToAsciiStr(port); return result;