xit-app
/
adds-fo
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 폐기보고 서버 호출로 변경

Browse Source
dev
Jonguk. Lim 4 months ago
parent 0b665277ed
commit cbcda15fbb
3 changed files with 44 additions and 138 deletions
Show Stats Download Patch File Download Diff File

117
src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java
Unescape Escape View File

@ -6,11 +6,13 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import javax.annotation.Resource;
import org.json.simple.JSONObject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
@ -19,8 +21,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import net.minidev.json.JSONObject;
import com.fasterxml.jackson.core.type.TypeReference;
import cokr.xit.adds.cmm.model.ApiBaseResponse;
@ -260,8 +260,44 @@ public class AddsNimsController extends ApplicationController {
return setCollectionInfo(new ModelAndView("jsonView"), dsuseMgtDocService.getDsuseMgtDocList(query),"","");
}
@RequestMapping(value = "/getHwpForRptDoc.do", name="보고문서 출력 상세 목록 조회", produces = "application/json;charset=UTF-8")
@RequestMapping(value = "/getHwpForRptDoc.do", name="보고문서 출력")
public ModelAndView getHwpForRptDoc(@ModelAttribute NimsApiRequest.DsuseMgtInqReq dto) {
String rslt = ApiUtil.callNimsApi(apiHost + dsuseMgtListForRptDocEndpoint, dto);
ApiBaseResponse<List<JSONObject>> parse = json.parse(rslt, new TypeReference<>() {});
List<JSONObject> respData = parse.getData();
List<JSONObject> dataForRptdoc = new ArrayList<>();
for(JSONObject mgtMaster : respData) {
List<JSONObject> mgtDetails = json.parse(json.stringify(mgtMaster.get("dsuseMgtDtls")), new TypeReference<>() {});
Set<String> keys = mgtMaster.keySet();
List<JSONObject> updatedDetails = mgtDetails.stream().map((detail) -> {
for (String key : keys) {
if (key.equals("dsuseMgtDtls")) {
continue;
}
if (key.equals("bsshNm") || key.equals("bsshCd")) {
detail.put(key + "0", mgtMaster.get(key));
} else if (!detail.containsKey(key)) {
detail.put(key, mgtMaster.get(key));
}
}
return detail;
}).toList();
dataForRptdoc.addAll(updatedDetails);
}
if("01".equals(dto.getAdds12())){
return makeDisposeResultReportHwp(json.stringify(dataForRptdoc));
}else if("02".equals(dto.getAdds12())) {
return makeDisposeProcessDetailsHwp(json.stringify(dataForRptdoc));
}else{
}
return null;
}
@ -624,79 +660,4 @@ public class AddsNimsController extends ApplicationController {
return json.parse(rslt, new TypeReference<>() {});
}
@RequestMapping(value = "/getNimsProductInfoKdAndMnfSeqInfo.do", name="제품 & 시리얼번호 검색", produces = "application/json;charset=UTF-8")
public @ResponseBody ApiBaseResponse<List<JSONObject>> getNimsProductInfoKdAndMnfSeqInfo(@ModelAttribute NimsApiRequest.ProductInfoReq dto) {
String rslt = ApiUtil.callNimsApi(apiHost + productAndseqInfoEndpoint, dto);
return json.parse(rslt, new TypeReference<>() {});
}
@RequestMapping(value = "/getDsuseMgtListForRptDoc.do", name="보고문서 출력 상세 목록 조회", produces = "application/json;charset=UTF-8")
public @ResponseBody ApiBaseResponse<List<JSONObject>> getDsuseMgtListForRptDoc(@ModelAttribute NimsApiRequest.DsuseMgtInqReq dto) {
String rslt = ApiUtil.callNimsApi(apiHost + dsuseMgtListForRptDocEndpoint, dto);
ApiBaseResponse<List<JSONObject>> parse = json.parse(rslt, new TypeReference<>() {});
List<JSONObject> respData = parse.getData();
List<DataObject> dataForRptdoc = new ArrayList<>();
for(JSONObject mgtMaster : respData) {
List<DataObject> mgtDetails = (List<DataObject>)mgtMaster.get("dsuseMgtDtls");
String[] keys = mgtMaster.keySet().toArray(new String[mgtMaster.keySet().size()]);
mgtDetails.stream().map((detail)->{
for(String key : keys) {
if(key.equals("dsuseMgtDtls")) {
continue;
}
if(key.equals("bsshNm") || key.equals("bsshCd")){
detail.put(key+"0", mgtMaster.get(key));
}
}
return detail;
}).toList();
dataForRptdoc.addAll(mgtDetails);
}
return parse;
}
}
/*
for(let dsuseMgtMaster of respData){
dsuseMgtMaster.dsuseMgtDtls.map((dtl) => {
keys = Object.keys(dsuseMgtMaster);
for(let key of keys){
if(key == "dsuseMgtDtls"){
continue;
}
if(key == "bsshNm" || key == "bsshCd"){
dtl[key+"0"] = dsuseMgtMaster[key];
} else if(dtl[key] == undefined){
dtl[key] = dsuseMgtMaster[key];
}
}
return dtl;
});
}
let dtls = [];
for(let i=0; i < respData.length; i++){
dtls = dtls.concat(respData[i].dsuseMgtDtls);
}
let url = "";
if(ADDS12 == "01"){
url = wctx.url("/adds/nims/makeDisposeResultReportHwp.do");
} else if(ADDS12 == "02"){
url = wctx.url("/adds/nims/makeDisposeProcessDetailsHwp.do");
} else {
return;
}
*/

2
src/main/resources/application.yml
Unescape Escape View File

@ -60,8 +60,6 @@ app:
bsshInfo: /api/biz/nims/v1/getNimsBsshInfoSt
# 제품 조회
productInfo: /api/biz/nims/v1/getNimsProductInfoKd
# 제품 & 시리얼 번호 조회
productAndseqInfo: /api/biz/nims/v1/getNimsProductInfoKdAndMnfSeqInfo
# 제품 시리얼 번호 조회
seqInfo: /api/biz/nims/v1/getNimsMnfSeqInfo
# 관할관청 조회

63
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp
Unescape Escape View File

@ -360,81 +360,28 @@
content: "선택한 폐기관리 정보로 "+ docName+" 파일을 생성 하시겠습니까?"
, init: () => { setDialogZindex(); }
, onOK: () => {
$P.getDataForDocument(ADDS12);
$P.fnCreateDoc(ADDS12);
}
});
};
//한글문서파일 생성을 위한 데이터 조회
$P.getDataForDocument = (ADDS12) => {
//한글문서파일 생성 요청
$P.fnCreateDoc = (ADDS12) => {
let dscdmngIds = $P.control.dataset.getKeys("selected");
if(dscdmngIds.length < 1){
alert("체크된 자료가 없습니다.");
return;
}
ajax.get({
url: wctx.url("/adds/nims/getDsuseMgtListForRptDoc.do"),
contentType : "application/json; charset=utf-8",
$.ajax({
url: wctx.url("/adds/nims/getHwpForRptDoc.do"),
data: {
dscdmngIds : dscdmngIds,
userId : "${currentUser.account}",
deptCd: "${currentUser.deptCode}",
adds12: ADDS12
},
success:resp => {
if(!resp.success){
dialog.alert({
content: resp.message
});
return;
}
$P.fnCreateDoc(resp.data, ADDS12);
}
});
};
//한글문서파일 생성 요청
$P.fnCreateDoc = (respData, ADDS12) => {
for(let dsuseMgtMaster of respData){
dsuseMgtMaster.dsuseMgtDtls.map((dtl) => {
keys = Object.keys(dsuseMgtMaster);
for(let key of keys){
if(key == "dsuseMgtDtls"){
continue;
}
if(key == "bsshNm" || key == "bsshCd"){
dtl[key+"0"] = dsuseMgtMaster[key];
} else if(dtl[key] == undefined){
dtl[key] = dsuseMgtMaster[key];
}
}
return dtl;
});
}
let dtls = [];
for(let i=0; i < respData.length; i++){
dtls = dtls.concat(respData[i].dsuseMgtDtls);
}
let url = "";
if(ADDS12 == "01"){
url = wctx.url("/adds/nims/makeDisposeResultReportHwp.do");
} else if(ADDS12 == "02"){
url = wctx.url("/adds/nims/makeDisposeProcessDetailsHwp.do");
} else {
return;
}
$.ajax({
url: url,
data: { dtls : JSON.stringify(dtls) },
xhrFields: { responseType: 'blob' },
success:(blob, status, xhr) => {
let disposition = xhr.getResponseHeader('Content-Disposition');

Write Preview
Loading…
Cancel
Save