관리자 basic 디렉토리 처리 수정

Gaia3D · Mar 20, 2020 · be07fe3 · be07fe3
1 parent 4f43cc9
commit be07fe3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 48 deletions.
diff --git a/doc/database/dml/insert.sql b/doc/database/dml/insert.sql
@@ -191,4 +191,15 @@ values
 	(6, '[사용자 전용] 사용자 페이지 DATA 조회 권한', 'USER_DATA_READ', '0', '0', 'Y', 'Y'),
 	(7, '[사용자 전용] 사용자 페이지 시민참여 관리 권한', 'USER_CIVIL_VOICE_MANAGE', '0', '0', 'Y', 'Y');
 
+
+INSERT INTO data_group (
+  data_group_id, data_group_name, data_group_key, data_group_path, data_group_target, sharing, user_id, 
+	ancestor, parent, depth, view_order, children, basic, available,  
+	metainfo)
+values (
+  1, '기본', 'basic', 'infra/basic/', 'admin', 'public', 'admin',
+  1, 0, 1, 1, 0, true, true,
+  '{"isPhysical": false}'
+);	
+
 commit;
diff --git a/ndtp-admin/src/main/java/ndtp/controller/view/DataGroupController.java b/ndtp-admin/src/main/java/ndtp/controller/view/DataGroupController.java
@@ -54,23 +54,7 @@ public String list(HttpServletRequest request, @ModelAttribute DataGroup dataGro
 
 		UserSession userSession = (UserSession)request.getSession().getAttribute(Key.USER_SESSION.name());
 		dataGroup.setUserId(userSession.getUserId());
-
 		List<DataGroup> dataGroupList = dataGroupService.getListDataGroup(dataGroup);
-		if(dataGroupList == null || dataGroupList.isEmpty()) {
-			String dataGroupPath = "basic/";
-
-			dataGroup.setDataGroupKey("basic");
-			dataGroup.setDataGroupName("기본");
-			dataGroup.setDataGroupPath(propertiesConfig.getAdminDataServicePath() + dataGroupPath);
-			dataGroup.setDataGroupTarget(ServerTarget.ADMIN.name().toLowerCase());
-			dataGroup.setSharing(SharingType.PUBLIC.name().toLowerCase());
-			dataGroup.setMetainfo("{\"isPhysical\": false}");
-
-			FileUtils.makeDirectoryByPath(propertiesConfig.getAdminDataServiceDir(), dataGroupPath);
-			dataGroupService.insertBasicDataGroup(dataGroup);
-
-			dataGroupList = dataGroupService.getListDataGroup(dataGroup);
-		}
 
 		model.addAttribute("dataGroupList", dataGroupList);
 
@@ -89,22 +73,7 @@ public String input(HttpServletRequest request, Model model) {
 		DataGroup dataGroup = new DataGroup();
 		dataGroup.setUserId(userSession.getUserId());
 		List<DataGroup> dataGroupList = dataGroupService.getListDataGroup(dataGroup);
-		if(dataGroupList == null || dataGroupList.isEmpty()) {
-			String dataGroupPath = "basic/";
-
-			dataGroup.setDataGroupKey("basic");
-			dataGroup.setDataGroupName("기본");
-			dataGroup.setDataGroupPath(propertiesConfig.getAdminDataServicePath() + dataGroupPath);
-			dataGroup.setDataGroupTarget(ServerTarget.ADMIN.name().toLowerCase());
-			dataGroup.setSharing(SharingType.PUBLIC.name().toLowerCase());
-			dataGroup.setMetainfo("{\"isPhysical\": false}");
-
-			FileUtils.makeDirectoryByPath(propertiesConfig.getAdminDataServiceDir(), dataGroupPath);
-			dataGroupService.insertBasicDataGroup(dataGroup);
-
-			dataGroupList = dataGroupService.getListDataGroup(dataGroup);
-		}
-
+
 		Policy policy = policyService.getPolicy();
 		dataGroup.setParentName(policy.getContentDataGroupRoot());
 		dataGroup.setParent(0);

diff --git a/ndtp-admin/src/main/java/ndtp/controller/view/UploadDataController.java b/ndtp-admin/src/main/java/ndtp/controller/view/UploadDataController.java
@@ -1,5 +1,6 @@
 package ndtp.controller.view;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -70,24 +71,14 @@ public String input(HttpServletRequest request, Model model) {
 		DataGroup dataGroup = new DataGroup();
 		dataGroup.setUserId(userSession.getUserId());
 		List<DataGroup> dataGroupList = dataGroupService.getListDataGroup(dataGroup);
-		if(dataGroupList == null || dataGroupList.isEmpty()) {
-			String dataGroupPath = "basic/";
-
-			dataGroup.setDataGroupKey("basic");
-			dataGroup.setDataGroupName("기본");
-			dataGroup.setDataGroupPath(propertiesConfig.getAdminDataServicePath() + dataGroupPath);
-			dataGroup.setDataGroupTarget(ServerTarget.ADMIN.name().toLowerCase());
-			dataGroup.setSharing(SharingType.PUBLIC.name().toLowerCase());
-			dataGroup.setMetainfo("{\"isPhysical\": false}");
-
-			FileUtils.makeDirectoryByPath(propertiesConfig.getAdminDataServiceDir(), dataGroupPath);
-			dataGroupService.insertBasicDataGroup(dataGroup);
-
-			dataGroupList = dataGroupService.getListDataGroup(dataGroup);
-		}
-
 		DataGroup basicDataGroup = dataGroupService.getBasicDataGroup();
 
+		// basic 디렉토리를 실수로 지웠거나 만들지 않았는지 확인
+		File basicDirectory = new File(propertiesConfig.getAdminDataServiceDir() + "basic");
+		if(!basicDirectory.exists()) {
+			basicDirectory.mkdir();
+		}
+
 		UploadData uploadData = UploadData.builder().
 											dataGroupId(basicDataGroup.getDataGroupId()).
 											dataGroupName(basicDataGroup.getDataGroupName()).build();