Merge branch 'master' into usky-zyj

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

service-backend/service-backend-biz/pom.xml

@@ -19,25 +19,21 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- Pagehelper -->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>service-backend-api</artifactId>
-            <version>0.0.1</version>
+            <artifactId>ruoyi-common-swagger</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.usky</groupId>-->
-<!--            <artifactId>usky-module-demo-api</artifactId>-->
-<!--            <version>0.0.1</version>-->
-<!--        </dependency>-->
-
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

service-backend/service-backend-biz/src/main/java/com/usky/backend/BackendApplication.java

@@ -1,11 +1,19 @@
 package com.usky.backend;
 
 
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.env.Environment;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 /**
  * 系统模块
@@ -14,14 +22,26 @@ import org.springframework.context.annotation.ComponentScan;
  */
 
 
+@EnableCustomSwagger2
 @EnableFeignClients(basePackages = "com.usky")
 @MapperScan(value = "com.usky.backend.mapper")
 @ComponentScan("com.usky")
 @SpringBootApplication
 public class BackendApplication
 {
-    public static void main(String[] args)
-    {
-        SpringApplication.run(BackendApplication.class, args);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BackendApplication.class);
+
+    public static void main(String[] args) throws UnknownHostException {
+        ConfigurableApplicationContext application = SpringApplication.run(BackendApplication.class, args);
+        Environment env = application.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        String path = env.getProperty("server.servlet.context-path");
+        LOGGER.info("\n----------------------------------------------------------\n\t" +
+                "Application is running! Access URLs:\n\t" +
+                "Local: \t\thttp://localhost:" + port + (null==path?"":path) + "/\n\t" +
+                "External: \thttp://" + ip + ":" + port + (null==path?"":path) + "/\n\t" +
+                "Api: \t\thttp://" + ip + ":" + port + (null==path?"":path) + "/swagger-ui/index.html\n\t" +
+                "----------------------------------------------------------");
     }
 }

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/DataQueryController.java

@@ -0,0 +1,61 @@
+package com.usky.backend.controller;
+import com.usky.backend.domain.vo.HistoryQueryVo;
+import com.usky.backend.domain.vo.HistoryResultVo;
+import com.usky.backend.domain.vo.LastQueryVo;
+import com.usky.backend.domain.vo.MetricItemVo;
+import com.usky.common.core.bean.ApiResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.stereotype.Controller;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  数据统一查询 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@Api(tags = "数据统一查询")
+@RequestMapping("/dataQuery")
+public class DataQueryController {
+
+
+    @GetMapping("/history")
+    @ApiOperation("获取单个设备单属性历史数据")
+    public ApiResult<HistoryResultVo> history(@RequestParam("startTime") String startTime,
+                                     @RequestParam("endTime") String endTime,
+                                     @RequestParam("deviceId") String deviceId,
+                                     @RequestParam("metric") String metric ) {
+        //以下是mock模拟数据
+        List<MetricItemVo> items = new ArrayList<>();
+        items.add(new MetricItemVo(new Date(),12.3));
+        HistoryResultVo historyResultVo = new HistoryResultVo(deviceId,metric,items);
+        return ApiResult.success(historyResultVo);
+    }
+
+    @PostMapping("/history")
+    @ApiOperation("获取单个设备多属性历史数据")
+    public ApiResult<List<HistoryResultVo>> history(@RequestBody HistoryQueryVo historyQueryVo) {
+        List<HistoryResultVo> result  = new ArrayList<>();
+        List<MetricItemVo> items = new ArrayList<>();
+        items.add(new MetricItemVo(new Date(),12.3));
+        HistoryResultVo historyResultVo = new HistoryResultVo(historyQueryVo.getDeviceId(),"cpu.load",items);
+        result.add(historyResultVo);
+        return ApiResult.success(result);
+    }
+
+    @PostMapping("/last")
+    @ApiOperation("获取单个设备多指标实时数据")
+    public ApiResult<List<MetricItemVo>> last(@RequestBody LastQueryVo lastQueryVo) {
+        List<MetricItemVo>  metricItemVos = new ArrayList<>();
+        return ApiResult.success(metricItemVos);
+    }
+
+
+}
+

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/SysConfigController.java

@@ -1,21 +0,0 @@
-package com.usky.backend.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 参数配置表 前端控制器
- * </p>
- *
- * @author ya
- * @since 2022-04-29
- */
-@Controller
-@RequestMapping("/sysConfig")
-public class SysConfigController {
-
-}
-

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/vo/HistoryQueryVo.java

@@ -0,0 +1,46 @@
+package com.usky.backend.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class HistoryQueryVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+     /**
+     * 开始时间戳
+     */
+    private Integer startTime;
+
+     /**
+     * 结束时间戳
+     */
+    private Integer endTime;
+
+     /**
+     * 设备Id
+     */
+    private String  deviceId;
+
+    /**
+     * 指标名
+     */
+    private List<String>  metrics;
+
+
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/vo/HistoryResultVo.java

@@ -0,0 +1,56 @@
+package com.usky.backend.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class HistoryResultVo implements Serializable {
+
+   private static final long serialVersionUID = 8837428366010205858L;
+
+   private String deviceId;
+   private String metric;
+   private List<MetricItemVo> metricItems;
+
+   public HistoryResultVo() {
+   }
+
+   public HistoryResultVo(String deviceId, String metric, List<MetricItemVo> metricItems) {
+      this.deviceId = deviceId;
+      this.metric = metric;
+      this.metricItems = metricItems;
+   }
+
+//   public static class MetricItem implements Serializable {
+//      private static final long serialVersionUID = 6319020786538254074L;
+//      private Date timestamp;
+//      private Object value;
+//
+//      public MetricItem() {
+//      }
+//
+//      public MetricItem(Date timestamp, Object value) {
+//         this.timestamp = timestamp;
+//         this.value = value;
+//      }
+//
+//      public Date getTimestamp() {
+//         return timestamp;
+//      }
+//
+//      public void setTimestamp(Date timestamp) {
+//         this.timestamp = timestamp;
+//      }
+//
+//      public Object getValue() {
+//         return value;
+//      }
+//
+//      public void setValue(Object value) {
+//         this.value = value;
+//      }
+//   }
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/vo/LastQueryVo.java

@@ -0,0 +1,31 @@
+package com.usky.backend.domain.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class LastQueryVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+     /**
+     * 设备Id
+     */
+    private String  deviceId;
+
+    /**
+     * 指标名
+     */
+    private List<String>  metrics;
+
+
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/vo/MetricItemVo.java

@@ -0,0 +1,21 @@
+package com.usky.backend.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class MetricItemVo implements Serializable {
+
+    private Date timestamp;
+    private Object value;
+
+    public MetricItemVo() {
+    }
+
+    public MetricItemVo(Date timestamp, Object value) {
+        this.timestamp = timestamp;
+        this.value = value;
+    }
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/DataQueryService.java

@@ -0,0 +1,6 @@
+package com.usky.backend.service;
+
+public interface DataQueryService {
+
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/DataQueryServiceImpl.java

@@ -0,0 +1,7 @@
+package com.usky.backend.service.impl;
+
+import com.usky.backend.service.DataQueryService;
+
+public class DataQueryServiceImpl implements DataQueryService {
+
+}

service-backend/service-backend-biz/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 101.133.214.75:8848
+        server-addr: usky-cloud-nacos:8848
       config:
         # 配置中心地址
-        server-addr: 101.133.214.75:8848
+        server-addr: usky-cloud-nacos:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

service-park/service-park-biz/src/main/java/com/usky/park/controller/web/EventEgController.java

@@ -6,8 +6,6 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.park.domain.EventEg;
 import com.usky.park.service.EventEgService;
 import com.usky.park.service.vo.EventEgStatisticVO;
-import jdk.nashorn.internal.objects.annotations.Getter;
-import org.bouncycastle.util.StringList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;