优化绿波相位差问题

signal-feign-service/pom.xml

@@ -33,6 +33,10 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
 
     </dependencies>
 </project>

signal-feign-service/src/main/resources/application-docker.properties

-utc.service.url=http://192.168.150.1:32000/utc
-utc.dt.service.url=http://192.168.150.1:39002/utc-dt
-utc.hisense.service.url=http://192.168.150.1:39003/utc-hisense
-control.url=http://192.168.150.1:32001/web
-ehualu.url=http://192.168.150.1:30015
\ No newline at end of file
+utc.service.url=http://37.12.182.29:32000/utc
+utc.dt.service.url=http://37.12.182.29:39002/utc-dt
+utc.hisense.service.url=http://37.12.182.29:39003/utc-hisense
+control.url=http://37.12.182.29:32001/web
+ehualu.url=http://37.12.182.29:30015
\ No newline at end of file

signal-feign-service/src/main/resources/application-test.properties

-utc.service.url=http://173.17.0.1:32000/utc
-utc.dt.service.url=http://173.17.0.1:39002/utc-dt
-utc.hisense.service.url=http://173.17.0.1:39003/utc-hisense
-control.url=http://173.17.0.1:32001/web
-ehualu.url=http://173.17.0.1:30015
\ No newline at end of file
+utc.service.url=http://37.12.182.29:32000/utc
+utc.dt.service.url=http://37.12.182.29:39002/utc-dt
+utc.hisense.service.url=http://37.12.182.29:39003/utc-hisense
+control.url=http://37.12.182.29:32001/web
+ehualu.url=http://37.12.182.29:30015
\ No newline at end of file

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/implv2/TrendServiceV2Impl.java

 package net.wanji.opt.servicev2.implv2;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
@@ -28,7 +27,6 @@ import net.wanji.opt.cache.BaseCrossInfoCache;
 import net.wanji.opt.common.RedisUtils;
 import net.wanji.opt.common.enums.EventInfoTypeEnum;
 import net.wanji.opt.common.enums.GreenBeltDirEnum;
-import net.wanji.opt.common.enums.GreenWaveInDirEnum;
 import net.wanji.opt.dao.mapper.*;
 import net.wanji.opt.dto.GreenBeltChartDTO;
 import net.wanji.opt.entity.GreenChartSchemeHist;
@@ -47,7 +45,6 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -497,7 +494,7 @@ public class TrendServiceV2Impl implements TrendServiceV2 {
                 // 空放
                 if (Objects.equals(1, currentAlgo) && paramTime - optTime < countDown * 1000) {
                     optStrategyResultInfoVO.setCurOptType(1);
-                } else if (paramTime - optTime < duration * 1000) {
+                } else if (Objects.nonNull(duration) && paramTime - optTime < duration * 1000) {
                     optStrategyResultInfoVO.setCurOptType(currentAlgo);
                 }
             }
@@ -582,7 +579,7 @@ public class TrendServiceV2Impl implements TrendServiceV2 {
             String controlTime = entity.getControlTime();
             // 如果最新一条在半小时内，取绿波优化数据
             Date parse = DateUtil.parse(controlTime, Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND);
-            int controlOptTime = (int) parse.getTime();
+            long controlOptTime =  parse.getTime();
             if (time - controlOptTime < 30 * 60 * 1000) {
                 String crossGreenDetailStr = entity.getCrossGreenDetail();
                 GreenBeltInfoVO.CrossGreenDetail crossGreenDetail = new GreenBeltInfoVO.CrossGreenDetail();
@@ -596,7 +593,7 @@ public class TrendServiceV2Impl implements TrendServiceV2 {
                     }
                 }
             } else {
-                curDetail = oriDetail;
+                curDetail = curDetail;
             }
 
         }

signal-optimize-service/src/main/resources/bootstrap.yaml

 spring:
   profiles:
-    active: test
+    active: docker

signal-optimize-service/src/main/resources/mapper/judgeanalysis/AnalysisProblemCrossDirHourMapper.xml

@@ -372,7 +372,7 @@
         ORDER BY event_number desc
         limit 1
     </select>
-    <select id="getCongestionReasoninfo" parameterType="map" resultType="CrossCongestionLaneReasonInfo">
+    <select id="getCongestionReasoninfo" parameterType="map" resultType="net.wanji.opt.entity.judgeanalysis.CrossCongestionLaneReasonInfo">
         SELECT a.cross_id,a.dir,a.id,avg(b.sturation) sturation
         from t_base_lane_info a
                  LEFT JOIN

signal-optimize-service/src/test/java/AreaCrossTest.java

-/**
- *
- */
-package zsg;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import net.wanji.opt.SignalOptimizeApplication;
-import net.wanji.opt.common.EsDateIndexUtil;
-import net.wanji.opt.servicev2.judgeanalysis.AnalysisProblemCrossDayService;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.LineIterator;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import java.io.File;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author fengyi
- * @date
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = SignalOptimizeApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class AreaCrossTest {
-
-    @Resource
-    AnalysisProblemCrossDayService analysisProblemCrossDayService;
-    @Test
-    public void testProducerTrack()  {
-
-        analysisProblemCrossDayService.updateCrossAreaIdByCondition();
-
-    }
-
-
-}

signal-optimize-service/src/test/java/OptimizeStatisticTaskTest.java

-/**
- *
- */
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import net.wanji.opt.SignalOptimizeApplication;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-
-/**
- * @author fengyi
- * @date
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = SignalOptimizeApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class OptimizeStatisticTaskTest {
-
-//    @Resource
-//    OptimizeStatisticTask optimizeStatisticTask;
-//    @Test
-//    public void testProducerTrack()  {
-//        DateTime dateTime = DateUtil.lastWeek();
-//        dateTime = DateUtil.beginOfWeek(dateTime.toJdkDate());
-//
-//        String start = dateTime.toString("yyyy-MM-dd HH:mm:ss");
-//        String end = DateUtil.now();
-//        //测试运行上周一到现在的数据
-//        optimizeStatisticTask.optimizeDurationCal();
-//
-//    }
-
-
-}

signal-optimize-service/src/test/resources/bootstrap-test.yaml

-spring:
-  cloud:
-    nacos:
-      config:
-        server-addr: 37.12.182.29:8848
-        file-extension: yaml
-        group: signal
-        namespace: signal
-        username: nacos
-        password: nacos
-  application:
-    # dubbo启动需要程序名称
-    name: signal-optimize-service
-  main:
-    allow-circular-references: true

signal-optimize-service/src/test/resources/bootstrap.yaml

-spring:
-  profiles:
-    active: test
-logging:
-  level:
-    org.apache.ibatis: DEBUG
\ No newline at end of file