From a87335ba0f5542aef29c0d5236921d3ce9831479 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 29 七月 2024 09:36:29 +0800
Subject: [PATCH] feign完善
---
ycl-server/src/main/resources/application.yml | 5 -----
ycl-server/src/main/resources/application-prod.yml | 5 +++++
ycl-server/src/main/java/com/ycl/web/UYClient.java | 8 +++++---
ycl-server/src/main/java/com/ycl/web/HKClient.java | 35 ++++++++++++++++++-----------------
ycl-server/src/main/resources/application-dev.yml | 6 ++++++
5 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/web/HKClient.java b/ycl-server/src/main/java/com/ycl/web/HKClient.java
index af6f745..faa9b4a 100644
--- a/ycl-server/src/main/java/com/ycl/web/HKClient.java
+++ b/ycl-server/src/main/java/com/ycl/web/HKClient.java
@@ -7,6 +7,7 @@
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author gonghl
@@ -29,7 +30,7 @@
* @return 鎸夊尯鍩熺粺璁＄粡绾害寮傚父璁惧鎴栧崱鍙�
*/
@PostMapping("/dqd/service/rs/v1/device/coordinateExpInfo/query")
- JSONObject coordinateByArea(CoordinateByAreaParam param);
+ JSONObject coordinateByArea(@RequestBody CoordinateByAreaParam param);
/**
* 鎸夊尯鍩熺粺璁＄紪鐮佸紓甯歌澶囨垨鍗″彛
@@ -43,7 +44,7 @@
* @return 鎸夊尯鍩熺粺璁＄紪鐮佸紓甯歌澶囨垨鍗″彛
*/
@PostMapping("/dqd/service/rs/v1/device/gbCodeExpInfo/query")
- JSONObject codeByArea(CodeByAreaParam param);
+ JSONObject codeByArea(@RequestBody CodeByAreaParam param);
/**
* 鎸夊尯鍩熺粺璁′汉鑴告暟鎹洃娴嬫寚鏍囬」
@@ -64,7 +65,7 @@
* @return 鎸夊尯鍩熺粺璁′汉鑴告暟鎹洃娴嬫寚鏍囬」
*/
@PostMapping("/dqd/service/rs/v2/data/faceDetect/query")
- JSONObject faceDetectByArea(FaceDetectParam param);
+ JSONObject faceDetectByArea(@RequestBody FaceDetectParam param);
/**
* 鎸夊尯鍩熺粺璁¤溅杈嗘暟鎹洃娴嬫寚鏍囬」
@@ -86,7 +87,7 @@
* @return 鎸夊尯鍩熺粺璁¤溅杈嗘暟鎹洃娴嬫寚鏍囬」
*/
@PostMapping("/dqd/service/rs/v2/data/passDetect/query")
- JSONObject carDetectByArea(CarDetectParam param);
+ JSONObject carDetectByArea(@RequestBody CarDetectParam param);
/**
* 閲囬泦璁惧灞炴�х洃娴嬬粨鏋�
@@ -96,7 +97,7 @@
* @return 閲囬泦璁惧灞炴�х洃娴嬬粨鏋�
*/
@PostMapping("/dqd/service/rs/v1/device/cameraExpDetailInfo/query")
- JSONObject monitorDetail(MonitoringDetailParam param);
+ JSONObject monitorDetail(@RequestBody MonitoringDetailParam param);
/**
* 鍗″彛灞炴�х洃娴嬬粨鏋�
@@ -106,7 +107,7 @@
* @return 鍗″彛灞炴�х洃娴嬬粨鏋�
*/
@PostMapping("/dqd/service/rs/v1/device/crossExpDetailInfo/query")
- JSONObject crossDetail(CrossDetailParam param);
+ JSONObject crossDetail(@RequestBody CrossDetailParam param);
/**
* 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋�
@@ -127,7 +128,7 @@
* @return 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋�
*/
@PostMapping("/dqd/service/rs/v1/data/snapCountDetail/query")
- JSONObject SnapshotDataMonitor(SnapshotDataMonitorParam param);
+ JSONObject SnapshotDataMonitor(@RequestBody SnapshotDataMonitorParam param);
/**
* 鎶撴媿鏁版嵁鏃跺欢鐩戞祴缁撴灉
@@ -143,7 +144,7 @@
* @return 鎶撴媿鏁版嵁鏃跺欢鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v1/data/snapAgingDetail/query")
- JSONObject SnapshotDataMonitor(SnapshotDelayMonitorParam param);
+ JSONObject SnapshotDataMonitor(@RequestBody SnapshotDelayMonitorParam param);
/**
* 鍥剧墖璁块棶鐩戞祴缁撴灉
@@ -154,7 +155,7 @@
* @return 鍥剧墖璁块棶鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v1/data/picAccessDetail/query")
- JSONObject PicAccessMonitor(PicAccessParam param);
+ JSONObject PicAccessMonitor(@RequestBody PicAccessParam param);
/**
* 灞炴�ц瘑鍒噯纭洃娴嬬粨鏋�
@@ -164,7 +165,7 @@
* @return 灞炴�ц瘑鍒噯纭洃娴嬬粨鏋�
*/
@PostMapping("/dqd/service/rs/v1/data/attributeRecognition/query")
- JSONObject AttrRecognitionMonitor(AttrRecognitionParam param);
+ JSONObject AttrRecognitionMonitor(@RequestBody AttrRecognitionParam param);
/**
* 鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋�
@@ -178,7 +179,7 @@
* @return 鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋�
*/
@PostMapping("/dqd/service/rs/v1/data/attributeIntegrity/query")
- JSONObject DataIntegrityMonitoring(DataIntegrityMonitoringParam param);
+ JSONObject DataIntegrityMonitoring(@RequestBody DataIntegrityMonitoringParam param);
/**
* 浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
@@ -189,7 +190,7 @@
* @return 浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v2/data/faceFullAmount/query")
- JSONObject FaceDeviceInspection(FaceDeviceInspectionParam param);
+ JSONObject FaceDeviceInspection(@RequestBody FaceDeviceInspectionParam param);
/**
* 浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
@@ -200,7 +201,7 @@
* @return 浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v2/data/faceSampleAmount/query")
- JSONObject FaceDeviceSampling(FaceDeviceSamplingParam param);
+ JSONObject FaceDeviceSampling(@RequestBody FaceDeviceSamplingParam param);
/**
* 杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
@@ -211,7 +212,7 @@
* @return 杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v2/data/vehFullAmount/query")
- JSONObject VehicleDeviceInspection(VehicleDeviceInspectionParam param);
+ JSONObject VehicleDeviceInspection(@RequestBody VehicleDeviceInspectionParam param);
/**
* 杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
@@ -222,7 +223,7 @@
* @return 杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v2/data/vehSampleAmount/query")
- JSONObject VehicleDeviceSampling(VehicleDeviceSamplingParam param);
+ JSONObject VehicleDeviceSampling(@RequestBody VehicleDeviceSamplingParam param);
/**
* 鍏虫敞鐩戞祴璧勬簮鏌ヨ
@@ -231,7 +232,7 @@
* @return 鍏虫敞鐩戞祴璧勬簮鏌ヨ
*/
@PostMapping("/dqd/service/rs/v1/alarm/monitorResource/query")
- JSONObject monitorResource(MonitorResourceParam param);
+ JSONObject monitorResource(@RequestBody MonitorResourceParam param);
/**
* 鎸囨爣閰嶇疆淇℃伅鏌ヨ
@@ -247,5 +248,5 @@
* @return 缁勭粐鏍戞煡璇�
*/
@PostMapping("/dqd/service/rs/v1/orgInfo/standard/query")
- JSONObject OrganizationTree(OrganizationTreeParam param);
+ JSONObject OrganizationTree(@RequestBody OrganizationTreeParam param);
}
diff --git a/ycl-server/src/main/java/com/ycl/web/UYClient.java b/ycl-server/src/main/java/com/ycl/web/UYClient.java
index 8757669..55c0f27 100644
--- a/ycl-server/src/main/java/com/ycl/web/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/web/UYClient.java
@@ -9,6 +9,8 @@
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
/**
* @author gonghl
@@ -26,7 +28,7 @@
* @return 鏌ヨ鎽勫儚鏈烘竻鍗曢泦鍚�
*/
@GetMapping("/VIID/Cameras")
- JSONObject cameraList(CameraParam cameraParam);
+ JSONObject cameraList(@RequestParam CameraParam cameraParam);
/**
* 鐐逛綅鍦ㄧ嚎
@@ -35,7 +37,7 @@
* @return 鏌ヨ鍦ㄧ嚎缁熻鍒楄〃
*/
@GetMapping("/openapi/v1/report/online/list")
- JSONObject onlineList(OnlineParam onlineParam);
+ JSONObject onlineList(@RequestParam OnlineParam onlineParam);
/**
* 褰曞儚鍙敤
@@ -44,7 +46,7 @@
* @return 鏌ヨ婊¤冻鏉′欢鐨勫綍鍍忔眹鎬讳俊鎭�
*/
@PostMapping("/report/recordMetaDSum/list")
- JSONObject recordMetaDSumList(RecordMetaDSumParam recordMetaDSumParam);
+ JSONObject recordMetaDSumList(@RequestBody RecordMetaDSumParam recordMetaDSumParam);
@GetMapping("/api/v1/app/osdMonitor/list")
JSONObject osdMonitorList();
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index ce14b61..2ce8bcc 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -126,3 +126,9 @@
username: admin
password: ycl@202466
+
+# 鎷夊彇鏁版嵁璇锋眰閰嶇疆
+request:
+ retry: 4 # 鏈�澶ч噸璇曟鏁�
+ youYunDomain: 123.123.123.5 # 浼樹簯鍦板潃
+ haiKangDomain: 123.123.123.1 # 娴峰悍鍦板潃
diff --git a/ycl-server/src/main/resources/application-prod.yml b/ycl-server/src/main/resources/application-prod.yml
index d3e3353..d1c5a60 100644
--- a/ycl-server/src/main/resources/application-prod.yml
+++ b/ycl-server/src/main/resources/application-prod.yml
@@ -120,3 +120,8 @@
pathMapping: /prod-api
+# 鎷夊彇鏁版嵁璇锋眰閰嶇疆
+request:
+ retry: 4 # 鏈�澶ч噸璇曟鏁�
+ youYunDomain: 123.123.123.5 # 浼樹簯鍦板潃
+ haiKangDomain: 123.123.123.1 # 娴峰悍鍦板潃
diff --git a/ycl-server/src/main/resources/application.yml b/ycl-server/src/main/resources/application.yml
index a3822bf..7473044 100644
--- a/ycl-server/src/main/resources/application.yml
+++ b/ycl-server/src/main/resources/application.yml
@@ -108,8 +108,3 @@
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
-# 鎷夊彇鏁版嵁璇锋眰閰嶇疆
-request:
- retry: 4 # 鏈�澶ч噸璇曟鏁�
- youYunDomain: 123.123.123.5 # 浼樹簯鍦板潃
- haiKangDomain: 123.123.123.1 # 娴峰悍鍦板潃
--
Gitblit v1.8.0