Merge branch 'data-zyj' of uskycloud/usky-data into server-165

data-tsdb-proxy/data-tsdb-proxy-api/src/main/java/com/usky/demo/RemoteTsdbProxyService.java

@@ -0,0 +1,61 @@
+package com.usky.demo;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.demo.domain.*;
+import com.usky.demo.factory.RemoteTsdbProxyFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@FeignClient(contextId = "remoteTsdbProxyService", value = "data-tsdb-proxy", fallbackFactory = RemoteTsdbProxyFallbackFactory.class)
+public interface RemoteTsdbProxyService {
+
+    /**
+     * 单个设备数据写入
+     * @return
+     */
+    @PostMapping("/sendDeviceData")
+    ApiResult<Void> sendDeviceData(@RequestBody DeviceDataWriteVO writeVO);
+
+    /**
+     * 单个设备实时数据查询
+     * @param productCode
+     * @param deviceId
+     * @return
+     */
+    @GetMapping("/last")
+    ApiResult<LastResultVO> queryLastDeviceData(@RequestParam(value = "productCode") String productCode,
+                                                       @RequestParam(value = "deviceId") String deviceId);
+
+    /**
+     * 批量设备实时数据查询
+     * @param requestVO
+     * @return
+     */
+    @PostMapping("/last")
+    ApiResult<List<LastResultVO>> queryLastDeviceData(@RequestBody LastRequestVO requestVO);
+
+    /**
+     * 单个设备历史数据查询
+     * @param productCode
+     * @param deviceId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping("/history")
+    ApiResult<HistoryResultVO> queryHistoryDeviceData(@RequestParam(value = "productCode") String productCode,
+                                                             @RequestParam(value = "deviceId") String deviceId,
+                                                             @RequestParam(value = "startTime") String startTime,
+                                                             @RequestParam(value = "endTime") String endTime);
+
+    /**
+     * 批量设备历史数据查询
+     * @param requestVO
+     * @return
+     */
+    @PostMapping("/history")
+    ApiResult<List<HistoryResultVO>> queryHistoryDeviceData(@RequestBody HistoryRequestVO requestVO);
+}

data-tsdb-proxy/data-tsdb-proxy-api/src/main/java/com/usky/demo/RemoteUserService.java

@@ -1,28 +0,0 @@
-package com.usky.demo;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.demo.domain.SysUserVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-@FeignClient(contextId = "remoteUserService", value = "usky-demo")
-public interface RemoteUserService {
-
-
-
-    @GetMapping("/byUserName")
-    ApiResult<List<SysUserVO>> getByUserName(@RequestParam("userName") String userName);
-
-
-    @PostMapping("/byUserName")
-    ApiResult<List<SysUserVO>> add(@RequestBody SysUserVO sysUserVO);
-
-
-    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    ApiResult<String> upload(@RequestPart(value = "file") MultipartFile file);
-}

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/service/vo/DeviceDataInfoVO.java → data-tsdb-proxy/data-tsdb-proxy-api/src/main/java/com/usky/demo/domain/DeviceDataInfoVO.java

@@ -1,4 +1,4 @@
-package com.usky.demo.service.vo;
+package com.usky.demo.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/service/vo/DeviceDataWriteVO.java → data-tsdb-proxy/data-tsdb-proxy-api/src/main/java/com/usky/demo/domain/DeviceDataWriteVO.java

@@ -1,4 +1,4 @@
-package com.usky.demo.service.vo;
+package com.usky.demo.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/service/vo/HistoryRequestVO.java → data-tsdb-proxy/data-tsdb-proxy-api/src/main/java/com/usky/demo/domain/HistoryRequestVO.java

@@ -1,4 +1,4 @@
-package com.usky.demo.service.vo;
+package com.usky.demo.domain;
 
 import lombok.Data;
 

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/service/vo/HistoryResultVO.java → data-tsdb-proxy/data-tsdb-proxy-api/src/main/java/com/usky/demo/domain/HistoryResultVO.java

@@ -1,4 +1,4 @@
-package com.usky.demo.service.vo;
+package com.usky.demo.domain;
 
 import lombok.Data;
 

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/service/vo/LastRequestVO.java → data-tsdb-proxy/data-tsdb-proxy-api/src/main/java/com/usky/demo/domain/LastRequestVO.java

@@ -1,4 +1,4 @@
-package com.usky.demo.service.vo;
+package com.usky.demo.domain;
 
 import lombok.Data;
 

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/service/vo/LastResultVO.java → data-tsdb-proxy/data-tsdb-proxy-api/src/main/java/com/usky/demo/domain/LastResultVO.java

@@ -1,4 +1,4 @@
-package com.usky.demo.service.vo;
+package com.usky.demo.domain;
 
 import lombok.Data;
 

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/service/vo/MetricVO.java → data-tsdb-proxy/data-tsdb-proxy-api/src/main/java/com/usky/demo/domain/MetricVO.java

@@ -1,4 +1,4 @@
-package com.usky.demo.service.vo;
+package com.usky.demo.domain;
 
 import lombok.Data;
 

data-tsdb-proxy/data-tsdb-proxy-api/src/main/java/com/usky/demo/domain/SysUserVO.java

@@ -1,105 +0,0 @@
-package com.usky.demo.domain;
-
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class SysUserVO {
-
-    /**
-     * 用户ID
-     */
-    private Long userId;
-
-    /**
-     * 部门ID
-     */
-    private Long deptId;
-
-    /**
-     * 用户账号
-     */
-    private String userName;
-
-    /**
-     * 用户昵称
-     */
-    private String nickName;
-
-    /**
-     * 用户类型（00系统用户）
-     */
-    private String userType;
-
-    /**
-     * 用户邮箱
-     */
-    private String email;
-
-    /**
-     * 手机号码
-     */
-    private String phonenumber;
-
-    /**
-     * 用户性别（0男 1女 2未知）
-     */
-    private String sex;
-
-    /**
-     * 头像地址
-     */
-    private String avatar;
-
-    /**
-     * 密码
-     */
-    private String password;
-
-    /**
-     * 帐号状态（0正常 1停用）
-     */
-    private String status;
-
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    private String delFlag;
-
-    /**
-     * 最后登录IP
-     */
-    private String loginIp;
-
-    /**
-     * 最后登录时间
-     */
-    private LocalDateTime loginDate;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}

data-tsdb-proxy/data-tsdb-proxy-api/src/main/java/com/usky/demo/factory/RemoteTsdbProxyFallbackFactory.java

@@ -0,0 +1,66 @@
+package com.usky.demo.factory;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.demo.RemoteTsdbProxyService;
+import com.usky.demo.domain.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+
+/**
+ * 用户服务降级处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class RemoteTsdbProxyFallbackFactory implements FallbackFactory<RemoteTsdbProxyService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteTsdbProxyFallbackFactory.class);
+
+    @Override
+    public RemoteTsdbProxyService create(Throwable throwable)
+    {
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new RemoteTsdbProxyService() {
+            @Override
+            public ApiResult<Void> sendDeviceData(DeviceDataWriteVO writeVO) {
+                throw new BusinessException(throwable.getMessage());
+            }
+
+            @Override
+            public ApiResult<LastResultVO> queryLastDeviceData(String productCode,String deviceId)
+            {
+                return ApiResult.error("500","单个设备实时数据查询:" + throwable.getMessage());
+            }
+
+            @Override
+            public ApiResult<List<LastResultVO>> queryLastDeviceData(LastRequestVO requestVO)
+            {
+                return ApiResult.error("500","批量设备实时数据查询:" + throwable.getMessage());
+            }
+
+            @Override
+            public ApiResult<HistoryResultVO> queryHistoryDeviceData(String productCode,
+                                                                     String deviceId,
+                                                                     String startTime,
+                                                                     String endTime)
+            {
+                return ApiResult.error("500","单个设备历史数据查询:" + throwable.getMessage());
+            }
+
+            @Override
+            public ApiResult<List<HistoryResultVO>> queryHistoryDeviceData(HistoryRequestVO requestVO)
+            {
+                return ApiResult.error("500","批量设备历史数据查询:" + throwable.getMessage());
+            }
+        };
+    }
+}

data-tsdb-proxy/data-tsdb-proxy-api/src/main/java/com/usky/demo/factory/RemoteUserFallbackFactory.java

@@ -1,48 +0,0 @@
-package com.usky.demo.factory;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessException;
-import com.usky.demo.RemoteUserService;
-import com.usky.demo.domain.SysUserVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-
-/**
- * 用户服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
-
-    @Override
-    public RemoteUserService create(Throwable throwable)
-    {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteUserService() {
-            @Override
-            public ApiResult<List<SysUserVO>> getByUserName(String userName) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<String> upload(MultipartFile file) {
-                throw new BusinessException(throwable.getMessage());
-            }
-        };
-    }
-}

data-tsdb-proxy/data-tsdb-proxy-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,4 +1,10 @@
-com\usky\demo\factory\RemoteUserFallbackFactory$1.class
-com\usky\demo\domain\SysUserVO.class
-com\usky\demo\RemoteUserService.class
-com\usky\demo\factory\RemoteUserFallbackFactory.class
+com\usky\demo\domain\HistoryResultVO.class
+com\usky\demo\factory\RemoteTsdbProxyFallbackFactory.class
+com\usky\demo\domain\HistoryRequestVO.class
+com\usky\demo\domain\DeviceDataInfoVO.class
+com\usky\demo\RemoteTsdbProxyService.class
+com\usky\demo\domain\LastRequestVO.class
+com\usky\demo\domain\LastResultVO.class
+com\usky\demo\domain\MetricVO.class
+com\usky\demo\domain\DeviceDataWriteVO.class
+com\usky\demo\factory\RemoteTsdbProxyFallbackFactory$1.class

data-tsdb-proxy/data-tsdb-proxy-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,3 +1,9 @@
-D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-api\src\main\java\com\usky\demo\domain\SysUserVO.java
-D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-api\src\main\java\com\usky\demo\factory\RemoteUserFallbackFactory.java
-D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-api\src\main\java\com\usky\demo\RemoteUserService.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-api\src\main\java\com\usky\demo\domain\LastRequestVO.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-api\src\main\java\com\usky\demo\RemoteTsdbProxyService.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-api\src\main\java\com\usky\demo\domain\DeviceDataInfoVO.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-api\src\main\java\com\usky\demo\domain\MetricVO.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-api\src\main\java\com\usky\demo\domain\HistoryResultVO.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-api\src\main\java\com\usky\demo\domain\HistoryRequestVO.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-api\src\main\java\com\usky\demo\domain\DeviceDataWriteVO.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-api\src\main\java\com\usky\demo\domain\LastResultVO.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-api\src\main\java\com\usky\demo\factory\RemoteTsdbProxyFallbackFactory.java

data-tsdb-proxy/data-tsdb-proxy-biz/data-tsdb-proxy-biz.iml

@@ -25,13 +25,11 @@
     <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2021.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:2.0.4" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.15" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
     <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
     <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.12.0" level="project" />
     <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel:0.12.0" level="project" />
     <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_common:0.12.0" level="project" />
@@ -44,7 +42,6 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.6.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.6.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
     <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.8.4" level="project" />
     <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
@@ -56,57 +53,6 @@
     <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
     <orderEntry type="library" name="Maven: com.usky:service-system-api:0.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.8" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.8" level="project" />
-    <orderEntry type="library" name="Maven: com.usky:usky-common-core:0.0.1" level="project" />
-    <orderEntry type="library" name="Maven: ma.glasnost.orika:orika-core:1.5.4" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.paranamer:paranamer:2.8" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch:java-sizeof:0.0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.janino:janino:3.1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.janino:commons-compiler:3.1.6" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-loadbalancer:3.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-loadbalancer:3.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.16" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.4.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: com.stoyanr:evictor:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.12.2" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.2.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.2.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.7" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.18" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.18" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" />
     <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
@@ -287,6 +233,61 @@
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.14.9" level="project" />
+    <orderEntry type="module" module-name="data-tsdb-proxy-api" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.8" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.8" level="project" />
+    <orderEntry type="library" name="Maven: com.usky:usky-common-core:0.0.1" level="project" />
+    <orderEntry type="library" name="Maven: ma.glasnost.orika:orika-core:1.5.4" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.24.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.paranamer:paranamer:2.8" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch:java-sizeof:0.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.janino:janino:3.1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.janino:commons-compiler:3.1.6" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-loadbalancer:3.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-loadbalancer:3.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.16" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.4.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.6.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.18" level="project" />
+    <orderEntry type="library" name="Maven: com.stoyanr:evictor:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.12.2" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.7" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.18" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.1" level="project" />

data-tsdb-proxy/data-tsdb-proxy-biz/pom.xml

@@ -47,6 +47,12 @@
             <artifactId>influxdb-java</artifactId>
             <version>2.23</version>
         </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>data-tsdb-proxy-api</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/controller/api/DataTsdbProxyControllerApi.java

@@ -0,0 +1,89 @@
+package com.usky.demo.controller.api;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.core.util.BeanMapperUtils;
+import com.usky.common.core.util.FileUtils;
+import com.usky.common.core.util.GlobalUtils;
+import com.usky.demo.RemoteTsdbProxyService;
+import com.usky.demo.domain.*;
+import com.usky.demo.service.QueryInfluxdbDataService;
+import com.usky.demo.service.SysUserService;
+import com.usky.system.RemoteUserService;
+import com.usky.system.domain.SysUserVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+@RestController
+public class DataTsdbProxyControllerApi implements RemoteTsdbProxyService {
+
+    @Autowired
+    private QueryInfluxdbDataService queryInfluxdbDataService;
+
+    /**
+     * 单个设备数据写入
+     * @return
+     */
+    @Override
+    public ApiResult<Void> sendDeviceData(DeviceDataWriteVO writeVO){
+        queryInfluxdbDataService.sendDeviceData(writeVO);
+        return ApiResult.success();
+    }
+
+    /**
+     * 单个设备实时数据查询
+     * @param productCode
+     * @param deviceId
+     * @return
+     */
+    @Override
+    public ApiResult<LastResultVO> queryLastDeviceData(String productCode,
+                                                       String deviceId){
+        return ApiResult.success(queryInfluxdbDataService.queryLastDeviceData(productCode,deviceId));
+    }
+
+    /**
+     * 批量设备实时数据查询
+     * @param requestVO
+     * @return
+     */
+    @Override
+    public ApiResult<List<LastResultVO>> queryLastDeviceData(LastRequestVO requestVO){
+        return ApiResult.success(queryInfluxdbDataService.queryLastDeviceData(requestVO));
+    }
+
+    /**
+     * 单个设备历史数据查询
+     * @param productCode
+     * @param deviceId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    @Override
+    public ApiResult<HistoryResultVO> queryHistoryDeviceData(String productCode,
+                                                             String deviceId,
+                                                             String startTime,
+                                                             String endTime){
+        return ApiResult.success(queryInfluxdbDataService.queryHistoryDeviceData(productCode,deviceId,startTime,endTime));
+    }
+
+    /**
+     * 批量设备历史数据查询
+     * @param requestVO
+     * @return
+     */
+    @Override
+    public ApiResult<List<HistoryResultVO>> queryHistoryDeviceData(HistoryRequestVO requestVO){
+        return ApiResult.success(queryInfluxdbDataService.queryHistoryDeviceData(requestVO));
+    }
+}

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/controller/api/SysUserControllerApi.java

@@ -1,60 +0,0 @@
-//package com.usky.demo.controller.api;
-//
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-//import com.usky.common.core.bean.ApiResult;
-//import com.usky.common.core.exception.BusinessException;
-//import com.usky.common.core.util.BeanMapperUtils;
-//import com.usky.common.core.util.FileUtils;
-//import com.usky.common.core.util.GlobalUtils;
-//import com.usky.demo.domain.SysUser;
-//import com.usky.demo.service.SysUserService;
-//import com.usky.system.RemoteUserService;
-//import com.usky.system.domain.SysUserVO;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.RestController;
-//import org.springframework.web.multipart.MultipartFile;
-//
-//import java.io.File;
-//import java.io.IOException;
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.Optional;
-//
-//@RestController
-//public class SysUserControllerApi implements RemoteUserService {
-//
-//    @Autowired
-//    private SysUserService sysUserService;
-//    @Override
-//    public ApiResult<List<SysUserVO>> getByUserName(String userName) {
-//        LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
-//        queryWrapper.eq(SysUser::getUserName,userName);
-//        return ApiResult.success(BeanMapperUtils.mapList(sysUserService.list(queryWrapper),SysUser.class,SysUserVO.class));
-//    }
-//
-//    @Override
-//    public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
-//        sysUserService.save(BeanMapperUtils.map(sysUserVO, SysUser.class));
-//        return ApiResult.success(new ArrayList<>());
-//    }
-//
-//    @Override
-//    public ApiResult<String> upload(MultipartFile multipartFile) {
-//        Optional.ofNullable(multipartFile).orElseThrow(() ->  new BusinessException("文件为空"));
-//        String originalFilename = multipartFile.getOriginalFilename();
-//        String newFileName = System.currentTimeMillis() + originalFilename;
-//        File file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), newFileName);
-//        String urlPath = "";
-//        try {
-//            try {
-//                multipartFile.transferTo(file);
-//            } catch (IOException e) {
-//                throw new BusinessException("文件上传失败");
-//            }
-//        } catch (Exception e) {
-//
-//        }
-//        return ApiResult.success(urlPath);
-//    }
-//}

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/controller/web/QueryInfluxdbDataController.java

@@ -2,19 +2,15 @@ package com.usky.demo.controller.web;
 
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.demo.domain.HistoryRequestVO;
+import com.usky.demo.domain.HistoryResultVO;
+import com.usky.demo.domain.LastRequestVO;
+import com.usky.demo.domain.LastResultVO;
 import com.usky.demo.service.QueryInfluxdbDataService;
-import com.usky.demo.service.vo.HistoryRequestVO;
-import com.usky.demo.service.vo.HistoryResultVO;
-import com.usky.demo.service.vo.LastRequestVO;
-import com.usky.demo.service.vo.LastResultVO;
 import io.swagger.annotations.Api;
-import org.bouncycastle.util.StringList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import org.springframework.stereotype.Controller;
-
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -40,7 +36,7 @@ public class QueryInfluxdbDataController {
      */
     @GetMapping("/last")
     public ApiResult<LastResultVO> queryLastDeviceData(@RequestParam(value = "productCode") String productCode,
-                                                             @RequestParam(value = "deviceId") String deviceId){
+                                                       @RequestParam(value = "deviceId") String deviceId){
         return ApiResult.success(queryInfluxdbDataService.queryLastDeviceData(productCode,deviceId));
     }
 

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/controller/web/SendMessageController.java

@@ -1,21 +1,11 @@
 package com.usky.demo.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.demo.domain.DeviceDataWriteVO;
 import com.usky.demo.service.QueryInfluxdbDataService;
-import com.usky.demo.service.rocketmq.MyProducer;
-import com.usky.demo.service.vo.DeviceDataWriteVO;
-import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
 /**
  * @Author :
  * @CreateTime : 2024/2/29

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/service/QueryInfluxdbDataService.java

@@ -1,10 +1,7 @@
 package com.usky.demo.service;
 
-import com.usky.demo.domain.QueryInfluxdbData;
+import com.usky.demo.domain.*;
 import com.usky.common.mybatis.core.CrudService;
-import com.usky.demo.service.vo.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -18,11 +15,11 @@ import java.util.List;
  */
 public interface QueryInfluxdbDataService extends CrudService<QueryInfluxdbData> {
 
-    LastResultVO queryLastDeviceData(String productCode,String deviceId);
+    LastResultVO queryLastDeviceData(String productCode, String deviceId);
 
     List<LastResultVO> queryLastDeviceData(LastRequestVO requestVO);
 
-    HistoryResultVO queryHistoryDeviceData(String productCode,String deviceId,String startTime,String endTime);
+    HistoryResultVO queryHistoryDeviceData(String productCode, String deviceId, String startTime, String endTime);
 
     List<HistoryResultVO> queryHistoryDeviceData(HistoryRequestVO requestVO);
 

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/service/impl/QueryInfluxdbDataServiceImpl.java

@@ -2,13 +2,12 @@ package com.usky.demo.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.usky.demo.domain.QueryInfluxdbData;
+import com.usky.demo.domain.*;
 import com.usky.demo.mapper.QueryInfluxdbDataMapper;
 import com.usky.demo.service.QueryInfluxdbDataService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.demo.service.rocketmq.MyProducer;
 import com.usky.demo.service.utils.TsdbUtils;
-import com.usky.demo.service.vo.*;
 import org.influxdb.dto.QueryResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -65,7 +64,7 @@ public class QueryInfluxdbDataServiceImpl extends AbstractCrudService<QueryInflu
     }
 
     @Override
-    public LastResultVO queryLastDeviceData(String productCode,String deviceId){
+    public LastResultVO queryLastDeviceData(String productCode, String deviceId){
 
         String tableName = productCode + "_" + deviceId;
         String query = "SELECT *::field FROM \""+tableName+"\" order by desc limit 1 tz('Asia/Shanghai')";

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/service/utils/TsdbUtils.java

@@ -1,5 +1,6 @@
 package com.usky.demo.service.utils;
 
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.usky.common.core.influx.core.InfluxDbUtils;
 import com.usky.common.core.util.DateUtils;
 import org.influxdb.InfluxDB;
@@ -10,6 +11,7 @@ import org.influxdb.dto.QueryResult;
 import org.influxdb.impl.TimeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.convert.Jsr310Converters;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -129,8 +131,8 @@ public class TsdbUtils extends InfluxDbUtils {
                                 } catch (ParseException e) {
                                     e.printStackTrace();
                                 }
-                                String dateStr = simpleDateFormat.format(time);
-                                obj.put(columns.get(i), dateStr);
+                                //String dateStr = simpleDateFormat.format(time);
+                                obj.put(columns.get(i), time.getTime());
                             } else if(columns.get(i).equals("timestamp")){
                                 Date time = null;
                                 try {
@@ -138,8 +140,8 @@ public class TsdbUtils extends InfluxDbUtils {
                                 } catch (ParseException e) {
                                     e.printStackTrace();
                                 }
-                                String dateStr = simpleDateFormat.format(time);
-                                obj.put(columns.get(i), dateStr);
+                                //String dateStr = simpleDateFormat.format(time);
+                                obj.put(columns.get(i), time.getTime());
                             }else{
                                 obj.put(columns.get(i), value.get(i));
                             }

data-tsdb-proxy/data-tsdb-proxy-biz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,16 +1,23 @@
-com\usky\demo\controller\web\SendMessageController.class
 com\usky\demo\mapper\SysUserMapper.class
-com\usky\demo\MybatisGenerator$2.class
 com\usky\demo\MybatisGenerator$1.class
-com\usky\demo\service\config\CodeCache.class
-com\usky\demo\service\utils\TsdbUtils.class
+com\usky\demo\service\rocketmq\MyProducer.class
 com\usky\demo\domain\SysUser.class
-com\usky\demo\service\config\TsdbConfig.class
 com\usky\demo\ApplicationRun.class
-com\usky\demo\service\impl\SysUserServiceImpl.class
 com\usky\demo\service\SysUserService.class
+com\usky\demo\mapper\QueryInfluxdbDataMapper.class
 com\usky\demo\domain\DataRealTime.class
-com\usky\demo\service\listener\MyConsumer.class
-com\usky\demo\controller\web\SysUserController.class
+com\usky\demo\controller\api\DataTsdbProxyControllerApi.class
 com\usky\demo\MybatisGenerator.class
+com\usky\demo\controller\web\SendMessageController.class
+com\usky\demo\service\QueryInfluxdbDataService.class
+com\usky\demo\MybatisGenerator$2.class
+com\usky\demo\service\config\CodeCache.class
+com\usky\demo\service\utils\TsdbUtils.class
+com\usky\demo\service\impl\QueryInfluxdbDataServiceImpl.class
+com\usky\demo\service\config\TsdbConfig.class
+com\usky\demo\service\impl\SysUserServiceImpl.class
+com\usky\demo\domain\QueryInfluxdbData.class
+com\usky\demo\controller\web\QueryInfluxdbDataController.class
+com\usky\demo\service\rocketmq\MyConsumer.class
+com\usky\demo\controller\web\SysUserController.class
 com\usky\demo\service\rocketmq\SimpleContext.class

data-tsdb-proxy/data-tsdb-proxy-biz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,15 +1,21 @@
 D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\domain\DataRealTime.java
 D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\service\SysUserService.java
 D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\service\utils\TsdbUtils.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\controller\web\QueryInfluxdbDataController.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\service\QueryInfluxdbDataService.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\controller\api\DataTsdbProxyControllerApi.java
 D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\ApplicationRun.java
 D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\controller\web\SendMessageController.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\mapper\QueryInfluxdbDataMapper.java
 D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\service\config\CodeCache.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\service\impl\QueryInfluxdbDataServiceImpl.java
 D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\MybatisGenerator.java
 D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\service\rocketmq\SimpleContext.java
 D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\mapper\SysUserMapper.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\service\rocketmq\MyConsumer.java
 D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\service\config\TsdbConfig.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\service\rocketmq\MyProducer.java
+D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\domain\QueryInfluxdbData.java
 D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\service\impl\SysUserServiceImpl.java
-D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\controller\api\SysUserControllerApi.java
-D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\service\listener\MyConsumer.java
 D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\domain\SysUser.java
 D:\zyj\JAVA-PROCESS\usky-data\usky-data\data-tsdb-proxy\data-tsdb-proxy-biz\src\main\java\com\usky\demo\controller\web\SysUserController.java