생활치료센터 정보수정페이지

src/main/java/com/lemon/lifecenter/controller/CenterController.java

@@ -1,7 +1,6 @@
 package com.lemon.lifecenter.controller;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -22,10 +21,13 @@ import com.lemon.lifecenter.common.LifeCenterConfigVO;
 import com.lemon.lifecenter.common.LifeCenterController;
 import com.lemon.lifecenter.common.LifeCenterFunction;
 import com.lemon.lifecenter.common.LifeCenterPaging;
+import com.lemon.lifecenter.common.LifeCenterSessionController;
 import com.lemon.lifecenter.dto.CenterInfoDTO;
 import com.lemon.lifecenter.dto.LocationDTO;
+import com.lemon.lifecenter.dto.LoginDTO;
 import com.lemon.lifecenter.dto.StaffDTO;
 import com.lemon.lifecenter.service.CenterService;
+import com.lemon.lifecenter.service.LoginService;
 import com.lemon.lifecenter.service.StaffService;
 
 // 생활치료센터관리 contorller
@@ -39,6 +41,8 @@ public class CenterController extends LifeCenterController {
     @Autowired
     private StaffService memberService;
     @Autowired
+    private LoginService loginService;
+    @Autowired
     private LifeCenterConfigVO config;
     private LifeCenterPaging paging;
     
@@ -85,8 +89,15 @@ public class CenterController extends LifeCenterController {
         CenterInfoDTO dto = new CenterInfoDTO();
         dto.setCenterCode(centerCode);
         dto = centerService.selectCenterInfo(dto);
+        
         ModelAndView mv = setMV("center/info");
+        
+        String centerAddress = dto.getCenterAddress().split( "|" )[0];
+        String detailAddress = dto.getCenterAddress().split( "|" )[1];
+        
         mv.addObject("centerInfo", dto);
+        mv.addObject( "centerAddress", centerAddress );
+        mv.addObject( "detailAddress", detailAddress );
         mv.addObject("centerCode", centerCode);
         return mv;
     }
@@ -97,51 +108,41 @@ public class CenterController extends LifeCenterController {
             @ModelAttribute("dto") final CenterInfoDTO dto,
             @RequestParam(value="detailAddr", required=true) String detailAddr,
             @RequestParam(value="staffId", required=true) String staffId,
-            @RequestParam(value="staffPw", required=true) String staffPw,
-            @RequestParam(value="staffNewPw", required=false, defaultValue="") String staffNewPw,
-            @RequestParam(value="staffNewPwConfirm", required=false, defaultValue="") String staffNewPwConfirm,
             @RequestParam(value="staffName", required=true) String staffName,
             @RequestParam(value="staffPhoneNumber", required=true) String staffPhoneNumber,
             HttpServletRequest request, HttpServletResponse response ) throws Exception {
+        String sesGroupIdx  = LifeCenterSessionController.getSession( request, "sesGroupIdx" );
+        String referer      = request.getHeader( "Referer" );
         
-        System.out.println( "staff Id : " + staffId );
-        
-        StaffDTO mDto = new StaffDTO();
-        
-        mDto.setId(staffId);
-        mDto.setPassword(LifeCenterFunction.aesEncrypt(config.aesKey, config.IV, staffPw));
-        int mCnt = memberService.selectMemberCount(mDto);
-        
-        if( mCnt == 1 ) {
-            String address = dto.getCenterAddress() + "|" + detailAddr;
-            dto.setCenterAddress(address);
-            int result = centerService.updateCenterInfo(dto);
+        if( !sesGroupIdx.equals( "1" ) ) {
+            LifeCenterFunction.scriptMessage( response, "alert( '권한이 없습니다.' );location.href='" + referer + "';" );
+            return "/common/blank";
+        } else {
+            StaffDTO memberDTO = new StaffDTO();
+            LoginDTO loginDTO  = new LoginDTO();
+            loginDTO.setId( staffId );
             
-            System.out.println( "result cnt : " + result  );
+            int memberTotal = loginService.selectMemberIdCount( loginDTO );
             
-            if (result > 0) {
-                mDto.setName(staffName);
-                mDto.setPhoneNumber(staffPhoneNumber);
-                mDto.setPassword("");
+            if( memberTotal == 1 ) {
+                String address = dto.getCenterAddress() + "|" + detailAddr;
+                dto.setCenterAddress( address );
+                int result = centerService.updateCenterInfo( dto );
                 
-                try {
-                    if (!staffNewPw.equals("")) {
-                        if( staffNewPw.equals( staffNewPwConfirm ) ) {
-                            mDto.setPassword(LifeCenterFunction.aesEncrypt(config.aesKey, config.IV, staffNewPw));
-                        } else {
-                            // not match password.
-                            throw new Exception();
-                        }
-                    }
-                } catch( Exception e ) {
-                    throw new RuntimeException(e);
-                }
+                System.out.println( "result cnt : " + result  );
                 
-                memberService.updateMember(mDto);
+                if (result > 0) {
+                    memberDTO.setId( staffId );
+                    memberDTO.setName( staffName );
+                    memberDTO.setPhoneNumber(staffPhoneNumber);
+                    memberDTO.setPassword( "" );
+                    
+                    memberService.updateMember( memberDTO );
+                }
+            } else {
+                LifeCenterFunction.scriptMessage( response, "alert( '비밀번호가 일치하지않습니다.' );location.href='../edit?centerCode="+dto.getCenterCode()+"';" );
+                return "/common/blank";
             }
-        } else {
-            LifeCenterFunction.scriptMessage( response, "alert( '비밀번호가 일치하지않습니다.' );location.href='../edit?centerCode="+dto.getCenterCode()+"';" );
-            return "/common/blank";
         }
         
         return "redirect:/center/info?centerCode=" + dto.getCenterCode();

src/main/webapp/WEB-INF/jsp/center/edit.jsp

@@ -15,17 +15,11 @@ $( function(){
             staffPhoneNumber : {
                 phoneValid : true
             },
-            staffNewPwConfirm : {
-//                 equalTo: "#staffNewPw"
-            },
             totalCapacity :{
                 number:true
             },
             totalStaff :{
                 number:true
-            },
-            staffNewPw :{
-                passwordValid : true
             }
         },
         messages : {
@@ -60,16 +54,14 @@ $( function(){
                     <!-- 환자관리 : 신규환자 등록 START -->
                     <div class="row">
                         <div class="col-12 col-lg-6">
-                            <h1 class="h3 mb-3">
-                            생활치료센터 수정
-                            </h1>
+                            <h1 class="h3 mb-3">생활치료센터 정보수정</h1>
                         </div>
                         <div class="col-12 col-lg-6  text-right">
                             <nav aria-label="breadcrumb">
                                 <ol class="breadcrumb">
                                     <li class="breadcrumb-item"><a href="javscript:;">Home</a></li>
                                     <li class="breadcrumb-item">생활치료센터 관리</li>
-                                    <li class="breadcrumb-item active">생활치료센터 조회</li>
+                                    <li class="breadcrumb-item active">생활치료센터 정보수정</li>
                                 </ol>
                             </nav>
                         </div>
@@ -148,24 +140,6 @@ $( function(){
                                                     <input type="text" class="form-control" name="staffPhoneNumber" value="${centerInfo.staffPhoneNumber}" placeholder="010-1234-1234" required onkeypress="onlyNumber();">
                                                 </td>
                                             </tr>
-                                            <tr>
-                                               <th><span class="fix">*</span>현재 비밀번호</th>
-                                                <td colspan="3">
-                                                    <input type="password" class="form-control" name="staffPw" placeholder="정보수정을 위해 비밀번호를 입력해주세요." required>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                               <th>신규 비밀번호</th>
-                                                <td colspan="3">
-                                                    <input type="password" class="form-control" id="staffNewPw" name="staffNewPw" placeholder="비밀번호 변경시에만 입력해주세요.(영문, 숫자, 특수문자를 혼합하여 8 ~ 15자 이내)">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                               <th>신규 비밀번호 확인</th>
-                                                <td colspan="3">
-                                                    <input type="password" class="form-control" id="staffNewPwConfirm" name="staffNewPwConfirm" placeholder="신규 비밀번호 확인을 위해 비밀번호를 한번 더 입력하세요.">
-                                                </td>
-                                            </tr>
                                         </table>
                                         <div class="row mt-3">
                                             <div class="col-12">

src/main/webapp/WEB-INF/jsp/center/info.jsp

@@ -1,6 +1,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
@@ -17,16 +18,14 @@
                     <!-- 환자관리 : 신규환자 등록 START -->
                     <div class="row">
                         <div class="col-12 col-lg-6">
-                            <h1 class="h3 mb-3">
-                            생활치료센터 조회
-                            </h1>
+                            <h1 class="h3 mb-3">생활치료센터 정보조회</h1>
                         </div>
                         <div class="col-12 col-lg-6  text-right">
                             <nav aria-label="breadcrumb">
                                 <ol class="breadcrumb">
-                                    <li class="breadcrumb-item"><a href="javscript:;">Home</a></li>
-                                    <li class="breadcrumb-item">의료진 관리</li>
-                                    <li class="breadcrumb-item active">의료진 정보 조회</li>
+                                    <li class="breadcrumb-item"><a href="/">Home</a></li>
+                                    <li class="breadcrumb-item">생활치료센터 관리</li>
+                                    <li class="breadcrumb-item active">생활치료센터 정보조회</li>
                                 </ol>
                             </nav>
                         </div>
@@ -62,7 +61,7 @@
                                         <tr>
                                             <th>주소</th>
                                             <td>
-                                                <c:out value="${centerInfo.centerAddress}" />
+                                                <c:out value="${fn:split( centerInfo.centerAddress,'|')[0]}"/> [<c:out value="${fn:split( centerInfo.centerAddress,'|')[1]}"/>]
                                             </td>
                                             <th>전화번호</th>
                                             <td>

src/main/webapp/WEB-INF/jsp/center/list.jsp

@@ -39,15 +39,13 @@
                     <!-- 환지관리 START -->
                     <div class="row">
                         <div class="col-12 col-lg-6">
-                            <h1 class="h3 mb-3">
-                                환자관리
-                            </h1>
+                            <h1 class="h3 mb-3">생활치료센터 관리</h1>
                         </div>
                         <div class="col-12 col-lg-6  text-right">
                             <nav aria-label="breadcrumb">
                                 <ol class="breadcrumb">
                                     <li class="breadcrumb-item"><a href="javscript:;">Home</a></li>
-                                    <li class="breadcrumb-item active">환자관리</li>
+                                    <li class="breadcrumb-item active">생활치료센터 관리</li>
                                 </ol>
                             </nav>
                         </div>