浏览代码

2021-01-28 13:17 배포전 심플렛폼, databank 머지, 주석처리작업

huiwon.seo 4 年之前
父节点
当前提交
d0b355930b

+ 1 - 1
src/main/java/com/lemon/lifecenter/common/LifeCenterInterCeptor.java

@@ -62,7 +62,7 @@ public class LifeCenterInterCeptor extends HandlerInterceptorAdapter {
                     
                     Object sesMAcceptCheck = request.getSession().getAttribute( "sesMAcceptCheck" );
                     
-                    System.err.println( "sesMAcceptCheck : " + sesMAcceptCheck );
+//                    System.err.println( "sesMAcceptCheck : " + sesMAcceptCheck );
                     
                     if( sesMAcceptCheck != null && sesMAcceptCheck.equals( "Y" ) ) {
                         if( !url.equals( "/mobile/accept/list" ) ) {

+ 1 - 1
src/main/java/com/lemon/lifecenter/controller/MobileLoginController.java

@@ -128,7 +128,7 @@ public class MobileLoginController extends LifeCenterController {
         json.put("patientIdx", 1);
         
         logger.error( "[PATIENT LOGOUT] RemoteIP : " + remoteIp + " UserId : " + sesMId );
-//        deviceService.deleteDeviceInfo(Integer.parseInt(sesMId));
+        deviceService.deleteDeviceInfo(Integer.parseInt(sesMId));
         
         LifeCenterFunction.scriptMessage(response, "localStorage.clear();location.href='/mobile/login';");
         return "/common/blank";

文件差异内容过多而无法显示
+ 42 - 0
src/main/webapp/WEB-INF/jsp/login/staff.jsp


+ 46 - 46
src/main/webapp/WEB-INF/jsp/mobile/menu/menu.jsp

@@ -5,52 +5,52 @@
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
 <script type="text/javascript">
 
-// $( function(){
-//     token( "getToken" );
-// });
+$( function(){
+    token( "getToken" );
+});
 
-// function getToken(token, deviceType, macAddress) {
-//     var jsonMsg = {
-//         patientIdx : "<c:out value='${patientIdx}' />",
-//         deviceType : deviceType,
-//         deviceToken : token,
-//         macAddress : macAddress
-//     };
+function getToken(token, deviceType, macAddress) {
+    var jsonMsg = {
+        patientIdx : "<c:out value='${patientIdx}' />",
+        deviceType : deviceType,
+        deviceToken : token,
+        macAddress : macAddress
+    };
     
-//     $.ajax({
-//         url      : "/mobile/insertDeviceInfo",
-//         data     : JSON.stringify(jsonMsg),
-//         method   : "POST",
-//         contentType: 'application/json',
-//         success  : function( data ){
-//             console.log(JSON.stringify(data));
-//           if( typeof success == "function" ){
-//             //success( data );
-//           };
-//         },
-//         error : function(jqXHR, exception){
-//           if( typeof error == "function" ) {
-//             //error(jqXHR, exception);
-//           };
-//         }
-//     }).done( function(){
-//         if( typeof done == "function" ){
-//           //done();
-//         };
-//     });
-// }
+    $.ajax({
+        url      : "/mobile/insertDeviceInfo",
+        data     : JSON.stringify(jsonMsg),
+        method   : "POST",
+        contentType: 'application/json',
+        success  : function( data ){
+            console.log(JSON.stringify(data));
+          if( typeof success == "function" ){
+            //success( data );
+          };
+        },
+        error : function(jqXHR, exception){
+          if( typeof error == "function" ) {
+            //error(jqXHR, exception);
+          };
+        }
+    }).done( function(){
+        if( typeof done == "function" ){
+          //done();
+        };
+    });
+}
 
-// function token(callback) {
-//     console.log(callback);
-//     var jsonMsg = {
-//         "type":"command",
-//         "functionType":"token",
-//         "value" : {
-//             "callbackFn" : callback
-//         }
-//     }
-//     toNative(jsonMsg);
-// }
+function token(callback) {
+    console.log(callback);
+    var jsonMsg = {
+        "type":"command",
+        "functionType":"token",
+        "value" : {
+            "callbackFn" : callback
+        }
+    }
+    toNative(jsonMsg);
+}
 </script>
 </head>
 <body>
@@ -95,9 +95,9 @@
                             <li>
                                 <a href="./nonface">비대면 진료(Untact Treatment)</a>
                             </li>
-                            <li>
-                                <a href="./push/list">메시지 수신함(Message received)</a>
-                            </li>
+<!--                             <li> -->
+<!--                                 <a href="./push/list">메시지 수신함(Message received)</a> -->
+<!--                             </li> -->
                             <!-- li>
                                 <a href="javascript:;">생활치료센터 이용 안내</a>
                             </li -->

+ 21 - 21
src/main/webapp/WEB-INF/jsp/patient/info.jsp

@@ -31,30 +31,30 @@ function goListPage(){
     }
     location.href = referer;
 }
-function changeCenterInfo(){
-    if( $( "#selectCenterList option:selected" ).val() == "" ) {
-        alertBox({ txt:"생활치료센터를 선택 해 주세요" });
-        $( "div.modal-header h3" ).remove();
-        return false;
-    }
+// function changeCenterInfo(){
+//     if( $( "#selectCenterList option:selected" ).val() == "" ) {
+//         alertBox({ txt:"생활치료센터를 선택 해 주세요" });
+//         $( "div.modal-header h3" ).remove();
+//         return false;
+//     }
     
-    var centerName  = $( "#selectCenterList option:selected" ).text();
-    var patientName = $( "#patientName" ).val();
+//     var centerName  = $( "#selectCenterList option:selected" ).text();
+//     var patientName = $( "#patientName" ).val();
     
-    alertBox({ type: "confirm", 
-               txt: " <span class='text-info'>[" + patientName+ "]</span> 환자의 모든정보가 <span class='text-info'>["+centerName+"]</span>로 이관되며 <br/>이관 후 현재 생활치료센터에서는 더이상 환자정보를 확인 할 수 없습니다. <br/>정말 이관하시겠습니까?",
-               callBack : function( result ) {
-                   if( result ) {
-                       $( "#newCenterName" ).val( centerName );
-                       $( "#changeForm" ).submit();
-                   }
-               }
-             });
+//     alertBox({ type: "confirm", 
+//                txt: " <span class='text-info'>[" + patientName+ "]</span> 환자의 모든정보가 <span class='text-info'>["+centerName+"]</span>로 이관되며 <br/>이관 후 현재 생활치료센터에서는 더이상 환자정보를 확인 할 수 없습니다. <br/>정말 이관하시겠습니까?",
+//                callBack : function( result ) {
+//                    if( result ) {
+//                        $( "#newCenterName" ).val( centerName );
+//                        $( "#changeForm" ).submit();
+//                    }
+//                }
+//              });
     
-    $( "div.modal-header h3" ).remove();
+//     $( "div.modal-header h3" ).remove();
     
-//     getAjax( "" )
-}
+// //     getAjax( "" )
+// }
 </script>
 </head>
 <body>
@@ -168,7 +168,7 @@ function changeCenterInfo(){
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn border" data-dismiss="modal">취소</button>
-                        <button type="button" class="btn btn-primary" onclick="changeCenterInfo();">생활치료센터 이관</button>
+<!--                         <button type="button" class="btn btn-primary" onclick="changeCenterInfo();">생활치료센터 이관</button> -->
                     </div>
                 </form>
             </div>