From 6a9148db96ae24cb932ee50e9427269569348868 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期一, 28 四月 2025 09:14:53 +0800 Subject: [PATCH] 手册,海康接口调整 --- ycl-server/src/main/java/com/ycl/task/HKTask.java | 4 ycl-server/src/main/java/com/ycl/feign/HKLabelName.java | 25 +-- 运维手册.md | 318 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 330 insertions(+), 17 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/feign/HKLabelName.java b/ycl-server/src/main/java/com/ycl/feign/HKLabelName.java index b67b341..6bf908c 100644 --- a/ycl-server/src/main/java/com/ycl/feign/HKLabelName.java +++ b/ycl-server/src/main/java/com/ycl/feign/HKLabelName.java @@ -7,30 +7,23 @@ @Getter public enum HKLabelName { - carBigPictureAccess("carBigPictureAccess", "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�"), - carButtStability2023("carButtStability2023", "杞﹁締瑙嗗浘搴撳鎺ョǔ瀹氭��"), carClockAccuracy("carClockAccuracy", "杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬�"), - carCorrectRate("carCorrectRate", "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�"), - - carDelay("carDelay", "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�"), - carOnlineRate2023("carOnlineRate2023", "杞﹁締鐐逛綅鍦ㄧ嚎鐜�"), - carQualifiedRate("carQualifiedRate", "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�"), carUrlOkRate("carUrlOkRate", "杞﹁締鍗″彛璁惧url鍙敤鎬�"), + carBigPictureAccess("carBigPictureAccess", "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�"), + carCorrectRate("carCorrectRate", "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�"), + carQualifiedRate("carQualifiedRate", "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�"), + carOnlineRate2023("carOnlineRate2023", "杞﹁締鐐逛綅鍦ㄧ嚎鐜�"), + carButtStability2023("carButtStability2023", "杞﹁締瑙嗗浘搴撳鎺ョǔ瀹氭��"), - + faceClockAccuracy("faceClockAccuracy", "浜鸿劯璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬�"), + faceCapturedPicturesEligibility("faceCapturedPicturesEligibility", "浜鸿劯璁惧鎶撴媿鍥剧墖鍚堟牸鎬�"), faceBigPictureAccess("faceBigPictureAccess", "浜鸿劯鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�"), - - + faceDelay("faceDelay", "璁惧鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�"), + faceOnlineRate("faceOnlineRate", "浜鸿劯鐐逛綅鍦ㄧ嚎鐜�"), faceButtStability2023("faceButtStability2023", "浜鸿劯瑙嗗浘搴撳鎺ョǔ瀹氭��"), - faceCapturedPicturesEligibility("faceCapturedPicturesEligibility", "浜鸿劯璁惧鎶撴媿鍥剧墖鍚堟牸鎬�"), - faceClockAccuracy("faceClockAccuracy", "浜鸿劯璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬�"), - - faceDelay("faceDelay", "璁惧鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�"), - - faceOnlineRate("faceOnlineRate", "浜鸿劯鐐逛綅鍦ㄧ嚎鐜�"), ; diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java index bb9940a..21f06c4 100644 --- a/ycl-server/src/main/java/com/ycl/task/HKTask.java +++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java @@ -709,7 +709,7 @@ if (faceJson != null) { String code = scoreJson.getString("code"); if (ApiConstants.HKSuccessCode.equals(code)){ - JSONObject data = scoreJson.getJSONObject("data"); + JSONObject data = faceJson.getJSONObject("data"); Map<Integer,JSONObject> map = new HashMap<>(); //鑾峰緱data 涓� batchId 鐨勬壒娆d瀵硅薄 鏀惧叆map涓� @@ -906,6 +906,8 @@ face.setFaceInformationCollectionAccuracy(new BigDecimal("1")); //TODO:娌℃壘鍒拌�冩牳椤� 璁惧鐩綍涓�鑷寸巼 face.setDeviceDirectoryConsistent(new BigDecimal("1")); + + //TODO:娌℃壘鍒拌�冩牳椤� 杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜� car.setVehicleInformationCollectionAccuracy(new BigDecimal("1")); //TODO:娌℃壘鍒拌�冩牳椤� 鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼 diff --git "a/\350\277\220\347\273\264\346\211\213\345\206\214.md" "b/\350\277\220\347\273\264\346\211\213\345\206\214.md" new file mode 100644 index 0000000..d771717 --- /dev/null +++ "b/\350\277\220\347\273\264\346\211\213\345\206\214.md" @@ -0,0 +1,318 @@ +# 娴嬭瘯鐜 + +鏈嶅姟鍣↖P锛�51.92.65.72 + +杩滅▼杩炴帴锛歳oot yunwei@123 + +## MySQL + +[centos7绂荤嚎瀹夎mysql](https://blog.csdn.net/m0_52985087/article/details/134444801) + +> 瀹夎鐩綍 + +`/usr/local/mysql` + +> 閰嶇疆鏂囦欢 + +`/etc/my.cnf` + +> 鏁版嵁搴撱�佸瘑鐮� + +```txt +zgyw zgyw@202488 +``` + +> 鍚姩鍛戒护 + +`service mysql start` + + + + + +## nginx + +[centos7绂荤嚎瀹夎nginx](https://blog.csdn.net/qq_42999949/article/details/121577084) + +> 瀹夎鐩綍 + +`/usr/local/nginx` + +> 閰嶇疆鏂囦欢浣嶇疆 + +`/usr/local/nginx/conf/nginx.conf` + +> 鍓嶇鍖呬綅缃� + +`/usr/local/deploy`/ + + + +## java + +> 瀹夎鐩綍 + +`usr/local/deploy`鐩綍涓� + +jdk17 + +灏嗛厤缃枃浠舵彁鍙栧湪jar鍖呭鐨勶紝濡傛灉瑕佷慨鏀归厤缃枃浠剁洿鎺ヤ慨鏀规湇鍔″櫒涓婄殑锛歚application.yml`銆乣application-prod.yml` + +> 濡備綍涓婁紶鏂囦欢 + +浣跨敤鐨勮繙绋嬪伐鍏蜂负锛歚MobaXterm` + +杩炴帴涓婃湇鍔″櫒鍚庯紝宸︿笂瑙掓湁涓婁紶锛� + +涓婁紶鍚庣殑鏂囦欢浣嶄簬锛歚/root/`涓嬨�傞渶瑕佸鍒跺埌`/usr/local/deploy/`涓嬶細`mv /root/xxx /usr/local/deploy/` + +> 鍚姩鍋滄鏈嶅姟 + +鍚姩锛歚./startserver.sh` + +鍋滄锛氭煡鎵剧鍙�(`ps -ef | grep java`)锛屾潃鎺夌鍙o細`kill -9 绔彛鍙穈 + + + +## mongo + +> 瀹夎鐗堟湰 + +```txt +mongo7 +``` + +> 瀹夎浣嶇疆 + +`/usr/local/mongodb7` + +> 閰嶇疆鏂囦欢浣嶇疆 + +```txt +/usr/local/mongodb7/mongo.conf +``` + +> 鍚姩 + +`/usr/local/mongodb7/bin/mongod -f /usr/local/mongodb7/mongo.conf` + +> 鐢ㄦ埛鍚嶅瘑鐮� + +```txt +root yunwei@2024 +``` + +> 鐩爣鏁版嵁搴� + +```txt +zgyw +``` + +> 濡備綍杩炴帴鍒版暟鎹簱 + +1. 浠绘剰鍦版柟杈撳叆锛歚mongosh`浼氳繘鍏est鏁版嵁搴� +2. 鍒囨崲鍒癮dmin鏁版嵁搴擄紝`use admin` +3. 璁よ瘉锛歚db.auth("root","yunwei@2024")` +4. 璁よ瘉鎴愬姛鍚庯紝鍒囨崲鍒皕gyw鏁版嵁搴擄細`use zgyw` +5. 鏌ヨ闆嗗悎锛歚show collections` +6. 鏌ヨ闆嗗悎涓殑鏁版嵁锛歚db.闆嗗悎鍚�.find()`锛岃繖鏄煡鍏ㄩ儴 +7. 鍒犻櫎闆嗗悎锛歚db.闆嗗悎鍚�.drop()`锛屾祴璇曠幆澧冨彲鐢� +8. 閫�鍑猴細`exit` + + + +> mongo宸ュ叿 + +浣嶄簬锛歚/usr/local/mongodb7/mongo-tools/bin` + + + +## redis + +[centos7绂荤嚎瀹夎redis](https://blog.csdn.net/u010177412/article/details/81780844) + +> 瀹夎鐗堟湰 + +```txt +redis6 +``` + +> 瀹夎浣嶇疆 + +`/usr/local/redis-6.2.14` + +> 閰嶇疆鏂囦欢浣嶇疆 + +```txt +/usr/local/redis-6.2.14/redis.conf +``` + +> 鐢ㄦ埛鍚嶅瘑鐮� + +```txt +鏃� +``` + +> 鐩爣鏁版嵁搴� + +```txt +1 +``` + +> 濡備綍杩炴帴redis + +1. /usr/local/redis-6.2.14/src鐩綍涓嬫湁涓細redis-cli鐨勮剼鏈� +2. 鍦ㄨ鐩綍涓媊./redis-cli`鍗冲彲杩愯 +3. 鍒囨崲鏁版嵁搴擄細`select 1` +4. 鏌ョ湅鎵�鏈塳ey锛歚keys *` +5. 閫�鍑猴細`exit` + + + +## 浼樹簯骞冲彴 + +> 鐢ㄦ埛鍚嶃�佸瘑鐮� + +```txt +yunwei Yesc@123 +``` + + + +## 杩愮淮绯荤粺jar鍖呭惎鍔ㄨ剼鏈細 + +```bash +#!/bin/bash + +# Jar鍖呭悕绉帮紙涓嶅寘鎷�.jar鍚庣紑锛� +JAR_NAME="zgyw" +# Jar鍖呰矾寰� +JAR_PATH="/usr/local/deploy/ycl-server.jar" +# Java鍛戒护璺緞锛堥�氬父璁剧疆涓簀ava锛岄櫎闈炰綘鐭ラ亾浣犵殑java鍛戒护鍦ㄧ壒瀹氳矾寰勶級 +JAVA_CMD="java -Dspring.profiles.active=prod -Dspring.config.location=/usr/local/deploy/application.yml,/usr/local/deploy/application-prod.yml" + +# 浣跨敤ps鍜実rep鍒楀嚭鎵�鏈変笌SEARCH_STRING鐩稿叧鐨勮繘绋� +echo "鎵惧埌浠ヤ笅java杩涚▼:" +ps -ef | grep "java" + +# 鎻愮ず鐢ㄦ埛杈撳叆瑕佹潃姝荤殑杩涚▼鐨凱ID +read -p "璇疯緭鍏ヨ鏉�姝荤殑杩涚▼鍙�, 鎴栬緭鍏モ�渜鈥濈粨鏉熻剼鏈�: " PID + +# 杈撳叆q锛岄��鍑鸿剼鏈墽琛� +if [ "$PID" = "q" ]; then + echo "Quitting..." + exit 0 +fi + +# 濡傛灉鐢ㄦ埛杈撳叆-1锛屽垯涓嶉渶瑕佹潃姝昏繘绋嬶紝鐩存帴鍚姩 +if [ "$PID" = "q" ]; then + # 鍚姩Jar鍖� + echo "Starting $JAR_NAME..." + nohup $JAVA_CMD -jar $JAR_PATH 2>&1 & + echo "$JAR_NAME started with PID $!" +fi + +# 妫�鏌ヨ緭鍏ョ殑PID鏄惁涓烘暟瀛� +if ! [[ "$PID" =~ ^[0-9]+$ ]]; then + echo "璇疯緭鍏ユ纭殑鏁板瓧杩涚▼鍙�. 杈撳叆鈥渜鈥濆彲缁撴潫鑴氭湰." + exit 1 +fi + +# 妫�鏌ヨPID鏄惁瀛樺湪 +if ! kill -0 "$PID" 2>/dev/null; then + echo "PID $PID does not exist." + exit 1 +fi + +# 鏉�姝昏繘绋� +kill -SIGTERM "$PID" + +# 鍙�夛細绛夊緟鍑犵閽熺湅杩涚▼鏄惁閫�鍑� +sleep 2 + +# 鍚姩Jar鍖� +echo "Starting $JAR_NAME..." +nohup $JAVA_CMD -jar $JAR_PATH 2>&1 & +echo "$JAR_NAME started with PID $!" +``` + +鍙渶灏唈ar鍖呬笂浼犺嚦鏈嶅姟鍣紝姝ゆ湇鍔″櫒涓婁紶榛樿鍦╜/root/`涓嬶紝涓婁紶鍒皉oot涓嬪悗锛岀洿鎺ユ墽琛屾鑴氭湰鍗冲彲銆� + +濡傛洿鎹㈡湇鍔″櫒锛岃鍦ㄦ湇鍔″櫒涓婏細`vi xxx.sh`锛屽鍒惰繘鍘诲悗锛岄渶瑕佽缃负鍙繍琛岃剼鏈細`chmod a+x xxx.sh` + + + +## 宸ュ崟鍙栬棰戞祦涓�甯у浘鐗� + +瀹炵幇锛氫娇鐢╣b28181鍗忚瀵规帴澶у崕骞冲彴锛屽鎺ユ垚鍔熷悗澶у崕浼氭帹閫佸浗鏍囩骇鑱旂洰褰�(鍥芥爣璁惧)锛屾牴鎹浗鏍囪澶囦互鍙婂叾涓殑閫氶亾鍗冲彲浣跨敤鐐规挱鑾峰彇鍒版煇涓憚鍍忓ご鐨勮棰戞祦锛屾嬁鍒拌棰戞祦灏卞彲浠ュ彇涓�甯у緱鍒板浘鐗囥�� + + + +浣跨敤鐨勫紑婧愰」鐩細 + +1. [wvp-pro](https://doc.wvp-pro.cn/#/_content/introduction/config)锛寃vp-pro鏄疄鐜颁簡gb281鍗忚鐨勪竴濂楀紑婧愭鏋讹紝鍩轰簬springboot+vue瀹炵幇銆� +2. [ZLmediaKit](https://github.com/ZLMediaKit/ZLMediaKit/wiki/%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B)锛孼LmediaKit鏄竴涓媺娴佸彇娴佺殑寮�婧愮熆寤猴紝鍩轰簬c++瀹炵幇銆� + +浜岃�呯浉浜掗厤鍚堬紝wvp-pro閫氳繃gb281寰楀埌鎷夋祦闇�瑕佺殑鏁版嵁(鍙傛暟)锛岀劧鍚庨�氳繃鍏剁偣鎾帴鍙e皢娴佹帹閫佽嚦ZLmediaKit杞崲鎴愬悇绉嶅崗璁殑瑙嗛鍦板潃锛坮tsp銆乵p4绛夌瓑绛夌瓑锛夈�傛垜浠彲浠ュ湪鑷繁鐨勭▼搴忎腑璋冪敤wvp-pro鐨勭偣鎾帴鍙e氨鑳藉緱鍒皕lmediakit杩斿洖鐨勮棰戝湴鍧�浜嗭紝涔熷氨鑳芥嬁鍒颁竴甯у浘鐗囥�� + + + +### 閮ㄧ讲zlmediakit + +褰撳墠閮ㄧ讲浣嶇疆锛歚/usr/zlm/` + + + +鍥犱负鏄唴缃戠幆澧冿紝鎵�浠ラ儴缃蹭細姣斿叾瀹樻柟鏂囨。鐨勬搷浣滆澶嶆潅涓�浜涖�� + +1. 绗竴姝ワ紝瀹夎openssl銆乬cc銆乬cc-c++銆乧make鍖咃紝杩欐槸zlm蹇呰鐨勭幆澧冦�傦紙openssl version 鏌ョ湅鏄惁瀹夎锛夊鏋滀綘宸茬粡绂荤嚎瀹夎浜唕edis銆乶ginx锛岄偅涔堣繖涓や釜鍖呭ぇ姒傜巼宸茬粡瀹夎浜嗐�� +2. 鍦ㄤ竴鍙板叕缃戞湇鍔″櫒涓婏紝鍘诲厠闅唞lm椤圭洰锛岄粯璁ゅ儚闃块噷浜戙�佽吘璁簯鐨勪簯鏈嶅姟鍣ㄩ兘鑷甫git銆備唬鐮佷笅杞藉畬鎴愬悗锛屾墽琛屽叾鏂囨。鐨勫懡浠わ紝鍒囪涓嶈兘婕忚繖涓懡浠わ細`git submodule update --init` + +```bash +#鍥藉唴鐢ㄦ埛鎺ㄨ崘浠庡悓姝ラ暅鍍忕綉绔檊itee涓嬭浇 +git clone --depth 1 https://gitee.com/xia-chu/ZLMediaKit +cd ZLMediaKit +#鍗冧竾涓嶈蹇樿鎵ц杩欏彞鍛戒护 +git submodule update --init +``` + +3. 鎵ц瀹屽懡浠ゅ悗锛屽帇缂﹝lm椤圭洰锛屼笂浼犲埌鍐呯綉鏈嶅姟鍣ㄨВ鍘嬨�� + + + +4. 杩愯 + + + +5. 鏉�姝粃lm杩涚▼锛歚ps -ef | grep MediaServer`锛岀劧鍚巏ill +6. 閰嶇疆鏂囦欢锛岄粯璁ttp銆乭ttps绔彛涓�80銆�443鍜宯ginx鍐茬獊锛屾墍浠ヨ鏀圭鍙c�傞厤缃枃浠朵篃鍦╜ZLmediaKit/release/linux/Debug/conf.ini`涓�傛敞鎰忥紝杩欓噷鍙渶瑕佹敼绔彛鑳藉惎鍔ㄥ氨琛岋紝鍚庣画wvp-pro浼氳嚜鍔ㄩ厤缃鏂囦欢 + + + +### 閮ㄧ讲wvp-pro + +褰撳墠閮ㄧ讲浣嶇疆锛歚/usr/local/deploy/wvp/` + + + +1. 淇敼閰嶇疆鏂囦欢锛氫富瑕佽淇敼鍏充簬gb284銆亃lm鐨勶細 + + + +杩欎簺閮藉彲浠ヨ嚜瀹氫箟锛屼絾鏄繖浜涗篃鏄渶瑕佸ぇ鍗庡钩鍙版坊鍔犵殑淇℃伅锛宨d鏃㈠仛缂栧彿涔熷仛鐢ㄦ埛鍚嶃�� + +<img src="https://xiangpeitop.oss-cn-chengdu.aliyuncs.com/blogimgs/image-20240830160353086.png" alt="image-20240830160353086" style="zoom:80%;" /> + +娉ㄦ剰锛歩d蹇呴』鍜寊lm閰嶇疆鏂囦欢涓殑mediaServerId(灞炴�у悕濂藉儚鍙繖涓�)涓�鑷淬�俿ecret涔熷繀椤讳竴鑷�(瀵瑰簲zlm涓殑閫氱敤閰嶇疆涓殑secret) + + + +鍥犱负wvp鏄痵prngboot鐨勬墍浠ユ墦鍖咃細鍏堟墦鍓嶇浼氭墦鍖呭埌jar鍖呴潤鎬佹枃浠朵腑锛屽啀鎵搄ar鍖呭嵆鍙� + +wvp鏄渶瑕佹暟鎹簱銆乺edis鐨勩�� + + + +wvp閮ㄧ讲濂戒箣鍚庯紝鑱旂郴澶у崕骞冲彴鐨勪汉锛屽湪澶у崕sip鍥芥爣骞冲彴娣诲姞鎴戜滑wvp鐨剆ip淇℃伅锛屾坊鍔犱箣鍚庯紝澶у崕浼氭帹閫佸埌鍥芥爣鐩綍鍒皐vp骞冲彴锛堝浗鏍囪澶囪彍鍗曪級銆傚彧鏈変竴鏉℃暟鎹紝鐐瑰嚮鍙充晶鎿嶄綔鎸夐挳锛氶�氶亾锛屽氨鑳界湅鍒版墍鏈夎澶囷紝鍏朵腑閫氶亾缂栧彿灏辨槸鍥芥爣鐮併�� + +鏍规嵁杩欎竴涓浗鏍囪澶囩殑璁惧缂栧彿+涓�鏈轰竴妗h澶囩殑鍥芥爣鐮侊紝鎴戜滑鐨勭郴缁熷氨鑳借皟鐢╳vp鐐规挱鎺ュ彛鎷垮埌瑙嗛鍦板潃锛岀劧鍚庡彇甯т繚瀛樹负鍥剧墖銆� -- Gitblit v1.8.0