commit

api-common/src/main/java/api/common/util/HttpUtil.java

@@ -92,11 +92,9 @@ public class HttpUtil {
 
     public static RequestConfig getRequestConfig() {
         return RequestConfig.custom()
-                .setSocketTimeout(5000)
-                .setConnectTimeout(5000)
-                .setConnectionRequestTimeout(5000)
-                .setRedirectsEnabled(false)
-                .setExpectContinueEnabled(false)
+                .setSocketTimeout(60000)
+                .setConnectTimeout(60000)
+                .setConnectionRequestTimeout(60000)
                 .build();
     }
 

pom.xml

@@ -33,9 +33,9 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <!-- 基础 -->
-        <spring-cloud.version>2020.0.1</spring-cloud.version>
-        <spring-boot.version>2.4.2</spring-boot.version>
         <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
+        <spring-boot.version>2.4.2</spring-boot.version>
+        <spring-cloud.version>2020.0.1</spring-cloud.version>
         <!-- 权限认证 -->
         <spring-cloud-starter-security.version>2.2.5.RELEASE</spring-cloud-starter-security.version>
         <spring-cloud-starter-oauth2.version>2.2.5.RELEASE</spring-cloud-starter-oauth2.version>

simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/oauth/OAuth2ResourceServerConfiguration.java

@@ -36,7 +36,7 @@ public class OAuth2ResourceServerConfiguration extends ResourceServerConfigurerA
                 .and()
                 .authorizeRequests()
                 .antMatchers("/simulation/resource/common/redis/getDictMaps").permitAll()
-                .anyRequest().access("#oauth2.hasScope('all')") // 拦截所有请求判断 scope
+//                .anyRequest().access("#oauth2.hasScope('all')") // 拦截所有请求判断 scope
         ;
     }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/AlgorithmServiceImpl.java

@@ -155,7 +155,7 @@ public class AlgorithmServiceImpl implements AlgorithmService {
         final String status = param.getStatus();
         Integer page = param.getPageNum();
         Integer size = param.getPageSize();
-        String sort = "algorithmId-desc";
+        String sort = "";
         String urlParam = "";
 //        if (StringUtil.isNotEmpty(algorithmId)) {
 //            urlParam = urlParam + "&algorithmId=" + algorithmId;
@@ -166,13 +166,8 @@ public class AlgorithmServiceImpl implements AlgorithmService {
         if (StringUtil.isNotEmpty(description)) {
             urlParam = urlParam + "&description=" + description;
         }
-//        if (StringUtil.isNotEmpty(page)) {
-//            urlParam = urlParam + "&page=" + page;
-//        }
-//        if (StringUtil.isNotEmpty(size)) {
-//            urlParam = urlParam + "&size=" + size;
-//        }
-        urlParam = urlParam + "&sort=" + sort;
+        // 获取所有算法
+        urlParam = urlParam + "&page=0&size=999999&sort=algorithmId-desc";
         // 此接口在此处只作为同步更新数据到仿真云数据库，分页查询通过仿真云数据库来查
         algoPlatformService.getAlgorithmList(urlParam);
         //2 查询仿真数据库里的数据

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/SimulationProjectServiceImpl.java

@@ -2821,11 +2821,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     // 项目运行状态统计-饼图
     @Override
     public ResponseBodyVO<List<Map<String, Object>>> selectRunProjectByState() {
-        Map<String, Object> params = new HashMap<>();
-        params.put("createUserId", AuthUtil.getCurrentUserId());
         // 10：未执行，20：执行中，30：执行完成，40：已中止
-        List<Map<String, Object>> list = simulationManualProjectMapper.selectRunProjectByState(params);
-        if (list != null && list.size() > 0) {
+        List<Map<String, Object>> list = simulationManualProjectMapper.selectRunProjectByState(AuthUtil.getCurrentUserId());
+        if (CollectionUtil.isNotEmpty(list)) {
             for (Map<String, Object> map : list) {
                 String nowRunState = map.get("nowRunState").toString();
                 map.put("nowRunState", getDictName(DictConstants.PROJECT_RUN_STATE, nowRunState));

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/SimulationManualProjectMapper.java

@@ -115,7 +115,7 @@ public interface SimulationManualProjectMapper {
 
     List<SublistScoreVo> selectSubScore2(SimulationManualProjectParam param);
 
-    List<Map<String, Object>> selectRunProjectByState(Map map);
+    List<Map<String, Object>> selectRunProjectByState(@Param("createUserId") String createUserId);
 
     List<Map<String, Object>> selectEvaluationLevel(Map map);
 

simulation-resource-server/src/main/resources/mysql/mapper/SimulationManualProjectMapper.xml

@@ -621,18 +621,17 @@
     </select>
 
     <!--运行项目状态-->
-    <select id="selectRunProjectByState" parameterType="java.util.Map" resultType="java.util.Map">
+    <select id="selectRunProjectByState" parameterType="java.lang.String" resultType="java.util.Map">
         select count(1) num, temp.now_run_state nowRunState
         from (select now_run_state, create_user_id
-        from simulation_manual_project
-        where is_deleted = 0
-        union all
-        select now_run_state, create_user_id
-        from simulation_automatic_subproject
-        where is_deleted = 0) temp
-        <if test="createUserId != null and createUserId != ''">
-            where temp.create_user_id = #{createUserId}
-        </if>
+              from simulation_manual_project t1
+              where is_deleted = 0
+                and t1.create_user_id = #{createUserId}
+              union all
+              select now_run_state, create_user_id
+              from simulation_automatic_subproject t2
+              where is_deleted = 0
+                and t2.create_user_id = #{createUserId}) temp
         group by temp.now_run_state
     </select>
     <!--评测等级分布-->

simulation-resource-video/src/main/java/com/css/simulation/resource/video/controller/VideoController.java

@@ -42,6 +42,9 @@ public class VideoController {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
+
+
+
     @RequestMapping(value = "/uploadToLocal")
     public ResponseBodyVO<Map<String, String>> uploadToLocal(
             @RequestParam("name") String name,

simulation-resource-video/src/main/java/com/css/simulation/resource/video/service/VideoService.java

@@ -138,7 +138,7 @@ public class VideoService {
         //1 生成 xosc 文件
         String command = constantConfiguration.getXoscGenerateCommand() + " " + csvDirectoryPath;
         String execute = LinuxUtil.execute(command);    // 执行命令后生成 xosc 到目录下
-        String oldXoscPath = csvDirectoryPath + oldXoscRelativePath;  // 生成文件的路径是固定的
+        String oldXoscPath = csvDirectoryPath + oldXoscRelativePath;  // xosc结果文件的路径
         //2 调用修改xosc
         return modifyXosc(oldXoscPath, xodrPath, osgbPath, projectId, projectType);  // 返回最新的 xosc 文件全路径
     }

simulation-resource-video/src/main/resources/bootstrap-dev.yaml

@@ -1,72 +1,13 @@
-server:
-  port: 8007
-  servlet:
-    context-path: /simulation/resource/video
+# 国汽私有云
 spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 36.110.106.156:8848
+        server-addr: http://36.110.106.156:8848
         namespace: 3698bfc2-a612-487a-b2a2-aaad16cd9d9d
-        ip: 10.14.86.20
+        group: dev
       config:
-        server-addr: 36.110.106.156:8848
+        server-addr: http://36.110.106.156:8848
         namespace: 3698bfc2-a612-487a-b2a2-aaad16cd9d9d
         file-extension: yaml
-  servlet:
-    multipart:
-      max-file-size: 10GB
-      max-request-size: 10GB
-  datasource:
-    druid:
-      url: jdbc:mysql://10.14.85.240:3306/simulation?characterEncoding=utf8&connectTimeout=60000&socketTimeout=60000&useSSL=false
-      username: root
-      password: 1qaz2wsx!
-      driver-class-name: com.mysql.jdbc.Driver
-      initial-size: 200
-      min-idle: 200
-      max-active: 200
-      max-wait: 300000
-      filter:
-        stat:
-          enabled: true
-        wall:
-          enabled: true
-        slf4j:
-          enabled: true
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        login-username: druid
-        login-password: 1qaz2wsx!
-  cache:
-    type: redis
-  redis:
-    host: 10.14.85.240
-    port: 6379
-    password: 1qaz2wsx!
-    connect-timeout: 10000
-    timeout: 10000
-    database: 2
-    lettuce:
-      pool:
-        max-active: 8
-        max-idle: 8
-        min-idle: 0
-        max-wait: 1000
-
-constant:
-  xvfb-command: "Xvfb :screen-num -screen 0 1920x1080x24+32 & export DISPLAY=:screen-num"
-  esmini-command: "xvfb-run -n screen-num /root/disk1/simulation-cloud/esmini/code-examples-bin/image-capture"
-  xosc-generate-command: "python3 /mnt/disk001/simulation-cloud/simulation-resource-video-8007/python/simulation_my.py"
-  video-test-command: "/root/disk1/simulation-cloud/esmini/code-examples-bin/image-capture /root/disk1/simulation-cloud/esmini/resources/xosc/lane_change_crest.xosc /root/disk1/simulation-cloud/esmini/test/screenshot"
-  linux-temp-directory: "/mnt/disk001/simulation-cloud/simulation-resource-video-8007/temp/"
-  esmini-osgb-directory: "/root/disk1/simulation-cloud/esmini/resources/models/"
-
-minio:
-  endpoint: http://10.14.85.242:9000/
-  access-key: minioadmin
-  secret-key: 1qaz2wsx!
-  bucket-name: simulation-cloud
-  project-result-directory: "/project/"
-
+        group: dev