From 2e7759dbd910e4cbcfd9cf54ba90c3c399b8cbc9 Mon Sep 17 00:00:00 2001 From: hongtianzai Date: Sat, 22 Jan 2022 17:07:56 +0800 Subject: [PATCH] =?UTF-8?q?api=E8=BD=AC=E5=8F=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/udidl/UdidlDeviceController.java | 2 +- .../udi/admin/service/udidl/UdidlService.java | 17 +++++++++-------- .../main/resources/application-pro.properties | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/UdidlDeviceController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/UdidlDeviceController.java index 2027dd1..522aae5 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/UdidlDeviceController.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/UdidlDeviceController.java @@ -24,7 +24,7 @@ public class UdidlDeviceController { } @AuthRuleAnnotation("") @GetMapping("udidl/device/dlByDay") - public String dlByDay(String day) { + public BaseResponse dlByDay(String day) { return udidlService.dlByDay(day); } @AuthRuleAnnotation("") diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/UdidlService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/UdidlService.java index 5e3ae31..790b22c 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/UdidlService.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/UdidlService.java @@ -6,6 +6,7 @@ import com.glxp.udi.admin.req.feign.BaseParam; import com.glxp.udi.admin.req.feign.DateRange; import com.glxp.udi.admin.req.feign.JobLogFilterRequest; import com.glxp.udi.common.res.BaseResponse; +import feign.Param; import feign.QueryMap; import feign.RequestLine; import org.springframework.format.annotation.DateTimeFormat; @@ -21,14 +22,14 @@ public interface UdidlService { BaseResponse jobLog_getList(@RequestBody JobLogFilterRequest jobLogFilterRequest); @RequestLine("GET /udidl/device/dlByDays") BaseResponse dlByDays(@QueryMap DateRange dateRange); - @RequestLine("GET /udidl/device/dlByDay") - String dlByDay(String day); - @RequestLine("POST /udidl/device/dlByDi") - BaseResponse downloadByDi(String deviceId); - @RequestLine("POST /udidl/device/downloadSingle") - BaseResponse downloadSingle(String deviceId) ; - @RequestLine("POST /udidl/device/downloadHistory") - BaseResponse downloadHistory(String key) ; + @RequestLine("GET /udidl/device/dlByDay?day={day}") + BaseResponse dlByDay(@Param("day") String day); + @RequestLine("GET /udidl/device/dlByDi?deviceId={deviceId}") + BaseResponse downloadByDi(@Param("deviceId") String deviceId); + @RequestLine("POST /udidl/device/downloadSingle?deviceId={deviceId}") + BaseResponse downloadSingle(@Param("deviceId") String deviceId) ; + @RequestLine("POST /udidl/device/downloadHistory?key={key}") + BaseResponse downloadHistory(@Param("key") String key) ; // // diff --git a/api-udims/src/main/resources/application-pro.properties b/api-udims/src/main/resources/application-pro.properties index dd6f574..9af3d24 100644 --- a/api-udims/src/main/resources/application-pro.properties +++ b/api-udims/src/main/resources/application-pro.properties @@ -28,5 +28,5 @@ COOR_UPLOAD_ORDER=http://127.0.0.1:9987/udi/upload UDI_SERVER.url= http://localhost:9994 UDI_SERVER.connectTimeout=2000 UDI_SERVER.readTimeout=3500 -UDI_SERVER.followRedirects=true +UDI_SERVER.followRedirects=false UDI_SERVER.key=17fbb8f8782c11ecaec9902e16f86c51