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

fix: 폐기보고 목록(NIMS API) 조회 반영

Browse Source
dev
Jonguk. Lim 6 months ago
parent 6be00af777
commit d2325eebed
5 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/cokr/xit/adds/biz/nims/service/bean/BizNimsServiceBean.java
Unescape Escape View File

@ -848,7 +848,7 @@ public class BizNimsServiceBean extends AbstractServiceBean implements BizNimsSe
if("1".equals(dto.getRptTyCd())) return;
int dtlCnt = 0;
for (NimsApiDto.DsuseRptInfoDtl d : dto.getDsuseRptInfoDtls()) {
for (NimsApiDto.DsuseRptInfoDtl d : dto.getListDtl()) {
d.setRgtr(Constants.NIMS_API_USER_ID);
dtlCnt = dtlCnt + bizNimsMapper.insertDsuseRptInfoDtl(d);
}

10
src/main/java/cokr/xit/adds/inf/nims/model/NimsApiDto.java
Unescape Escape View File

@ -426,7 +426,7 @@ public class NimsApiDto {
*/
@Builder.Default
@Valid
private List<DsuseRptInfoDtl> dsuseRptInfoDtls = new ArrayList<>();
private List<DsuseRptInfoDtl> listDtl = new ArrayList<>();
/**
* <pre>
@ -494,8 +494,8 @@ public class NimsApiDto {
// FIXME: 폐기관리와 폐기보고의 상품정보 일치 여부 set - 비교 필드 확정 필요
if (rptInfo.equals(mgtInfo)) {
if (this.dsuseRptInfoDtls.size() == mgtDto.getDsuseMgtDtls().size()) {
for (DsuseRptInfoDtl rptDtl : this.dsuseRptInfoDtls) {
if (this.listDtl.size() == mgtDto.getDsuseMgtDtls().size()) {
for (DsuseRptInfoDtl rptDtl : this.listDtl) {
for (BizNimsRequest.DsuseMgtDtl mgtDtl : mgtDto.getDsuseMgtDtls()) {
if (rptDtl.getPrductCd().equals(mgtDtl.getPrductCd())
&& rptDtl.getMnfNo().equals(mgtDtl.getMnfNo())
@ -557,8 +557,8 @@ public class NimsApiDto {
}
// FIXME: 상품정보 미일치 여부 set - 비교 필드 확정 필요
if (this.dsuseRptInfoDtls.size() == mgtDto.getDsuseMgtDtls().size()) {
for (DsuseRptInfoDtl rptDtl : this.dsuseRptInfoDtls) {
if (this.listDtl.size() == mgtDto.getDsuseMgtDtls().size()) {
for (DsuseRptInfoDtl rptDtl : this.listDtl) {
for (BizNimsRequest.DsuseMgtDtl mgtDtl : mgtDto.getDsuseMgtDtls()) {
if (rptDtl.getPrductCd().equals(mgtDtl.getPrductCd())
&& rptDtl.getMnfNo().equals(mgtDtl.getMnfNo())

8
src/main/java/cokr/xit/adds/inf/nims/model/NimsApiRequest.java
Unescape Escape View File

@ -257,7 +257,7 @@ public class NimsApiRequest {
* 빈값 : 전체
* 0: 신규, 1: 취소, 2: 변경
*/
@Schema(title = "보고유형('': 전체, 0:신규, 1:취소, 2:변경)", description = "보고유형('': 전체, 0:신규, 1:취소, 2:변경)", example = " ", allowableValues = {"", "0", "1", "2"})
@Schema(title = "보고유형('': 전체, 0:신규, 1:취소, 2:변경)", description = "보고유형('': 전체, 0:신규, 1:취소, 2:변경)", example = "0", allowableValues = {"", "0", "1", "2"})
@Pattern(regexp = "^$|[012]", message = "보고유형 값을 확인해 주세요('': 전체, 0:신규, 1:취소, 2:변경)")
String fg2;
@ -274,7 +274,7 @@ public class NimsApiRequest {
* 조회 시작일(yyyyMMdd)
* 최대 1개월
*/
@Schema(title = "조회 시작일(yyyyMMdd)", description = "조회 시작일(yyyyMMdd)", example = "20240101")
@Schema(title = "조회 시작일(yyyyMMdd)", description = "조회 시작일(yyyyMMdd)", example = "20240105")
@Pattern(regexp = Constants.DATE_REGX, message = "조회 시작일은 필수 입니다(yyyyMMdd)")
String sdt;
@ -282,7 +282,7 @@ public class NimsApiRequest {
* 조회 종료일(yyyyMMdd)
* 최대 1개월
*/
@Schema(title = "조회 종료일(yyyyMMdd)", description = "조회 종료일(yyyyMMdd)", example = "20240131")
@Schema(title = "조회 종료일(yyyyMMdd)", description = "조회 종료일(yyyyMMdd)", example = "20240105")
@Pattern(regexp = Constants.DATE_REGX, message = "조회 종료일은 필수 입니다(yyyyMMdd)")
String edt;
@ -308,7 +308,7 @@ public class NimsApiRequest {
* 폐기 보고 상태
* 01: 확인, 02: 보류, 03: 정정, 04: 미처리
*/
@Schema(title = "상태", description = "상태", example = " ", allowableValues = {"01", "02", "03", "04"})
@Schema(title = "상태", description = "상태", example = "01", allowableValues = {"01", "02", "03", "04"})
@Pattern(regexp = "^$|0[1-4]", message = "상태[폐기보고] 값을 확인해 주세요('': 전체, 01:확인, 02:보류, 03:정정, 04:미처리)")
String ps;

15
src/main/java/cokr/xit/adds/inf/nims/service/bean/InfNimsServiceBean.java
Unescape Escape View File

@ -72,6 +72,13 @@ public class InfNimsServiceBean extends AbstractServiceBean implements InfNimsSe
@Value("${app.inf.nims.api.officeinfo}")
private String officeinfo;
/**
* 폐기보고 정보 조회 API URL
*/
@Value("${app.inf.nims.api.dsuseresult}")
private String dsuseresult;
@Override
@TraceLogging
public NimsApiResult.Response<NimsApiDto.BsshInfoSt> getBsshInfoSt(NimsApiRequest.BsshInfoReq dto) {
@ -146,9 +153,9 @@ public class InfNimsServiceBean extends AbstractServiceBean implements InfNimsSe
ApiUtil.checkYmdError(dto.getEdt(), "edt");
// FIXME: API 호출 시 주석 해제
//String rslt = ApiUtil.callNimsApi(nimsUrl + reportinfo, dto);
//NimsApiResult<NimsApiDto.DsuseRpt> result = json.parse(rslt, new TypeReference<>() {});
//return result.getResponse();
// String rslt = ApiUtil.callNimsApi(nimsUrl + dsuseresult, dto);
// NimsApiResult<NimsApiDto.DsuseRptInfo> result = json.parse(rslt, new TypeReference<>() {});
// return result.getResponse();
return getDsuseRptResponse();
}
@ -206,7 +213,7 @@ public class InfNimsServiceBean extends AbstractServiceBean implements InfNimsSe
.dsuseDe("20240306")
.dsuseLoc("보건소")
.status("0")
.dsuseRptInfoDtls("1".equals(rptTyCds.get(i))? null : List.of(dtl1, dtl2))
.listDtl("1".equals(rptTyCds.get(i))? null : List.of(dtl1, dtl2))
.build();
dsuseRpts.add(dsuseRpt);
}

4
src/main/resources/config/application-nims.yml
Unescape Escape View File

@ -7,7 +7,7 @@ app:
seqinfo: /api/seqinfo.do
officeinfo: /api/officeinfo.do
placeinfoV1: /api/placeinfo_v1.do
reportinfo: /api/reportinfo_ggg.do
dsuseresult: /api/dsuseresult.do
iros:
url: https://apis.data.go.kr
api-key: 0fTkYnZU6XjaAPAp6GzKW9Q6fYq8iaoSH9wKUZwz2PBjRXGM04aUgtO3a61xYGjL8nFZn4fjLGS9XErhMSXq%2Bw%3D%3D
@ -23,7 +23,7 @@ spring:
app:
inf:
nims:
url: https://test.nims.or.kr
url: https://www.nims.or.kr
---
spring:

Write Preview
Loading…
Cancel
Save