tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'JIWOO' into advc

Browse Source
This commit is contained in:
jiwoo 2024-02-13 14:59:32 +09:00
commit f668f540b5
1 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
View File

@ -12,6 +12,7 @@ import org.json.simple.JSONArray;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
@ -153,6 +154,10 @@ public class CrownixAjaxController {
@Resource(name="vEInstrMixService") @Resource(name="vEInstrMixService")
private VEInstrMixService vEInstrMixService; private VEInstrMixService vEInstrMixService;
/** 구동 환경 */
@Value("#{property['Globals.prod.islocal']}")
private String environment;
/** /**
* 교육 list select * 교육 list select
* viewer.openFile('cmplt_crtfc_20231030.mrd' * viewer.openFile('cmplt_crtfc_20231030.mrd'
@ -366,7 +371,11 @@ public class CrownixAjaxController {
modelAndView.addObject("data_7", "전문분야"); modelAndView.addObject("data_7", "전문분야");
//modelAndView.addObject("path", "http://119.193.215.98:9989/offedu/visitEdu/usr/publish/images/common/ci.png"); //modelAndView.addObject("path", "http://119.193.215.98:9989/offedu/visitEdu/usr/publish/images/common/ci.png");
modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463"); if("real".equals(environment)) {
modelAndView.addObject("image", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463");
}else {
modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463");
}
modelAndView.addObject("data_d", "2023년05월28일"); modelAndView.addObject("data_d", "2023년05월28일");
@ -396,7 +405,12 @@ public class CrownixAjaxController {
//modelAndView.addObject("path", "http://119.193.215.98:9989/offedu/visitEdu/usr/publish/images/common/ci.png"); //modelAndView.addObject("path", "http://119.193.215.98:9989/offedu/visitEdu/usr/publish/images/common/ci.png");
//modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463"); //modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463");
modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+info.getPhtAtchFileId()); if("real".equals(environment)) {
modelAndView.addObject("image", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId="+info.getPhtAtchFileId());
}else {
modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+info.getPhtAtchFileId());
}
modelAndView.addObject("data_d", "2023년05월28일"); modelAndView.addObject("data_d", "2023년05월28일");
@ -565,7 +579,12 @@ public class CrownixAjaxController {
jsDrtInfo.put("data_6", vEInstrDetailVOList.get(i).getdBirth()); jsDrtInfo.put("data_6", vEInstrDetailVOList.get(i).getdBirth());
jsDrtInfo.put("data_7", vEInstrDetailVOList.get(i).getPrfsnFld()); jsDrtInfo.put("data_7", vEInstrDetailVOList.get(i).getPrfsnFld());
//jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); //jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId());
jsDrtInfo.put("image", "http://192.168.0.59:3080/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); if("real".equals(environment)) {
jsDrtInfo.put("image", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId());
}else {
jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId());
}
@ -603,7 +622,6 @@ public class CrownixAjaxController {
, ModelMap model , ModelMap model
, HttpServletRequest request , HttpServletRequest request
) throws Exception { ) throws Exception {
ModelAndView modelAndView = new ModelAndView(); ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("jsonView"); modelAndView.setViewName("jsonView");
System.out.println(" vEInstrDetailVO.getUserIdList().toString() :: "+vEInstrDetailVO.getUserIdList().toString()); System.out.println(" vEInstrDetailVO.getUserIdList().toString() :: "+vEInstrDetailVO.getUserIdList().toString());
@ -625,7 +643,11 @@ public class CrownixAjaxController {
jsDrtInfo.put("data_6", vEInstrDetailVOList.get(i).getdBirth()); jsDrtInfo.put("data_6", vEInstrDetailVOList.get(i).getdBirth());
jsDrtInfo.put("data_7", vEInstrDetailVOList.get(i).getPrfsnFld()); jsDrtInfo.put("data_7", vEInstrDetailVOList.get(i).getPrfsnFld());
//jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); //jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId());
jsDrtInfo.put("image", "http://192.168.0.59:3080/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); if("real".equals(environment)) {
jsDrtInfo.put("image", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId());
}else {
jsDrtInfo.put("image", "http://192.168.0.59:3080/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId());
}
jsReqInfo.add(jsDrtInfo); jsReqInfo.add(jsDrtInfo);
@ -1006,8 +1028,14 @@ public class CrownixAjaxController {
//jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); //jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId());
//jsDrtInfo.put("image", "http://192.168.0.12:8086/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0"); //jsDrtInfo.put("image", "http://192.168.0.12:8086/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0");
//jsDrtInfo.put("image2", "http://192.168.0.12:8086/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=1"); //jsDrtInfo.put("image2", "http://192.168.0.12:8086/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=1");
jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0"); if("real".equals(environment)) {
jsDrtInfo.put("image2", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=1"); jsDrtInfo.put("image", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0");
jsDrtInfo.put("image2", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=1");
}else {
jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0");
jsDrtInfo.put("image2", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=1");
}
jsReqInfo.add(jsDrtInfo); jsReqInfo.add(jsDrtInfo);
@ -1051,7 +1079,11 @@ public class CrownixAjaxController {
jsDrtInfo.put("data_6", vEEduAplctVOList.get(i).getTrgt()); jsDrtInfo.put("data_6", vEEduAplctVOList.get(i).getTrgt());
jsDrtInfo.put("data_7", vEEduAplctVOList.get(i).getEduPrsnl()); jsDrtInfo.put("data_7", vEEduAplctVOList.get(i).getEduPrsnl());
jsDrtInfo.put("data_8", vEEduAplctVOList.get(i).getInstrNm()); jsDrtInfo.put("data_8", vEEduAplctVOList.get(i).getInstrNm());
jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0"); if("real".equals(environment)) {
jsDrtInfo.put("image", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0");
}else {
jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0");
}
//jsDrtInfo.put("image", "http://192.168.0.12:8086/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0"); //jsDrtInfo.put("image", "http://192.168.0.12:8086/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0");