Ver código fonte

增加精讯土壤墒情传感器

limeng 2 anos atrás
pai
commit
2bdf68f09b

+ 3 - 3
ruoyi-admin/src/main/java/com/ruoyi/monitorInterface/sennor/controller/SennorController.java

@@ -19,9 +19,9 @@ public class SennorController {
     /**
      * 查询设备节点数据
      * */
-    @GetMapping("/selSensorData/{deviceNumber}")
-    public AjaxResult selSensorData(@PathVariable("deviceNumber") String deviceNumber){
-        return sennorService.selSensorData(deviceNumber);
+    @GetMapping("/getDeviceInfo/{deviceNumber}")
+    public AjaxResult getDeviceInfo(@PathVariable("deviceNumber") String deviceNumber){
+        return sennorService.getDeviceInfo(deviceNumber);
     }
 
 

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/monitorInterface/sennor/service/SennorService.java

@@ -7,5 +7,5 @@ public interface SennorService {
     /**
      * 查询设备节点数据
      * */
-    AjaxResult selSensorData(String deviceNumber);
+    AjaxResult getDeviceInfo(String deviceNumber);
 }

+ 4 - 3
ruoyi-admin/src/main/java/com/ruoyi/monitorInterface/sennor/service/impl/SennorServiceImpl.java

@@ -22,11 +22,12 @@ public class SennorServiceImpl implements SennorService {
 
     private String secretKey;
 
+    //这个方法应该用定时任务三分钟调用一次
     @Override
-    public AjaxResult selSensorData(String deviceNumber) {
+    public AjaxResult getDeviceInfo(String deviceNumber) {
         secretKey = configService.getKey("sennorSecretKey");
         //先请求
-        StringBuffer URI = new StringBuffer(configService.getKey("sennorURL")+ API.selSensorData);
+        StringBuffer URI = new StringBuffer(configService.getKey("sennorURL")+ API.getDeviceInfo);
         URI.append("?secretKey=").append(secretKey);
         URI.append("&deviceNumber=").append(deviceNumber);
         String result = HttpRequest.get(URI.toString())
@@ -42,7 +43,7 @@ public class SennorServiceImpl implements SennorService {
                     .body(object.toJSONString())
                     .execute().body();
             log.info("数据推送成功! data ===> {} , result ===> {}",result, res);
-            return AjaxResult.success("数据推送成功!",result);
+            return AjaxResult.success("数据推送成功!",res);
         }catch(Exception e){
             e.printStackTrace();
             log.error("数据推送失败! data ===> {} , result ===> {}",result, e.getMessage());