[update] 干线评价曲线图时间修改

signal-control-service/src/main/resources/application-local.yaml

+spring:
+  application:
+    # dubbo启动需要程序名称
+    name: web
+  jackson:
+    mapper:
+      accept_case_insensitive_properties: true
+  main:
+    allow-circular-references: true
+    # allow-bean-definition-overriding: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  datasource:
+    dynamic:
+      primary: master
+      datasource:
+        master:
+          type: com.alibaba.druid.pool.DruidDataSource
+          url: jdbc:mysql://37.12.182.29:3306/t_signal_control_jinan?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&useSSL=false&useCursorFetch=true
+          #          url: jdbc:mysql://10.102.1.112:53306/t_signal_control?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&useSSL=false&useCursorFetch=true
+          username: root
+          password: Wanji300552
+          driverClassName: com.mysql.cj.jdbc.Driver
+        slave:
+          type: com.alibaba.druid.pool.DruidDataSource
+          url: jdbc:mysql://37.12.182.29:3306/t_signal_control_jinan?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&useSSL=false&useCursorFetch=true
+          username: root
+          password: Wanji300552
+          driverClassName: com.mysql.cj.jdbc.Driver
+        webService:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://37.12.182.29:3306/t_signal?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&useSSL=false&useCursorFetch=true
+          username: root
+          password: Wanji300552
+          type: com.alibaba.druid.pool.DruidDataSource
+  redis:
+    host: 37.12.182.29
+    port: 6379
+    password: Wanji300552
+    jedis:
+      pool:
+        max-active: 200
+        max-wait: 5000
+        max-idle: 20
+        min-idle: 10
+    timeout: 5000
+    database: 3
+  kafka:
+    bootstrap-servers: 37.12.182.29:9092
+    #消费者配置
+    consumer:
+      max-poll-records: 1
+      #      broker-id: 0
+      auto-commit-interval: 1S
+      auto-offset-reset: earliest
+      enable-auto-commit: false
+      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+      value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+      group-id: group
+    listener:
+      concurrency: 3
+      ack-mode: manual_immediate
+
+service:
+  name: signal-control-service
+
+mapper:
+  mappers:
+    - net.wanji.web.mapper.MyBaseMapper
+  not-empty: false
+  identity: MYSQL
+
+pagehelper:
+  helper-dialect: mysql
+  reasonable: false
+  # pagehelper分页 配置参数 supportMethodsArguments 建议不要全局设置
+  # https://www.cnblogs.com/liran123/p/12889093.html
+  support-methods-arguments: false
+  params: count=countSql
+
+jasypt:
+  encryptor:
+    algorithm: PBEWithMD5AndDES
+    password: 7F84150B6A114C48F0EA1158484BF63C
+    iv-generator-classname: org.jasypt.iv.NoIvGenerator
+
+mybatis-plus:
+  mapper-locations: classpath*:mapper/*.xml,classpath:mapper/*/*.xml
+  typeAliasesPackage: net.wanji.web.entity
+  check-config-location: true
+  configuration:
+    #是否开启自动驼峰命名规则（camel case）映射
+    map-underscore-to-camel-case: true
+    #全局地开启或关闭配置文件中的所有映射器已经配置的任何缓存
+    cache-enabled: false
+    call-setters-on-nulls: true
+    #配置JdbcTypeForNull, oracle数据库必须配置
+    jdbc-type-for-null: 'null'
+    #MyBatis 自动映射时未知列或未知属性处理策略 NONE：不做任何处理 (默认值), WARNING：以日志的形式打印相关警告信息, FAILING：当作映射失败处理，并抛出异常和详细信息
+    auto-mapping-unknown-column-behavior: warning
+    #开启SQL打印
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+mybatis:
+  type-aliases-package: net.wanji.*.model
+  mapper-locations: classpath*:mapper/*.xml,classpath:mapper/*/*.xml
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+
+#线程池配置
+threadPoolConfig:
+  threadPoolName: ${spring.application.name}-threadPool-thread-%d
+  coreSize: 8
+  maxSize: 16
+  queueCapacity: 200
+  keepAliveTime: 6000
+  allowCoreTimeOut: false
+
+#鉴权
+security:
+  oauth2:
+    client:
+      # client-id、client-secret 要和认证服务中的配置一致
+      client-id: identity
+      client-secret: identity-secret
+      # 授权码认证方式需要的
+      user-authorization-uri: http://37.12.182.29:17040/oauth/authorize
+      # 密码模式需要用到的获取 token 的接口
+      access-token-uri: http://37.12.182.29:17040/oauth/token
+      scope: all
+      # 备选列表 password client_credentials authorization_code
+      grant-type: password
+    authorization:
+      # 当此服务端接收到来自客户端端的请求后，需要拿着请求中的 token 到认证服务端做 token 验证，就是请求的这个接口
+      check-token-access: http://37.12.182.29:17040/oauth/check_token
+    resource:
+      jwt:
+        key-uri: http://37.12.182.29:17040/oauth/token_key
+        key-value: dev
+ignite-client:
+  address: 37.12.182.29:10800
+
+server:
+  port: 32001
+  servlet:
+    display-name: Wanji
+    context-path: /web
+    multipart:
+      max-file-size: 50MB
+      max-request-size: 50MB
+  tomcat:
+    threads:
+      max: 10000
+
+#线程池配置
+threadPool:
+  corePoolSize: 5
+  maxPoolSize: 200
+  queueCapacity: 5
+  keepAliveTime: 60000
+
+# 信号平台
+signal:
\ No newline at end of file

signal-control-service/src/main/resources/bootstrap-local.yaml

-spring:
-  application:
-    # dubbo启动需要程序名称
-    name: web
-  cloud:
-    nacos:
-      config:
-        server-addr: 10.102.1.182:8848
-        file-extension: yaml
-        group: signal
-        namespace: signal
-        username: nacos
-        password: nacos
-  main:
-    allow-circular-references: true
\ No newline at end of file

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/MainlineEvaluateServiceImpl.java

@@ -119,6 +119,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
         Integer scope = bo.getScope();
         List<String> scopeList = bo.getScopeList();
         Integer minutes = bo.getMinutes();
+        Integer minutesSpan = minutes - 1; // 排除结束时间
         String metricName = bo.getMetricCode();
         Date startTime = bo.getStartTime();
         Date endTime = bo.getEndTime();
@@ -153,7 +154,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
 
                 // 计算结束时间
                 Calendar endTimeCal = (Calendar) startTimeCal.clone();
-                endTimeCal.add(Calendar.MINUTE, minutes);
+                endTimeCal.add(Calendar.MINUTE, minutesSpan);
 
                 // 过滤 crossPOList 中的记录
                 List<CrossDataHistPO> filteredList = crossPOList.stream()
@@ -267,7 +268,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
 
                     // 计算结束时间
                     Calendar endTimeCal = (Calendar) startTimeCal.clone();
-                    endTimeCal.add(Calendar.MINUTE, minutes);
+                    endTimeCal.add(Calendar.MINUTE, minutesSpan);
 
                     // 过滤 poList 中的记录
                     List<CrossDirDataHistPO> filteredList = dirPOList.stream()
@@ -375,7 +376,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
 
                     // 计算结束时间
                     Calendar endTimeCal = (Calendar) startTimeCal.clone();
-                    endTimeCal.add(Calendar.MINUTE, minutes);
+                    endTimeCal.add(Calendar.MINUTE, minutesSpan);
 
                     // 过滤 poList 中的记录
                     List<CrossTurnDataHistPO> filteredList = dirPOList.stream()
@@ -487,7 +488,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
 
                     // 计算结束时间
                     Calendar endTimeCal = (Calendar) startTimeCal.clone();
-                    endTimeCal.add(Calendar.MINUTE, minutes);
+                    endTimeCal.add(Calendar.MINUTE, minutesSpan);
 
                     // 过滤 poList 中的记录
                     List<CrossLaneDataHistPOExt> filteredList = lanePOList.stream()

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/SceneEvaluateServiceImpl.java

@@ -191,7 +191,7 @@ public class SceneEvaluateServiceImpl implements SceneEvaluateService {
         Integer duration = crossDataHistPO.getDuration();
         // 计算startTime加上duration后的时间
         cal.setTime(startTime);
-        cal.add(Calendar.MINUTE, duration);
+        cal.add(Calendar.MINUTE, duration--);
         Date newEndTime = cal.getTime();
 
         List<CrossDataHistPO> sceneCrossDataHistPOList = getCrossDataHistPOList(startTime, newEndTime, crossId);