Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/Gyee_Frame_NX

src/main/java/com/gyee/frame/controller/comm/WindturbineController.java

@@ -0,0 +1,30 @@
+package com.gyee.frame.controller.comm;
+
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.auto.Windturbine;
+import com.gyee.frame.service.WindturbineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping("/windturbine")
+public class WindturbineController {
+
+
+    @Autowired
+    private WindturbineService windturbineService;
+
+    @GetMapping("/getWindturbine")
+    public AjaxResult getWindturbine(String windturbineid) {
+        Windturbine windturbine = windturbineService.selectByPrimaryKey(windturbineid);
+
+        if(null != windturbine){
+            return  AjaxResult.successData(200, windturbine);
+        }
+
+        return AjaxResult.error();
+    }
+}

src/main/java/com/gyee/frame/model/auto/Windturbinecurvefitting.java

@@ -11,7 +11,7 @@ public class Windturbinecurvefitting implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer id;
+    private long id;
 
     /**
      *
@@ -83,7 +83,7 @@ public class Windturbinecurvefitting implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getId() {
+    public long getId() {
         return id;
     }
 
@@ -95,7 +95,7 @@ public class Windturbinecurvefitting implements Serializable {
      *
      * @mbg.generated
      */
-    public void setId(Integer id) {
+    public void setId(long id) {
         this.id = id;
     }
 

src/main/java/com/gyee/frame/model/auto/Windturbinecurvefittingmonth.java

@@ -10,7 +10,7 @@ public class Windturbinecurvefittingmonth implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer id;
+    private long id;
 
     /**
      *
@@ -91,7 +91,7 @@ public class Windturbinecurvefittingmonth implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getId() {
+    public long getId() {
         return id;
     }
 
@@ -103,7 +103,7 @@ public class Windturbinecurvefittingmonth implements Serializable {
      *
      * @mbg.generated
      */
-    public void setId(Integer id) {
+    public void setId(long id) {
         this.id = id;
     }