2025-02-25 18:13 기존 소스와 충돌 내용 수정

This commit is contained in:
myname 2025-02-25 18:14:08 +09:00
parent 3c01ddbcf6
commit 724e270204
26 changed files with 10767 additions and 122 deletions

View File

@ -1,33 +1,15 @@
package kcc.com.uss.ion.gw.web;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.StringReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpSession;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import kcc.com.uss.ion.hld.service.HolidayService;
import kcc.com.uss.ion.hld.service.HolidayVO;
@ -60,108 +42,4 @@ public class GWManualController {
model.addAttribute("holidayList", holidayList);
return "/com/gwmanual/gwManualList";
}
@RequestMapping(value="/uss/holiday/deleteHoliday.do")
public String deleteHoliday(@ModelAttribute("holidayVO") HolidayVO holidayVO, RedirectAttributes redirectAttributes)throws Exception{
holidayService.deleteHoliday(holidayVO);
redirectAttributes.addAttribute("searchYear", holidayVO.getSearchYear());
return "redirect:/uss/holiday/selectHolidayList.do";
}
@RequestMapping(value="/uss/holiday/insertViewHoliday.do")
public String insertViewHoliday(@ModelAttribute("holidayVO") HolidayVO holidayVO)throws Exception{
return "/com/holiday/holidayInsert";
}
@RequestMapping(value="/uss/holiday/insertHoliday.do")
public String insertHoliday(@ModelAttribute("holidayVO") HolidayVO holidayVO, RedirectAttributes redirectAttributes)throws Exception{
holidayService.insertHoliday(holidayVO);
return "redirect:/uss/holiday/selectHolidayList.do";
}
@RequestMapping(value="/uss/holiday/insertHolidayAPI.do")
public String insertHolidayAPI(@ModelAttribute("holidayVO") HolidayVO holidayVO, RedirectAttributes redirectAttributes)throws Exception{
StringBuilder urlBuilder = new StringBuilder("http://apis.data.go.kr/B090041/openapi/service/SpcdeInfoService/getRestDeInfo"); /*URL*/
urlBuilder.append("?" + URLEncoder.encode("serviceKey","UTF-8") + "=qC21K3oaxizQNSTba2aKLXQY8PdMn8N0GPYtjhnOUETJIlvcZ4bmeyJz2eyBQ9hCe%2B9v7A3ZINAKTWaofuR%2Fjw%3D%3D"); /*Service Key*/
urlBuilder.append("&" + URLEncoder.encode("numOfRows","UTF-8") + "=" + URLEncoder.encode("100", "UTF-8")); /*한 페이지 결과 수*/
urlBuilder.append("&" + URLEncoder.encode("solYear","UTF-8") + "=" + URLEncoder.encode(holidayVO.getSearchYear(), "UTF-8")); /*연*/
URL url = new URL(urlBuilder.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
conn.setRequestProperty("Content-type", "application/json");
System.out.println("Response code: " + conn.getResponseCode());
BufferedReader rd;
if(conn.getResponseCode() >= 200 && conn.getResponseCode() <= 300) {
rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
} else {
rd = new BufferedReader(new InputStreamReader(conn.getErrorStream()));
}
StringBuilder sb = new StringBuilder();
String line;
while ((line = rd.readLine()) != null) {
sb.append(line);
}
rd.close();
conn.disconnect();
/*파싱 후 insert 반복*/
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
InputSource is = new InputSource(new StringReader(sb.toString()));
Document doc = builder.parse(is);
NodeList itemList = doc.getElementsByTagName("item");
List<HolidayVO> holidayList = new ArrayList<>();
for(int i=0; i <itemList.getLength(); i++ ) {
Element item = (Element) itemList.item(i);
HolidayVO holidayItem = new HolidayVO();
holidayItem.setLocdate(item.getElementsByTagName("locdate").item(0).getTextContent());
holidayItem.setDateKind(item.getElementsByTagName("dateKind").item(0).getTextContent().replace("0",""));
holidayItem.setDateName(item.getElementsByTagName("dateName").item(0).getTextContent());
holidayItem.setHolidayYn(item.getElementsByTagName("isHoliday").item(0).getTextContent());
holidayList.add(holidayItem);
}
for (HolidayVO holiday : holidayList) {
try {
holidayService.insertHoliday(holiday);
}catch(Exception ex) {
ex.printStackTrace();
}
}
return "redirect:/uss/holiday/selectHolidayList.do";
}
@RequestMapping(value="/uss/holiday/returnHolidayAjax.do")
public ResponseEntity<Integer> returnHolidayAjax(@RequestBody HolidayVO holidayVO, RedirectAttributes redirectAttributes)throws Exception{
String std = holidayVO.getSdt();
String etd = holidayVO.getEdt();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
LocalDate startDate = LocalDate.parse(std, formatter);
LocalDate endDate = LocalDate.parse(etd, formatter);
//시작일에 하루 더해서 set 해주기 - 시작일이 공휴일 또는 주말인 경우 대비ㄱ
startDate = startDate.plusDays(1);
std = startDate.format(formatter);
holidayVO.setSdt(std);
//공휴일
int hldCnt = holidayService.selectHolidayCnt(holidayVO);
int workCnt = 0;
//주말, 공휴일 기간
for (LocalDate date = startDate; !date.isAfter(endDate); date = date.plusDays(1)) {
// 주말이 아닌 경우에만 근무일 증가
if (date.getDayOfWeek().getValue() != 6 && date.getDayOfWeek().getValue() != 7) {
workCnt++;
}
}
workCnt = workCnt - hldCnt;
return new ResponseEntity<Integer>(workCnt, HttpStatus.OK);
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -0,0 +1 @@
{"count":3,"endReport":true,"error":false}

View File

@ -0,0 +1 @@
{"a":"1.0.0.71","b":"","c":"","d":"","e":"","f":"","g":{"a":[[1,2100,2970,0,50,50,50,50,1,0]],"b":[],"c":[[1,16777215,0,0,0,16777215,16777215],[0,14545387,0,16777215,0,16777215,0],[1,16777215,0,0,0,16777215,0],[0,14545387,0,0,0,16777215,0],[0,16777215,0,0,0,16777215,0]],"d":[[0,0,0],[1,75,0],[0,0,0],[0,0,0]],"e":[[8,9,true,false,false,false,0,1,-1,1,-1,8],[8,14,true,false,false,false,0,1,-1,1,-1,8],[8,10,false,false,false,false,0,1,-1,1,-1,8],[8,18,true,false,false,false,0,1,-1,1,-1,8],[8,8,false,false,false,false,0,1,-1,1,-1,8],[8,9,false,false,false,false,0,1,-1,1,-1,8]],"f":[[1,1,true,1,-1.0,0.0,1,"",0],[0,1,true,1,0.0,0.0,1,"",0],[2,1,true,1,0.0,0.0,1,"",0],[1,1,true,1,0.0,0.0,1,"",0],[1,1,true,1,0.0,0.0,1,"%23%2C%23%230",0],[0,1,true,1,0.0,3.0,1,"",0],[1,1,true,1,-1.0,0.0,1,"%23%2C%23%230",0],[1,1,true,1,-1.0,0.0,1,"%23%2C%23%23%23%2C%2C_-",0]],"g":[[false,"B","I","B","S","C","O","R","P","O","BR"]],"h":[[0,0,0,0]],"i":[[true,true,true,true,true,true,true,true,true,true,true,true]],"j":[],"k":["%EB%82%98%EB%88%94%EB%B0%94%EB%A5%B8%EA%B3%A0%EB%94%95","NanumBarunGothic","%EB%82%98%EB%88%94%EB%B0%94%EB%A5%B8%EA%B3%A0%EB%94%95+Light","NanumBarunGothic+Light","%EB%82%98%EB%88%94%EB%B0%94%EB%A5%B8%EA%B3%A0%EB%94%95+UltraLight","NanumBarunGothic+UltraLight","%EB%82%98%EB%88%94%EA%B3%A0%EB%94%95+ExtraBold","NanumGothicExtraBold","%EB%82%98%EB%88%94%EA%B3%A0%EB%94%95","NanumGothic","%EB%82%98%EB%88%94%EA%B3%A0%EB%94%95%EC%BD%94%EB%94%A9","NanumGothicCoding","%EB%82%98%EB%88%94%EA%B3%A0%EB%94%95%EC%BD%94%EB%94%A9-Bold","%EB%82%98%EB%88%94%EB%AA%85%EC%A1%B0","NanumMyeongjo","%EB%82%98%EB%88%94%EB%AA%85%EC%A1%B0+Bold","%EB%82%98%EB%88%94%EB%AA%85%EC%A1%B0+ExtraBold","NanumMyeongjoExtraBold"]},"h":[3,3,3],"i":3,"j":[0,92,100,121,126,184,200,247,252,276,300,368,373,378,390,400,460,499,500,504,552,600,625,630,644,650,692,700,751,756,784,800,876,877,882,900,950,968,984,1000,1003,1008,1060,1100,1129,1150,1152,1155,1191,1200,1250,1253,1255,1300,1303,1317,1400,1438,1443,1500,1550,1564,1569,1600,1690,1695,1700,1800,1816,1850,1877,1900,1998,2000],"k":false,"l":[],"m":"","n":"","o":[{"a":"","b":1,"c":[0,92,100,121,126,184,200,247,252,276,300,368,373,378,390,400,460,499,500,504,552,600,625,630,644,650,692,700,751,756,784,800,876,877,882,900,950,968,984,1000,1003,1008,1060,1100,1129,1150,1152,1155,1191,1200,1250,1253,1255,1300,1303,1317,1400,1438,1443,1500,1550,1564,1569,1600,1690,1695,1700,1800,1816,1850,1877,1900,1998,2000]}],"p":[false,false,false],"r":{},"s":"C%3A%5CeGovFrameDev-3.9.0-64bit_kofons%5Cworkspace%5Cfairnet%5Csrc%5Cmain%5Cwebapp%5CWEB-INF%5Cclipreport4%2Ftemp%2F%5C50ac002030484c139ab8353a4afbbe036933aadcee75421cb953a4a9c61f102f",,"t":"C%3A%5CeGovFrameDev-3.9.0-64bit_kofons%5Cworkspace%5Cfairnet%5Csrc%5Cmain%5Cwebapp%5CWEB-INF%5Cclipreport4%2Ftemp%2F%5C50ac002030484c139ab8353a4afbbe03e64d75a608644ecaa638cba83943ebd6",}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

View File

@ -0,0 +1 @@
{"count":3,"endReport":true,"error":false}

View File

@ -0,0 +1 @@
{"a":"1.0.0.71","b":"","c":"","d":"","e":"","f":"","g":{"a":[[1,2100,2970,0,50,50,50,50,1,0]],"b":[],"c":[[1,16777215,0,0,0,16777215,16777215],[0,14545387,0,16777215,0,16777215,0],[1,16777215,0,0,0,16777215,0],[0,14545387,0,0,0,16777215,0],[0,16777215,0,0,0,16777215,0]],"d":[[0,0,0],[1,75,0],[0,0,0],[0,0,0]],"e":[[8,9,true,false,false,false,0,1,-1,1,-1,8],[8,14,true,false,false,false,0,1,-1,1,-1,8],[8,10,false,false,false,false,0,1,-1,1,-1,8],[8,18,true,false,false,false,0,1,-1,1,-1,8],[8,8,false,false,false,false,0,1,-1,1,-1,8],[8,9,false,false,false,false,0,1,-1,1,-1,8]],"f":[[1,1,true,1,-1.0,0.0,1,"",0],[0,1,true,1,0.0,0.0,1,"",0],[2,1,true,1,0.0,0.0,1,"",0],[1,1,true,1,0.0,0.0,1,"",0],[1,1,true,1,0.0,0.0,1,"%23%2C%23%230",0],[0,1,true,1,0.0,3.0,1,"",0],[1,1,true,1,-1.0,0.0,1,"%23%2C%23%230",0],[1,1,true,1,-1.0,0.0,1,"%23%2C%23%23%23%2C%2C_-",0]],"g":[[false,"B","I","B","S","C","O","R","P","O","BR"]],"h":[[0,0,0,0]],"i":[[true,true,true,true,true,true,true,true,true,true,true,true]],"j":[],"k":["%EB%82%98%EB%88%94%EB%B0%94%EB%A5%B8%EA%B3%A0%EB%94%95","NanumBarunGothic","%EB%82%98%EB%88%94%EB%B0%94%EB%A5%B8%EA%B3%A0%EB%94%95+Light","NanumBarunGothic+Light","%EB%82%98%EB%88%94%EB%B0%94%EB%A5%B8%EA%B3%A0%EB%94%95+UltraLight","NanumBarunGothic+UltraLight","%EB%82%98%EB%88%94%EA%B3%A0%EB%94%95+ExtraBold","NanumGothicExtraBold","%EB%82%98%EB%88%94%EA%B3%A0%EB%94%95","NanumGothic","%EB%82%98%EB%88%94%EA%B3%A0%EB%94%95%EC%BD%94%EB%94%A9","NanumGothicCoding","%EB%82%98%EB%88%94%EA%B3%A0%EB%94%95%EC%BD%94%EB%94%A9-Bold","%EB%82%98%EB%88%94%EB%AA%85%EC%A1%B0","NanumMyeongjo","%EB%82%98%EB%88%94%EB%AA%85%EC%A1%B0+Bold","%EB%82%98%EB%88%94%EB%AA%85%EC%A1%B0+ExtraBold","NanumMyeongjoExtraBold"]},"h":[3,3,3],"i":3,"j":[0,92,100,121,126,184,200,247,252,276,300,368,373,378,390,400,460,499,500,504,552,600,625,630,644,650,692,700,751,756,784,800,876,877,882,900,950,968,984,1000,1003,1008,1060,1100,1129,1150,1152,1155,1191,1200,1250,1253,1255,1300,1303,1317,1400,1438,1443,1500,1550,1564,1569,1600,1690,1695,1700,1800,1816,1850,1877,1900,1998,2000],"k":false,"l":[],"m":"","n":"","o":[{"a":"","b":1,"c":[0,92,100,121,126,184,200,247,252,276,300,368,373,378,390,400,460,499,500,504,552,600,625,630,644,650,692,700,751,756,784,800,876,877,882,900,950,968,984,1000,1003,1008,1060,1100,1129,1150,1152,1155,1191,1200,1250,1253,1255,1300,1303,1317,1400,1438,1443,1500,1550,1564,1569,1600,1690,1695,1700,1800,1816,1850,1877,1900,1998,2000]}],"p":[false,false,false],"r":{},"s":"C%3A%5CeGovFrameDev-3.9.0-64bit_kofons%5Cworkspace%5Cfairnet%5Csrc%5Cmain%5Cwebapp%5CWEB-INF%5Cclipreport4%2Ftemp%2F%5Cc0d96dc951864b059fa512712acc9f2be2e4af883056471f94d3f91d71cde243",,"t":"C%3A%5CeGovFrameDev-3.9.0-64bit_kofons%5Cworkspace%5Cfairnet%5Csrc%5Cmain%5Cwebapp%5CWEB-INF%5Cclipreport4%2Ftemp%2F%5Cc0d96dc951864b059fa512712acc9f2b664493aead6540e886ec63eaf14ee2ad",}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

View File

@ -0,0 +1 @@
{"count":3,"endReport":true,"error":false}

View File

@ -0,0 +1 @@
{"a":"1.0.0.71","b":"","c":"","d":"","e":"","f":"","g":{"a":[[1,2100,2970,0,50,50,50,50,1,0]],"b":[],"c":[[1,16777215,0,0,0,16777215,16777215],[0,14545387,0,16777215,0,16777215,0],[1,16777215,0,0,0,16777215,0],[0,14545387,0,0,0,16777215,0],[0,16777215,0,0,0,16777215,0]],"d":[[0,0,0],[1,75,0],[0,0,0],[0,0,0]],"e":[[8,9,true,false,false,false,0,1,-1,1,-1,8],[8,14,true,false,false,false,0,1,-1,1,-1,8],[8,10,false,false,false,false,0,1,-1,1,-1,8],[8,18,true,false,false,false,0,1,-1,1,-1,8],[8,8,false,false,false,false,0,1,-1,1,-1,8],[8,9,false,false,false,false,0,1,-1,1,-1,8]],"f":[[1,1,true,1,-1.0,0.0,1,"",0],[0,1,true,1,0.0,0.0,1,"",0],[2,1,true,1,0.0,0.0,1,"",0],[1,1,true,1,0.0,0.0,1,"",0],[1,1,true,1,0.0,0.0,1,"%23%2C%23%230",0],[0,1,true,1,0.0,3.0,1,"",0],[1,1,true,1,-1.0,0.0,1,"%23%2C%23%230",0],[1,1,true,1,-1.0,0.0,1,"%23%2C%23%23%23%2C%2C_-",0]],"g":[[false,"B","I","B","S","C","O","R","P","O","BR"]],"h":[[0,0,0,0]],"i":[[true,true,true,true,true,true,true,true,true,true,true,true]],"j":[],"k":["%EB%82%98%EB%88%94%EB%B0%94%EB%A5%B8%EA%B3%A0%EB%94%95","NanumBarunGothic","%EB%82%98%EB%88%94%EB%B0%94%EB%A5%B8%EA%B3%A0%EB%94%95+Light","NanumBarunGothic+Light","%EB%82%98%EB%88%94%EB%B0%94%EB%A5%B8%EA%B3%A0%EB%94%95+UltraLight","NanumBarunGothic+UltraLight","%EB%82%98%EB%88%94%EA%B3%A0%EB%94%95+ExtraBold","NanumGothicExtraBold","%EB%82%98%EB%88%94%EA%B3%A0%EB%94%95","NanumGothic","%EB%82%98%EB%88%94%EA%B3%A0%EB%94%95%EC%BD%94%EB%94%A9","NanumGothicCoding","%EB%82%98%EB%88%94%EA%B3%A0%EB%94%95%EC%BD%94%EB%94%A9-Bold","%EB%82%98%EB%88%94%EB%AA%85%EC%A1%B0","NanumMyeongjo","%EB%82%98%EB%88%94%EB%AA%85%EC%A1%B0+Bold","%EB%82%98%EB%88%94%EB%AA%85%EC%A1%B0+ExtraBold","NanumMyeongjoExtraBold"]},"h":[3,3,3],"i":3,"j":[0,92,100,121,126,184,200,247,252,276,300,368,373,378,390,400,460,499,500,504,552,600,625,630,644,650,692,700,751,756,784,800,876,877,882,900,950,968,984,1000,1003,1008,1060,1100,1129,1150,1152,1155,1191,1200,1250,1253,1255,1300,1303,1317,1400,1438,1443,1500,1550,1564,1569,1600,1690,1695,1700,1800,1816,1850,1877,1900,1998,2000],"k":false,"l":[],"m":"","n":"","o":[{"a":"","b":1,"c":[0,92,100,121,126,184,200,247,252,276,300,368,373,378,390,400,460,499,500,504,552,600,625,630,644,650,692,700,751,756,784,800,876,877,882,900,950,968,984,1000,1003,1008,1060,1100,1129,1150,1152,1155,1191,1200,1250,1253,1255,1300,1303,1317,1400,1438,1443,1500,1550,1564,1569,1600,1690,1695,1700,1800,1816,1850,1877,1900,1998,2000]}],"p":[false,false,false],"r":{},"s":"C%3A%5CeGovFrameDev-3.9.0-64bit_kofons%5Cworkspace%5Cfairnet%5Csrc%5Cmain%5Cwebapp%5CWEB-INF%5Cclipreport4%2Ftemp%2F%5Cfc17afce0ad040e8aba4f81c8f0877cf07d4b69e0f83410088f9c57a98dd5d03",,"t":"C%3A%5CeGovFrameDev-3.9.0-64bit_kofons%5Cworkspace%5Cfairnet%5Csrc%5Cmain%5Cwebapp%5CWEB-INF%5Cclipreport4%2Ftemp%2F%5Cfc17afce0ad040e8aba4f81c8f0877cf42fe803364fe4993a6c4ca373af83b9b",}