标签

api-common/src/main/java/api/common/pojo/param/scene/SceneNaturalNewParam.java

@@ -25,4 +25,7 @@ public class SceneNaturalNewParam extends PageVO implements Serializable {
     private String[][] selfBehavior  ;//自车行为
     private String[][] targetBehavior ; //目标行为
     private String[] ids ; //回显数组
+
+
+
 }

api-common/src/main/java/api/common/pojo/po/scene/ScenePackagePO.java

@@ -24,6 +24,7 @@ public class ScenePackagePO implements Serializable {
     private Integer sceneNum;//场景数量
     private String remarks;//备注
     private String share ; //是否分析  1为分享
+    private String treeNode;//模板预览node节点
     /**
      * 记录创建时间
      */

api-common/src/main/java/api/common/pojo/po/scene/ScenePackageSublistPO.java

@@ -32,6 +32,7 @@ public class ScenePackageSublistPO implements Serializable {
     private int packageLevel;//级别
     private String remarks;//备注
     private String share ; //是否分析  1为分享
+    private String treeNode;//模板预览node节点
     /**
      * 记录创建时间
      */

api-common/src/main/java/api/common/pojo/vo/scene/ScenePackageNewVO.java

@@ -24,5 +24,6 @@ public class ScenePackageNewVO  implements Serializable {
     private Integer sceneNum;//场景数量
     private String remarks;//备注
     private List<ScenePackageSublistVO> list;
+    private String treeNode;//模板预览node节点
 
 }

api-common/src/main/java/api/common/pojo/vo/scene/ScenePackageSublistVO.java

@@ -31,4 +31,5 @@ public class ScenePackageSublistVO implements Serializable {
     private String remarks;//备注
     private int seq;//在当前层级下的顺序，由小到大
     private List<ScenePackageSublistVO>  children;
+    private String treeNode;//模板预览node节点
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/service/AlgorithmService.java

@@ -5,6 +5,7 @@ import api.common.pojo.param.algorithm.AlgorithmParameter;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.Map;
 
 
 public interface AlgorithmService {
@@ -25,5 +26,5 @@ public interface AlgorithmService {
 
     ResponseBodyVO testConnection(AlgorithmParameter param);
 
-    ResponseBodyVO selectDetailsBySy();
+    Map selectDetailsBySy();
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/serviceImpl/AlgorithmServiceImpl.java

@@ -234,7 +234,7 @@ public class AlgorithmServiceImpl implements AlgorithmService {
     }
 
     @Override
-    public ResponseBodyVO selectDetailsBySy() {
+    public Map selectDetailsBySy() {
         AlgorithmParameter param=new AlgorithmParameter();
         param.setUploadMode("1");
         param.setShare("0");
@@ -245,7 +245,7 @@ public class AlgorithmServiceImpl implements AlgorithmService {
         Map map=new HashMap();
         map.put("fileNum",fileNum);
         map.put("pathNum",pathNum);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS,map);
+        return map;
     }
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/HomePageController.java

@@ -0,0 +1,129 @@
+package com.css.simulation.resource.scene.ctrl;
+
+import api.common.pojo.common.ResponseBodyVO;
+import com.css.simulation.resource.algorithm.service.AlgorithmService;
+import com.css.simulation.resource.model.service.ConfigService;
+import com.css.simulation.resource.project.service.SimulationProjectService;
+import com.css.simulation.resource.scene.service.SceneNaturalService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+//首页系统概览
+@Slf4j
+@RestController
+@RequestMapping("/homePage")
+public class HomePageController {
+    @Resource
+    SceneNaturalService sceneNaturalService;
+    @Resource
+    private AlgorithmService algorithmService;
+    @Autowired
+    private SimulationProjectService simulationProjectService;
+    @Autowired
+    private com.css.simulation.resource.model.service.ConfigService ConfigService;
+
+    //首页概况汇总方法
+    @PostMapping("/queryAllNum")
+    @ResponseBody
+    public ResponseBodyVO<Integer> queryAllNum() {
+
+        Map map=algorithmService.selectDetailsBySy();
+        map.put("ConfigTotal",ConfigService.getConfigTotal());
+        map.put("SceneNum", sceneNaturalService.querySceneNumBySy());
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, map);
+    }
+
+
+    //首页查询场景数量
+    @PostMapping("/querySceneNumBySy")
+    @ResponseBody
+    public ResponseBodyVO<Integer> querySceneNumBySy() {
+        Integer SceneNum = sceneNaturalService.querySceneNumBySy();
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, SceneNum);
+    }
+
+    //首页车辆配置数量
+    @PostMapping("/queryCarDisposeNumBySy")
+    @ResponseBody
+    public ResponseBodyVO<Integer> queryCarDisposeNumBySy() {
+        Integer ConfigTotal = ConfigService.getConfigTotal();
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, ConfigTotal);
+    }
+
+    /**
+     * 首页文件数量
+     *
+     * @param
+     * @return
+     */
+    @RequestMapping("selectDetailsBySy")
+    @ResponseBody
+    public ResponseBodyVO selectDetailsBySy() {
+
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, algorithmService.selectDetailsBySy());
+    }
+
+    /**
+     * 近一周运行运行项目数量
+     *
+     * @param
+     * @return
+     */
+    @RequestMapping("selectRunProjectBySy")
+    @ResponseBody
+    public ResponseBodyVO selectRunProjectBySy() {
+        return simulationProjectService.selectRunProjectBySy();
+    }
+
+    /**
+     * 近一周运行任务数量
+     *
+     * @param
+     * @return
+     */
+    @RequestMapping("selectRunTaskBySy")
+    @ResponseBody
+    public ResponseBodyVO selectRunTaskBySy() {
+        return simulationProjectService.selectRunTaskBySy();
+    }
+
+    /**
+     * 任务运行状态统计-饼图
+     *
+     * @param
+     * @return
+     */
+    @RequestMapping("selectRunTaskByState")
+    @ResponseBody
+    public ResponseBodyVO selectRunTaskByState() {
+        return simulationProjectService.selectRunTaskByState();
+    }
+
+    /**
+     * 项目运行状态统计-饼图
+     *
+     * @param
+     * @return
+     */
+    @RequestMapping("selectRunProjectByState")
+    @ResponseBody
+    public ResponseBodyVO selectRunProjectByState() {
+        return simulationProjectService.selectRunProjectByState();
+    }
+
+    /**
+     * 评测等级分布-饼图
+     *
+     * @param
+     * @return
+     */
+    @RequestMapping("selectEvaluationLevel")
+    @ResponseBody
+    public ResponseBodyVO selectEvaluationLevel() {
+        return simulationProjectService.selectEvaluationLevel();
+    }
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SceneAccidentService.java

@@ -5,6 +5,7 @@ import api.common.pojo.param.MinioParameter;
 import api.common.pojo.param.scene.SceneAccidentParam;
 import api.common.pojo.po.scene.SceneAccidentPO;
 import api.common.util.FileUtil;
+import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
@@ -164,6 +165,35 @@ public class SceneAccidentService {
     public List<SceneAccidentPO> querySceneAccidentList(SceneAccidentParam params) {
 
         List<SceneAccidentPO> list = SceneAccidentMapper.querySceneAccidentList(params);
+        for (SceneAccidentPO po: list) {
+            if(po.getConflictBehavior().indexOf("追尾")>0){
+                po.setLabel("追尾");
+            }
+            if(po.getTargetDriving().indexOf("切入")>0){
+                if(ObjectUtil.isNull(po.getLabel())){
+                    po.setLabel("目标车切入");
+                }else{
+                    po.setLabel(po.getLabel()+",目标车切入");
+                }
+
+            }
+            if(po.getTargetDriving().indexOf("沿弯道行驶")>0){
+                if(ObjectUtil.isNull(po.getLabel())){
+                    po.setLabel("目标车沿弯道行驶");
+                }else{
+                    po.setLabel(po.getLabel()+",目标车沿弯道行驶");
+                }
+
+            }
+            if(po.getConflictType().indexOf("机动车-机动车冲突")>0){
+                if(ObjectUtil.isNull(po.getLabel())){
+                    po.setLabel("机动车-机动车冲突");
+                }else{
+                    po.setLabel(po.getLabel()+",机动车-机动车冲突");
+                }
+            }
+        }
+
         return list;
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/ScenePackageService.java

@@ -47,6 +47,7 @@ public class ScenePackageService {
             po.setWeight(vo.getWeight());
             po.setRemarks(vo.getRemarks());
             po.setSceneNum(vo.getSceneNum());
+            po.setTreeNode(vo.getTreeNode());
             listSublictTree = vo.getChildren();
         }
         po.setCreateTime(TimeUtil.getNowForMysql());
@@ -92,6 +93,7 @@ public class ScenePackageService {
             po.setWeight(vo.getWeight());
             po.setRemarks(vo.getRemarks());
             po.setSceneNum(vo.getSceneNum());
+            po.setTreeNode(vo.getTreeNode());
             listSublictTree = vo.getChildren();
         }
 
@@ -137,6 +139,7 @@ public class ScenePackageService {
         root.setWeight(vo.getWeight());
         root.setSceneNum(vo.getSceneNum());
         root.setRemarks(vo.getRemarks());
+        root.setTreeNode(vo.getTreeNode());
         scenePackageSublistVOS.add(0, root);
         //list转tree
         List<ScenePackageSublistVO> tree = listToTree(scenePackageSublistVOS);
@@ -261,6 +264,7 @@ public class ScenePackageService {
                 params.setIsDeleted("0");
                 params.setShare(share);
                 params.setPackageLevel(level);
+                params.setTreeNode(parentVoList.get(i).getTreeNode());
                 List<ScenePackageSublistVO> cvoList = parentVoList.get(i).getChildren();
                 poList.add(params);
                 if (cvoList != null && cvoList.size() > 0) {

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/StandardsRegulationsService.java

@@ -3,6 +3,7 @@ package com.css.simulation.resource.scene.service;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.MinioParameter;
 import api.common.pojo.param.scene.StandardsRegulationsParam;
+import api.common.pojo.po.scene.SceneAccidentPO;
 import api.common.pojo.po.scene.StandardsRegulationsPO;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
@@ -16,6 +17,8 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @Slf4j

simulation-resource-server/src/main/resources/mapper/scene/ScenePackageMapper.xml

@@ -8,11 +8,11 @@
         (package_id,package_code,package_name,weight,
         package_and_rules,scene_num,remarks,
         create_user_id,create_time,modify_user_id,modify_time,
-         is_deleted,share)
+         is_deleted,share,tree_node)
         values (#{packageId,jdbcType=VARCHAR},#{packageCode,jdbcType=VARCHAR},#{packageName,jdbcType=VARCHAR},#{weight,jdbcType=VARCHAR},
         #{packageAndRules,jdbcType=VARCHAR},#{sceneNum},#{remarks,jdbcType=VARCHAR},
          #{createUserId,jdbcType=VARCHAR},#{createTime},#{modifyUserId,jdbcType=VARCHAR},#{modifyTime},
-        #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR})
+        #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR}, #{treeNode,jdbcType=VARCHAR})
     </insert>
 
 
@@ -22,7 +22,7 @@
         a.package_id,a.package_name,a.weight,a.package_code,
         a.package_and_rules,a.scene_num,a.remarks,
         a.create_user_id,a.create_time,a.modify_user_id,a.modify_time,
-        a.is_deleted,a.share
+        a.is_deleted,a.share,a.tree_node
         from simulation.scene_package as a
         <where>
             a.is_deleted = '0'
@@ -56,7 +56,7 @@
         a.package_id,a.package_name,a.package_code,a.weight,
         a.package_and_rules,a.scene_num,a.remarks,
         a.create_user_id,a.create_time,a.modify_user_id,a.modify_time,
-        a.is_deleted,a.share
+        a.is_deleted,a.share,a.tree_node
         from simulation.scene_package as a
         <where>
             a.is_deleted = '0'
@@ -86,7 +86,7 @@
             resultType="api.common.pojo.vo.scene.ScenePackageNewVO">
         select
         a.package_id ,a.package_name ,a.weight,a.package_code,
-        a.scene_num,a.remarks
+        a.scene_num,a.remarks,a.tree_node
         from simulation.scene_package as a
         <where>
             a.is_deleted = '0'
@@ -123,7 +123,9 @@
             <if test="modifyTime != null ">
                 modify_time = #{modifyTime},
             </if>
-
+            <if test="treeNode != null and treeNode!=''">
+                tree_node = #{treeNode},
+            </if>
         </set>
         where package_id = #{packageId,jdbcType=VARCHAR}
     </update>

simulation-resource-server/src/main/resources/mapper/scene/ScenePackageSublistMapper.xml

@@ -8,14 +8,14 @@
         scene_natural_ids,scene_traffic_ids,scene_statue_ids,scene_generalization_ids,
         scene_num,parent_id,root_id,seq,package_level,remarks,
         create_user_id,create_time,modify_user_id,modify_time,
-         is_deleted,share)
+         is_deleted,share,tree_node)
         values (#{id,jdbcType=VARCHAR},#{sublistName,jdbcType=VARCHAR},#{weight,jdbcType=VARCHAR},#{ruleName,jdbcType=VARCHAR},
         #{packageAndRules,jdbcType=VARCHAR},
         #{sceneNaturalIds}, #{sceneTrafficIds}, #{sceneStatueIds}, #{sceneGeneralizationIds},
         #{sceneNum},#{parentId,jdbcType=VARCHAR},#{rootId,jdbcType=VARCHAR},#{seq},
          #{packageLevel},#{remarks},
          #{createUserId,jdbcType=VARCHAR},#{createTime},#{modifyUserId,jdbcType=VARCHAR},#{modifyTime},
-        #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR})
+        #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR}, #{treeNode,jdbcType=VARCHAR})
     </insert>
 
 
@@ -26,7 +26,7 @@
         scene_natural_ids,scene_traffic_ids,scene_statue_ids,scene_generalization_ids,
         scene_num,parent_id,root_id,seq,package_level,remarks,
         create_user_id,create_time,modify_user_id,modify_time,
-        is_deleted,share) values
+        is_deleted,share,tree_node) values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{item.id,jdbcType=VARCHAR},#{item.sublistName,jdbcType=VARCHAR},#{item.weight,jdbcType=VARCHAR},#{item.ruleName,jdbcType=VARCHAR},
             #{item.packageAndRules,jdbcType=VARCHAR},
@@ -34,7 +34,7 @@
             #{item.sceneNum},#{item.parentId,jdbcType=VARCHAR},#{item.rootId,jdbcType=VARCHAR},#{index}+1,
             #{item.packageLevel},#{item.remarks},
             #{item.createUserId,jdbcType=VARCHAR},#{item.createTime},#{item.modifyUserId,jdbcType=VARCHAR},#{item.modifyTime},
-            #{item.isDeleted,jdbcType=VARCHAR}, #{item.share,jdbcType=VARCHAR})
+            #{item.isDeleted,jdbcType=VARCHAR}, #{item.share,jdbcType=VARCHAR}, #{item.treeNode,jdbcType=VARCHAR})
         </foreach>
     </insert>
 
@@ -43,7 +43,7 @@
         select
         a.sublist_id id,a.sublist_name,a.weight,b.rule_name,
         a.scene_num,a.parent_id,a.root_id,a.package_level,a.remarks,a.seq,a.package_and_rules,
-        a.scene_natural_ids,a.scene_traffic_ids,a.scene_statue_ids,a.scene_generalization_ids
+        a.scene_natural_ids,a.scene_traffic_ids,a.scene_statue_ids,a.scene_generalization_ids,a.tree_node
         from simulation.scene_package_sublist as a left join simulation.scoring_rules as b on
         a.package_and_rules=b.rules_id
         <where>