Merge remote-tracking branch 'origin/jinan-signal-opt-v1-20250304' into...

Merge remote-tracking branch 'origin/jinan-signal-opt-v1-20250304' into jinan-signal-opt-v1-20250304

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

@@ -2,3 +2,4 @@ utc.service.url=http://172.17.0.1:32000/utc
 utc.dt.service.url=http://172.17.0.1:39002/utc-dt
 utc.hisense.service.url=http://127.0.0.1:39003/utc-hisense
 control.url=http://172.17.0.1:42001/web
+ehualu.url=http://37.12.182.29:30015
\ No newline at end of file

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/service/impl/StaticInfoServiceImpl.java

@@ -1054,7 +1054,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
         LambdaQueryWrapper<CrossSchemeStageOptLogPO> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CrossSchemeStageOptLogPO::getCrossId, crossSchemeRingsDTO.getCrossId())
                 .eq(CrossSchemeStageOptLogPO::getSchemeId, crossSchemeRingsDTO.getPattern())
-                .inSql(CrossSchemeStageOptLogPO::getBatchTime, "select max(batch_time) from t_cross_scheme_opt_log where cross_id = '" + crossSchemeRingsDTO.getCrossId() + "' and scheme_id = " + crossSchemeRingsDTO.getPattern()+ "' and opt_result = 1'");
+                .inSql(CrossSchemeStageOptLogPO::getBatchTime, "select max(batch_time) from t_cross_scheme_opt_log where cross_id = '" + crossSchemeRingsDTO.getCrossId() + "' and scheme_id = '" + crossSchemeRingsDTO.getPattern()+ "' and opt_result = 1");
         List<CrossSchemeStageOptLogPO> crossSchemeStageOptLogPOS = crossSchemeStageOptLogMapper.selectList(queryWrapper);
         return crossSchemeStageOptLogPOS;
     }

signal-utc-hisense-service/src/main/resources/bootstrap-jinan.yaml

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

signal-utc-service/src/main/java/net/wanji/utc/service/control/impl/ControlCommandStrategyServiceImpl.java

@@ -30,7 +30,7 @@ import net.wanji.utc.common.typeenum.HttpCode;
 import net.wanji.utc.po.hk.request.DelBaseConfigPO;
 import net.wanji.utc.service.control.ControlCommandService;
 import net.wanji.utc.service.control.ControlCommandStrategyService;
-import net.wanji.utc.service.staticinfo.StaticInfoService;
+import net.wanji.utc.service.staticinfo.WanJiCommonStaticInfoService;
 import net.wanji.utc.task.SignalCommandSyncTask;
 import net.wanji.utc.task.SignalStatusTask;
 import net.wanji.utc.util.StringUtils;
@@ -78,7 +78,8 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
     private final SignalCommandPOMapper signalCommandPOMapper;
     private final CrossPhaseDirTurnCache crossPhaseDirTurnCache;
     private final CrossSchemePhaseTimeCountCache crossSchemePhaseTimeCountCache;
-    private final StaticInfoService staticInfoService;
+    @Resource
+     WanJiCommonStaticInfoService wanjiCommonStaticInfoService;
 
 
     @Override
@@ -697,7 +698,7 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
             CrossSchemeRingsDTO crossSchemeRingsDTO = new CrossSchemeRingsDTO();
             crossSchemeRingsDTO.setCrossId(crossId);
             crossSchemeRingsDTO.setPattern(String.valueOf(schemeId));
-            JsonViewObject jsonViewObject = staticInfoService.selectCrossSchemeRingsToStages(crossSchemeRingsDTO);
+            JsonViewObject jsonViewObject = wanjiCommonStaticInfoService.selectCrossSchemeRingsToStages(crossSchemeRingsDTO);
             if (Objects.nonNull(jsonViewObject) && Objects.equals(200, jsonViewObject.getCode())) {
                 String contentStr = String.valueOf(jsonViewObject.getContent());
                 CrossSchemeRingsToStagesPO crossSchemeRingsToStagesPO = mapper.convertValue(contentStr, CrossSchemeRingsToStagesPO.class);

signal-utc-service/src/main/resources/bootstrap-jinan.yaml

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