From a72344e7cc385bfcfffafaac3c5994143eab656e Mon Sep 17 00:00:00 2001
From: JIe Jie <depressedjie@outlook.com>
Date: Tue, 9 Jul 2024 16:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96IMPORT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.rs                    | 4 +++-
 src/models/config_model.rs     | 3 ++-
 src/services/config_service.rs | 2 ++
 src/services/excel_service.rs  | 4 +++-
 src/services/log_service.rs    | 3 ++-
 src/services/serial_service.rs | 5 +++--
 src/services/sqlite_service.rs | 5 +++--
 src/services/ui_service.rs     | 5 +++--
 src/services/work_service.rs   | 5 +++--
 9 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 9a04ac8..c9d17bc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,7 @@
-use fltk::{prelude::*, window::Window, *};
+use fltk::{*, prelude::*};
+
 use crate::services::ui_service::UiService;
+
 mod services;
 mod models;
 mod ui;
diff --git a/src/models/config_model.rs b/src/models/config_model.rs
index eef8708..77e13eb 100644
--- a/src/models/config_model.rs
+++ b/src/models/config_model.rs
@@ -1,4 +1,5 @@
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub(crate) struct ConfigModel{
     pub current_line: usize,
diff --git a/src/services/config_service.rs b/src/services/config_service.rs
index 0ac9747..9ecc938 100644
--- a/src/services/config_service.rs
+++ b/src/services/config_service.rs
@@ -1,5 +1,7 @@
 use std::fs;
+
 use anyhow::Result;
+
 use crate::models::config_model::ConfigModel;
 
 pub(crate) struct ConfigService;
diff --git a/src/services/excel_service.rs b/src/services/excel_service.rs
index 6d27597..6f4d4ec 100644
--- a/src/services/excel_service.rs
+++ b/src/services/excel_service.rs
@@ -1,7 +1,9 @@
 use std::fs::File;
 use std::io::BufReader;
-use calamine::{Reader, open_workbook, Xlsx, Data, DataType};
+
 use anyhow::Result;
+use calamine::{Data, DataType, open_workbook, Reader, Xlsx};
+
 use crate::models::work_model::WorkModel;
 
 pub(crate) struct ExcelService {
diff --git a/src/services/log_service.rs b/src/services/log_service.rs
index 6570d47..18e156f 100644
--- a/src/services/log_service.rs
+++ b/src/services/log_service.rs
@@ -1,7 +1,8 @@
-use log::{Record, Level, Metadata, SetLoggerError};
 use std::sync::{Arc, Mutex};
+
 use chrono::Local;
 use lazy_static::lazy_static;
+use log::{Level, Metadata, Record, SetLoggerError};
 
 type LogCallback = Box<dyn Fn(&str) + Send + Sync>;
 
diff --git a/src/services/serial_service.rs b/src/services/serial_service.rs
index 383c565..896dfc4 100644
--- a/src/services/serial_service.rs
+++ b/src/services/serial_service.rs
@@ -1,9 +1,10 @@
-use anyhow::Result;
-use serialport::*;
 use std::io::prelude::*;
 use std::thread::sleep;
 use std::time::Duration;
 
+use anyhow::Result;
+use serialport::*;
+
 pub struct SerialService {
     port: Box<dyn SerialPort>,
 }
diff --git a/src/services/sqlite_service.rs b/src/services/sqlite_service.rs
index b928007..e5c565d 100644
--- a/src/services/sqlite_service.rs
+++ b/src/services/sqlite_service.rs
@@ -1,7 +1,8 @@
 use anyhow::Result;
-use crate::models::work_model::*;
-use rusqlite::{Connection};
 use chrono::Local;
+use rusqlite::Connection;
+
+use crate::models::work_model::*;
 
 pub(crate) struct SqliteService {
     conn: Connection,
diff --git a/src/services/ui_service.rs b/src/services/ui_service.rs
index 752c49b..57ab2f9 100644
--- a/src/services/ui_service.rs
+++ b/src/services/ui_service.rs
@@ -2,13 +2,14 @@ use std::cell::RefCell;
 use std::process;
 use std::rc::Rc;
 use std::sync::{Arc, Mutex};
+
 use fltk::prelude::{DisplayExt, InputExt, WidgetBase, WidgetExt};
 use fltk::text::TextBuffer;
+
+use crate::services::log_service::LOGGER;
 use crate::services::work_service::WorkService;
 use crate::ui::main_ui;
 use crate::ui::main_ui::*;
-use crate::services::log_service::LOGGER;
-
 
 pub(crate) struct UiService {
     ui: Rc<RefCell<UserInterface>>,
diff --git a/src/services/work_service.rs b/src/services/work_service.rs
index d7c31f4..036f3e9 100644
--- a/src/services/work_service.rs
+++ b/src/services/work_service.rs
@@ -1,8 +1,9 @@
 use anyhow::Result;
 use log::Log;
-use crate::models::work_model::WorkModel;
+
 use crate::models::config_model::ConfigModel;
-use crate::services::{serial_service::SerialService, sqlite_service::SqliteService, excel_service::ExcelService, config_service::ConfigService};
+use crate::models::work_model::WorkModel;
+use crate::services::{config_service::ConfigService, excel_service::ExcelService, serial_service::SerialService, sqlite_service::SqliteService};
 use crate::services::log_service::{FltkLogger, init_logger, LOGGER};
 
 pub struct WorkService {