From 1a8c35c5d1e976c3e7a156e665634d296223518e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Sat, 14 Jun 2025 18:38:25 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=ED=8D=BC=EB=B8=94=20=EC=9E=85=ED=9E=88=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/admin/adminList.html | 210 +++++++++--------- .../templates/common/list-components.html | 33 ++- 2 files changed, 117 insertions(+), 126 deletions(-) diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index c0d789c0..62e5bea1 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -13,122 +13,118 @@ -
-
- - - +
+
+
+
+

+
+
+
+ +
+
+
+ +
+
+
+
+
+
+

권한

+
+
+ +
+
+
+
+ + +
+
-
- - -
-
- - -
-
+
Total:
-
- - +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
# + + ID권한Email + 활성화 + 계정잠김등록일 + 수정일 +
+ 게시물번호 + + 아이디 + + + 이메일등록일수정일
+ +
+
+
+ + + +
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# - - ID권한Email - 활성화 - 계정잠김등록일 - 수정일 -
- 게시물번호 - - 아이디 - - - 이메일등록일수정일
- + - -
- -
-
- -
-
- - -
-
diff --git a/admin/src/main/resources/templates/common/list-components.html b/admin/src/main/resources/templates/common/list-components.html index 3ea7a517..a9ef7c4b 100644 --- a/admin/src/main/resources/templates/common/list-components.html +++ b/admin/src/main/resources/templates/common/list-components.html @@ -11,25 +11,20 @@ -->
-
From a2f78ea366db07aa3708e843081b6667071481c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Sat, 14 Jun 2025 20:35:19 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=ED=8D=BC=EB=B8=94=EC=9E=85=ED=98=93?= =?UTF-8?q?=EB=8A=94=EB=8D=B0=20=EB=8F=99=EC=9E=91=EC=9D=84=20=EC=95=88?= =?UTF-8?q?=ED=95=A8...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/AdminCreatePostController.java | 2 - .../web/AdminUpdateGetController.java | 3 - .../web/AdminUpdatePostController.java | 2 - .../web/model/AdminCreateBindingVO.java | 6 +- .../web/model/AdminUpdateBindingVO.java | 8 +- .../templates/admin/adminCreateForm.html | 273 +++++++-------- .../templates/admin/adminUpdateForm.html | 311 +++++++++--------- .../security/AdminAuthFailHandlerTest.java | 2 - .../security/AdminDetailsServiceTest.java | 2 - .../dao/AdminCreateUpdateDaoTest.java | 4 - .../persistence/initData/InitAdminData.java | 6 - .../saveAdmin/ports/SaveAdminPortIn.java | 2 - .../ports/application/SaveAdminService.java | 5 - .../application/domain/SaveAdminCmd.java | 6 +- 14 files changed, 309 insertions(+), 323 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java index 7b3557df..5a510cab 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java @@ -44,10 +44,8 @@ public class AdminCreatePostController { bindingVO.getSeq(), bindingVO.getId(), bindingVO.getPassword(), - bindingVO.getEmail(), bindingVO.getRegionMainCode(), bindingVO.getAccountDisabled(), - bindingVO.getAccountLocked(), bindingVO.getRoleIds()); redirectAttributes.addFlashAttribute( diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java index bc43415d..f88e4c4c 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java @@ -53,12 +53,9 @@ class AdminUpdateGetController { output.getSeq(), output.getId(), null, - output.getEmail(), output.getRegionMainCode(), output.getPasswordUpdatedAt(), output.getAccountDisabled(), - output.getLoginFailCnt(), - output.getAccountLocked(), output.getRoles().stream().map(CoreRole::getId).collect(Collectors.toList())); model.addAttribute("bindingVO", bindingVO); diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java index 97e7b639..6919bb25 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java @@ -44,10 +44,8 @@ class AdminUpdatePostController { bindingVO.getSeq(), bindingVO.getId(), bindingVO.getUpdatePassword(), - bindingVO.getEmail(), bindingVO.getRegionMainCode(), bindingVO.getAccountDisabled(), - bindingVO.getAccountLocked(), bindingVO.getRoleIds()); redirectAttributes.addFlashAttribute( diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java index 269b453e..6698327e 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java @@ -15,15 +15,15 @@ public class AdminCreateBindingVO { private String id; private String password; - @NotBlank(message = "{valid.common.required}") +/* @NotBlank(message = "{valid.common.required}") @Pattern( regexp = "^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$", message = "{valid.common.email.wrong}") - private String email; + private String email;*/ private Boolean accountDisabled; - private Boolean accountLocked; +/* private Boolean accountLocked;*/ private List roleIds; private String regionMainCode; } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java index e340bbad..a4379a44 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java @@ -26,17 +26,17 @@ public class AdminUpdateBindingVO implements AuditOutput { private String id; private String updatePassword; - @NotBlank(message = "{valid.common.required}") +/* @NotBlank(message = "{valid.common.required}") @Pattern( regexp = "^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$", message = "{valid.common.email.wrong}") - private String email; + private String email;*/ private String regionMainCode; private LocalDateTime passwordUpdatedAt; private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; +/* private Integer loginFailCnt; + private Boolean accountLocked;*/ private List roleIds; } diff --git a/admin/src/main/resources/templates/admin/adminCreateForm.html b/admin/src/main/resources/templates/admin/adminCreateForm.html index 2c23e6e4..ffa3d9dd 100644 --- a/admin/src/main/resources/templates/admin/adminCreateForm.html +++ b/admin/src/main/resources/templates/admin/adminCreateForm.html @@ -2,147 +2,160 @@ -
+
-
- -
- -
- 에러 메세지 -
+ + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ +
+
+ 에러 메세지 +
+
+
+
+
+
+
+
+ +
+ 에러 메세지 +
+
+
+
+
+
+
+
+ +
+ 에러 메세지 +
+
+
+
+
+
+
+ +
+
+ 에러 메세지 +
+
+
+
+ +
+
+ +
+
+ 에러 메세지 +
+
+ +
+
+ +
- -
- -
- - -
- 에러 메세지 -
- -
-
- -
- -
- -
- 에러 메세지 -
-
-
- -
- -
- -
- 에러 메세지 -
-
-
- - - - -
- -
-
- - -
-
- - -
-
- 에러 메세지 -
-
-
- - -
- -
-
- - -
-
- - -
-
- 에러 메세지 -
-
-
- - - - + + + $(document).ready(() => { + const roleSelect = document.getElementById('roleIds'); + onRoleChange(roleSelect); + }); + const onRoleChange = (el) => { + const selectedValues = Array.from(el.selectedOptions).map(option => option.value); + const isAdmin = !selectedValues.length || selectedValues.includes('ROLE_ADMIN'); + $('.regionMainCodeArea').toggle(!isAdmin); + }; + +
- + \ No newline at end of file diff --git a/admin/src/main/resources/templates/admin/adminUpdateForm.html b/admin/src/main/resources/templates/admin/adminUpdateForm.html index 88a1e3e4..0ebaef04 100644 --- a/admin/src/main/resources/templates/admin/adminUpdateForm.html +++ b/admin/src/main/resources/templates/admin/adminUpdateForm.html @@ -2,7 +2,7 @@ -
+
-
- -
- + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ +
+
+ 에러 메세지 +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+ 에러 메세지 +
+
+
+
+
+
+ +
+
+ 에러 메세지 +
+
+
+
+ +
+
+ +
+
+ 에러 메세지 +
+
+
+ +
+
+ +
- -
- -
- -
- 에러 메세지 -
-
-
- -
- -
- -
- 에러 메세지 -
-
-
- -
- -
- -
- 에러 메세지 -
-
-
- -
- -
- -
- 에러 메세지 -
-
-
- - -
- -
-
- - -
-
- - -
-
- 에러 메세지 -
-
-
- - -
- -
-
- - -
-
- - -
-
- 에러 메세지 -
-
-
- -
- -
-
- - - -
- - - - - - - -
+
+ + + + + + + +
- + $(document).ready(() => { + showAudit([[${bindingVO.id}]], [[${bindingVO.createdBy}]], + [[${#temporals.format(bindingVO.createdAt, "yyyy-MM-dd'T'HH:mm:ss")}]], + [[${bindingVO.updatedBy}]], + [[${#temporals.format(bindingVO.updatedAt, "yyyy-MM-dd'T'HH:mm:ss")}]]); - + // 초기 로드 시 roleIds에 따라 regionMainCodeArea 표시/숨김 + const roleSelect = document.getElementById('roleIds'); + if (roleSelect) { + onRoleChange(roleSelect); + } + }); + + const onRoleChange = (el) => { + const isAdmin = el.value === 'ROLE_ADMIN' || !el.value; + $('.regionMainCodeArea').toggle(!isAdmin); + }; + +
- + \ No newline at end of file diff --git a/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java b/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java index 40164a99..8c921526 100644 --- a/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java +++ b/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java @@ -47,10 +47,8 @@ class AdminAuthFailHandlerTest { 1L, testUsername, "test.1@#$", - "xx4@test.com", null, false, - false, Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); } diff --git a/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java b/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java index d2a258a4..c73fb3b9 100644 --- a/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java +++ b/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java @@ -42,10 +42,8 @@ class AdminDetailsServiceTest { 1L, username, password, - "xx1@test.com", null, false, - false, Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); diff --git a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java index 828a6ed2..7a80d20e 100644 --- a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java +++ b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java @@ -38,10 +38,8 @@ class AdminCreateUpdateDaoTest { 1L, "admin_for_createDao_test", "test.1@#$", - "admin_for_createDao_test@test.com", null, false, - false, Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); adminViewPortIn @@ -56,10 +54,8 @@ class AdminCreateUpdateDaoTest { 2L, "admin_for_createDao_test", "test.1@#$", - "admin_for_createDao_test@test.com", null, false, - false, List.of("ROLE_STAFF")); assertEquals( 1, diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java index 87b04ff4..1e8a3f13 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java @@ -32,10 +32,8 @@ public class InitAdminData implements ApplicationRunner { null, "test-admin", "admin1@#$", - "admin@framework.org", null, false, - false, List.of("ROLE_ADMIN")); // 지방실사 @@ -43,10 +41,8 @@ public class InitAdminData implements ApplicationRunner { null, "test-local-inspection", "local1@#$", - "local@framework.org", "code.region.main.1", false, - false, List.of("ROLE_LOCAL_INSPECTION")); // 조사원 @@ -54,10 +50,8 @@ public class InitAdminData implements ApplicationRunner { null, "test-researcher", "researcher1@#$", - "researcher@framework.org", "code.region.main.1", false, - false, List.of("ROLE_RESEARCHER")); } } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/SaveAdminPortIn.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/SaveAdminPortIn.java index 860c5b4c..5abd145a 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/SaveAdminPortIn.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/SaveAdminPortIn.java @@ -8,9 +8,7 @@ public interface SaveAdminPortIn { Long seq, String id, String password, - String email, String regionMainCode, Boolean accountDisabled, - Boolean accountLocked, List roleIds); } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java index 5c6706d7..e85b296d 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java @@ -25,10 +25,8 @@ public class SaveAdminService implements SaveAdminPortIn { Long seq, String id, String password, - String email, String regionMainCode, Boolean accountDisabled, - Boolean accountLocked, List roleIds) { LocalDateTime passwordUpdatedAt; @@ -58,11 +56,8 @@ public class SaveAdminService implements SaveAdminPortIn { id, password, passwordUpdatedAt, - email, regionMainCode, accountDisabled, - loginFailCnt, - accountLocked, roleIds )); } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java index 106f12f4..74c0dce1 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java @@ -15,10 +15,10 @@ public class SaveAdminCmd extends AuditCommand { private String id; private String encodedPassword; private LocalDateTime passwordUpdatedAt; - private String email; +/* private String email;*/ private String regionMainCode; private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; +/* private Integer loginFailCnt; + private Boolean accountLocked;*/ private List roleIds; } From 1322c8bb01cfe030b3dfaf7533e287e531f64d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 16 Jun 2025 08:51:22 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/admin/adminCreateForm.html | 2 +- admin/src/main/resources/templates/admin/adminList.html | 7 +------ .../main/resources/templates/admin/adminUpdateForm.html | 4 ++-- .../saveAdmin/ports/application/SaveAdminService.java | 1 + .../saveAdmin/ports/application/domain/SaveAdminCmd.java | 4 ++-- core/src/main/resources/mappers/admin/SaveAdminMapper.xml | 6 ------ 6 files changed, 7 insertions(+), 17 deletions(-) diff --git a/admin/src/main/resources/templates/admin/adminCreateForm.html b/admin/src/main/resources/templates/admin/adminCreateForm.html index ffa3d9dd..4157dc27 100644 --- a/admin/src/main/resources/templates/admin/adminCreateForm.html +++ b/admin/src/main/resources/templates/admin/adminCreateForm.html @@ -23,7 +23,7 @@ th:field="*{roleIds}" onchange="onRoleChange(this);"> -
diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index 62e5bea1..051725b3 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -79,13 +79,10 @@ ID 권한 - Email 활성화 - 계정잠김 등록일 수정일 @@ -104,11 +101,9 @@ + th:text="${role.getDescription()} + ${!status.last ? ', ': ''}"> - 이메일 - 등록일 수정일 diff --git a/admin/src/main/resources/templates/admin/adminUpdateForm.html b/admin/src/main/resources/templates/admin/adminUpdateForm.html index 0ebaef04..b017e14e 100644 --- a/admin/src/main/resources/templates/admin/adminUpdateForm.html +++ b/admin/src/main/resources/templates/admin/adminUpdateForm.html @@ -25,7 +25,7 @@ th:field="*{roleIds}" onchange="onRoleChange(this);"> - @@ -117,7 +117,7 @@ -
+
diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java index e85b296d..128fcd37 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java @@ -58,6 +58,7 @@ public class SaveAdminService implements SaveAdminPortIn { passwordUpdatedAt, regionMainCode, accountDisabled, + loginFailCnt, roleIds )); } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java index 74c0dce1..bb91497b 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java @@ -18,7 +18,7 @@ public class SaveAdminCmd extends AuditCommand { /* private String email;*/ private String regionMainCode; private Boolean accountDisabled; -/* private Integer loginFailCnt; - private Boolean accountLocked;*/ + private Integer loginFailCnt; +/* private Boolean accountLocked;*/ private List roleIds; } diff --git a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml index 1460ecfd..0bfbf1b7 100644 --- a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml +++ b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml @@ -12,22 +12,18 @@ INSERT INTO admin (seq, id, password, - email, region_main_code, password_updated_at, account_disabled, login_fail_cnt, - account_locked, ) VALUES (#{seq}, #{id}, #{encodedPassword}, - #{email}, #{regionMainCode}, #{passwordUpdatedAt}, #{accountDisabled}, #{loginFailCnt}, - #{accountLocked}, ) @@ -36,12 +32,10 @@ UPDATE admin SET password = #{encodedPassword}, - email = #{email}, region_main_code = #{regionMainCode}, password_updated_at = #{passwordUpdatedAt}, account_disabled = #{accountDisabled}, login_fail_cnt = #{loginFailCnt}, - account_locked = #{accountLocked}, WHERE seq = #{seq} From d0a39da6c10757d005972c40e400dcdefcabc65d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 16 Jun 2025 08:57:09 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/admin/adminUpdateForm.html | 86 ++++++++----------- 1 file changed, 37 insertions(+), 49 deletions(-) diff --git a/admin/src/main/resources/templates/admin/adminUpdateForm.html b/admin/src/main/resources/templates/admin/adminUpdateForm.html index b017e14e..f63df0d6 100644 --- a/admin/src/main/resources/templates/admin/adminUpdateForm.html +++ b/admin/src/main/resources/templates/admin/adminUpdateForm.html @@ -16,25 +16,19 @@ -
-
-
-
- -
-
- 에러 메세지 -
-
-
+
+ +
+
+ 에러 메세지
@@ -42,27 +36,23 @@
-
-
-
-
-
- -
-
- 에러 메세지 -
+
+
+ +
+
+ 에러 메세지
@@ -71,22 +61,20 @@ th:classappend="${#lists.isEmpty(bindingVO.roleIds) or #lists.contains(bindingVO.roleIds, 'ROLE_ADMIN')} ? 'd-none'"> -
-
- -
-
- 에러 메세지 -
+
+ +
+
+ 에러 메세지
From 0822b222ed9d8c93a5333a20724cb9c7e28b8150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 16 Jun 2025 08:59:43 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/admin/adminCreateForm.html | 90 +++++++++---------- 1 file changed, 41 insertions(+), 49 deletions(-) diff --git a/admin/src/main/resources/templates/admin/adminCreateForm.html b/admin/src/main/resources/templates/admin/adminCreateForm.html index 4157dc27..483cef24 100644 --- a/admin/src/main/resources/templates/admin/adminCreateForm.html +++ b/admin/src/main/resources/templates/admin/adminCreateForm.html @@ -16,21 +16,19 @@
-
-
- -
-
- 에러 메세지 -
+
+ +
+
+ 에러 메세지
@@ -40,15 +38,13 @@
-
-
- -
- 에러 메세지 -
+
+ +
+ 에러 메세지
@@ -56,15 +52,13 @@
-
-
- -
- 에러 메세지 -
+
+ +
+ 에러 메세지
@@ -74,22 +68,20 @@ th:classappend="${#lists.isEmpty(bindingVO.roleIds) or #lists.contains(bindingVO.roleIds, 'ROLE_ADMIN')} ? 'd-none'"> -
-
- -
-
- 에러 메세지 -
+
+ +
+
+ 에러 메세지
From 5bebc53deabcc98088daa64407ce509aede82a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 16 Jun 2025 09:37:28 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/GetHouseholdsStatusCmd.java | 4 ++++ .../persistence/model/HouseholdDto.java | 15 +++++++++++++ .../researcher/service/ResearcherService.java | 3 +++ .../service/ResearcherServiceImpl.java | 16 ++++++++++++++ .../researcher/web/ResearcherController.java | 12 ++++++---- .../model/MappingHouseholdListUIReqVO.java | 22 +++++++++++++++++++ .../templates/researcher/detail.html | 10 ++++----- 7 files changed, 73 insertions(+), 9 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/HouseholdDto.java create mode 100644 admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListUIReqVO.java diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java index 6a9f935e..c8d1d50d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java @@ -45,4 +45,8 @@ public class GetHouseholdsStatusCmd { // 로그인한 유저 실사 지역 private String userRegionMainCode; + public GetHouseholdsStatusCmd(String searchRegionMainCode) { + this.regionMainCode = searchRegionMainCode; + } + } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/HouseholdDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/HouseholdDto.java new file mode 100644 index 00000000..d57de63a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/HouseholdDto.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.researcher.persistence.model; + +import lombok.Data; + + +@Data +public class HouseholdDto { + private Long seq; + private String id; + private String name; + private String phone; + private String regionMainCodeName; + private Integer householdCount; + private String accountDisabledFlag; +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java index 4c0a1b15..e30c31c6 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java @@ -1,8 +1,10 @@ package app.module.admin.usecase.researcher.service; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; import app.module.admin.usecase.researcher.persistence.model.ResearchersDto; import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto; import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto; +import app.module.admin.usecase.researcher.web.model.MappingHouseholdListUIReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; import org.springframework.data.domain.Page; @@ -16,4 +18,5 @@ public interface ResearcherService { Page mappingHouseholdList(ResearchersDetailReqVO reqVO); Page visitHouseholdList(ResearchersDetailReqVO reqVO); Integer visitHouseholdDelete(List selectIds); + Page reginMainCodeHouseholdList(MappingHouseholdListUIReqVO reqVO); } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java index 1d0edd71..5ce287c4 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java @@ -1,10 +1,14 @@ package app.module.admin.usecase.researcher.service; +import app.module.admin.usecase.household.getHouseholdsStatus.adapters.persistence.GetHouseholdsStatusMapper; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd; import app.module.admin.usecase.researcher.persistence.ResearcherMapper; import app.module.admin.usecase.researcher.persistence.model.ResearchersDto; import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto; import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto; +import app.module.admin.usecase.researcher.web.model.MappingHouseholdListUIReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; import app.module.core.config.application.util.CommonUtil; @@ -23,6 +27,7 @@ import java.util.List; @RequiredArgsConstructor public class ResearcherServiceImpl implements ResearcherService { private final ResearcherMapper researcherMapper; + private final GetHouseholdsStatusMapper householdsStatusMapper; @Override public Page list(ResearchersListReqVO reqVO) { @@ -60,4 +65,15 @@ public class ResearcherServiceImpl implements ResearcherService { String deletedBy = CommonUtil.getLoginUsername(); return researcherMapper.visitHouseholdDelete(selectIds,deletedBy); } + + @Override + public Page reginMainCodeHouseholdList(MappingHouseholdListUIReqVO reqVO) { + Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize()); + + List householdsStatus = householdsStatusMapper.getHouseholdsStatus(pageable, + new GetHouseholdsStatusCmd(reqVO.getSearchRegionMainCode())); + + return new PageImpl<>(householdsStatus, pageable, + householdsStatus.isEmpty() ? 0 : householdsStatus.get(0).getTotal()); + } } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java index cc6b6af3..1e5fda6b 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java @@ -2,9 +2,7 @@ package app.module.admin.usecase.researcher.web; import app.module.admin.config.application.util.DateUiUtil; import app.module.admin.usecase.researcher.service.ResearcherService; -import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; -import app.module.admin.usecase.researcher.web.model.ResearchersDetailUIReqVO; -import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; +import app.module.admin.usecase.researcher.web.model.*; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -12,7 +10,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; -import app.module.admin.usecase.researcher.web.model.GetResearchersUIReqVO; import java.util.List; @@ -48,6 +45,13 @@ class ResearcherController { return ResponseEntity.status(HttpStatus.OK).body(researcherService.mappingHouseholdList(reqVO)); } + @GetMapping(path = "/mappingHousehold/list") + String mappingHouseholdResearcherList(Model model, @ModelAttribute("reqVO") MappingHouseholdListUIReqVO reqVO) { + model.addAttribute("householdDto", researcherService.reginMainCodeHouseholdList(reqVO)); + return "researcher/mappingHouserhold"; + } + + @GetMapping(path = "/visitHouseholdList") ResponseEntity visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) { return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdList(reqVO)); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListUIReqVO.java new file mode 100644 index 00000000..279a5ca4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListUIReqVO.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.researcher.web.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class MappingHouseholdListUIReqVO { + private Integer page; + private Integer size; + private String searchRegionMainCode; + + public Integer getPage() { + // 요청 페이지 넘버 - 초기값 `0` + return page != null ? page : 0; + } + + public Integer getSize() { + // 페이지 당 아이템 수 - 초기값 `10` + return size != null ? size : 10; + } +} diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 0715f255..0d580b55 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -4,7 +4,6 @@
- @@ -63,14 +62,17 @@ TOTAL. + - -
@@ -339,8 +341,6 @@ '/researcher/visitHousehold/remove', JSON.stringify(selectIds), function (response) { - console.log("여기있어요"); - console.log(response); if(response > 0){ alert('선택한 임가정보가 삭제되었습니다.'); getHouseholdVisitList(document.householdReqForm.page.value);