DBNT
/
geoinfo_eGov_work
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

관리자 입력중인 프로젝트 현황에서 입력일시 컬럼 추가

main
thkim 2024-11-20 15:25:48 +09:00
parent ba0969523d
commit dafa0df984
12 changed files with 185 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
2_apply.bat
View File

@ -9,67 +9,72 @@ set source_file=
set target_file= set target_file=
for /f "delims=" %%i in (list.txt) do ( for /f "delims=" %%i in (list.txt) do (
set line=%%i
echo %%i | findstr /v "^#" > nul
if !errorlevel! == 0 (
set "line=%%i"
rem #으로 시작하지 않는 라인 처리
echo !line!
set line=%%i
if "!line:~-5!" == ".java" ( if "!line:~-5!" == ".java" (
echo Skip echo Skip
) else if "!line:~-4!" == ".xml" ( ) else if "!line:~-4!" == ".xml" (
set source_file=%target_directory%!line! set source_file=%target_directory%!line!
set relative_path=!line:%source_prefix%=! set relative_path=!line:%source_prefix%=!
:: "src\main\resources\" Á¦°Å :: "src\main\resources\" 제거
set relative_path=!relative_path:*src\main\resources\=! set relative_path=!relative_path:*src\main\resources\=!
set target_file=%target_prefix%WEB-INF\classes\!relative_path! set target_file=%target_prefix%WEB-INF\classes\!relative_path!
) else if "!line:~-4!" == ".jsp" ( ) else if "!line:~-4!" == ".jsp" (
set source_file=%target_directory%!line! set source_file=%target_directory%!line!
set relative_path=!line:%source_prefix%=! set relative_path=!line:%source_prefix%=!
set target_file=%target_prefix%!relative_path! set target_file=%target_prefix%!relative_path!
) else if "!line:~-4!" == ".css" ( ) else if "!line:~-4!" == ".css" (
set source_file=%target_directory%!line! set source_file=%target_directory%!line!
set relative_path=!line:%source_prefix%=! set relative_path=!line:%source_prefix%=!
set target_file=%target_prefix%!relative_path! set target_file=%target_prefix%!relative_path!
) else if "!line:~-4!" == ".png" ( ) else if "!line:~-4!" == ".png" (
set source_file=%target_directory%!line! set source_file=%target_directory%!line!
set relative_path=!line:%source_prefix%=! set relative_path=!line:%source_prefix%=!
set target_file=%target_prefix%!relative_path! set target_file=%target_prefix%!relative_path!
) else if "!line:~-4!" == ".svg" ( ) else if "!line:~-4!" == ".svg" (
set source_file=%target_directory%!line! set source_file=%target_directory%!line!
set relative_path=!line:%source_prefix%=! set relative_path=!line:%source_prefix%=!
set target_file=%target_prefix%!relative_path! set target_file=%target_prefix%!relative_path!
) else if "!line:~-3!" == ".js" ( ) else if "!line:~-3!" == ".js" (
set source_file=%target_directory%!line! set source_file=%target_directory%!line!
set relative_path=!line:%source_prefix%=! set relative_path=!line:%source_prefix%=!
set target_file=%target_prefix%!relative_path! set target_file=%target_prefix%!relative_path!
) else if "!line:~-4!" == ".svg" ( ) else if "!line:~-4!" == ".reb" (
set source_file=%target_directory%!line! set source_file=%target_directory%!line!
set relative_path=!line:%source_prefix%=! set relative_path=!line:%source_prefix%=!
set target_file=%target_prefix%!relative_path! set target_file=%target_prefix%!relative_path!
) else if "!line:~-4!" == ".reb" ( ) else if "!line:~-6!" == ".woff2" (
set source_file=%target_directory%!line! set source_file=%target_directory%!line!
set relative_path=!line:%source_prefix%=! set relative_path=!line:%source_prefix%=!
set target_file=%target_prefix%!relative_path! set target_file=%target_prefix%!relative_path!
) else if "!line:~-4!" == ".png" ( ) else if "!line:~-5!" == ".woff" (
set source_file=%target_directory%!line! set source_file=%target_directory%!line!
set relative_path=!line:%source_prefix%=! set relative_path=!line:%source_prefix%=!
set target_file=%target_prefix%!relative_path! set target_file=%target_prefix%!relative_path!
) else if "!line:~-6!" == ".woff2" ( ) else if "!line:~-4!" == ".otf" (
set source_file=%target_directory%!line! set source_file=%target_directory%!line!
set relative_path=!line:%source_prefix%=! set relative_path=!line:%source_prefix%=!
set target_file=%target_prefix%!relative_path! set target_file=%target_prefix%!relative_path!
) else if "!line:~-5!" == ".woff" ( ) else if "!line:~-11!" == ".properties" (
set source_file=%target_directory%!line! set source_file=%target_directory%!line!
set relative_path=!line:%source_prefix%=! set relative_path=!line:%source_prefix%=!
set target_file=%target_prefix%!relative_path! set target_file=%target_prefix%!relative_path!
) else if "!line:~-4!" == ".otf" ( )
set source_file=%target_directory%!line!
set relative_path=!line:%source_prefix%=! rem Copy the source file to the target location, overwriting if necessary
set target_file=%target_prefix%!relative_path! echo Copying "!source_file!" to "!target_file!"
) else if "!line:~-11!" == ".properties" ( xcopy /i /Y "!source_file!" "!target_file!"
set source_file=%target_directory%!line! ) else (
set relative_path=!line:%source_prefix%=! echo #은 무시됩니다
set target_file=%target_prefix%!relative_path!
) )
rem Copy the source file to the target location, overwriting if necessary
echo Copying "!source_file!" to "!target_file!"
xcopy /i /Y "!source_file!" "!target_file!"
) )

4
list.txt
View File

@ -1 +1,3 @@
src\main\resources\egovframework\egovProps\globals.properties #src\main\resources\egovframework\egovProps\globals.properties
src\main\resources\egovframework\sqlmap\mapper\regi\listReg.xml
src\main\webapp\WEB-INF\views\web\manage\list_reg.jsp

15
src/main/java/geoinfo/main/join/JoinController.java
View File

@ -249,6 +249,11 @@ public class JoinController {
public ModelAndView join_post(MultipartRequest multi, Map<String, Object> map,HttpServletRequest request, HttpServletResponse response,@RequestParam HashMap<String, Object> params, RedirectAttributes rda)throws Exception { public ModelAndView join_post(MultipartRequest multi, Map<String, Object> map,HttpServletRequest request, HttpServletResponse response,@RequestParam HashMap<String, Object> params, RedirectAttributes rda)throws Exception {
ModelAndView mv = new ModelAndView("body/join/join_post"); ModelAndView mv = new ModelAndView("body/join/join_post");
log.info("JoinController 회원 가입 폼 전송"); log.info("JoinController 회원 가입 폼 전송");
/**
* msgCd
* 1 : 이미가입된 회원
*/
String passwdCode; String passwdCode;
@ -315,6 +320,16 @@ public ModelAndView join_post(MultipartRequest multi, Map<String, Object> map,Ht
if(checkWebMember != 0) { if(checkWebMember != 0) {
log.info("JoinController 회원 가입 폼 전송 // 이미 가입된 회원"); log.info("JoinController 회원 가입 폼 전송 // 이미 가입된 회원");
mv.addObject("msg","alert('이미 회원 가입되어있습니다.');history.go(-1);"); mv.addObject("msg","alert('이미 회원 가입되어있습니다.');history.go(-1);");
map.put("msgCd", 1);
System.out.println(
"\n--------------------------------------------------------------\n" +
request.getRequestURI() + " " + " join_post" +
"\n--------------------------------------------------------------\n" +
"name:[" + name + "]\n" +
"cls:[" + cls + "]\n" +
"DI:[" + DI + "]\n" +
"\n--------------------------------------------------------------\n"
);
return mv; return mv;
} }

5
src/main/java/geoinfo/regi/status/RegiController.java
View File

@ -1568,6 +1568,11 @@ public class RegiController {
e.printStackTrace(); e.printStackTrace();
} }
//기존 database의 records를 제거한다.
HashMap<String, Object> deleteParams = new HashMap<String, Object>();
deleteParams.put("projectCode", projectCode);
masterService.deleteOldDatas(deleteParams);
return "/web/manage/createZip"; return "/web/manage/createZip";
} }

4
src/main/java/geoinfo/regi/status/service/RegiPageService.java
View File

@ -193,4 +193,8 @@ public interface RegiPageService {
EgovMap selectModeifyCallReason(HashMap<String, Object> params) throws Exception; EgovMap selectModeifyCallReason(HashMap<String, Object> params) throws Exception;
public ArrayList<HashMap<String, Object>> getHoleNamesByProjectCode(HashMap<String,Object> params) throws Exception; public ArrayList<HashMap<String, Object>> getHoleNamesByProjectCode(HashMap<String,Object> params) throws Exception;
public int deleteOldDatas(HashMap<String, Object> params) throws Exception;
} }

11
src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java
View File

@ -204,6 +204,8 @@ public class RegiPageServiceImpl implements RegiPageService {
public int deleteWebData(HashMap<String, Object> params) throws Exception { public int deleteWebData(HashMap<String, Object> params) throws Exception {
return regiPageMapper.deleteWebData(params); return regiPageMapper.deleteWebData(params);
} }
@Override @Override
public HashMap getProjectCd(HashMap<String, Object> params) throws Exception { public HashMap getProjectCd(HashMap<String, Object> params) throws Exception {
return regiPageMapper.getProjectCd(params); return regiPageMapper.getProjectCd(params);
@ -480,5 +482,14 @@ public class RegiPageServiceImpl implements RegiPageService {
public ArrayList<HashMap<String, Object>> getHoleNamesByProjectCode(HashMap<String, Object> params) throws Exception { public ArrayList<HashMap<String, Object>> getHoleNamesByProjectCode(HashMap<String, Object> params) throws Exception {
return regiPageMapper.getHoleNamesByProjectCode(params); return regiPageMapper.getHoleNamesByProjectCode(params);
} }
/**
* 기존 database에 있는 불필요한 데이터들을 지운다. 필요시 구현 요망. 20241119 thkim
*/
@Override
public int deleteOldDatas(HashMap<String, Object> params) throws Exception {
return 0;
}
} }

3
src/main/resources/egovframework/sqlmap/mapper/regi/listReg.xml
View File

@ -15,10 +15,11 @@
, A.REPORT_TYPE , A.REPORT_TYPE
, COUNT(B.HOLE_CODE) HOLE_CNT , COUNT(B.HOLE_CODE) HOLE_CNT
, A.USERID , A.USERID
, A.DATETIME
FROM TEMP_PROJECT_INFO A LEFT OUTER JOIN TEMP_HEADER B FROM TEMP_PROJECT_INFO A LEFT OUTER JOIN TEMP_HEADER B
ON A.PROJECT_CODE = B.PROJECT_CODE ON A.PROJECT_CODE = B.PROJECT_CODE
WHERE A.STATE = '4' WHERE A.STATE = '4'
GROUP BY A.PROJECT_CODE, A.PROJECT_NAME, A.REPORT_TYPE,A.USERID GROUP BY A.PROJECT_CODE, A.PROJECT_NAME, A.REPORT_TYPE,A.USERID, A.DATETIME
) OA ) OA
) F ) F
WHERE 1=1 WHERE 1=1

16
src/main/webapp/WEB-INF/views/body/account/pwsearch.jsp
View File

@ -459,15 +459,17 @@
<td class="t-left"> <td class="t-left">
<input type="text" name="email1" id="email1" class="join_form" style="width: 200px;"> @ <input type="text" name="email1" id="email1" class="join_form" style="width: 200px;"> @
<select name="email2" class="join_form" style="width: 200px;" onChange="optChk()"> <select name="email2" class="join_form" style="width: 200px;" onChange="optChk()">
<option value="0" selected>직접입력 ------------</option> <option value="0" selected>직접입력 ------------</option>
<option value="hotmail.com">hotmail.com</option>
<option value="hanmail.net">hanmail.net</option>
<option value="empal.com">empal.com</option>
<option value="naver.com">naver.com</option> <option value="naver.com">naver.com</option>
<option value="korea.com">korea.com</option> <option value="hanmail.net">hanmail.net</option>
<option value="yahoo.co.kr">yahoo.co.kr</option> <option value="hanmail.net">daum.net</option>
<option value="nate.com">nate.com</option>
<option value="gmail.com">gmail.com</option> <option value="gmail.com">gmail.com</option>
<option value="korea.com">korea.com</option>
<option value="nate.com">nate.com</option>
<option value="kakao.com">kakao.com</option>
<option value="hotmail.com">hotmail.com</option>
<option value="empal.com">empal.com</option>
<option value="yahoo.co.kr">yahoo.co.kr</option>
<option value="dreamwiz.com">dreamwiz.com</option> <option value="dreamwiz.com">dreamwiz.com</option>
<option value="chol.com">chol.com</option> <option value="chol.com">chol.com</option>
<option value="paran.com">paran.com</option> <option value="paran.com">paran.com</option>

33
src/main/webapp/WEB-INF/views/body/join/join.jsp
View File

@ -635,15 +635,17 @@
<td class="t-left"> <td class="t-left">
<input type="text" name="email1" id="email1" class="join_form" style="width: 200px;"> @ <input type="text" name="email1" id="email1" class="join_form" style="width: 200px;"> @
<select name="email2" class="join_form" style="width: 200px;" onChange="optChk()"> <select name="email2" class="join_form" style="width: 200px;" onChange="optChk()">
<option value="0" selected>직접입력 ------------</option> <option value="0" selected>직접입력 ------------</option>
<option value="hotmail.com">hotmail.com</option>
<option value="hanmail.net">hanmail.net</option>
<option value="empal.com">empal.com</option>
<option value="naver.com">naver.com</option> <option value="naver.com">naver.com</option>
<option value="korea.com">korea.com</option> <option value="hanmail.net">hanmail.net</option>
<option value="yahoo.co.kr">yahoo.co.kr</option> <option value="hanmail.net">daum.net</option>
<option value="nate.com">nate.com</option>
<option value="gmail.com">gmail.com</option> <option value="gmail.com">gmail.com</option>
<option value="korea.com">korea.com</option>
<option value="nate.com">nate.com</option>
<option value="kakao.com">kakao.com</option>
<option value="hotmail.com">hotmail.com</option>
<option value="empal.com">empal.com</option>
<option value="yahoo.co.kr">yahoo.co.kr</option>
<option value="dreamwiz.com">dreamwiz.com</option> <option value="dreamwiz.com">dreamwiz.com</option>
<option value="chol.com">chol.com</option> <option value="chol.com">chol.com</option>
<option value="paran.com">paran.com</option> <option value="paran.com">paran.com</option>
@ -775,20 +777,21 @@
<td class="t-left"> <td class="t-left">
<input type="text" name="email1" id="email1" class="join_form" style="width: 200px;"> @ <input type="text" name="email1" id="email1" class="join_form" style="width: 200px;"> @
<select name="email2" class="join_form" style="width: 200px;" onChange="optChk()"> <select name="email2" class="join_form" style="width: 200px;" onChange="optChk()">
<option value="0" selected>직접입력 ------------</option> <option value="0" selected>직접입력 ------------</option>
<option value="hotmail.com">hotmail.com</option>
<option value="hanmail.net">hanmail.net</option>
<option value="empal.com">empal.com</option>
<option value="naver.com">naver.com</option> <option value="naver.com">naver.com</option>
<option value="korea.com">korea.com</option> <option value="hanmail.net">hanmail.net</option>
<option value="yahoo.co.kr">yahoo.co.kr</option> <option value="hanmail.net">daum.net</option>
<option value="nate.com">nate.com</option>
<option value="gmail.com">gmail.com</option> <option value="gmail.com">gmail.com</option>
<option value="korea.com">korea.com</option>
<option value="nate.com">nate.com</option>
<option value="kakao.com">kakao.com</option>
<option value="hotmail.com">hotmail.com</option>
<option value="empal.com">empal.com</option>
<option value="yahoo.co.kr">yahoo.co.kr</option>
<option value="dreamwiz.com">dreamwiz.com</option> <option value="dreamwiz.com">dreamwiz.com</option>
<option value="chol.com">chol.com</option> <option value="chol.com">chol.com</option>
<option value="paran.com">paran.com</option> <option value="paran.com">paran.com</option>
<option value="freechal.com">freechal.com</option> <option value="freechal.com">freechal.com</option>
<option value="daum.net">daum.net</option>
</select> </select>
<input type="text" name="email3" maxlength="20" class="join_form" style="width: 200px;"> <input type="text" name="email3" maxlength="20" class="join_form" style="width: 200px;">
</td> </td>

8
src/main/webapp/WEB-INF/views/body/join/join_post.jsp
View File

@ -14,7 +14,11 @@ ${msg}
</c:if> </c:if>
<c:if test="${check == null}"> <c:if test="${check == null}">
<script> <script>
alert("오류로 인해 등록하지 못하였습니다");
<c:if test="${msgCd == null || msgCd != 1 }">
alert("오류로 인해 등록하지 못하였습니다");
</c:if>
top.location.href="index.do"; top.location.href="index.do";
</script> </script>
</c:if> </c:if>
<body>${msgCd}</body>

16
src/main/webapp/WEB-INF/views/body/mypage/joinEx.jsp
View File

@ -110,15 +110,17 @@ function joinCheck() {
<td class="t-left"> <td class="t-left">
<input type="text" name="email1" id="email1" class="join_form" style="width: 200px;"> @ <input type="text" name="email1" id="email1" class="join_form" style="width: 200px;"> @
<select name="email2" class="join_form" style="width: 200px;" onChange="optChk()"> <select name="email2" class="join_form" style="width: 200px;" onChange="optChk()">
<option value="0" selected>직접입력 ------------</option> <option value="0" selected>직접입력 ------------</option>
<option value="hotmail.com">hotmail.com</option>
<option value="hanmail.net">hanmail.net</option>
<option value="empal.com">empal.com</option>
<option value="naver.com">naver.com</option> <option value="naver.com">naver.com</option>
<option value="korea.com">korea.com</option> <option value="hanmail.net">hanmail.net</option>
<option value="yahoo.co.kr">yahoo.co.kr</option> <option value="hanmail.net">daum.net</option>
<option value="nate.com">nate.com</option>
<option value="gmail.com">gmail.com</option> <option value="gmail.com">gmail.com</option>
<option value="korea.com">korea.com</option>
<option value="nate.com">nate.com</option>
<option value="kakao.com">kakao.com</option>
<option value="hotmail.com">hotmail.com</option>
<option value="empal.com">empal.com</option>
<option value="yahoo.co.kr">yahoo.co.kr</option>
<option value="dreamwiz.com">dreamwiz.com</option> <option value="dreamwiz.com">dreamwiz.com</option>
<option value="chol.com">chol.com</option> <option value="chol.com">chol.com</option>
<option value="paran.com">paran.com</option> <option value="paran.com">paran.com</option>

38
src/main/webapp/WEB-INF/views/web/manage/list_reg.jsp
View File

@ -78,6 +78,37 @@ function onDataBound(e) {
}); });
} }
function pad(n, width, z) {
z = z || '0';
n = n + '';
return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;
}
function unixTimestampToFormattedDateTime(unixTimestamp) {
const date = new Date(unixTimestamp);
const year = date.getFullYear();
const month = ('0' + (date.getMonth() + 1)).slice(-2); // 월은 0부터 시작하므로 1을 더하고, 두 자리로 만들기 위해 0을 앞에 붙인 후 마지막 두 자리만 취함
const day = ('0' + date.getDate()).slice(-2); // 일도 두 자리로 만들기 위해 0을 앞에 붙인 후 마지막 두 자리만 취함
const daysOfWeek = ['일', '월', '화', '수', '목', '금', '토'];
const dayOfWeek = daysOfWeek[date.getDay()];
let hours = date.getHours();
const minutes = date.getMinutes();
let ampm = "오전";
if (hours >= 12) {
ampm = "오후";
hours = hours - 12;
}
if (hours === 0) {
hours = 12; // 자정은 12시로 표시
}
return year+"-" + month +"-" + day + "" + '(' + dayOfWeek + ') ' + " " + pad(date.getHours(),2) + ":" + minutes;
}
function kendoGrid(dataList) { function kendoGrid(dataList) {
var kictDataSource = new kendo.data.DataSource ({ var kictDataSource = new kendo.data.DataSource ({
data: dataList, data: dataList,
@ -88,6 +119,7 @@ function kendoGrid(dataList) {
projectName: { type: "string" }, projectName: { type: "string" },
holeCnt: { type: "string" }, holeCnt: { type: "string" },
userName: { type: "string" }, userName: { type: "string" },
datetime: { type: "object" },
} }
}, },
}, },
@ -111,6 +143,12 @@ function kendoGrid(dataList) {
}, },
{ field: "holeCnt", width: 100, title: "시추공수", template: "<div class='td-data'>#: holeCnt #</div>" }, { field: "holeCnt", width: 100, title: "시추공수", template: "<div class='td-data'>#: holeCnt #</div>" },
{ field: "userName", width: 80, title: "공급자", template: "<div class='td-data'>#: userName #</div>" }, { field: "userName", width: 80, title: "공급자", template: "<div class='td-data'>#: userName #</div>" },
{ field: "datetime", width: 160, title: "입력일시",
template: function(data){
var url = "<div class='td-data'>" + unixTimestampToFormattedDateTime(data.datetime.time) + "</div>";
return url;
}
},
], ],
sortable: true, sortable: true,
scrollable: true, scrollable: true,