Skip to content

Commit d7f33e1

Browse files
committed
获取大屏参数
1 parent 9c10c6c commit d7f33e1

59 files changed

Lines changed: 332 additions & 255 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50

Whitespace-only changes.

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.ruoyi;
22

3+
import org.mybatis.spring.annotation.MapperScan;
4+
import org.mybatis.spring.annotation.MapperScans;
35
import org.springframework.boot.SpringApplication;
46
import org.springframework.boot.autoconfigure.SpringBootApplication;
57
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -12,6 +14,9 @@
1214
*/
1315
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
1416
@EnableCaching
17+
@MapperScans({
18+
@MapperScan("com.ruoyi.simulation.dao")
19+
})
1520
public class RuoYiApplication {
1621
public static void main(String[] args) {
1722
// System.setProperty("spring.devtools.restart.enabled", "false");

ruoyi-admin/src/main/resources/application.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,15 @@ simulation:
135135
wizardCoder:
136136
interpreterLocation: C:/ProgramData/anaconda3/python.exe #非虚拟环境的python服务安装位置
137137
scriptLocation: D:/project/gpt/webui/client.py #生成代码的客户端脚本位置
138+
indirection:
139+
interpreterLocation: C:/ProgramData/Python37/python.exe
140+
scriptDirectory: D:/project/gpt/webui/indirectionscript/
138141
ue4Engine:
139142
interpreterLocation: C:\ProgramData\Python37\python.exe
140143
scriptDirectory: D:\project\gpt\webui\examples\
141144
port: 10001
142-
filepath: D:/users/alanYang/documents/accessory/intelligentTraffic/simulation #音频文件以及视频文件保存路径
145+
filepath:
146+
audioPath: D:/users/alanYang/documents/accessory/intelligentTraffic/simulation/audio #音频文件以及视频文件保存路径
147+
loggerPath: D:/users/alanYang/documents/accessory/intelligentTraffic/simulation/logger
148+
sumoPath: D:/users/alanYang/documents/accessory/intelligentTraffic/simulation/sumo/data.json
149+
vehiclePath: D:/users/alanYang/documents/accessory/intelligentTraffic/simulation/vehicle #存储车辆轨迹的文本文件所在的文件夹

ruoyi-simulation/src/main/java/com/ruoyi/simulation/call/CallUE4Engine.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ protected Process getProcess() throws Exception {
7373

7474
@Override
7575
protected Process processResult(InputStream ins) throws Exception {
76-
BufferedReader bufferedReader = null;
77-
bufferedReader = new BufferedReader(new InputStreamReader(ins,"gbk"));
76+
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(ins,"gbk"));
7877
String str = null;
7978
while(!StringUtils.isEmpty(str = bufferedReader.readLine())){
8079
logger.info(str);
@@ -112,6 +111,11 @@ protected Process getProcess() throws Exception {
112111

113112
@Override
114113
protected Void processResult(InputStream ins) throws Exception {
114+
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(ins,"gbk"));
115+
String str = null;
116+
while(!StringUtils.isEmpty(str = bufferedReader.readLine())){
117+
logger.info(str);
118+
}
115119
return null;
116120
}
117121
};

ruoyi-simulation/src/main/java/com/ruoyi/simulation/call/CallWizardCoder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ protected Process getProcess() throws Exception {
4040
//执行服务器中的python脚本
4141
Runtime runtime = Runtime.getRuntime();
4242
//>C:/ProgramData/anaconda3/python.exe D:/project/gpt/webui/client.py --prompt 创建一个驾驶场景对象scenario,并在场景中创建了一个车辆对象v1
43+
logger.info("cmd /k "+interpreterLocation+" "+scriptLocation+" --prompt "+command);
4344
return runtime.exec("cmd /k "+interpreterLocation+" "+scriptLocation+" --prompt "+command);
4445
}
4546
@Override

ruoyi-simulation/src/main/java/com/ruoyi/simulation/config/RestTemplateConfig.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)