Merge branch 'master' of http://124.70.43.205:3000/wangb/runeconomy-nx

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/WindDirection/WindDirectionController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.gyee.runeconomy.dto.result.JsonResult;
 import com.gyee.runeconomy.dto.result.ResultCode;
 import com.gyee.runeconomy.service.WindDirection.WindDirectionService;
+import com.gyee.runeconomy.service.WindDirection.WindMachineJsService;
 import com.gyee.runeconomy.service.WindDirection.WindMachineService;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,6 +19,8 @@ public class WindDirectionController {
     private WindDirectionService windDirectionService;
     @Resource
     private WindMachineService windMachineService;
+    @Resource
+    private WindMachineJsService windMachineJsService;
     /***
      * 风速风向频次玫瑰图
      * @return
@@ -51,4 +54,16 @@ public class WindDirectionController {
         Object o = windMachineService.machine(wpid);
         return JsonResult.successData(ResultCode.SUCCESS, o);
     }
+
+    /**
+     * 单机偏差分析
+
+     * @return
+     */
+    @GetMapping("/machinejs")
+    public JSONObject Deviationmachinejs(String wpid,String time) throws Exception {
+
+        Object o = windMachineJsService.machine(wpid,time);
+        return JsonResult.successData(ResultCode.SUCCESS, o);
+    }
 }