泛化上传记录文件地址

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

@@ -231,9 +231,9 @@ public class SceneGeneralTemplateController {
         String taskName = request.getParameter("taskName");
         sceneImportPO.setName(taskName);
         sceneImportPO.setSceneType("4");
-        SceneImportPO  sceneImportPO1=sceneImportService.saveTask(sceneImportPO);
-        sceneImportPO1.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
-        sceneImportService.updateStatus(sceneImportPO1);
+       sceneImportPO=sceneImportService.saveTask(sceneImportPO);
+        sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
+
         File file = null;
         String originalFilename = multipartFile.getOriginalFilename();
         if (originalFilename.indexOf(".xls") == -1 && originalFilename.indexOf(".xlsx") == -1) {
@@ -252,6 +252,8 @@ public class SceneGeneralTemplateController {
             file = File.createTempFile(filename[0], filename[1]);
             multipartFile.transferTo(file);
             file.deleteOnExit();
+            sceneImportPO.setDataDirectory(fileName);
+            sceneImportService.update(sceneImportPO);
         } catch (IOException e) {
             e.printStackTrace();
             return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "模板解析失败，请检查模板.");

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

@@ -129,7 +129,6 @@ public class SceneGeneralTemplateService {
 
     }
 
-
     /**
      * 泛化模板导入：
      */
@@ -222,7 +221,6 @@ public class SceneGeneralTemplateService {
             sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
             return  sceneImportPO;
         }
-
     }
 
 
@@ -233,19 +231,16 @@ public class SceneGeneralTemplateService {
         String userId = AuthUtil.getCurrentUserId();
         if(DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)){ //管理员账户
              list=mapper.querySceneGeneralTemplateList(po);
-
         }else if(DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)){
             //查询父账户
             userId = AuthUtil.getCreateUserId();
             po.setUserId(userId);
            list=mapper.querySceneGeneralTemplateListByQx(po);
-
         }else if(DictConstants.ROLE_CODE_UESR.equals(roleCode)){
             //查询普通账户
             po.setUserId(userId);
             list=mapper.querySceneGeneralTemplateListByQx(po);
         }
-
         Map<String,String>  scenarioRoadTypeMap= dictService.getDictMapByType("scenarioRoadType");
         Map<String,String>  scenarioWeatherMap= dictService.getDictMapByType("scenarioWeather");
         for (SceneGeneralTemplatePO vo : list) {
@@ -253,7 +248,6 @@ public class SceneGeneralTemplateService {
             vo.setScenarioWeather(scenarioWeatherMap.get(vo.getScenarioWeather()));
         }
         return   list;
-
     }
     @SneakyThrows
     public SceneGeneralTemplateVO querySceneGeneralTemplateById(String id){
@@ -277,7 +271,6 @@ public class SceneGeneralTemplateService {
         vo.setListMb(listMb);
         vo.setTemplateId(vo.getId());
         return vo;
-
     }
 
     public   List<SceneGeneralTemplateMbVO> spliceVo(SceneGeneralTemplatePO po) throws JsonProcessingException {
@@ -321,7 +314,6 @@ public class SceneGeneralTemplateService {
             listMb.add(mbVO);
         }
         return listMb;
-
     }
 
 
@@ -329,15 +321,12 @@ public class SceneGeneralTemplateService {
         po.setModifyUserId(AuthUtil.getCurrentUserId());
         po.setModifyTime(TimeUtil.getNowForMysql());
         mapper.deleteSceneGeneralTemplateById(po);
-
         Map map=new HashMap();
         map.put("sceneId",po.getId());
         map.put("sceneName",po.getSceneId());
         map.put("type",DictConstants.SCENE_GENERAL);
         logService.logSceneDelete(LogConstants.SYS_LOG_SCENE_DELETE, map);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
-
-
     }
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/SceneImportService.java

@@ -52,6 +52,12 @@ public class SceneImportService {
         params.setModifyUserId(AuthUtil.getCurrentUserId());
         sceneImportMapper.updateStatus(params);
     }
+
+    public void update(SceneImportPO params) {
+        params.setModifyTime(TimeUtil.getNowForMysql());
+        params.setModifyUserId(AuthUtil.getCurrentUserId());
+        sceneImportMapper.updateStatus(params);
+    }
     public void updateInfo(SceneImportPO params) {
         params.setModifyTime(TimeUtil.getNowForMysql());
         params.setModifyUserId(AuthUtil.getCurrentUserId());