From 7efb5ed160c259912e774c5ce7ef9dc6bb4afb0d Mon Sep 17 00:00:00 2001
From: TaehunPark <qkrxogns21@gmail.com>
Date: Wed, 31 Aug 2022 09:57:37 +0900
Subject: [PATCH] =?UTF-8?q?feat:=EC=99=B8=EC=82=AC=EA=B2=BD=EC=B0=B0?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20->=20=EC=8A=B9=EC=9D=B8=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95(=EA=B4=80=EB=A6=AC=EC=9E=90,=EC=9D=BC?=
 =?UTF-8?q?=EB=B0=98=EC=82=AC=EC=9A=A9=EC=9E=90=EB=A7=8C=EC=A0=81=EC=9A=A9?=
 =?UTF-8?q?=EB=90=A8)=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../faisp/controller/userMgtController.java   | 11 +++++
 .../dbnt/faisp/userInfo/UserInfoService.java  | 14 +++++-
 .../mybatisMapper/UserInfoMapper.xml          | 11 ++++-
 .../resources/static/js/userMgt/userMgt.js    | 48 +++++++++++++++++++
 .../adminPage/userMgt/userEditModal.html      | 11 ++++-
 .../templates/adminPage/userMgt/userMgt.html  |  7 +--
 6 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/controller/userMgtController.java b/src/main/java/com/dbnt/faisp/controller/userMgtController.java
index de09b849..324c79b2 100644
--- a/src/main/java/com/dbnt/faisp/controller/userMgtController.java
+++ b/src/main/java/com/dbnt/faisp/controller/userMgtController.java
@@ -60,5 +60,16 @@ public class userMgtController {
 	 int result = userInfoService.updateUserCompanion(userInfo);
     return result;
   }
+  
+  @PostMapping("/updateUserInfo")
+  public void updateUserInfo(UserInfo userInfo) {
+	  userInfoService.updateUser(userInfo);
+  }
+  
+  @PostMapping("/userDelete")
+  @ResponseBody
+  public void userDelete(@RequestBody List<UserInfo> userInfo) {
+	  userInfoService.userDelete(userInfo);  
+  }
 
 }
diff --git a/src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java b/src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java
index 4380d04b..3da40c8a 100644
--- a/src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java
+++ b/src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java
@@ -78,15 +78,15 @@ public class UserInfoService implements UserDetailsService {
 		UserInfo dbUserInfo = userInfoRepository.findById(user.getUserSeq()).orElse(null);
 		if(dbUserInfo != null) {
 			dbUserInfo.setUserStatus(user.getUserStatus());
+			userInfoRepository.save(dbUserInfo);
 			cnt++;
 		}
 	}
 	return cnt;
   }
-  
+  @Transactional
   public int updateUserCompanion(List<UserInfo> userInfo) {
 	int cnt = 0;
-	System.out.println("!!"+userInfo);
 	for(UserInfo user: userInfo) {
 		UserInfo dbUserInfo = userInfoRepository.findById(user.getUserSeq()).orElse(null);
 		if(dbUserInfo != null) {
@@ -97,4 +97,14 @@ public class UserInfoService implements UserDetailsService {
 	}
 	return cnt;
   }
+  @Transactional
+  public void updateUser(UserInfo userInfo) { 
+	  UserInfo dbUserInfo = userInfoRepository.findById(userInfo.getUserSeq()).orElse(null);
+	  dbUserInfo.setUserRole(userInfo.getUserRole());
+	  userInfoRepository.save(dbUserInfo);
+		
+  }
+  public void userDelete(List<UserInfo> userInfo) {
+	  userInfoRepository.deleteAll(userInfo);	
+  }
 }
diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml
index 0cfa10fe..cf07b8fb 100644
--- a/src/main/resources/mybatisMapper/UserInfoMapper.xml
+++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml
@@ -9,6 +9,7 @@
            user_id,
            user_nm,
            address,
+           user_role,
            detail_addr,
            email,
            og_cd,
@@ -43,7 +44,15 @@
   <select id="selectUserInfoListCnt" resultType="int" parameterType="UserInfo">
     select count(*)
     from user_info
-    where user_status != 'D'
+    where
+    <choose>
+    	<when test="userStatus != null and userStatus != ''">
+    	user_status = #{userStatus}
+    	</when>
+    	<otherwise>
+    	user_status != 'D'
+    	</otherwise>
+    </choose> 
     <if test="userId != null and userId != ''">
       and user_id like '%'||#{userId}||'%'
     </if>
diff --git a/src/main/resources/static/js/userMgt/userMgt.js b/src/main/resources/static/js/userMgt/userMgt.js
index 5343ea47..78e50c5b 100644
--- a/src/main/resources/static/js/userMgt/userMgt.js
+++ b/src/main/resources/static/js/userMgt/userMgt.js
@@ -95,4 +95,52 @@ function userCompanion(checkArr){
   })	
 }
 
+$(document).on('click', '#updateBtn', function (){
+    if(confirm("저장하시겠습니까?")){
+      contentFade("in");
+      const formData = new FormData($("#userInfoUpdate")[0]);
+      $.ajax({
+        type : 'POST',
+        data : formData,
+        url : "/userMgt/updateUserInfo",
+        processData: false,
+        contentType: false,
+        success : function() {
+          alert("저장되었습니다.");
+          contentFade("out");
+        },
+        error : function(xhr, status) {
+          alert("저장에 실패하였습니다.");
+          contentFade("out");
+        }
+      })    
+  }
+})
+
+$(document).on('click', '#deleteBtn', function (){
+  if(confirm("삭제 하시겠습니까?")){
+	console.log($("#userSeq").val());
+    deleteUser([{userSeq: Number($("#userSeq").val())}])
+  }
+})
+
+function deleteUser(userList){
+	$.ajax({
+    type : 'POST',
+    url : "/userMgt/userDelete",
+    data : JSON.stringify(userList),
+    contentType: 'application/json',
+    beforeSend: function (xhr){
+      xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
+    },
+    success : function() {
+      alert("삭제 처리되었습니다.");
+      location.reload();
+    },
+    error : function(xhr, status) {
+      alert("삭제 처리에 실패하였습니다");
+    }
+  })	
+}
+
 	
\ No newline at end of file
diff --git a/src/main/resources/templates/adminPage/userMgt/userEditModal.html b/src/main/resources/templates/adminPage/userMgt/userEditModal.html
index 06150663..cfafbf3b 100644
--- a/src/main/resources/templates/adminPage/userMgt/userEditModal.html
+++ b/src/main/resources/templates/adminPage/userMgt/userEditModal.html
@@ -1,12 +1,19 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
   <div class="tab-pane fade show active" id="accessTabPanel" role="tabpanel" aria-labelledby="accessTab" tabindex="0">
-    <form id="userInfoInsert" action="#" th:action="@{/admin/insertUserInfo}" method="post">
+    <form id="userInfoUpdate" action="#" th:action="@{/admin/insertUserInfo}" method="post">
+          <label style="font-size: 12px">     
+          <input type="radio" name="userRole" value="ROLE_ADMIN,ROLE_USER" th:checked="${userInfo.userRole eq 'ROLE_ADMIN,ROLE_USER'}">
+          관리자</label>
+          <label style="font-size: 12px">     
+          <input type="radio" name="userRole" value="ROLE_USER" th:checked="${userInfo.userRole eq 'ROLE_USER'}">
+          일반사용자</label>
           <div class="mb-3 row">
+          <input type="hidden" name="userSeq" id="userSeq" class="userSeq" th:value="${userInfo.userSeq}">               
           <div class="mb-3 mt-3 row">
             <label for="userId" class="col-sm-2 col-form-label text-center ">아이디</label>
             <div class="col-sm-4">
-              <input type="text" class="form-control" id="userId" name="userId" th:value="${userInfo.userId}" autocomplete="off">
+              <input type="text" class="form-control" id="userId" name="userId" th:value="${userInfo.userId}" autocomplete="off" readonly>
               <label for="userId" style="font-size: 12px">6~20자 사이의 알파벳, 숫자를 입력하세요</label>
             </div>
             <label for="userNm" class="col-sm-2 col-form-label text-center">이름</label>
diff --git a/src/main/resources/templates/adminPage/userMgt/userMgt.html b/src/main/resources/templates/adminPage/userMgt/userMgt.html
index cde3b809..0391c140 100644
--- a/src/main/resources/templates/adminPage/userMgt/userMgt.html
+++ b/src/main/resources/templates/adminPage/userMgt/userMgt.html
@@ -96,7 +96,7 @@
                       </thead>
                       <tbody>
                       <tr class="userInfoTr" th:each="userInfo:${userInfoList}">
-                        <input type="hidden" class="userSeq" th:value="${userInfo.userSeq}">
+                        <input type="hidden" name="userSeq" class="userSeq" th:value="${userInfo.userSeq}">                      
                         <td>
                           <input type="checkbox" id="userChk" name="userChk" class="userInfoCheckBox" th:value="${userInfo.userSeq}">
                         </td>
@@ -164,7 +164,7 @@
     <div class="modal-dialog modal-lg modal-dialog-scrollable">
       <div class="modal-content" id="userEditModalContent">
         <div class="modal-header">
-          <h5 class="modal-title" id="menuEditModalLabel">외사경찰 등록</h5>
+          <h5 class="modal-title" id="menuEditModalLabel">외사경찰 수정</h5>
           <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
         </div>
         <div class="modal-body">
@@ -173,8 +173,9 @@
           </div>
         </div>
         <div class="modal-footer">
+          <button type="button" class="btn" id="deleteBtn" style='background-color : red;float:left;'>삭제</button>
           <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
-          <button type="button" class="btn btn-primary" id="saveAuthBtn">저장</button>
+          <button type="button" class="btn btn-primary" id="updateBtn">저장</button>
         </div>
       </div>
     </div>