Merge remote-tracking branch 'origin/data-fix' into data-fix

pom.xml

@@ -68,10 +68,6 @@
              <artifactId>sentinel-datasource-nacos</artifactId>
          </dependency>-->
         <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.3.1</version>

src/main/java/com/gct/edge/actuator/controller/DiagnoseController.java

@@ -76,10 +76,11 @@ public class DiagnoseController {
     public Result getGtOverlayDataLazy(@RequestParam String moduleKey, @RequestParam String wellId,
                                        @RequestParam String beginDate, @RequestParam String endDate,
                                        @ApiParam("叠加数,也就相当于pageSize") @RequestParam Integer splitCount,
-                                       @ApiParam("当前第几个叠加图,也就相当于curPage") @RequestParam Integer curIndex) {
+                                       @ApiParam("当前第几个叠加图,也就相当于curPage") @RequestParam Integer curIndex,
+                                       @RequestParam(required = false) String dilutionCount) {
         if (StringUtil.isBlankOrEmpty(moduleKey)) return Result.error("参数条件不足");
         if (splitCount != null && splitCount >= 20000) return Result.error("超过叠加上限");
-        JSONObject ja = diagnoseService.getGtOverlayDataLazy(moduleKey, wellId, beginDate, endDate, splitCount,curIndex);
+        JSONObject ja = diagnoseService.getGtOverlayDataLazy(moduleKey, wellId, beginDate, endDate, splitCount,curIndex,dilutionCount);
         return Result.ok(ja);
     }
 

src/main/java/com/gct/edge/actuator/controller/YieldController.java

@@ -30,15 +30,6 @@ public class YieldController {
     @Autowired
     YieldService yieldService;
 
-    @PreAuthorize("hasAuthority('module:view:read')")
-    @GetMapping("/getYieldResultDisperse")
-    public Result getYieldResultDisperse(@RequestParam String moduleKey,@RequestParam String wellId,
-                                         @RequestParam String beginDateTime,
-                                         @RequestParam String endDateTime,@RequestParam Integer total) {
-        return yieldService.getYieldResultDisperse(moduleKey,wellId,beginDateTime,endDateTime,total);
-    }
-
-
     @PreAuthorize("hasAuthority('module:view:write')")
     @PostMapping("/uploadYieldReuslt")
     public Result uploadDiagnoseReuslt(@RequestParam MultipartFile file, @RequestParam String moduleKey) {

src/main/java/com/gct/edge/actuator/service/DiagnoseService.java

@@ -40,5 +40,5 @@ public interface DiagnoseService extends IService<DiagnoseResultRealTime> {
 
     Page<DiagnoseResultRealTime> selectPageByCondition(String moduleKey, String wellId, LocalDateTime start, LocalDateTime end, Integer curPage, Integer pageSize);
 
-    JSONObject getGtOverlayDataLazy(String moduleKey, String wellId, String beginDate, String endDate, Integer splitCount, Integer curIndex);
+    JSONObject getGtOverlayDataLazy(String moduleKey, String wellId, String beginDate, String endDate, Integer splitCount, Integer curIndex, String dilutionCount);
 }

src/main/java/com/gct/edge/actuator/service/impl/DiagnoseServiceImpl.java

@@ -209,7 +209,7 @@ public class DiagnoseServiceImpl extends ServicePlusImpl<DiagnoseResultRealTimeM
     }
 
     @Override
-    public JSONObject getGtOverlayDataLazy(String moduleKey, String wellId, String beginDate, String endDate, Integer splitCount, Integer curIndex) {
+    public JSONObject getGtOverlayDataLazy(String moduleKey, String wellId, String beginDate, String endDate, Integer splitCount, Integer curIndex, String dilutionCount) {
         Page<DiagnoseResultRealTime> data = selectPageToObject(
                 new Page<DiagnoseResultRealTime>(curIndex, splitCount).
                         setSearchCount(false),

src/main/java/com/gct/edge/actuator/service/impl/YieldServiceImpl.java

@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -53,6 +54,7 @@ public class YieldServiceImpl extends ServicePlusImpl<YieldRealTimeMapper, Yield
         List<YieldRealTime> data = DataTranslator.transFileToFileParseObject(file, YieldRealTime.class);
         data.forEach(x -> {
             x.setModuleKey(moduleKey);
+            x.setId(UUID.randomUUID().toString());
         });
         int sus = saveOnConflictDoNothingBatch(data);
 //        int failed = 0;

src/main/resources/application-dev.yml

@@ -8,8 +8,8 @@ server:
 logging:
   level:
     root: info
-    com.gct.edge.actuator.mapper: debug
-    com.gct.edge.actuator.service: debug
+    com.gct.edge.actuator.mapper: off
+    com.gct.edge.actuator.service: off
 
 management:
   endpoints:
@@ -21,17 +21,8 @@ spring:
     ## 指定nacos server地址
     nacos:
       ## 指定nacos server地址
-      server-addr: 192.168.31.167:8848
-      discovery:
-        namespace: 6ff57726-5b12-4ffe-a0dc-b1e67168ffe5
-        group: DEV_GROUP
-      #指定sentinel地址
-  #    sentinel:
-  #      transport:
-  #        dashboard: 101.200.219.190:8858
-  #        port: 8722 #端口会自动向下获取 8720 8721...
-  #        #默认locahost 然而对容器、云主机不友好，明确地址,sentinel没有实现打洞
-  #        client-ip: 101.200.219.190
+      server-addr: 192.168.31.252:8848
+
   ## 本服务名称
   application:
     name: edge-actuator
@@ -62,7 +53,7 @@ spring:
     edge:
       base:
         enabled: true
-        jdbc-url: jdbc:postgresql://geo-cruiser.com:54324/central
+        jdbc-url: jdbc:postgresql://192.168.31.252:54322/central
         username: root
         password: 123456
         driver-class-name: org.postgresql.Driver
@@ -103,22 +94,6 @@ swagger:
   authorization:
     key-name: token
   enabled: true
-gct:
-  thrift:
-    provider:
-      port: 9091
-      host: 192.168.1.50
-
-      timeout: 3000
-    pool:
-      maxTotal: 20
-      maxIdle: 20
-      minIdle: 0
-      test-on-return: off
-      test-on-borrow: on
-      test-while-idle: off
-
-
 
 feign:
   client:
@@ -131,16 +106,7 @@ feign:
 
 #token 认证中心主机地址
 auth:
-  hostList: 192.168.31.167:9001
-
-#mybatis-plus:
-#  global-config:
-#    db-config:
-#      logic-delete-value: 1
-#      logic-not-delete-value: 0
-#  configuration:
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
+  hostList: 192.168.31.252:9001
 
 sample-source-path: ${user.home}/dl/samplesource/
 

src/main/resources/bootstrap.yml

@@ -1,14 +1,6 @@
 spring:
   ## 切换配置文件
   profiles:
-    active: pro   # dev 开发环境    /   pro  生产环境    / test   测试环境
-#  cloud:
-#    nacos:
-#      config:
-#        server-addr: 101.200.219.190:8848 #Nacos作为配置中心地址
-#        file-extension: yaml #指定yaml格式配置
-#        group: DEV_GROUP
-#        namespace: 75b6372b-5e8b-4698-840c-66add07e147f
-#        refresh-enabled: false
+    active: dev   # dev 开发环境    /   pro  生产环境    / test   测试环境
   application:
     name: edge-actuator