From 66e4e5daf2915463f213de9e41f5cdb8be19cace Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Fri, 16 Dec 2022 11:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SDK_ReadMe_请先读我.txt               |   0
 .../罗伯泰克plc通讯协议1.jpg          | Bin
 .../罗伯泰克plc通讯协议2.jpg          | Bin
 readme.md                                     |  50 +++++++++++-------
 app.sh => script_run/app.sh                   |   0
 lia_duoji.sql => script_run/lia_duoji.sql     |   0
 script_run/mysql.bat                          |  18 +++++++
 start-jar.bat => script_run/start-jar.bat     |   0
 stop-jar.bat => script_run/stop-jar.bat       |   0
 9 files changed, 50 insertions(+), 18 deletions(-)
 rename SDK_ReadMe_请先读我.txt => doc/SDK_ReadMe_请先读我.txt (100%)
 rename plc通讯协议1.jpg => doc/罗伯泰克plc通讯协议1.jpg (100%)
 rename plc通讯协议2.jpg => doc/罗伯泰克plc通讯协议2.jpg (100%)
 rename app.sh => script_run/app.sh (100%)
 rename lia_duoji.sql => script_run/lia_duoji.sql (100%)
 create mode 100644 script_run/mysql.bat
 rename start-jar.bat => script_run/start-jar.bat (100%)
 rename stop-jar.bat => script_run/stop-jar.bat (100%)

diff --git a/SDK_ReadMe_请先读我.txt b/doc/SDK_ReadMe_请先读我.txt
similarity index 100%
rename from SDK_ReadMe_请先读我.txt
rename to doc/SDK_ReadMe_请先读我.txt
diff --git a/plc通讯协议1.jpg b/doc/罗伯泰克plc通讯协议1.jpg
similarity index 100%
rename from plc通讯协议1.jpg
rename to doc/罗伯泰克plc通讯协议1.jpg
diff --git a/plc通讯协议2.jpg b/doc/罗伯泰克plc通讯协议2.jpg
similarity index 100%
rename from plc通讯协议2.jpg
rename to doc/罗伯泰克plc通讯协议2.jpg
diff --git a/readme.md b/readme.md
index ca67a82..8179a8b 100644
--- a/readme.md
+++ b/readme.md
@@ -1,26 +1,40 @@
-# 舵机
+## 初始化启动的逻辑，见com.leaper.web.service.InitService
+### 包括启动自动连接球机、自动连接WMS或者plc
+
 ## 通讯协议：
-### 昆船通訊協議见doc文件夹，每个项目的协议会略有差异，但是格式不会变
-### tcp通讯用的netty
-### 昆船通讯协议编解码在web
-#### 1.HeartNettyClient*类是维持与plc的心跳
-#### 2.解码：MyProtocolDecode 这里收到plc的包解析处理，见通讯协议的两张图片
-#### 3.调用sdk拍照，录像，转动球机等操作在com.zhehekeji.web.lib里面
+### tcp通讯用的netty框架
+### 昆船通讯协议编解码在com.leaper.web.service.kesc下面
+#### 罗伯泰克协议见doc文件夹下JSON通讯协议文档，每个项目会略有差异，但是格式不变，可能就是加一个字段，改一个字段
+
+### 罗伯泰克协议编解码在com.leaper.web.service.robotic下面
+#### 罗伯泰克协议见doc文件夹下两张图片（罗伯泰克plc通讯协议1——2.jpg）
+
+
 ## SDK:
-### 1.调用sdk的代码在 com.zhehekeji.web.lib下面
+### 1.调用sdk的代码在 com.leaper.web.lib下面
 ### 2.sdk在根目录libs下面
 ### 3.sdk回调在CallBack类里，重连回调，断线回调，球机转动回调，下载mp4下载结束回调
-### 4.详见SDK_ReadMe_请先读我.TXT
-### InitService: 项目启动自动登录球机，自动连接PLC
+### 4.详见doc/SDK_ReadMe_请先读我.TXT
 ### 球机的连接句柄维护在CameraConnMap类里,key:球机ID，value:登录句柄
-# 部署 使用利珀一键部署服务
-## windows(该服务一般都会放在win10系统上)
-### start-jar.bat (注意目录和profile)
-### stop-jar.bat  (注意端口号)
-## linux: 
-### sh app.sh start
-### sh app.sh restart
-### sh app.sh stop
+
+## 设备控制：
+### SICK扫码枪： com.leaper.web.service.sick
+#### 逻辑是tcp发送start,sick扫码枪会回复条码
+### RFID: com.leaper.web.service.RFID
+#### tcp协议，6C标签需要左右两个天线一直切换，并且不断发送条码识别信号
+### 光源控制：分为两个
+#### 海康视觉控制器：com.leaper.web.service.hikLightSource
+#### JayDam: com.leaper.web.service.damLightSource
+
+## 关于lib文件夹
+### code_scan: 条码识别dll
+### ffmpeg: 海康球机下载的视频，无法在浏览器播放，需要调用该库修改视频格式为标准mp4
+### hik: 海康球机SDK
+### win64: 中威球机SDK
+
+
+## script_run 一些启动脚本，由于部署方式改变，已经用不到了
+## 数据库初始化sql: script_run/lia_duoji.sql
 
 
 
diff --git a/app.sh b/script_run/app.sh
similarity index 100%
rename from app.sh
rename to script_run/app.sh
diff --git a/lia_duoji.sql b/script_run/lia_duoji.sql
similarity index 100%
rename from lia_duoji.sql
rename to script_run/lia_duoji.sql
diff --git a/script_run/mysql.bat b/script_run/mysql.bat
new file mode 100644
index 0000000..7cbe058
--- /dev/null
+++ b/script_run/mysql.bat
@@ -0,0 +1,18 @@
+@ECHO OFF 
+
+SET dbhost=127.0.0.1 
+SET dbuser=root
+SET dbpasswd=Leaper@123
+SET dbName=test
+set sqlfile=C:\Users\Peter\Desktop\lia_duoji.sql
+
+cd D:\hzleaper_auto_install\mysql-5.7.33-winx64\bin
+
+::执行SQL脚本
+@ECHO Start!
+mysql -h%dbhost% -u%dbuser% -p%dbpasswd% < %sqlfile% --default-character-set=utf8
+
+ECHO OK!
+PAUSE
+
+@ECHO Done!
\ No newline at end of file
diff --git a/start-jar.bat b/script_run/start-jar.bat
similarity index 100%
rename from start-jar.bat
rename to script_run/start-jar.bat
diff --git a/stop-jar.bat b/script_run/stop-jar.bat
similarity index 100%
rename from stop-jar.bat
rename to script_run/stop-jar.bat