Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/cache/PhaseDirTurnCache.java → signal-optimize-service/src/main/java/net/wanji/opt/cache/CrossDirTurnPhaseCache.java

@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
  */
 @Component
 @Slf4j
-public class PhaseDirTurnCache implements CommandLineRunner {
+public class CrossDirTurnPhaseCache implements CommandLineRunner {
 
     private static Map<String, CrossPhaseDTO> phaseMap = new ConcurrentHashMap<>();
 
@@ -35,6 +35,7 @@ public class PhaseDirTurnCache implements CommandLineRunner {
 
     /**
      * 统一获取缓存方法
+     * key: crossId-dir-turn value:CrossPhaseDTO
      *
      * @return
      */
@@ -52,7 +53,7 @@ public class PhaseDirTurnCache implements CommandLineRunner {
      *
      * key: crossId-dir-turn value:CrossPhaseDTO
      */
-    private synchronized void init() {
+    private void init() {
         try {
             long start = System.currentTimeMillis();
             // 获取已执行的调度详情信息

signal-optimize-service/src/main/java/net/wanji/opt/common/exception/GlobalExceptionHandler.java → signal-optimize-service/src/main/java/net/wanji/opt/common/exception/OptExceptionHandler.java

 package net.wanji.opt.common.exception;
 
+import net.wanji.common.framework.exceptionhandler.GlobalExceptionHandler;
 import net.wanji.common.framework.rest.JsonViewObject;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.validation.BindingResult;
@@ -20,7 +21,7 @@ import java.util.Map;
  * @date 2023/1/5 13:18
  */
 @RestControllerAdvice
-public class GlobalExceptionHandler {
+public class OptExceptionHandler extends GlobalExceptionHandler {
     @ExceptionHandler(value = MethodArgumentNotValidException.class)
     public JsonViewObject methodArgumentExceptionHandler(MethodArgumentNotValidException e) {
         BindingResult bindingResult = e.getBindingResult();

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

@@ -10,7 +10,7 @@ import net.wanji.databus.entity.develop.servicedevelop.develop.StatusCodeEnum;
 import net.wanji.feign.pojo.vo.SchemeSendVO;
 import net.wanji.feign.pojo.vo.SignalStatusVO;
 import net.wanji.feign.service.UtcFeignClients;
-import net.wanji.opt.cache.PhaseDirTurnCache;
+import net.wanji.opt.cache.CrossDirTurnPhaseCache;
 import net.wanji.opt.dao.mapper.CrossPhaseMapper;
 import net.wanji.opt.dao.mapper.CrossSchemeMapper;
 import net.wanji.opt.dao.mapper.CrossSchemeOptLogMapper;
@@ -57,7 +57,7 @@ public class CrossOptimizeServiceImpl implements CrossOptimizeService {
     @Resource
     UtcFeignClients utcFeignClients;
     @Resource
-    PhaseDirTurnCache phaseDirTurnCache;
+    CrossDirTurnPhaseCache crossDirTurnPhaseCache;
 
     @Value("${crossOptParam.maxVehheadDist}")
     private Double maxVehheadDist;
@@ -91,7 +91,7 @@ public class CrossOptimizeServiceImpl implements CrossOptimizeService {
 
         try {
             // 相位配时信息，key: 路口编号_方向类型_转向类型，value: 相位配时信息
-            Map<String, CrossPhaseDTO> phaseMap = phaseDirTurnCache.getPhaseDirTurnMap();
+            Map<String, CrossPhaseDTO> phaseMap = crossDirTurnPhaseCache.getPhaseDirTurnMap();
             setTurnList(abnormalCrossList, phaseMap);
             setTurnList(crossDataRealtimePOList, phaseMap);
 

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

@@ -5,7 +5,7 @@ import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.entity.develop.servicedevelop.develop.StatusCodeEnum;
 import net.wanji.feign.pojo.vo.SchemeSendVO;
 import net.wanji.feign.service.UtcFeignClients;
-import net.wanji.opt.cache.PhaseDirTurnCache;
+import net.wanji.opt.cache.CrossDirTurnPhaseCache;
 import net.wanji.opt.dao.mapper.CrossSchemeOptLogMapper;
 import net.wanji.opt.dto.CrossPhaseDTO;
 import net.wanji.opt.po.base.CrossSchemeOptLogPO;
@@ -35,7 +35,7 @@ public class FeignProxyServiceImpl implements FeignProxyService {
     @Autowired
     private CrossSchemeOptLogMapper crossSchemeOptLogMapper;
     @Autowired
-    private PhaseDirTurnCache phaseDirTurnCache;
+    private CrossDirTurnPhaseCache crossDirTurnPhaseCache;
 
     @Override
     public JsonViewObject schemeOptSend(SchemeOptSendVO schemeOptSendVO) throws Exception {
@@ -57,7 +57,7 @@ public class FeignProxyServiceImpl implements FeignProxyService {
     @Override
     public JsonViewObject schemeOptRestore(String crossId) throws Exception {
         // 下发原始方案
-        Map<String, CrossPhaseDTO> phaseMap = phaseDirTurnCache.getPhaseDirTurnMap();
+        Map<String, CrossPhaseDTO> phaseMap = crossDirTurnPhaseCache.getPhaseDirTurnMap();
         SchemeSendVO schemeSendVO = getSchemeSendVO(crossId, phaseMap, Collections.EMPTY_MAP);
         JsonViewObject jsonViewObject = utcFeignClients.schemeSend(schemeSendVO);
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
@@ -75,7 +75,7 @@ public class FeignProxyServiceImpl implements FeignProxyService {
      */
     private List<CrossSchemeOptLogPO> getCrossSchemeOptLogPOList(SchemeOptSendVO schemeOptSendVO) {
         List<CrossSchemeOptLogPO> crossSchemeOptLogPOS = new ArrayList<>();
-        Map<String, CrossPhaseDTO> phaseDirTurnMap = phaseDirTurnCache.getPhaseDirTurnMap();
+        Map<String, CrossPhaseDTO> phaseDirTurnMap = crossDirTurnPhaseCache.getPhaseDirTurnMap();
 
         long dataBatchTimeLong = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
         Map<String, Integer> phaseOffsetTimeMap = schemeOptSendVO.getPhaseOffsetTimeMap();