mlx

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

@@ -9,6 +9,7 @@ import api.common.pojo.po.scene.SceneGeneralTemplatePO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateVO;
 import api.common.util.ObjectUtil;
+import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.feign.FileDownService;
@@ -75,11 +76,13 @@ public class SceneGeneralTemplateController {
     @PostMapping("/saveSceneGeneralTemplateNew")
     @ResponseBody
     public ResponseBodyVO<String> saveSceneGeneralTemplateNew(@RequestParam("file") MultipartFile multipartFile, @RequestBody SceneImportPO sceneImportPO) {
-        File file = null;
+        File file;
         String originalFilename = multipartFile.getOriginalFilename();
-        if (originalFilename.indexOf(".xls") == -1 && originalFilename.indexOf(".xlsx") == -1) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "文件格式错误，请检查模板.");
-
+        if (StringUtil.isEmpty(originalFilename)) {
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE);
+        }
+        if (!originalFilename.contains(".xls") && !originalFilename.contains(".xlsx")) {
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "文件格式错误，请检查模板.");
         }
         //版本号
         String version = TimeUtil.getToStringDate(new Date(), 5);
@@ -89,21 +92,20 @@ public class SceneGeneralTemplateController {
             // Integer nowTime = TimeUtil.getRq(new Date(), 0);
             String fileName = "泛化场景/" + version + "/" + originalFilename;
             respon = fileDownService.upload(multipartFile, fileName);
-
             String[] filename = originalFilename.split("\\.");
             file = File.createTempFile(filename[0], filename[1]);
             multipartFile.transferTo(file);
             file.deleteOnExit();
         } catch (IOException e) {
             e.printStackTrace();
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "模板解析失败，请检查模板.");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "模板解析失败，请检查模板.");
 
         }
         sceneImportPO1.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
         sceneImportService.updateStatus(sceneImportPO1);
         sceneImportPO = sceneGeneralTemplateService.saveSceneGeneralTemplateNew(file, version, sceneImportPO);
         sceneImportService.updateStatus(sceneImportPO);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
 
     }
 
@@ -113,7 +115,7 @@ public class SceneGeneralTemplateController {
     public ResponseBodyVO<String> saveSceneGeneralTemplate(@RequestParam("file") MultipartFile multipartFile) {
         File file;
         String originalFilename = multipartFile.getOriginalFilename();
-        if (originalFilename.indexOf(".xls") == -1 && originalFilename.indexOf(".xlsx") == -1) {
+        if (!originalFilename.contains(".xls") && !originalFilename.contains(".xlsx")) {
             return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "文件格式错误，请检查模板.");
 
         }
@@ -124,7 +126,6 @@ public class SceneGeneralTemplateController {
             // Integer nowTime = TimeUtil.getRq(new Date(), 0);
             String fileName = "泛化场景/" + version + "/" + originalFilename;
             respon = fileDownService.upload(multipartFile, fileName);
-
             String[] filename = originalFilename.split("\\.");
             file = File.createTempFile(filename[0], filename[1]);
             multipartFile.transferTo(file);
@@ -147,7 +148,7 @@ public class SceneGeneralTemplateController {
     @ResponseBody
     public ResponseBodyVO<String> deleteSceneGeneralTemplateById(@RequestBody SceneGeneralTemplatePO po) {
         sceneGeneralTemplateService.deleteSceneGeneralTemplateById(po);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
 
     }
 
@@ -176,10 +177,12 @@ public class SceneGeneralTemplateController {
     }
 
 
-    //泛化实例保存及调用外部接口
+    /**
+     * 调用外部接口生成泛化数据
+     */
     @PostMapping("/saveSceneGeneralExample")
     @ResponseBody
-    public ResponseBodyVO saveSceneGeneralExample(@RequestBody SceneGeneralTemplateVO vo) {
+    public ResponseBodyVO<Map<String,String>> saveSceneGeneralExample(@RequestBody SceneGeneralTemplateVO vo) {
         if (ObjectUtil.isNotNull(vo)) {
             return exampleService.saveSceneGeneralExample(vo);
         }

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

@@ -85,7 +85,7 @@ public class SceneGeneralExampleService {
     }
 
     @SneakyThrows
-    public ResponseBodyVO saveSceneGeneralExample(SceneGeneralTemplateVO vo) {
+    public ResponseBodyVO<Map<String, String>> saveSceneGeneralExample(SceneGeneralTemplateVO vo) {
 
         //查询泛化标志位并赋值
         SceneGeneralTemplatePO poV = templateMapper.querySceneGeneralTemplateById(vo.getTemplateId());
@@ -212,9 +212,9 @@ public class SceneGeneralExampleService {
         po.setIsDeleted("0");
         //po.setGeneralizationType(generalizationType);
         exampleMapper.saveSceneGeneralExample(po);
-        Map map1 = new HashMap();
+        Map<String, String> map1 = new HashMap<>();
         map1.put("exampleId", exampleId);//实例id
-        map1.put("sceneNum", list.size());//场景数量
+        map1.put("sceneNum", list.size() + "");//场景数量
         map1.put("templateId", po.getTemplateId()); //模板id
         map1.put("sceneGeneralizationIds", sceneGeneralizationIds);//泛化场景数组
         map1.put("sublistId", sublistId); //指标id
@@ -232,7 +232,7 @@ public class SceneGeneralExampleService {
      * @throws IllegalAccessException
      */
     public Map beanToMap(Object object) throws IllegalAccessException {
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         Field[] fields = object.getClass().getDeclaredFields();
         for (Field field : fields) {
             field.setAccessible(true);