首页汉化

simulation-resource-server/src/main/java/com/css/simulation/resource/home/controller/HomePageController.java

@@ -82,7 +82,7 @@ public class HomePageController {
      * 首页 -- 系统监控 -- 状态统计 -- 项目运行状态统计
      */
     @RequestMapping("selectRunProjectByState")
-    public ResponseBodyVO selectRunProjectByState() {
+    public ResponseBodyVO<List<Map<String, Object>>> selectRunProjectByState() {
         return simulationProjectService.selectRunProjectByState();
     }
 
@@ -99,7 +99,7 @@ public class HomePageController {
      * 评测等级分布-饼图
      */
     @RequestMapping("selectEvaluationLevel")
-    public ResponseBodyVO selectEvaluationLevel() {
+    public ResponseBodyVO<List<Map<String, Object>>> selectEvaluationLevel() {
         return simulationProjectService.selectEvaluationLevel();
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/project/ctrl/SimulationProjectCtrl.java

@@ -174,7 +174,7 @@ public class SimulationProjectCtrl {
      * 解析车辆坐标文件
      */
     @RequestMapping("analysisVehicleCoord")
-    public ResponseBodyVO analysisVehicleCoord() throws Exception {
+    public ResponseBodyVO<String> analysisVehicleCoord(){
         return service.analysisVehicleCoord();
     }
 

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

@@ -1289,11 +1289,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     @Override
-    public ResponseBodyVO analysisVehicleCoord() throws Exception {
-
+    @SneakyThrows
+    public ResponseBodyVO<String> analysisVehicleCoord(){
         analysisCsvFile("E:\\仿真云平台\\三维还原视频说明\\360ogt.csv", new int[]{6, 7, 9});
-
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, null);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
 
     }
 
@@ -1324,7 +1323,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     private void analysisCsvFile(String filePath, int[] analysisFields) throws Exception {
 
         File file = new File(filePath);
-        InputStream fileInputStream = new FileInputStream(file);
+        InputStream fileInputStream = Files.newInputStream(file.toPath());
         InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
         BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
         String line;
@@ -2592,48 +2591,62 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     //任务运行状态统计-饼图
     @Override
     public ResponseBodyVO<List<Map<String, Object>>> selectRunTaskByState() {
+        String key1 = "num";
+        String key2 = "runState";
         Map<String, Object> params = new HashMap<>();
         params.put("createUserId", AuthUtil.getCurrentUserId());
         List<Map<String, Object>> list = simulationProjectTaskMapper.selectRunTaskByState(params);
+        // 汉化
         list.forEach(map -> {
-            if (StateConstant.Aborted.getEnglish().equals(map.get("runState"))) {
-                map.put("runState", StateConstant.Aborted.getChinese());
+            if (StateConstant.Aborted.getEnglish().equals(map.get(key2))) {
+                map.put(key2, StateConstant.Aborted.getChinese());
             }
-            if (StateConstant.PendingAnalysis.getEnglish().equals(map.get("runState"))) {
-                map.put("runState", StateConstant.PendingAnalysis.getChinese());
+            if (StateConstant.PendingAnalysis.getEnglish().equals(map.get(key2))) {
+                map.put(key2, StateConstant.PendingAnalysis.getChinese());
             }
-            if (StateConstant.Running.getEnglish().equals(map.get("runState"))) {
-                map.put("runState", StateConstant.Running.getChinese());
+            if (StateConstant.Running.getEnglish().equals(map.get(key2))) {
+                map.put(key2, StateConstant.Running.getChinese());
             }
-            if (StateConstant.Analysing.getEnglish().equals(map.get("runState"))) {
-                map.put("runState", StateConstant.Analysing.getChinese());
+            if (StateConstant.Analysing.getEnglish().equals(map.get(key2))) {
+                map.put(key2, StateConstant.Analysing.getChinese());
             }
-            if (StateConstant.Completed.getEnglish().equals(map.get("runState"))) {
-                map.put("runState", StateConstant.Completed.getChinese());
+            if (StateConstant.Completed.getEnglish().equals(map.get(key2))) {
+                map.put(key2, StateConstant.Completed.getChinese());
             }
-            if (StateConstant.Terminated.getEnglish().equals(map.get("runState"))) {
-                map.put("runState", StateConstant.Terminated.getChinese());
+            if (StateConstant.Terminated.getEnglish().equals(map.get(key2))) {
+                map.put(key2, StateConstant.Terminated.getChinese());
             }
-            if (StateConstant.Terminating.getEnglish().equals(map.get("runState"))) {
-                map.put("runState", StateConstant.Terminating.getChinese());
+            if (StateConstant.Terminating.getEnglish().equals(map.get(key2))) {
+                map.put(key2, StateConstant.Terminating.getChinese());
             }
-            if (StateConstant.Pending.getEnglish().equals(map.get("runState"))) {
-                map.put("runState", StateConstant.Pending.getChinese());
+            if (StateConstant.Pending.getEnglish().equals(map.get(key2))) {
+                map.put(key2, StateConstant.Pending.getChinese());
             }
         });
-
+        // 合并手动终止
+        Map<String, Object> newMap = new HashMap<>();
+        int numSum = 0;
+        for (Map<String, Object> map : list) {
+            if (StateConstant.Terminated.getChinese().equals(map.get(key2))) {
+                numSum += Integer.parseInt(map.get(key2) + "");
+                list.remove(map);
+            }
+        }
+        newMap.put(key1, numSum + "");
+        newMap.put(key2, StateConstant.Terminated.getChinese());
+        list.add(newMap);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, list);
     }
 
     //项目运行状态统计-饼图
     @Override
-    public ResponseBodyVO selectRunProjectByState() {
+    public ResponseBodyVO<List<Map<String, Object>>> selectRunProjectByState() {
         Map<String, Object> params = new HashMap<>();
         params.put("createUserId", AuthUtil.getCurrentUserId());
         //10：未执行，20：执行中，30：执行完成，40：已中止
-        List<Map> list = simulationProjectMapper.selectRunProjectByState(params);
+        List<Map<String, Object>> list = simulationProjectMapper.selectRunProjectByState(params);
         if (list != null && list.size() > 0) {
-            for (Map map : list) {
+            for (Map<String, Object> map : list) {
                 String nowRunState = map.get("nowRunState").toString();
                 map.put("nowRunState", getDictName(DictConstants.PROJECT_RUN_STATE, nowRunState));
             }
@@ -2643,10 +2656,26 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
     //评测等级分布-饼图
     @Override
-    public ResponseBodyVO selectEvaluationLevel() {
+    public ResponseBodyVO<List<Map<String, Object>>> selectEvaluationLevel() {
+        String key2 = "evaluationLevel";
         Map<String, Object> params = new HashMap<>();
         params.put("createUserId", AuthUtil.getCurrentUserId());
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, simulationProjectMapper.selectEvaluationLevel(params));
+        final List<Map<String, Object>> maps = simulationProjectMapper.selectEvaluationLevel(params);
+        maps.forEach(map -> {
+            if (StateConstant.G.getEnglish().equals(map.get(key2))) {
+                map.put(key2, StateConstant.G.getChinese());
+            }
+            if (StateConstant.A.getEnglish().equals(map.get(key2))) {
+                map.put(key2, StateConstant.A.getChinese());
+            }
+            if (StateConstant.M.getEnglish().equals(map.get(key2))) {
+                map.put(key2, StateConstant.M.getChinese());
+            }
+            if (StateConstant.P.getEnglish().equals(map.get(key2))) {
+                map.put(key2, StateConstant.P.getChinese());
+            }
+        });
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, maps);
     }
 
     @Override

simulation-resource-server/src/main/java/com/css/simulation/resource/project/mapper/SimulationProjectMapper.java

@@ -52,7 +52,9 @@ public interface SimulationProjectMapper {
     int updateProjectNowRunState(SimulationManualProjectParam param);
 
     List<AlgorithmPO> selectAlgorithmBaseInfoById(AlgorithmPO algorithmPO);
+
     List<AlgorithmPO> selectAlgorithmBaseInfoByIdGy(AlgorithmPO algorithmPO);
+
     List<AlgorithmPO> selectAlgorithmBaseInfoByIdSy(AlgorithmPO algorithmPO);
 
     @Select("select id, algorithm_name, description\n" +
@@ -63,7 +65,9 @@ public interface SimulationProjectMapper {
     List<VehiclePO> selectVehicleBaseInfoById(String id);
 
     List<ScenePackagePO> selectScenePackageBaseById(ScenePackagePO scenePackagePO);
+
     List<ScenePackagePO> selectScenePackageBaseByIdGy(ScenePackagePO scenePackagePO);
+
     List<ScenePackagePO> selectScenePackageBaseByIdSy(ScenePackagePO scenePackagePO);
 
     ScenePackagePO selectScenePackageInfoById(String id);
@@ -107,7 +111,9 @@ public interface SimulationProjectMapper {
     List<ConfigPO> selectConfigVehicle(ConfigPO configPO);
 
     List<ConfigPO> selectConfigVehicle2(ConfigPO configPO);
+
     List<ConfigPO> selectConfigVehicleGy(ConfigPO configPO);
+
     List<ConfigPO> selectConfigVehicleSy(ConfigPO configPO);
 
     List<ConfigSensorPO> selectConfigSensor(String id);
@@ -118,9 +124,9 @@ public interface SimulationProjectMapper {
 
     List<SublistScoreVo> selectSubScore2(SimulationManualProjectParam param);
 
-    List<Map> selectRunProjectByState(Map map);
+    List<Map<String, Object>> selectRunProjectByState(Map map);
 
-    List<Map> selectEvaluationLevel(Map map);
+    List<Map<String, Object>> selectEvaluationLevel(Map map);
 
     int insertOtherAlgorithm(AlgorithmPO po);
 

simulation-resource-server/src/main/java/com/css/simulation/resource/project/service/SimulationProjectService.java

@@ -12,35 +12,66 @@ import java.util.Map;
 public interface SimulationProjectService {
 
     ResponseBodyVO<String> addOrUpdateProject(SimulationManualProjectParam param);
+
     ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectProject(SimulationManualProjectParam param);
+
     ResponseBodyVO<SimulationManualProjectSingleVo> selectProjectById(SimulationManualProjectParam param);
+
     ResponseBodyVO<String> deleteProjectByids(SimulationManualProjectParam param);
+
     ResponseBodyVO<String> updateProjectNowRunState(SimulationManualProjectParam param);
+
     ResponseBodyVO<ProjectDetailsVo> selectProjectDetailsById(SimulationManualProjectParam param);
+
     ResponseBodyVO<ProjectReportVo> selectProjectReportById(SimulationManualProjectParam param);
+
     ResponseBodyVO<List<DropDownTypeVo>> selectDropDownByType(SimulationManualProjectParam param);
+
     ResponseBodyVO<List<DropDownTypeNewVo>> selectDropDownByTypeNew(SimulationManualProjectParam param);
+
     ResponseBodyVO<ProjectTaskDetailsVo> selectProjectTaskById(SimulationManualProjectParam param);
+
     String getDictName(String type, String code);
-    ResponseBodyVO analysisVehicleCoord() throws Exception;
+
+    ResponseBodyVO<String> analysisVehicleCoord();
+
     ResponseBodyVO selectProjectTaskList(SimulationManualProjectParam param);
+
     ResponseBodyVO<List<Map<String, Object>>> selectRunTaskByState();
-    ResponseBodyVO selectRunProjectByState();
-    ResponseBodyVO selectEvaluationLevel();
+
+    ResponseBodyVO<List<Map<String, Object>>> selectRunProjectByState();
+
+    ResponseBodyVO<List<Map<String, Object>>> selectEvaluationLevel();
+
     void exportProjectReport(SimulationManualProjectParam param);
+
     String selectProjectReportIdByAlgorithmId(String algorithmId);
+
     ResponseBodyVO<String> saveEvaluationLevel(String id);
+
     ResponseBodyVO saveTaskResult(SimulationManualProjectParam param);
+
     void exportProjectTaskFileById(SimulationManualProjectParam param);
+
     void exportProjectReportAndTaskFileById(SimulationManualProjectParam param);
+
     ResponseBodyVO addOrUpdateAutomaticProject(SimulationManualProjectParam param);
+
     ResponseBodyVO<String> deleteAutomaticProjectByids(SimulationManualProjectParam param);
+
     ResponseBodyVO<String> updateAutomaticRunState(SimulationManualProjectParam param);
+
     ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectAutomaticProject(SimulationManualProjectParam param);
+
     ResponseBodyVO<String> createAutomaticSubProject(SimulationManualProjectParam param);
+
     ResponseBodyVO<String> deleteAutomaticSubProjectByIds(SimulationManualProjectParam param);
+
     ResponseBodyVO<AutomaticProjectVo> selectSubProjectInfo(SimulationManualProjectParam param);
+
     ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectSubProjectList(SimulationManualProjectParam param);
+
     ResponseBodyVO<SimulationManualProjectSingleVo> selectAutomaticProjectById(SimulationManualProjectParam param);
+
     ResponseBodyVO<String> updateAutoProjectNowRunState(SimulationManualProjectParam param);
 }