From d8f66b834134f6b755fd3fb93bb91b56f9d31f6f Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期四, 29 十二月 2022 15:46:53 +0800
Subject: [PATCH] 放假备份。对接光伏对外接口，单灯，灯杆调整。
---
src/main/java/api/controller/TimerController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/src/main/java/api/controller/TimerController.java b/src/main/java/api/controller/TimerController.java
index 6d9461d..7500d5a 100644
--- a/src/main/java/api/controller/TimerController.java
+++ b/src/main/java/api/controller/TimerController.java
@@ -65,7 +65,7 @@
String result = HttpUtil.Post(
- "http://127.0.0.1:8888/machine-fast/serv/api/timer/list",
+ "http://47.106.172.9:8888/machine-fast/serv/api/timer/list",
new Gson().toJson(reqParams)
);
@@ -82,10 +82,50 @@
}
+ @RequestMapping(value = "info",method = RequestMethod.POST)
+ public Msg timerInfo(@RequestBody ReqParams reqParams){
+ rateLimiter.acquire(1);
+
+ Long userId = accessService.getUserId(reqParams.getAccessToken());
+
+
+ if(userId == null){
+ return Msg.error("accessToken exception!!!");
+ }
+
+ reqParams.setApiKey(reqParams.getApiKey());
+ reqParams.setUserId(userId);
+
+ TimerRequest timerRequest = new TimerRequest();
+
+ timerRequest.setTimerId(reqParams.getTimerId());
+ reqParams.setTimerRequest(timerRequest);
+
+ String result = HttpUtil.Post(
+ "http://47.106.172.9:8888/machine-fast/serv/api/timer/getStreetlightListByTimerId",
+ new Gson().toJson(reqParams)
+ );
+
+ Map msg = JSON.parseObject(result, HashMap.class);
+
+ System.out.println(result);
+ if (msg.get("msg").equals("success")){
+
+ return Msg.ok().put("data",msg.get("list"));
+ }
+ else {
+ return Msg.error(msg.get("msg").toString());
+ }
+
+
+ }
+
+
+
/**
* 鏌ョ湅瀹氭椂浠诲姟ID瀵瑰簲缁戝畾鐨勭伅鏉嗗垪琛�
* */
- @RequestMapping(value = "listByTimerId",method = RequestMethod.POST)
+ @RequestMapping(value = "getSyncStatusByTimerId",method = RequestMethod.POST)
public Msg getStreetlightListByTimerId(@RequestBody ReqParams reqParams){
System.out.println(reqParams);
rateLimiter.acquire(1);
@@ -108,7 +148,7 @@
String result = HttpUtil.Post(
- "http://127.0.0.1:8888/machine-fast/serv/api/timer/listByTimerId",
+ "http://47.106.172.9:8888/machine-fast/serv/api/timer/listByTimerId",
new Gson().toJson(reqParams)
);
@@ -148,7 +188,7 @@
String result = HttpUtil.Post(
- "http://127.0.0.1:8888/machine-fast/serv/api/timer/deleteTimerByTimerId",
+ "http://47.106.172.9:8888/machine-fast/serv/api/timer/deleteTimerByTimerId",
new Gson().toJson(reqParams)
);
@@ -195,7 +235,7 @@
String result = HttpUtil.Post(
- "http://127.0.0.1:8888/machine-fast/serv/api/timer/addTimer",
+ "http://47.106.172.9:8888/machine-fast/serv/api/timer/addTimer",
new Gson().toJson(reqParams)
);
@@ -244,7 +284,7 @@
String result = HttpUtil.Post(
- "http://127.0.0.1:8888/machine-fast/serv/api/timer/updateTimer",
+ "http://47.106.172.9:8888/machine-fast/serv/api/timer/updateTimer",
new Gson().toJson(reqParams)
);
--
Gitblit v1.9.3