diff --git a/src/main/java/externalsystem/nuri2/RandomMessageCreateRequest.java b/src/main/java/externalsystem/nuri2/RandomMessageCreateRequest.java index aec54189..97719405 100644 --- a/src/main/java/externalsystem/nuri2/RandomMessageCreateRequest.java +++ b/src/main/java/externalsystem/nuri2/RandomMessageCreateRequest.java @@ -11,6 +11,7 @@ public class RandomMessageCreateRequest extends AbstractEntity { private String dest; private String msgPrps; private String sggCd; + private int dataCnt; private String sincheongFrom; private String sincheongTo; diff --git a/src/main/java/externalsystem/nuri2/web/nuri2Controller.java b/src/main/java/externalsystem/nuri2/web/nuri2Controller.java index 80295351..ad90e04e 100644 --- a/src/main/java/externalsystem/nuri2/web/nuri2Controller.java +++ b/src/main/java/externalsystem/nuri2/web/nuri2Controller.java @@ -176,58 +176,67 @@ public class nuri2Controller extends AbstractController { ModelAndView mav = new ModelAndView("jsonView"); DataObject respDataObject = new DataObject(); - Map req = new HashMap(); - - req.put("recptnNo", RandomUtil.randomPhone()); - - List> args = new ArrayList>(); - - Map arg = new HashMap(); - - DataObject chgr = testPoolMapper.selectRandomChgr(); - arg = new HashMap(); - arg.put("argName", "충전소"); - arg.put("argValue", chgr.string("STN_NM")); - args.add(arg); - - arg = new HashMap(); - arg.put("argName", "충전기"); - arg.put("argValue", chgr.string("CHGR_NM")); - args.add(arg); - - switch(rmcq.getMsgPrps()) { - case "02": - arg = new HashMap(); - arg.put("argName", "입차시간"); - arg.put("argValue", RandomUtil.randomYmdhhmmss(rmcq.getIbchaFrom(), rmcq.getIbchaTo())); - args.add(arg); - case "03": - List GyeongGwa = Arrays.asList("50분", "60분", "12시간"); - Collections.shuffle(GyeongGwa); - arg = new HashMap(); - arg.put("argName", "주차시간"); - arg.put("argValue", GyeongGwa.get(0)); - args.add(arg); - - arg = new HashMap(); - arg.put("argName", "차량번호"); - arg.put("argValue", RandomUtil.randomCarNo()); - args.add(arg); - break; - case "04": - arg = new HashMap(); - arg.put("argName", "신청일자"); - arg.put("argValue", RandomUtil.randomYmd(rmcq.getSincheongFrom(), rmcq.getSincheongTo())); - args.add(arg); - - arg = new HashMap(); - arg.put("argName", "차량번호"); - arg.put("argValue", RandomUtil.randomCarNo()); - args.add(arg); - break; + List> reqs = new ArrayList>(); + + int dataCnt = rmcq.getDataCnt(); + + for(int i=0; i req = new HashMap(); + + req.put("recptnNo", RandomUtil.randomPhone()); + + List> args = new ArrayList>(); + + Map arg = new HashMap(); + + DataObject chgr = testPoolMapper.selectRandomChgr(); + arg = new HashMap(); + arg.put("argName", "충전소"); + arg.put("argValue", chgr.string("STN_NM")); + args.add(arg); + + arg = new HashMap(); + arg.put("argName", "충전기"); + arg.put("argValue", chgr.string("CHGR_NM")); + args.add(arg); + + switch(rmcq.getMsgPrps()) { + case "02": + arg = new HashMap(); + arg.put("argName", "입차시간"); + arg.put("argValue", RandomUtil.randomYmdhhmmss(rmcq.getIbchaFrom(), rmcq.getIbchaTo())); + args.add(arg); + case "03": + List GyeongGwa = Arrays.asList("50분", "60분", "12시간"); + Collections.shuffle(GyeongGwa); + arg = new HashMap(); + arg.put("argName", "주차시간"); + arg.put("argValue", GyeongGwa.get(0)); + args.add(arg); + + arg = new HashMap(); + arg.put("argName", "차량번호"); + arg.put("argValue", RandomUtil.randomCarNo()); + args.add(arg); + break; + case "04": + arg = new HashMap(); + arg.put("argName", "신청일자"); + arg.put("argValue", RandomUtil.randomYmd(rmcq.getSincheongFrom(), rmcq.getSincheongTo())); + args.add(arg); + + arg = new HashMap(); + arg.put("argName", "차량번호"); + arg.put("argValue", RandomUtil.randomCarNo()); + args.add(arg); + break; + } + + req.put("args", args); + + reqs.add(req); } - req.put("args", args); HttpResponse apiRslt = new WebClient().post(request -> { request.contentType(WebClient.Request.ContentType.JSON); @@ -237,7 +246,7 @@ public class nuri2Controller extends AbstractController { request.data("sggCd", rmcq.getSggCd()); request.data("teskSeCd", ""); request.data("msgDtlPrps", ""); - request.data("reqs", List.of(req)); + request.data("reqs", reqs); }); String rslt = apiRslt.body(); diff --git a/src/main/webapp/WEB-INF/jsp/mms/sendTest-main.jsp b/src/main/webapp/WEB-INF/jsp/mms/sendTest-main.jsp index f4156ca7..81d4b897 100644 --- a/src/main/webapp/WEB-INF/jsp/mms/sendTest-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/mms/sendTest-main.jsp @@ -7,7 +7,7 @@
시군구코드
- +
발송목적
@@ -23,15 +23,18 @@
- 신청일자 범위
+ 신청일자 범위(고장신고접수)
부터 까지
- 입차시간 범위
+ 입차시간 범위(단속기 이동주차)
부터 까지 +
+ 요청데이터 건수
+