--- src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
+++ src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
... | ... | @@ -208,7 +208,6 @@ |
| 208 | 208 |
HttpServletRequest request, |
| 209 | 209 |
ModelMap model, |
| 210 | 210 |
RedirectAttributes redirectAttributes) throws Exception{
|
| 211 |
- |
|
| 212 | 211 |
try {
|
| 213 | 212 |
|
| 214 | 213 |
/* |
... | ... | @@ -287,9 +286,12 @@ |
| 287 | 286 |
letterVO.setLastIndex(paginationInfo.getLastRecordIndex()); |
| 288 | 287 |
letterVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); |
| 289 | 288 |
|
| 290 |
- |
|
| 289 |
+ |
|
| 291 | 290 |
List<?> resultPhoList = mjonMsgDataService.selectPhotoLetterList(letterVO); |
| 292 |
- |
|
| 291 |
+ |
|
| 292 |
+ |
|
| 293 |
+ |
|
| 294 |
+ |
|
| 293 | 295 |
model.addAttribute("resultPhoList", resultPhoList);
|
| 294 | 296 |
paginationInfo.setTotalRecordCount( resultPhoList.size()> 0 ? ((Long)((EgovMap)resultPhoList.get(0)).get("totCnt")).intValue() : 0);
|
| 295 | 297 |
model.addAttribute("paginationInfo", paginationInfo);
|
... | ... | @@ -442,6 +444,9 @@ |
| 442 | 444 |
@RequestMapping(value= {"/web/mjon/msgdata/selectMsgDataSMLViewAjax.do"})
|
| 443 | 445 |
public String selectMsgDataSMLView(@ModelAttribute("searchVO") MjonMsgDataVO searchVO, CateCode cateCode, ModelMap model) throws Exception{
|
| 444 | 446 |
|
| 447 |
+ |
|
| 448 |
+ System.out.println(" : selectMsgDataSMLView : ");
|
|
| 449 |
+ long startTime = System.nanoTime(); // 시작 시간 |
|
| 445 | 450 |
//로그인 권한정보 불러오기 |
| 446 | 451 |
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; |
| 447 | 452 |
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); |
... | ... | @@ -662,23 +667,25 @@ |
| 662 | 667 |
//최근 전송 내역 |
| 663 | 668 |
// 20241230 이호영 |
| 664 | 669 |
// 로딩 시간이 오래걸려 ajax로 따로 분리함 |
| 665 |
-// Calendar cal = Calendar.getInstance(); |
|
| 666 |
-// Date now = new Date(); |
|
| 670 |
+ /* |
|
| 671 |
+ Calendar cal = Calendar.getInstance(); |
|
| 672 |
+ Date now = new Date(); |
|
| 667 | 673 |
|
| 668 |
-// SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
|
|
| 674 |
+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
|
|
| 669 | 675 |
|
| 670 |
-// cal.setTime(now); |
|
| 671 |
-// cal.add(Calendar.DATE, -3); |
|
| 676 |
+ cal.setTime(now); |
|
| 677 |
+ cal.add(Calendar.DATE, -3); |
|
| 672 | 678 |
|
| 673 |
-// String chkDate = format.format(cal.getTime()); |
|
| 674 |
-// searchVO.setMyMsgStDt(chkDate); //검색 시작일 저장 - 현재날짜로 부터 3일 이전 날짜로 시작 |
|
| 675 |
-// List<?> resultLatestMsgList = mjonMsgDataService.selectLatestMsgList(searchVO); |
|
| 676 |
-// model.addAttribute("resultLatestMsgList", resultLatestMsgList);
|
|
| 679 |
+ String chkDate = format.format(cal.getTime()); |
|
| 680 |
+ searchVO.setMyMsgStDt(chkDate); //검색 시작일 저장 - 현재날짜로 부터 3일 이전 날짜로 시작 |
|
| 681 |
+ List<?> resultLatestMsgList = mjonMsgDataService.selectLatestMsgList(searchVO); |
|
| 682 |
+ model.addAttribute("resultLatestMsgList", resultLatestMsgList);
|
|
| 683 |
+ |
|
| 684 |
+ */ |
|
| 677 | 685 |
|
| 678 | 686 |
//자주보내는 번호 |
| 679 |
- List<?> resultBookMarkMsgList = mjonMsgDataService.selectBookMarkMsgList(searchVO); |
|
| 680 |
- model.addAttribute("resultBookMarkMsgList", resultBookMarkMsgList);
|
|
| 681 |
- |
|
| 687 |
+// List<?> resultBookMarkMsgList = mjonMsgDataService.selectBookMarkMsgList(searchVO); |
|
| 688 |
+// model.addAttribute("resultBookMarkMsgList", resultBookMarkMsgList);
|
|
| 682 | 689 |
|
| 683 | 690 |
/** pageing */ |
| 684 | 691 |
PaginationInfo paginationInfo = new PaginationInfo(); |
... | ... | @@ -698,12 +705,18 @@ |
| 698 | 705 |
|
| 699 | 706 |
model.addAttribute("tabDision", searchVO.getTabDision());
|
| 700 | 707 |
|
| 701 |
- |
|
| 708 |
+ |
|
| 709 |
+ long endTime = System.nanoTime(); // 종료 시간 |
|
| 710 |
+ // 실행 시간 계산 (나노초 단위) |
|
| 711 |
+ long duration = endTime - startTime; |
|
| 712 |
+ |
|
| 713 |
+ System.out.println("Execution time: " + duration + " nanoseconds");
|
|
| 714 |
+ System.out.println("Execution time: " + (duration / 1_000_000) + " milliseconds");
|
|
| 702 | 715 |
return "web/msgdata/MsgDataSMLView"; |
| 703 | 716 |
} |
| 704 | 717 |
|
| 705 | 718 |
@RequestMapping(value= {"/web/mjon/msgdata/resultLatestMsgListAjax.do"})
|
| 706 |
- public ResponseEntity<StatusResponse> cancelRegistIdChkAjax() throws Exception {
|
|
| 719 |
+ public ResponseEntity<StatusResponse> resultLatestMsgListAjax() throws Exception {
|
|
| 707 | 720 |
|
| 708 | 721 |
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; |
| 709 | 722 |
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); |
... | ... | @@ -732,6 +745,25 @@ |
| 732 | 745 |
return ResponseEntity.ok().body(new StatusResponse(HttpStatus.OK, "", resultLatestMsgList)); |
| 733 | 746 |
} |
| 734 | 747 |
|
| 748 |
+ @RequestMapping(value= {"/web/mjon/msgdata/resultBookMarkMsgList.do"})
|
|
| 749 |
+ public ResponseEntity<StatusResponse> resultBookMarkMsgList() throws Exception {
|
|
| 750 |
+ |
|
| 751 |
+ LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; |
|
| 752 |
+ String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); |
|
| 753 |
+ |
|
| 754 |
+ if(StringUtils.isEmpty(userId)) {
|
|
| 755 |
+ |
|
| 756 |
+ return ResponseEntity.ok().body(new StatusResponse(HttpStatus.OK, "", "")); |
|
| 757 |
+ } |
|
| 758 |
+ |
|
| 759 |
+ MjonMsgDataVO mjonMsgDataVO = new MjonMsgDataVO(); |
|
| 760 |
+ mjonMsgDataVO.setUserId(userId); |
|
| 761 |
+ |
|
| 762 |
+ List<?> resultBookMarkMsgList = mjonMsgDataService.selectBookMarkMsgList(mjonMsgDataVO); |
|
| 763 |
+ |
|
| 764 |
+ return ResponseEntity.ok().body(new StatusResponse(HttpStatus.OK, "", resultBookMarkMsgList)); |
|
| 765 |
+ } |
|
| 766 |
+ |
|
| 735 | 767 |
|
| 736 | 768 |
/** |
| 737 | 769 |
* 문자재전송 내용 처리 |
--- src/main/resources/egovframework/egovProps/globals_dev.properties
+++ src/main/resources/egovframework/egovProps/globals_dev.properties
... | ... | @@ -28,17 +28,15 @@ |
| 28 | 28 |
|
| 29 | 29 |
# mysql |
| 30 | 30 |
Globals.DriverClassName=com.mysql.jdbc.Driver |
| 31 |
-Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon |
|
| 32 |
-Globals.UserName= mjonUr |
|
| 33 |
-#Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon_20230221 |
|
| 34 |
-#Globals.UserName= mjonUr_20230221 |
|
| 35 |
-Globals.Password= mjon!@#$ |
|
| 31 |
+#Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon |
|
| 32 |
+#Globals.UserName= mjonUr |
|
| 33 |
+#Globals.Password= mjon!@#$ |
|
| 36 | 34 |
|
| 37 | 35 |
# mysql-prod |
| 38 | 36 |
#Globals.DriverClassName=com.mysql.jdbc.Driver |
| 39 |
-#Globals.Url=jdbc:mysql://139.150.72.157:3306/mjon |
|
| 40 |
-#Globals.UserName= mjonUr |
|
| 41 |
-#Globals.Password= mjon!@#$ |
|
| 37 |
+Globals.Url=jdbc:mysql://139.150.72.157:3306/mjon |
|
| 38 |
+Globals.UserName= mjonUr |
|
| 39 |
+Globals.Password= mjon!@#$ |
|
| 42 | 40 |
|
| 43 | 41 |
# MainPage Setting(admin) |
| 44 | 42 |
Globals.MainPage = /cmm/main/mainPage.do |
--- src/main/resources/egovframework/egovProps/globals_local.properties
+++ src/main/resources/egovframework/egovProps/globals_local.properties
... | ... | @@ -123,8 +123,3 @@ |
| 123 | 123 |
#Slack |
| 124 | 124 |
Globals.slack.hooks.url=https://hooks.slack.com/services/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 |
| 125 | 125 |
Globals.slack.channel.name=\ud14c\uc2a4\ud2b8_mjon\uba54\uc2dc\uc9c0 |
| 126 |
- |
|
| 127 |
- |
|
| 128 |
- |
|
| 129 |
- |
|
| 130 |
- |
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
... | ... | @@ -2204,7 +2204,7 @@ |
| 2204 | 2204 |
</select> |
| 2205 | 2205 |
|
| 2206 | 2206 |
<select id="mjonMsgDAO.selectBookMarkMsgList" parameterClass="mjonMsgDataVO" resultClass="egovMap"> |
| 2207 |
- |
|
| 2207 |
+ /* mjonMsgDAO.selectBookMarkMsgList */ |
|
| 2208 | 2208 |
SELECT ADDR_ID AS addrId, |
| 2209 | 2209 |
ADDR_GRP_ID AS addrGrpId, |
| 2210 | 2210 |
MBER_ID AS mberId, |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
... | ... | @@ -17,7 +17,9 @@ |
| 17 | 17 |
|
| 18 | 18 |
|
| 19 | 19 |
$(document).ready(function(){
|
| 20 |
+ |
|
| 20 | 21 |
|
| 22 |
+ console.log("12111111111111");
|
|
| 21 | 23 |
|
| 22 | 24 |
// console.log(' + $(#tabDision).val() : ',$('#tabDision').val())
|
| 23 | 25 |
// if($('#tabDision').val() == 'tab02'){
|
... | ... | @@ -193,11 +195,11 @@ |
| 193 | 195 |
}); |
| 194 | 196 |
|
| 195 | 197 |
updateButtons(currentIndex); |
| 196 |
- |
|
| 197 |
- |
|
| 198 | 198 |
|
| 199 | 199 |
// 최근 전송내역 |
| 200 | 200 |
resultLatestMsgList(); |
| 201 |
+ //자주보내는 번호 |
|
| 202 |
+ resultBookMarkMsgList(); |
|
| 201 | 203 |
|
| 202 | 204 |
}); |
| 203 | 205 |
|
... | ... | @@ -227,13 +229,12 @@ |
| 227 | 229 |
// 데이터가 있는 경우 |
| 228 | 230 |
if (resultList && resultList.length > 0) {
|
| 229 | 231 |
resultList.forEach(function(item, index) {
|
| 230 |
- console.log(item.callTo + " : " + item.callTo); |
|
| 231 | 232 |
let listItem = |
| 232 | 233 |
'<li id="latestLi">' + |
| 233 |
- '<input type="checkbox" id="addrChk_' + (index + 1) + '" name="latAddrChk" value="' + item.callTo + '">' + |
|
| 234 |
- '<label for="addrChk_' + (index + 1) + '" class="label">최근 전송내역</label>' + |
|
| 235 |
- '<p>' + item.callTo + '</p>' + |
|
| 236 |
- '<button type="button" id="latestAddrDel">' + |
|
| 234 |
+ '<input type="checkbox" id="bokAddrChk_' + (index + 1) + '" name="bookAddrChk" value="' + item.addrPhoneNo + '">' + |
|
| 235 |
+ '<label for="bokAddrChk_' + (index + 1) + '" class="label">최근 전송내역</label>' + |
|
| 236 |
+ '<p>' + item.addrPhoneNo + '</p>' + |
|
| 237 |
+ '<button type="button" id="bookMarkAddrDel">' + |
|
| 237 | 238 |
'<img src="/publish/images/popup/close3.png" alt="전화번호 삭제">' + |
| 238 | 239 |
'</button>' + |
| 239 | 240 |
'</li>'; |
... | ... | @@ -244,7 +245,6 @@ |
| 244 | 245 |
// 데이터가 없는 경우 |
| 245 | 246 |
$latestMsgUl.append('<li><p>최근 발송 내역이 없습니다.</p></li>');
|
| 246 | 247 |
} |
| 247 |
- // console.log('$latestMsgUl : ', $latestMsgUl.html());
|
|
| 248 | 248 |
}, |
| 249 | 249 |
error:function(request , status, error){
|
| 250 | 250 |
console.log(' error ?');
|
... | ... | @@ -253,6 +253,57 @@ |
| 253 | 253 |
} |
| 254 | 254 |
}); |
| 255 | 255 |
} |
| 256 |
+ |
|
| 257 |
+// 자주보내는 번호 |
|
| 258 |
+function resultBookMarkMsgList(){
|
|
| 259 |
+ |
|
| 260 |
+ $.ajax({
|
|
| 261 |
+ type:"POST", |
|
| 262 |
+ url:"/web/mjon/msgdata/resultBookMarkMsgList.do", |
|
| 263 |
+ data:{},
|
|
| 264 |
+ dataType:'json', |
|
| 265 |
+ // timeout:(1000*30), |
|
| 266 |
+ success:function(data){
|
|
| 267 |
+ |
|
| 268 |
+ console.log('resultBookMarkMsgList data : ', data);
|
|
| 269 |
+ |
|
| 270 |
+ // 가져온 데이터 배열 |
|
| 271 |
+ let resultList = data.object; |
|
| 272 |
+ let $bookMsgUl = $('#bookMsgUl'); // 기존 리스트 UL
|
|
| 273 |
+ console.log('let $bookMsgUl : ', $bookMsgUl);
|
|
| 274 |
+ |
|
| 275 |
+ // 기존 내용을 비우기 |
|
| 276 |
+ $bookMsgUl.empty(); |
|
| 277 |
+ |
|
| 278 |
+ // 데이터가 있는 경우 |
|
| 279 |
+ if (resultList && resultList.length > 0) {
|
|
| 280 |
+ resultList.forEach(function(item, index) {
|
|
| 281 |
+ console.log(item.addrPhoneNo + " : " + item.addrPhoneNo); |
|
| 282 |
+ let listItem = |
|
| 283 |
+ '<li id="bookMarkLi">' + |
|
| 284 |
+ '<input type="checkbox" id="addrChk_' + (index + 1) + '" name="latAddrChk" value="' + item.addrPhoneNo + '">' + |
|
| 285 |
+ '<label for="addrChk_' + (index + 1) + '" class="label">최근 전송내역</label>' + |
|
| 286 |
+ '<p>' + item.addrPhoneNo + '</p>' + |
|
| 287 |
+ '<button type="button" id="bookMarkAddrDel">' + |
|
| 288 |
+ '<img src="/publish/images/popup/close3.png" alt="전화번호 삭제">' + |
|
| 289 |
+ '</button>' + |
|
| 290 |
+ '</li>'; |
|
| 291 |
+ |
|
| 292 |
+ $bookMsgUl.append(listItem); |
|
| 293 |
+ }); |
|
| 294 |
+ } else {
|
|
| 295 |
+ // 데이터가 없는 경우 |
|
| 296 |
+ $bookMsgUl.append('<li><p>등록된 자주 보내는 번호 내역이 없습니다..</p></li>');
|
|
| 297 |
+ } |
|
| 298 |
+ }, |
|
| 299 |
+ error:function(request , status, error){
|
|
| 300 |
+ console.log(' error ?');
|
|
| 301 |
+ console.log('request : ', request);
|
|
| 302 |
+ console.log('status : ', status);
|
|
| 303 |
+ } |
|
| 304 |
+ }); |
|
| 305 |
+} |
|
| 306 |
+ |
|
| 256 | 307 |
|
| 257 | 308 |
/* |
| 258 | 309 |
* 버튼 disabled 스크립트 |
... | ... | @@ -3566,7 +3617,7 @@ |
| 3566 | 3617 |
<div class="history_cont hascont"> |
| 3567 | 3618 |
<div class="histroy_trans" id="bookMarkMsgArea"> |
| 3568 | 3619 |
<ul id="bookMsgUl"> |
| 3569 |
- <c:choose> |
|
| 3620 |
+ <%-- <c:choose> |
|
| 3570 | 3621 |
<c:when test="${not empty resultBookMarkMsgList}">
|
| 3571 | 3622 |
<c:forEach var="bookMarkMsgList" items="${resultBookMarkMsgList}" varStatus="status">
|
| 3572 | 3623 |
<li id="bookMarkLi"> |
... | ... | @@ -3582,7 +3633,7 @@ |
| 3582 | 3633 |
<p>등록된 자주 보내는 번호 내역이 없습니다.</p> |
| 3583 | 3634 |
</li> |
| 3584 | 3635 |
</c:otherwise> |
| 3585 |
- </c:choose> |
|
| 3636 |
+ </c:choose> --%> |
|
| 3586 | 3637 |
</ul> |
| 3587 | 3638 |
</div> |
| 3588 | 3639 |
<div class="popup_btn_wrap2 hisroy_btn" style="width: 230px;"> |
--- src/main/webapp/js/web/msgdata/msgDataView.js
+++ src/main/webapp/js/web/msgdata/msgDataView.js
... | ... | @@ -173,10 +173,12 @@ |
| 173 | 173 |
var sendData = $(document.goPageAjax).serializeArray() ; |
| 174 | 174 |
console.log('sendData : ', sendData)
|
| 175 | 175 |
$(".contentArea").load("/web/mjon/msgdata/selectMsgDataSMLViewAjax.do", sendData ,function(response, status, xhr){
|
| 176 |
+ console.log(' contentArea : 문자전송 부분 로딩');
|
|
| 176 | 177 |
|
| 177 | 178 |
//문자 재전송 및 주소록 전달 처리를 위해 사용 |
| 178 | 179 |
$("#msgForm").ready(function(){ //문자 내용 폼이 로드된 후 실행
|
| 179 |
- |
|
| 180 |
+ |
|
| 181 |
+ console.log(' contentArea : 문자전송 부분 로딩');
|
|
| 180 | 182 |
//헤더 문자검색 결과 처리 |
| 181 | 183 |
var headerMsgSearchFlag = '${headerMsgSearchVO.headerMsgSearchFlag}';
|
| 182 | 184 |
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?