From efc09ee839d7e87bafd722f7b9dd504ea0948fe4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 01 11월 2021 17:16:41 +0900
Subject: [PATCH] 사용자등급관리 프론트 수청
---
src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java | 2
src/main/webapp/scripts/app/workspace/workspaceDepartmentAdd.controller.js | 2
src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js | 2
src/main/webapp/scripts/components/workspace/workspace.service.js | 36 ------------
src/main/java/kr/wisestone/owl/web/controller/UserWorkspaceController.java | 26 ++++++++
src/main/webapp/scripts/app/workspace/workspace.controller.js | 62 --------------------
src/main/java/kr/wisestone/owl/web/controller/WorkspaceController.java | 20 ------
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 2
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 4 -
src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js | 24 ++++++++
10 files changed, 54 insertions(+), 126 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
index d41c05c..f830917 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
@@ -75,7 +75,7 @@
public List<UserWorkspaceVo> findUserWorkspace(Map<String, Object> resJsonData,
UserWorkspaceCondition condition, Pageable pageable) {
- UserWorkspace userWorkspace = this.findMyWorkspace(this.webAppUtil.getLoginId());
+ UserWorkspace userWorkspace = this.findMyWorkspace(this.webAppUtil.getLoginId()); //濡쒓렇�씤�븳 �븘�씠�뵒
Workspace myWorkspace = userWorkspace.getWorkspace();
condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
condition.setPageSize(pageable.getPageSize());
diff --git a/src/main/java/kr/wisestone/owl/web/controller/UserWorkspaceController.java b/src/main/java/kr/wisestone/owl/web/controller/UserWorkspaceController.java
index fc19000..c226690 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/UserWorkspaceController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/UserWorkspaceController.java
@@ -26,6 +26,32 @@
@Autowired
private UserWorkspaceService userWorkspaceService;
+ // �궗�슜�옄 �벑湲� 議고쉶
+ @RequestMapping(value = "/userWorkspace/levelFind", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> levelFind(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> resJsonData = new HashMap<>();
+ Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
+
+ this.userWorkspaceService.findUserWorkspace(resJsonData, UserWorkspaceCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
+ //this.userWorkspaceService.levelFind(resJsonData, UserWorkspaceCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
+ return this.setSuccessMessage(resJsonData);
+ }
+
+ // 遺��꽌 議고쉶
+ @RequestMapping(value = "/userWorkspace/departmentFind", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> departmentFind(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> resJsonData = new HashMap<>();
+ Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
+
+ this.userWorkspaceService.findUserWorkspace(resJsonData, UserWorkspaceCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
+ //this.userWorkspaceService.departmentFind(resJsonData, UserWorkspaceCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
+ return this.setSuccessMessage(resJsonData);
+ }
+
// �뾽臾닿났媛꾩뿉 李몄뿬�븯�뒗 �궗�슜�옄 議고쉶
@RequestMapping(value = "/userWorkspace/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
public
diff --git a/src/main/java/kr/wisestone/owl/web/controller/WorkspaceController.java b/src/main/java/kr/wisestone/owl/web/controller/WorkspaceController.java
index 7e01f08..44ea533 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/WorkspaceController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/WorkspaceController.java
@@ -25,27 +25,7 @@
@Autowired
private WorkspaceService workspaceService;
- // �궗�슜�옄 �벑湲� 議고쉶
- @RequestMapping(value = "/workspace/levelFind", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
- public
- @ResponseBody
- Map<String, Object> levelFind() {
- Map<String, Object> resJsonData = new HashMap<>();
- this.workspaceService.find(resJsonData);
- //this.workspaceService.levelFind(resJsonData);
- return this.setSuccessMessage(resJsonData);
- }
- // 遺��꽌 議고쉶
- @RequestMapping(value = "/workspace/departmentFind", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
- public
- @ResponseBody
- Map<String, Object> departmentFind() {
- Map<String, Object> resJsonData = new HashMap<>();
- this.workspaceService.find(resJsonData);
- //this.workspaceService.departmentFind(resJsonData);
- return this.setSuccessMessage(resJsonData);
- }
// �궗�슜�옄 愿�由� 議고쉶
@RequestMapping(value = "/workspace/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
diff --git a/src/main/webapp/scripts/app/workspace/workspace.controller.js b/src/main/webapp/scripts/app/workspace/workspace.controller.js
index d84c974..a710461 100644
--- a/src/main/webapp/scripts/app/workspace/workspace.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspace.controller.js
@@ -13,8 +13,6 @@
$scope.fn = {
changeTab : changeTab, // �꺆 蹂�寃�
findMyWorkspace : findMyWorkspace, // �궡媛� 愿�由ы븯�뒗 �뾽臾� 怨듦컙 �젙蹂�
- findUserLevel : findUserLevel, // �궗�슜�옄 �벑湲�
- findDepartment : findDepartment // 遺��꽌
};
$scope.vm = {
@@ -27,16 +25,6 @@
$scope.fn.findMyWorkspace();
});
- // �궗�슜�옄 �벑湲� �젙蹂� 媛깆떊
- $scope.$on("findUserLevel", function () {
- $scope.fn.findUserLevel();
- });
-
- // 遺��꽌 �젙蹂� 媛깆떊
- $scope.$on("findDepartment", function () {
- $scope.fn.findDepartment();
- });
-
// �꺆 蹂�寃�
function changeTab(tab) {
$scope.vm.tab = tab;
@@ -45,12 +33,8 @@
$scope.fn.findMyWorkspace();
$scope.$broadcast("getUserWorkspaceList");
}else if (tab === "USER_LEVEL_CONFIG") {
- //$scope.fn.findMyWorkspace();
- $scope.fn.findUserLevel();
$scope.$broadcast("getUserLevelList");
}else if (tab === "DEPARTMENT_CONFIG") {
- //$scope.fn.findMyWorkspace();
- $scope.fn.findDepartment();
$scope.$broadcast("getDepartmentList");
}
}
@@ -77,52 +61,6 @@
});
}
$scope.fn.findMyWorkspace();
-
- // �궗�슜�옄 �벑湲됱쓣 議고쉶�븳�떎.
- function findUserLevel() {
- Workspace.findUserLevel($resourceProvider.getContent(
- {},
- $resourceProvider.getPageContent(0, 0))).then(function (result) {
- if (result.data.message.status === "success") {
- if (result.data.data != null) {
- /*$scope.vm.workspaceVo = result.data.data;
- // 李몄뿬 媛��뒫 �궗�슜�옄 �닔
- $scope.vm.workspaceVo.includeUserCount = $scope.vm.workspaceVo.maxUser - $scope.vm.workspaceVo.activeUser;*/
-
- /*if ($scope.vm.workspaceVo.includeUserCount < 0) {
- $scope.vm.workspaceVo.includeUserCount = 0;
- }*/
- }
- }
- else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceInformation"), result.data.message.message); // "�옄�떊�씠 愿�由ы븯�뒗 �뾽臾� 怨듦컙 �젙蹂� 議고쉶 �떎�뙣"
- }
- });
- }
- $scope.fn.findUserLevel();
-
- // 遺��꽌瑜� 議고쉶�븳�떎.
- function findDepartment() {
- Workspace.findDepartment($resourceProvider.getContent(
- {},
- $resourceProvider.getPageContent(0, 0))).then(function (result) {
- if (result.data.message.status === "success") {
- if (result.data.data != null) {
- /*$scope.vm.workspaceVo = result.data.data;
- // 李몄뿬 媛��뒫 �궗�슜�옄 �닔
- $scope.vm.workspaceVo.includeUserCount = $scope.vm.workspaceVo.maxUser - $scope.vm.workspaceVo.activeUser;*/
-
- /*if ($scope.vm.workspaceVo.includeUserCount < 0) {
- $scope.vm.workspaceVo.includeUserCount = 0;
- }*/
- }
- }
- else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceInformation"), result.data.message.message); // "�옄�떊�씠 愿�由ы븯�뒗 �뾽臾� 怨듦컙 �젙蹂� 議고쉶 �떎�뙣"
- }
- });
- }
- $scope.fn.findDepartment();
}
]);
}
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentAdd.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentAdd.controller.js
index 263a33c..af3e40d 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentAdd.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentAdd.controller.js
@@ -91,7 +91,7 @@
description : $rootScope.preventXss($scope.vm.form.description)
};
- Workspace.departmentAdd($resourceProvider.getContent(
+ UserWorkspace.departmentAdd($resourceProvider.getContent(
content,
$resourceProvider.getPageContent(0, 10))).then(function (result) {
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
index 1274e8e..d16a436 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
@@ -37,7 +37,6 @@
// �뀒�씠釉� �씠踰ㅽ듃
$scope.vm.tableEvent = {
// modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
- view : view
};
// 遺��꽌 愿�由� 由ъ뒪�듃 遺덈윭�삤湲�
@@ -96,7 +95,6 @@
};
//�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
- //UserWorkspace.findDepartment($resourceProvider.getContent(conditions,
UserWorkspace.departmentFind($resourceProvider.getContent(conditions,
$resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
diff --git a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
index 98c9dbe..a1a6f6d 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
@@ -48,7 +48,7 @@
description : $rootScope.preventXss($scope.vm.form.description)
};
- Workspace.levelAdd($resourceProvider.getContent(
+ UserWorkspace.levelAdd($resourceProvider.getContent(
content,
$resourceProvider.getPageContent(0, 10))).then(function (result) {
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index d91f13a..4a8a351 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -38,7 +38,6 @@
// �뀒�씠釉� �씠踰ㅽ듃
$scope.vm.tableEvent = {
// modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
- view : view
};
// �궗�슜�옄 �벑湲� 由ъ뒪�듃 遺덈윭�삤湲�
@@ -136,8 +135,7 @@
};
//�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
- //UserWorkspace.findLevel($resourceProvider.getContent(conditions,
- Workspace.levelFind($resourceProvider.getContent(conditions,
+ UserWorkspace.levelFind($resourceProvider.getContent(conditions,
$resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
if (result.data.message.status === "success") {
diff --git a/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js b/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
index 0d3c33e..2554779 100644
--- a/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
+++ b/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
@@ -6,6 +6,30 @@
define(['app'], function (app) {
app.factory("UserWorkspace", ['$http', '$log', function ($http, $log) {
return {
+ levelFind : function (conditions) {
+ return $http.post("userWorkspace/levelFind", conditions).then(function (response) {
+ $log.debug("�궗�슜�옄 �벑湲� 紐⑸줉 : ", response);
+ return response;
+ });
+ },
+ departmentFind : function (conditions) {
+ return $http.post("userWorkspace/departmentFind", conditions).then(function (response) {
+ $log.debug("遺��꽌 紐⑸줉 : ", response);
+ return response;
+ });
+ },
+ levelAdd : function (conditions) {
+ return $http.post("userWorkspace/levelAdd", conditions).then(function (response) {
+ $log.debug("�궗�슜�옄 �벑湲� �깮�꽦 寃곌낵 : ", response);
+ return response;
+ });
+ },
+ departmentAdd : function (conditions) {
+ return $http.post("userWorkspace/departmentAdd", conditions).then(function (response) {
+ $log.debug("遺��꽌 �깮�꽦 寃곌낵 : ", response);
+ return response;
+ });
+ },
find : function (conditions) {
return $http.post("userWorkspace/find", conditions).then(function (response) {
$log.debug("�썙�겕�뒪�럹�씠�뒪�뿉 李몄뿬�븯�뒗 �쟾泥� �궗�슜�옄 紐⑸줉 : ", response);
diff --git a/src/main/webapp/scripts/components/workspace/workspace.service.js b/src/main/webapp/scripts/components/workspace/workspace.service.js
index 753763a..2c090dc 100644
--- a/src/main/webapp/scripts/components/workspace/workspace.service.js
+++ b/src/main/webapp/scripts/components/workspace/workspace.service.js
@@ -8,33 +8,9 @@
], function (app) {
app.factory("Workspace", ['$http', '$log', function ($http, $log) {
return {
- levelFind : function (conditions) {
- return $http.post("workspace/levelFind", conditions).then(function (response) {
- $log.debug("�궗�슜�옄 �벑湲� 紐⑸줉 : ", response);
- return response;
- });
- },
- departmentFind : function (conditions) {
- return $http.post("workspace/departmentFind", conditions).then(function (response) {
- $log.debug("遺��꽌 紐⑸줉 : ", response);
- return response;
- });
- },
find : function (conditions) {
return $http.post("workspace/find", conditions).then(function (response) {
$log.debug("�뾽臾닿났媛� 紐⑸줉 �뜲�씠�꽣 : ", response);
- return response;
- });
- },
- levelAdd : function (conditions) {
- return $http.post("workspace/levelAdd", conditions).then(function (response) {
- $log.debug("�궗�슜�옄 �벑湲� �깮�꽦 寃곌낵 : ", response);
- return response;
- });
- },
- departmentAdd : function (conditions) {
- return $http.post("workspace/departmentAdd", conditions).then(function (response) {
- $log.debug("遺��꽌 �깮�꽦 寃곌낵 : ", response);
return response;
});
},
@@ -53,18 +29,6 @@
findMyWorkspace : function (conditions) {
return $http.post("workspace/findMyWorkspace", conditions).then(function (response) {
$log.debug("�옄�떊�씠 愿�由ы븯�뒗 �뾽臾닿났媛� �젙蹂� 寃곌낵 : ", response);
- return response;
- });
- },
- findUserLevel : function (conditions) { //�궗�슜�옄 �벑湲�
- return $http.post("workspace/levelFind", conditions).then(function (response) {
- $log.debug("�궗�슜�옄 �벑湲� �젙蹂� 寃곌낵 : ", response);
- return response;
- });
- },
- findDepartment : function (conditions) { //遺��꽌
- return $http.post("workspace/departmentFind", conditions).then(function (response) {
- $log.debug("�궗�슜�옄 �벑湲� �젙蹂� 寃곌낵 : ", response);
return response;
});
},
--
Gitblit v1.8.0