수정

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

@@ -15,6 +15,25 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.lemon.lifecenter.common.LifeCenterConfigVO;
+import com.lemon.lifecenter.common.LifeCenterController;
+import com.lemon.lifecenter.common.LifeCenterFileDownload;
+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.ClinicConfigurationDTO;
+import com.lemon.lifecenter.dto.FileDownloadDTO;
+import com.lemon.lifecenter.dto.LocationDTO;
+import com.lemon.lifecenter.dto.SmsDTO;
+import com.lemon.lifecenter.dto.StaffDTO;
+import com.lemon.lifecenter.service.CenterService;
+import com.lemon.lifecenter.service.ClinicService;
+import com.lemon.lifecenter.service.FileDownloadService;
+import com.lemon.lifecenter.service.LoginService;
+import com.lemon.lifecenter.service.SmsService;
+import com.lemon.lifecenter.service.StaffService;
+
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.opc.OPCPackage;
@@ -43,23 +62,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.lemon.lifecenter.common.LifeCenterConfigVO;
-import com.lemon.lifecenter.common.LifeCenterController;
-import com.lemon.lifecenter.common.LifeCenterFileDownload;
-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.ClinicConfigurationDTO;
-import com.lemon.lifecenter.dto.FileDownloadDTO;
-import com.lemon.lifecenter.dto.LocationDTO;
-import com.lemon.lifecenter.dto.StaffDTO;
-import com.lemon.lifecenter.service.CenterService;
-import com.lemon.lifecenter.service.ClinicService;
-import com.lemon.lifecenter.service.FileDownloadService;
-import com.lemon.lifecenter.service.LoginService;
-import com.lemon.lifecenter.service.StaffService;
-
 // 생활치료센터관리 contorller
 @Controller
 @RequestMapping("/center")
@@ -77,6 +79,8 @@ public class CenterController extends LifeCenterController {
     @Autowired
     private ClinicService clinicService;
     @Autowired
+    private SmsService smsService;
+    @Autowired
     private LifeCenterConfigVO config;
     private LifeCenterPaging paging;
     
@@ -307,6 +311,24 @@ public class CenterController extends LifeCenterController {
         if (rts == 1) {
             result = true;
         }
+
+        try {
+          StaffDTO info = new StaffDTO();
+          info.setId(id);
+
+          info = memberService.selectMemberInfo(info);
+
+          // MSG_DATA 누리 발송 테이블에 INSERT
+          SmsDTO smsData = new SmsDTO();
+          smsData.setCallFrom("16618308");
+          smsData.setCallTo(LifeCenterFunction.exportOnlyNumber(info.getPhoneNumber()));
+          smsData.setEtcSendType("R"); // N:재택환자등록, L:로그인2차인증, R:비밀번호 초기화
+          smsData.setEtcTargetId(info.getId());
+          smsData.setSmsTxt("[Web발신][진료지원시스템] 로그인 비밀번호가 [" + pw + "]로 초기화 되었습니다.");
+          smsService.insertNuriMsgData(smsData);  
+        } catch (Exception e) {
+          //TODO: handle exception
+        }
         
         return result;
     }

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

@@ -280,7 +280,7 @@ public class LoginController extends LifeCenterController {
             } else {
                 // 로그인 30일 이상 미사용 계정 로그인 불가처리
                 System.err.println( "memberData.getDateDiff() : " + memberData.getDateDiff() );
-                if (memberData.getDateDiff() > 1 && loginType.equals("staff")) {
+                if (memberData.getDateDiff() > 30 && loginType.equals("staff")) {
                   resultCode = "07";
                   message = "장기간(30일) 미사용으로 계정 사용이 불가하오니<br/>관리자에게 비밀번호 초기화를 요청하시기 바랍니다";
                   accessMap.put("successYn", "N");

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

@@ -7,20 +7,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.lemon.lifecenter.common.LifeCenterConfigVO;
 import com.lemon.lifecenter.common.LifeCenterController;
 import com.lemon.lifecenter.common.LifeCenterFunction;
@@ -30,13 +16,29 @@ import com.lemon.lifecenter.dto.CenterInfoDTO;
 import com.lemon.lifecenter.dto.GroupListDTO;
 import com.lemon.lifecenter.dto.LoginDTO;
 import com.lemon.lifecenter.dto.PrivateLogDTO;
+import com.lemon.lifecenter.dto.SmsDTO;
 import com.lemon.lifecenter.dto.StaffDTO;
 import com.lemon.lifecenter.service.CenterService;
 import com.lemon.lifecenter.service.GroupListService;
 import com.lemon.lifecenter.service.LoginService;
 import com.lemon.lifecenter.service.PrivateLogService;
+import com.lemon.lifecenter.service.SmsService;
 import com.lemon.lifecenter.service.StaffService;
 
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
 // 의료진관리 contorller
 @Controller
 @RequestMapping("/staff")
@@ -61,6 +63,9 @@ public class StaffController extends LifeCenterController {
     
     @Autowired
     private PrivateLogService privateLogService;
+
+    @Autowired
+    private SmsService smsService;
     
     @RequestMapping("/new")
     public ModelAndView staffNew( HttpServletRequest request,HttpServletResponse response ) throws Exception {
@@ -610,16 +615,21 @@ public class StaffController extends LifeCenterController {
             pw = config.centerResetPw;
         }
 
-        // MSG_DATA 누리 발송 테이블에 INSERT
-        // SmsDTO smsData = new SmsDTO();
-        // smsData.setCallFrom("01000000000");
-        // smsData.setCallTo(LifeCenterFunction.exportOnlyNumber(memberData.getPhoneNumber()));
-        // smsData.setEtcSendType("L"); // N:재택환자등록, L:로그인2차인증, R:비밀번호 초기화
-        // smsData.setEtcTargetId(memberData.getId());
-        // smsData.setSmsTxt("[생활치료센터 2차인증 본인확인]인증번호[123456]를 입력해주세요");
-        // smsService.insertNuriMsgData(dto);
 
+        try {
+          
+          // MSG_DATA 누리 발송 테이블에 INSERT
+          SmsDTO smsData = new SmsDTO();
+          smsData.setCallFrom("16618308");
+          smsData.setCallTo(LifeCenterFunction.exportOnlyNumber(info.getPhoneNumber()));
+          smsData.setEtcSendType("R"); // N:재택환자등록, L:로그인2차인증, R:비밀번호 초기화
+          smsData.setEtcTargetId(info.getId());
+          smsData.setSmsTxt("[Web발신][진료지원시스템] 로그인 비밀번호가 ["+pw+"]로 초기화 되었습니다.");
+          smsService.insertNuriMsgData(smsData);
+        } catch (Exception e) {
+          //TODO: handle exception
 
+        }
 
         dto.setPassword(pw);
         

src/main/resources/mybatis/mapper/staff/staff.xml

@@ -174,7 +174,8 @@
         <![CDATA[
             UPDATE MEMBER
                SET PASSWORD = sfxdb_hash(6, #{password}),
-                   FAIL_COUNT = 0
+                   FAIL_COUNT = 0,
+                   LAST_LOGIN_TIME = NULL
              WHERE ID = #{id}
         ]]>
     </update>

src/main/webapp/WEB-INF/jsp/include/patientInfo.jsp

@@ -203,7 +203,7 @@
             체온
         </th>
         <td>
-            <c:out value="우측 ${info.feverRight}℃ /  좌측  ${info.feverRight}℃" />
+            <c:out value="우측 ${info.feverRight}℃ /  좌측  ${info.feverLeft}℃" />
         </td>
         <th>
             맥박수

src/main/webapp/resources/js/drm/MaWebDRM.js

@@ -32,7 +32,7 @@ var MA_EXCEPT_WINDOW		= 0;		// IE의 새탭, 탭복제 새창 막음 :0, 뚫음
 
 //set ICP
 var g_ICPOn					= 1;			// ICP On : 1 / Off : 0
-var g_ICPType				= 2; 
+var g_ICPType				= 3; 
 var g_szICPMsg				= "생활치료센터 의료진 시스템";
 var g_iICPTextPercent		= 7;
 var g_iICPOpacity			= 30;