Merge branch 'master' of http://nas.zhengjl.com:10880/wan/recom-gorse

api/src/main/java/com/wx/application/nebula/graph/conrtroller/NebulaImportController.java

@@ -2,6 +2,7 @@ package com.wx.application.nebula.graph.conrtroller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -11,6 +12,7 @@ import org.springframework.web.multipart.MultipartFile;
 import com.wx.application.base.BaseController;
 import com.wx.application.base.ResponseData;
 import com.wx.application.nebula.graph.service.ImportGraphInJsonService;
+import com.wx.application.nebula.graph.service.ImportGraphService;
 
 @RestController
 @RequestMapping("/nebula_graph_import")
@@ -19,6 +21,8 @@ public class NebulaImportController extends BaseController {
 	@Autowired
 	ImportGraphInJsonService importGraphInJsonService;
 	
+	@Autowired
+	ImportGraphService importGraphService;
 	/**
 	 * 上传zip文件
 	 * @param space
@@ -31,6 +35,18 @@ public class NebulaImportController extends BaseController {
 		return success(importGraphInJsonService.uploadFile(file, space));
     }
 	
+	@PostMapping(value = "/iptuser")
+    public ResponseData iptUser() {
+		importGraphService.iptUser();
+		return success();
+    }
+	
+	@PostMapping(value = "/iptentrys")
+    public ResponseData iptentrys() {
+		importGraphService.iptentrys();
+		return success();
+    }
+	
 	/*@Autowired
 	ImportGraphInExcelService importGraphService;