planin 추가

src/main/java/com/no1/wms/account/AccountController.java

@@ -30,6 +30,7 @@ public class AccountController {
         int count = accountService.count(searchn, search, startRow, perPage);
 
 
+
         int pageNum = 4;//보여질 페이지 번호 수
         int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수
 
@@ -37,7 +38,7 @@ public class AccountController {
 
 
         //스톡서비스로 재고 리스트 출력 메서트 작성
-        List<AccountDto> list = accountService.selectAll(searchn, search, searchn, perPage);
+        List<AccountDto> list = accountService.selectAll(searchn, search, startRow, perPage);
 
         int begin = (page - 1) / pageNum * pageNum + 1;
         int end = begin + pageNum - 1;
@@ -48,8 +49,9 @@ public class AccountController {
         mav.addObject("end", end);
         mav.addObject("searchn", searchn);
         mav.addObject("search", search);
-        mav.addObject("page", startRow);
+        mav.addObject("pageNum", pageNum);
         mav.addObject("begin", begin);
+        mav.addObject("page", page);
         mav.setViewName("account/list");
         return mav;
     }

src/main/java/com/no1/wms/login/LoginController.java

@@ -34,6 +34,21 @@ public class LoginController {
     }
 
 
+    @PostMapping("/pass_reset_call")
+    @ResponseBody
+    public String passResetCall(AccountDto dto, Gson gson)
+    {
+        return gson.toJson("s");
+
+    }
+
+    @GetMapping("/passreset")
+    public String passReset()
+    {
+        return "pass_reset_call";
+
+    }
+
 
 
     @PostMapping("/login/check_password")

src/main/resources/mappers/AccountMapper.xml

@@ -65,8 +65,8 @@
         from account acc join authority auth join authority auth2 on acc.personal_authority_id = auth.id and acc.group_authority_id = auth2.id
         <where>
             <choose>
-                <when test="searchn == 0"> acc.activation = 1 and acc.name like concat('%',#{search},'%')</when>
+                <when test="searchn == 1"> acc.activation = 1 and acc.name like concat('%',#{search},'%')</when>
-                <when test="searchn == 1"> acc.activation = 1 and acc.employee_number like concat('%',#{search},'%') </when>
+                <when test="searchn == 0"> acc.activation = 1 and acc.employee_number like concat('%',#{search},'%') </when>
             </choose>
         </where>
         order by acc.id desc limit #{start}, #{perPage}
@@ -140,6 +140,9 @@
     <update id="delete" parameterType="accountDto">
         update account SET activation = false WHERE id = #{id}
     </update>
+    <update id="passReset" parameterType="accountDto">
+        update account SET password = #{password} WHERE employee_number = #{employeeNumber}
+    </update>
 
     <select id="count" parameterType="map" resultType="java.lang.Integer">
         select count(*) from ( SELECT 1 from account
@@ -149,6 +152,6 @@
                 <when test="searchn == 0"> activation = 1 and employee_number like concat('%',#{search},'%') </when>
             </choose>
         </where>
-        order by id desc limit #{start}, #{perPage} ) t
+         ) t
     </select>
 </mapper>

src/main/resources/static/css/account.css

@@ -0,0 +1,3 @@
+tbody tr{
+    cursor: pointer;
+}

src/main/webapp/WEB-INF/views/account/list.jsp

@@ -1,7 +1,7 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <!-- 이 안에 내용 복사해서 jsp에 붙여넣기 -->
-<link rel="stylesheet" href="authority.css">
+<link rel="stylesheet" href="/resources/static/css/account.css">
 <script>
     /*
     yes no 모달의 확인 버튼을 누를때 재정의할 function
@@ -57,14 +57,20 @@
         $form.trigger("submit");
     }
 
+    function goCreate(){
+        const $form = $("<form method='post' action='/account/create'></form> ");
+        $(".att").after($form);
+        $form.trigger("submit");
+
+    }
 
 
 </script>
-<div class="container-fluid">
+<div class="container">
     <div class="row">
         <div class="col-12">
             <div class="mt-5 mb-5 text-center">
-                <h1>계정 관리</h1><form method="post" action="/account/create"><button class="btn btn-primary" type="submit" id="btn_create">생성</button></form>
+                <h1>계정 관리</h1>
             </div>
             <div>
                 <hr>
@@ -72,12 +78,8 @@
         </div>
     </div>
     <div class="row">
-        <div class="col-12">
+        <div class="col-12 att">
-            <div class="container">
+            <form class="d-inline" id="search_form">
-                <div class="row">
-                    <div class="col-12">
-                        <div id="search" align="center">
-                            <form id="search_form">
             <select name="searchn">
                 <option <c:if test="${searchn == 0}">selected="selected"</c:if> value="0">사번</option>
                 <option <c:if test="${searchn == 1}">selected="selected"</c:if> value="1">사원명</option>
@@ -86,11 +88,11 @@
             <button type="submit" class="btn btn-primary" >검색</button>
             <input id="pPage" hidden type="text" name="page">
             </form>
+            <button style="float: right;"  class="btn btn-primary" type="submit" id="btn_create" onclick="goCreate() ">생성</button>
+
         </div>
-                    </div>
+        <div class="row p-0 m-0">
-                </div>
+            <div class="col-12 m-0">
-                <div class="row">
-                    <div class="col-12">
                 <table class="table" >
                     <thead class="table-dark">
                     <tr><th>사번</th><th>사용자 명</th><th>활성 여부</th></tr>
@@ -114,18 +116,18 @@
         </div>
         <div class="row">
             <div class="col-12">
-                        <div id="page" align="center">
+                <div id="page">
+                    <ul class="pagination justify-content-center">
                     <c:if test="${begin > pageNum }">
-                                <a data-p='${begin-1 }' href="#" onclick="onPaging(this)">[<]</a>
+                        <li class="page-item"><a class="page-link" data-p='${begin-1 }' href="#" onclick="onPaging(this)">[<]</a></li>
                     </c:if>
-                            <c:forEach begin="${begin }" end="${end}" var="i">
+                    <c:forEach begin="${begin }" end="${end}" var="i" varStatus="status">
-                                <a data-p='${i}' href="#" onclick="onPaging(this)" >${i}</a>
+                        <li class="page-item <c:if test="${page eq status.count}">active</c:if> "><a class="page-link"  data-p='${i}' href="#" onclick="onPaging(this)" >${i}</a></li>
                     </c:forEach>
                     <c:if test="${end < totalPages }">
-                                <a data-p='${end+1}' href="#" onclick="onPaging(this)">[>]</a>
+                        <li class="page-item"><a class="page-link" data-p='${end+1}' href="#" onclick="onPaging(this)">[>]</a></li>
                     </c:if>
-                        </div>
+                    </ul>
-                    </div>
                 </div>
             </div>
         </div>

src/main/webapp/WEB-INF/views/authority/list.jsp

@@ -70,7 +70,7 @@
         <div class="col-12">
             <div class="container">
                 <div class="row">
-                    <div class="col-4">
+                    <div class="col-12">
                         <!-- 탭 부분 -->
                         <ul class="nav nav-tabs" id="myTab" role="tablist">
                             <li class="nav-item" role="presentation">
@@ -81,21 +81,6 @@
                             </li>
                         </ul>
                     </div>
-                    <div class="col-8">
-                        <div id="div_group_search" class="text-end">
-                            <input id="search_group_input" type="text" class="w-60 d-inline form-control" placeholder="검색">
-                            <button id="search_group_btn" type="button" class="btn btn-primary" onclick="onSearch(false)">검색</button>
-                        </div>
-                        <div id="div_personal_search" class="text-end">
-                            <select name="search_select" class="form-select d-inline">
-                                <option selected value="10">10</option>
-                                <option value="20">20</option>
-                                <option value="30">30</option>
-                            </select>
-                            <input id="search_personal_input" type="text" class="w-60 d-inline form-control" placeholder="검색">
-                            <button id="search_personal_btn" type="button" class="btn btn-primary" onclick="onSearch(true)">검색</button>
-                        </div>
-                    </div>
                 </div>
                 <div class="row">
                     <div class="col-12">

src/main/webapp/WEB-INF/views/modal/login.jsp

@@ -66,7 +66,7 @@
 
         <div class="checkbox mb-3">
             <label>
-                <a href="/">비밀번호를 잊으셨나요?</a>
+                <a href="/passreset">비밀번호를 잊으셨나요?</a>
             </label>
         </div>
         <button class="w-100 btn btn-lg btn-primary" type="button" onclick="onLogin()">로그인</button>

src/main/webapp/WEB-INF/views/modal/pass_reset_call.jsp

@@ -0,0 +1,67 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%>
+<!DOCTYPE html>
+<html lang="ko">
+<head>
+
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
+    <script src="https://unpkg.com/feather-icons"></script>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>No1 WMS</title>
+    <style>
+        .form-signin {
+            width: 100%;
+            max-width: 330px;
+            padding: 15px;
+            margin: auto;
+        }
+        body{
+            display: flex;
+            align-items: center;
+            padding-top: 40px;
+            padding-bottom: 40px;
+            background-color: #f5f5f5;
+        }
+
+
+    </style>
+
+</head>
+<body class="text-center">
+<script>
+    function onPassReset(){
+        const data={};
+        data.employeeNumber=$("#employ_number").val();
+        $.ajax({
+            type: 'post',           // 타입 (get, post, put 등등)
+            url: '/login/pass_reset_call',           // 요청할 서버url
+            dataType: 'json',       // 데이터 타입 (html, xml, json, text 등등)
+            data: data,
+            success: function (result) { // 결과 성공 콜백함수
+                alert("패스워드 초기화 요청이 완료되었습니다");
+                window.location.href = "/";
+            },
+            error: function (request, status, error) {
+                alert(error);
+            }
+        });
+    }
+</script>
+<main class="form-signin">
+    <img class="mb-4" src="/docs/5.0/assets/brand/bootstrap-logo.svg" alt="" width="72" height="57">
+    <h1 class="h3 mb-3 fw-normal">비밀번호 초기화 요청</h1>
+
+    <div class="form-floating mb-3">
+        <input type="text" class="form-control" id="employ_number" name="employeeNumber" placeholder="사번">
+        <label for="employ_number">사번</label>
+    </div>
+    <button class="w-100 btn btn-lg btn-primary" type="button" onclick="onPassReset()">초기화 요청</button>
+    <p class="mt-5 mb-3 text-muted">© 2023–2024</p>
+</main>
+
+</body>
+</html>