Browse Source

数据中心模块更新

xieshengjie 3 years ago
parent
commit
befca7b94c

BIN
common/target/common-1.0-SNAPSHOT.jar


+ 1 - 1
web/consumer/src/main/java/com/gyee/consumer/api/DatacenterApi.java

@@ -1,4 +1,4 @@
-package com.gyee.consumer.api;
+package com.gyee.consumer.api.datacenter;
 
 import com.gyee.common.config.R;
 import org.springframework.cloud.openfeign.FeignClient;

+ 45 - 0
web/consumer/src/main/java/com/gyee/consumer/api/datacenter/ParameterComparisonApi.java

@@ -0,0 +1,45 @@
+package com.gyee.consumer.api.datacenter;
+
+import com.gyee.common.config.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @ClassName : ParameterComparisonApi
+ * @Author : xieshengjie
+ * @Date: 2022/2/22 12:26
+ * @Description :
+ */
+@FeignClient("datacenter-provider")
+@RequestMapping("//paramComparison")
+public interface ParameterComparisonApi {
+
+    /**
+     * 获取设备结构
+     * @return
+     */
+    @GetMapping("/equipmentStructure")
+    public R getEquipmentStructure(@RequestParam(value = "wtid",required = false)String wtid);
+
+    /**
+     * 获取参数列表
+     * @return
+     */
+    @GetMapping("/equipmentParams")
+    public R getEquipmentParams(@RequestParam(value = "description",required = false)String description);
+
+
+    /**
+     * 生成曲线
+     * @return
+     */
+    @GetMapping("/generatingCurve")
+    public R generatingCurve(@RequestParam(value = "begin",required = true)String begin,
+                             @RequestParam(value = "end",required = true)String end,
+                             @RequestParam(value = "interval",required = false)String interval,
+                             @RequestParam(value = "type",required = false)String type,
+                             @RequestParam(value = "paramtype",required = true)String paramtype,
+                             @RequestParam(value = "wts",required = true)String wts,
+                             @RequestParam(value = "params",required = true)String params) throws Exception;
+}

+ 1 - 3
web/consumer/src/main/java/com/gyee/consumer/controller/datacenter/DatacenterController.java

@@ -1,9 +1,7 @@
 package com.gyee.consumer.controller.datacenter;
 
 import com.gyee.common.config.R;
-import com.gyee.consumer.api.DatacenterApi;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.FeignClient;
+import com.gyee.consumer.api.datacenter.DatacenterApi;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

+ 57 - 0
web/consumer/src/main/java/com/gyee/consumer/controller/datacenter/ParameterComparisonController.java

@@ -0,0 +1,57 @@
+package com.gyee.consumer.controller.datacenter;
+
+import com.gyee.common.config.R;
+import com.gyee.consumer.api.datacenter.DatacenterApi;
+import com.gyee.consumer.api.datacenter.ParameterComparisonApi;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @ClassName : ParameterComparisonController
+ * @Author : xieshengjie
+ * @Date: 2022/2/22 12:28
+ * @Description :
+ */
+@RestController
+public class ParameterComparisonController {
+
+    @Resource
+    private ParameterComparisonApi parameterComparisonApi;
+
+    /**
+     * 获取设备结构
+     * @return
+     */
+    @GetMapping("/consumer/paramComparison/equipmentStructure")
+    public R getEquipmentStructure(@RequestParam(value = "wtid",required = false)String wtid){
+        return parameterComparisonApi.getEquipmentStructure(wtid);
+    }
+
+    /**
+     * 获取参数列表
+     * @return
+     */
+    @GetMapping("/consumer/paramComparison/equipmentParams")
+    public R getEquipmentParams(@RequestParam(value = "description",required = false)String description){
+        return parameterComparisonApi.getEquipmentParams(description);
+    }
+
+
+    /**
+     * 生成曲线
+     * @return
+     */
+    @GetMapping("/consumer/paramComparison/generatingCurve")
+    public R generatingCurve(@RequestParam(value = "begin",required = true)String begin,
+                             @RequestParam(value = "end",required = true)String end,
+                             @RequestParam(value = "interval",required = false)String interval,
+                             @RequestParam(value = "type",required = false)String type,
+                             @RequestParam(value = "paramtype",required = true)String paramtype,
+                             @RequestParam(value = "wts",required = true)String wts,
+                             @RequestParam(value = "params",required = true)String params) throws Exception{
+        return parameterComparisonApi.generatingCurve(begin,end,interval,type,paramtype,wts,params);
+    }
+}

BIN
web/consumer/target/classes/com/gyee/consumer/api/DatacenterApi.class


BIN
web/consumer/target/classes/com/gyee/consumer/controller/datacenter/DatacenterController.class


BIN
web/consumer/target/consumer-1.0-SNAPSHOT.jar


BIN
web/consumer/target/consumer-1.0-SNAPSHOT.jar.original


+ 3 - 0
web/consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,2 +1,5 @@
 com\gyee\consumer\controller\knowleage\KnowleageController.class
+com\gyee\consumer\controller\datacenter\ParameterComparisonController.class
+com\gyee\consumer\api\datacenter\DatacenterApi.class
+com\gyee\consumer\api\datacenter\ParameterComparisonApi.class
 com\gyee\consumer\controller\targetdata\TargetdataController.class