Skip to content

S
sparrowzz
Commit 769fc826 by dongshufeng
Options

refactor(all): remove nousage files

parent 40a0f0f2
正在显示 包含 16 行增加 和 328 行删除
eig-domain/src/excel.rs deleted 100644 → 0
use std::collections::HashMap;
use std::io::{Cursor, Write};
use std::path::Path;
use calamine::{open_workbook_auto_from_rs, Data, Reader, Sheets, Xlsx, open_workbook_from_rs};
pub fn excel_to_csv_bytes<P: AsRef<Path>>(path: P) -> Option<Vec<Vec<u8>>> {
let bytes = std::fs::read(path).ok()?;
excel_bytes_to_csv_bytes(bytes.as_slice())
}
pub fn get_first_sheet_merged_cells(bytes: Vec<u8>) -> Option<(u32, u32, HashMap<(u32,u32), (u32, u32)>)> {
let c = Cursor::new(bytes);
let mut excel: Xlsx<_> = open_workbook_from_rs(c).ok()?;
excel.load_merged_regions().ok()?;
let sheet_names = excel.sheet_names();
let mut max_col = 0;
if sheet_names.len() > 0 {
let v = excel.merged_regions_by_sheet(&sheet_names[0]);
let mut merged_cells = HashMap::with_capacity(v.len());
for (_, _, c) in v {
merged_cells.insert(c.start, c.end);
if c.end.1 > max_col {
max_col = c.end.1;
}
}
let range = excel.worksheet_range_ref(&sheet_names[0]).ok()?;
let (m, w) = range.get_size();
let n = if w as u32 > max_col + 1 { w as u32 } else { max_col + 1 };
return Some((m as u32, n, merged_cells));
}
None
}
pub fn excel_bytes_to_csv_bytes(bytes: &[u8]) -> Option<Vec<Vec<u8>>> {
let c = Cursor::new(bytes.to_vec());
if let Ok(mut xl) = open_workbook_auto_from_rs(c) {
let mut sheet_names = xl.sheet_names();
sheet_names.retain(|name| !name.starts_with('_'));
sheets_to_csv(&mut xl, sheet_names)
} else {
let is_csv = csv::ReaderBuilder::new()
.has_headers(true)
.from_reader(bytes)
.records()
.next().is_some_and(|x| x.is_ok());
if is_csv {
Some(vec![bytes.to_vec()])
} else {
None
}
}
}
pub fn excel_bytes_to_csv_bytes_by_sheet_names(
bytes: &[u8],
names: Vec<String>,
) -> Option<Vec<Vec<u8>>> {
let c = Cursor::new(bytes.to_vec());
let mut xl = open_workbook_auto_from_rs(c).ok()?;
sheets_to_csv(&mut xl, names)
}
fn sheets_to_csv<T>(xl: &mut Sheets<T>, names: Vec<String>) -> Option<Vec<Vec<u8>>>
where
T: std::io::Read + std::io::Seek,
{
let mut result = Vec::with_capacity(names.len());
for name in names {
let range = xl.worksheet_range(name.as_str()).ok()?;
let n = range.get_size().1 - 1;
let mut dest = Vec::new();
for r in range.rows() {
for (i, c) in r.iter().enumerate() {
match *c {
Data::Empty => Ok(()),
Data::String(ref s) => {
if s.contains(',')
|| s.contains('\r')
|| s.contains('\n')
|| s.contains('"')
{
let new_s = s.replace('\"', "\"\"");
write!(dest, "\"{new_s}\"")
} else {
write!(dest, "{s}")
}
}
Data::Float(ref f) => write!(dest, "{f}"),
Data::DateTime(ref data) => write!(dest, "{data}"),
Data::DurationIso(ref s) | Data::DateTimeIso(ref s) => write!(dest, "{s}"),
Data::Int(ref i) => write!(dest, "{i}"),
Data::Error(ref e) => write!(dest, "{:?}", e),
Data::Bool(ref b) => write!(dest, "{b}"),
}
.ok()?;
if i != n {
write!(dest, ",").ok()?;
}
}
write!(dest, "\r\n").ok()?;
}
if !dest.is_empty() {
result.push(dest);
}
}
Some(result)
}
#[derive(Debug, PartialEq)]
enum FileEncode {
UTF8,
UTF16LE,
UTF16BE,
GBK,
}
pub fn transfer_to_utf8(data: Vec<u8>) -> Result<Vec<u8>,()> {
let encode = get_encoding(data.as_slice());
// encoding_rs::max_utf8_buffer_length
let mut decoder = match encode {
FileEncode::UTF8 => encoding_rs::UTF_8.new_decoder(),
FileEncode::UTF16LE => {
encoding_rs::UTF_16LE.new_decoder()
}
FileEncode::UTF16BE => {
encoding_rs::UTF_16BE.new_decoder()
}
FileEncode::GBK => {
encoding_rs::GBK.new_decoder()
}
};
let mut result = Vec::with_capacity(
decoder.max_utf8_buffer_length(data.len()).unwrap()
);
result.resize(result.capacity(), 0u8);
let (_, _, written, has_errors) = decoder.decode_to_utf8(data.as_slice(), &mut result, true);
if has_errors {
Err(())
} else {
result.truncate(written);
Ok(result)
}
}
fn get_encoding(data: &[u8]) -> FileEncode {
// let data: Vec<u8> = vec![0xFF, 0xFE, 0x41, 0x00, 0x42, 0x00];
// let data = data.to_owned();
// let data_clone = data.to_owned();
let len = data.len();
if len > 2 && data[0] == 0xFF && data[1] == 0xFE {
return FileEncode::UTF16LE;
} else if len > 2 && data[0] == 0xFE && data[1] == 0xFF {
return FileEncode::UTF16BE;
} else if len > 3 && data[0] == 0xEF && data[1] == 0xBB && data[2] == 0xBF {
// UTF8-BOM
return FileEncode::UTF8;
} else {
// 根据编码规则判断编码格式是GBK/UTF-8
//无文件头根据编码规律来判断编码格式
//UTF-8的编码规则很简单，只有二条：
//1）对于单字节的符号，字节的第一位设为0，后面7位为这个符号的unicode码。因此对于英语字母，UTF - 8编码和ASCII码是相同的。
//2）对于n字节的符号（n>1），第一个字节的前n位都设为1，第n + 1位设为0，后面字节的前两位一律设为10。剩下的没有提及的二进制位，全部为这个符号的unicode码。
// let mut byte_number = 0;
let mut utf8_number = 0;
let mut index = 0;
while index < len {
//取第一个字节判断第一位是否为1，以及获取第一位为1时后面位连续为1的数量
let mut byte_number = 0;
for i in 0..8 {
if data[index] & (0b10000000 >> i) != 0 {
byte_number += 1;
} else {
break;
}
}
//若byte等于0，则非中文，中文数量清零
if byte_number == 0 {
utf8_number = 0;
index += 1;
} else if byte_number == 1 || byte_number > 4 {
return FileEncode::GBK;
} else {
//如果该字节开头几位连续为1，且数量byte超过1，则判断d该自己后面byte-1个字节是否符合UTF-8编码规则, 即10开头；
for i in 1..byte_number {
if data[index + i] & 0b11000000 != 0b10000000 {
return FileEncode::GBK;
}
}
//即使满足UTF-8，仍可能为GBK
//如果连续的UTF-8编码的中文数量超过3个，则判断为utf-8
utf8_number += 1;
index += byte_number;
if utf8_number >= 3 {
return FileEncode::UTF8;
}
}
}
}
return FileEncode::UTF8;
}
\ No newline at end of file
eig-domain/src/prop.rs 100755 → 100644
...@@ -2,7 +2,11 @@ use std::{fmt, str::FromStr}; ...@@ -2,7 +2,11 @@ use std::{fmt, str::FromStr};
use std::fmt::{Display, Formatter}; use std::fmt::{Display, Formatter};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::DataUnitError;
#[derive(Debug, Clone, PartialEq)]
pub enum DataUnitError {
UnknownDataUnit(String),
}
/** /**
* @api {枚举_采集数据类型} /DataType DataType * @api {枚举_采集数据类型} /DataType DataType
...@@ -133,6 +137,8 @@ impl FromStr for DataType { ...@@ -133,6 +137,8 @@ impl FromStr for DataType {
"EightByteIntSigned" => DataType::EightByteIntSigned, "EightByteIntSigned" => DataType::EightByteIntSigned,
"EightByteIntUnsignedSwapped" => DataType::EightByteIntUnsignedSwapped, "EightByteIntUnsignedSwapped" => DataType::EightByteIntUnsignedSwapped,
"EightByteIntSignedSwapped" => DataType::EightByteIntSignedSwapped, "EightByteIntSignedSwapped" => DataType::EightByteIntSignedSwapped,
"EightByteIntUnsignedSwappedSwapped" => DataType::EightByteIntUnsignedSwappedSwapped,
"EightByteIntSignedSwappedSwapped" => DataType::EightByteIntSignedSwappedSwapped,
"EightByteFloat" => DataType::EightByteFloat, "EightByteFloat" => DataType::EightByteFloat,
"EightByteFloatSwapped" => DataType::EightByteFloatSwapped, "EightByteFloatSwapped" => DataType::EightByteFloatSwapped,
"EightByteMod10kSwapped" => DataType::EightByteMod10kSwapped, "EightByteMod10kSwapped" => DataType::EightByteMod10kSwapped,
...@@ -692,7 +698,7 @@ impl Display for DataUnit { ...@@ -692,7 +698,7 @@ impl Display for DataUnit {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::DataUnit; use crate::prop::DataUnit;
#[test] #[test]
fn test() { fn test() {
......
eig-domain/src/proto.rs 100755 → 100644
File mode changed from 100755 to 100644
eig-domain/src/topics.rs deleted 100755 → 0
static EIG_IN: &str = "GwIn";
static EIG_OUT: &str = "GwOut";
// --------------------- from users to gateway -------------------
/// 控制指令下发，内容是　PbSetPoints
pub fn set_points(bee_id: &str) -> String {
format!("{EIG_IN}/C/{bee_id}")
}
/// aoe调度指令，内容是 PbAoeOperation
pub fn aoe_control(bee_id: &str) -> String {
format!("{EIG_IN}/Aoe/{bee_id}")
}
/// 重置，无内容
pub fn reset(bee_id: &str) -> String {
format!("{EIG_IN}/Reset/{bee_id}")
}
/// recover，无内容
pub fn recover(bee_id: &str) -> String {
format!("{EIG_IN}/Recover/{bee_id}")
}
/// 重置AOE文件，内容是 PbFile
pub fn reload_aoe_file(bee_id: &str) -> String {
format!("{EIG_IN}/AoeFile/{bee_id}")
}
/// 重置通道文件, 内容是 PbFile
pub fn reload_tp_file(bee_id: &str) -> String {
format!("{EIG_IN}/TpFile/{bee_id}")
}
/// 重置测点文件，内容是 PbFile
pub fn reload_point_file(bee_id: &str) -> String {
format!("{EIG_IN}/PtFile/{bee_id}")
}
/// 重置配置文件，内容是 PbFile
pub fn reload_config_file(bee_id: &str) -> String {
format!("{EIG_IN}/conf/{bee_id}")
}
/// 重置svg文件，内容是 PbFile
pub fn reload_svg_file(bee_id: &str) -> String {
format!("{EIG_IN}/SvgFile/{bee_id}")
}
/// 查询当前所有数据，内容为空
pub fn call_all(bee_id: &str) -> String {
format!("{EIG_IN}/AM/{bee_id}")
}
/// 查询网关Ping消息，内容为空
pub fn gw_ping_req() -> String {
format!("{EIG_IN}/PING/REQ")
}
// --------------------- from gateway to users ------------------------
/// 测量值变化数据上传，内容是 PbPointValues
pub fn measure_changed(bee_id: &str) -> String {
format!("{EIG_OUT}/SM_/{bee_id}")
}
/// 所有当前所有量测值的命令，内容是 PbPointValues
pub fn call_alled(bee_id: &str) -> String {
format!("{EIG_OUT}/AM_/{bee_id}")
}
/// 网关通道、测点、svg三类文件的概况信息，内容是 PbEigProfile
pub fn gw_peeked(bee_id: &str) -> String {
format!("{EIG_OUT}/GP_/{bee_id}")
}
/// 网关的概况，内容是 pbEigPing
pub fn gw_ping_res() -> String {
format!("{EIG_OUT}/PING/RES")
}
/// 网关里的文件，内容是 PbFile
pub fn gw_file_res(file_url: &str) -> String {
format!("{EIG_OUT}/FR_/{file_url}")
}
/// 内容是 PbEigAlarms
pub fn gw_alarmed(bee_id: &str) -> String {
format!("{EIG_OUT}/ALARM_/{bee_id}")
}
pub fn gw_loged(file_url: &str) -> String {
format!("{EIG_OUT}/LOG_/{file_url}")
}
/// 设点结果，内容是 PbSetPointResults
pub fn set_points_result(bee_id: &str) -> String {
format!("{EIG_OUT}/C_/{bee_id}")
}
/// aoe运行结果，内容是 PbAoeResult
pub fn aoe_executed(bee_id: &str) -> String {
format!("{EIG_OUT}/AH_/{bee_id}")
}
pub fn standby_topic(bee_id: &str) -> String {
format!("standby/{}", bee_id)
}
\ No newline at end of file
eig-domain/src/web.rs
use std::collections::HashMap; use std::collections::HashMap;
use serde::{Serialize, Deserialize}; use serde::{Serialize, Deserialize};
use crate::PbEigPingRes; use crate::proto::eig::PbEigPingRes;
/** /**
* @api {Eig配置对象} /EigConfig EigConfig * @api {Eig配置对象} /EigConfig EigConfig
......
mems/examples/ds-3phase-pf/src/nlp.rs
...@@ -3,7 +3,7 @@ use std::collections::HashMap; ...@@ -3,7 +3,7 @@ use std::collections::HashMap;
use ndarray::{Array, array, Array2, Ix2}; use ndarray::{Array, array, Array2, Ix2};
use num_complex::{Complex64, ComplexFloat}; use num_complex::{Complex64, ComplexFloat};
use eig_domain::DataUnit; use eig_domain::prop::DataUnit;
use mems::model::dev::MeasPhase; use mems::model::dev::MeasPhase;
pub fn get_pf_nlp_constraints( pub fn get_pf_nlp_constraints(
......
mems/examples/ds-3phase-pf/src/read.rs
...@@ -3,7 +3,7 @@ use std::collections::HashMap; ...@@ -3,7 +3,7 @@ use std::collections::HashMap;
use csv::StringRecordsIter; use csv::StringRecordsIter;
use ndarray::Array2; use ndarray::Array2;
use eig_domain::DataUnit; use eig_domain::prop::DataUnit;
const MAT_SIZE: usize = 18; const MAT_SIZE: usize = 18;
......
mems/examples/ds-common/src/tn_input.rs
use std::collections::HashMap; use std::collections::HashMap;
use csv::StringRecordsIter; use csv::StringRecordsIter;
use eig_domain::DataUnit; use eig_domain::prop::DataUnit;
use mems::model::dev::MeasPhase; use mems::model::dev::MeasPhase;
pub fn read_shunt_measures(records: &mut StringRecordsIter<&[u8]>) pub fn read_shunt_measures(records: &mut StringRecordsIter<&[u8]>)
......
mems/examples/ds-dev-ohm-cal/src/lib.rs
...@@ -6,7 +6,7 @@ use csv::StringRecordsIter; ...@@ -6,7 +6,7 @@ use csv::StringRecordsIter;
use log::{info, warn}; use log::{info, warn};
use ndarray::{Array2, ArrayBase, Ix2, OwnedRepr}; use ndarray::{Array2, ArrayBase, Ix2, OwnedRepr};
use eig_domain::PropValue; use eig_domain::prop::PropValue;
use mems::model::{get_csv_str, get_df_from_in_plugin, get_island_from_plugin_input, PluginInput, PluginOutput}; use mems::model::{get_csv_str, get_df_from_in_plugin, get_island_from_plugin_input, PluginInput, PluginOutput};
use mems::model::dev::PsRsrType; use mems::model::dev::PsRsrType;
......
mems/examples/ds-dyn-topo/src/lib.rs
...@@ -5,7 +5,7 @@ use bytes::{Buf, BufMut, BytesMut}; ...@@ -5,7 +5,7 @@ use bytes::{Buf, BufMut, BytesMut};
use ds_common::{DEV_TOPO_DF_NAME, DYN_TOPO_DF_NAME, POINT_DF_NAME, STATIC_TOPO_DF_NAME, TERMINAL_DF_NAME}; use ds_common::{DEV_TOPO_DF_NAME, DYN_TOPO_DF_NAME, POINT_DF_NAME, STATIC_TOPO_DF_NAME, TERMINAL_DF_NAME};
use ds_common::static_topo::{read_point_terminal, read_static_topo, read_terminal_cn_dev}; use ds_common::static_topo::{read_point_terminal, read_static_topo, read_terminal_cn_dev};
use eig_domain::DataUnit; use eig_domain::prop::DataUnit;
use mems::model::{get_df_from_in_plugin, get_meas_from_plugin_input, ModelType, PluginInput, PluginOutput}; use mems::model::{get_df_from_in_plugin, get_meas_from_plugin_input, ModelType, PluginInput, PluginOutput};
static mut OUTPUT: Vec<u8> = vec![]; static mut OUTPUT: Vec<u8> = vec![];
......
mems/examples/ds-pf-input/src/lib.rs
...@@ -10,7 +10,7 @@ use ds_common::{DEV_TOPO_DF_NAME, POINT_DF_NAME, SHUNT_MEAS_DF_NAME, TERMINAL_DF ...@@ -10,7 +10,7 @@ use ds_common::{DEV_TOPO_DF_NAME, POINT_DF_NAME, SHUNT_MEAS_DF_NAME, TERMINAL_DF
use ds_common::dyn_topo::read_dev_topo; use ds_common::dyn_topo::read_dev_topo;
use ds_common::static_topo::{read_point_terminal, read_terminal_cn_dev}; use ds_common::static_topo::{read_point_terminal, read_terminal_cn_dev};
use ds_common::tn_input::read_shunt_measures; use ds_common::tn_input::read_shunt_measures;
use eig_domain::{DataUnit, MeasureValue}; use eig_domain::{prop::DataUnit, MeasureValue};
use mems::model::{get_df_from_in_plugin, get_meas_from_plugin_input, PluginInput, PluginOutput}; use mems::model::{get_df_from_in_plugin, get_meas_from_plugin_input, PluginInput, PluginOutput};
use mems::model::dev::{MeasPhase, PsRsrType}; use mems::model::dev::{MeasPhase, PsRsrType};
......
mems/src/model/mod.rs
...@@ -3,7 +3,7 @@ use std::collections::HashMap; ...@@ -3,7 +3,7 @@ use std::collections::HashMap;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use eig_aoe::aoe::AoeModel; use eig_aoe::aoe::AoeModel;
use eig_domain::{DataUnit, Measurement, MeasureValue}; use eig_domain::{prop::DataUnit, Measurement, MeasureValue};
use crate::model::dev::{Island, PropDefine, RsrDefine}; use crate::model::dev::{Island, PropDefine, RsrDefine};
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论