|
@@ -59,16 +59,19 @@ public class PushController {
|
|
|
String sendTime = list.get(i).getSendTime();
|
|
|
// String createDate = list.get(i).getCreateDate();
|
|
|
String startDate = sendDate + " " + sendTime;
|
|
|
-
|
|
|
+ int logIdx = 0;
|
|
|
if (sendType.equals("D")) {
|
|
|
startDate = pushUtils.getNow();
|
|
|
}
|
|
|
|
|
|
list.get(i).setStartDate(startDate);
|
|
|
|
|
|
+ logger.error("DDDDDDDDDD1111 IDX -- > " + list.get(i).getIdx());
|
|
|
if (pushUtils.compareDateTime(startDate) == true) {
|
|
|
int idx = service.insertPushLog(list.get(i));
|
|
|
-
|
|
|
+ logIdx = list.get(i).getIdx();
|
|
|
+ logger.error("DDDDDDDDD2222 IDX -- > " + list.get(i).getIdx());
|
|
|
+ logger.error("DDDDDDDDD2222 IDX -- > " + logIdx);
|
|
|
if (idx == 0) {
|
|
|
} else {
|
|
|
list.get(i).setSendState("I");
|
|
@@ -83,6 +86,7 @@ public class PushController {
|
|
|
|
|
|
PushResultDTO pushResultDto = new PushResultDTO();
|
|
|
pushResultDto.setYm(pushUtils.getNowYm());
|
|
|
+ pushResultDto.setLogIdx(logIdx);
|
|
|
pushResultDto.setPushIdx(pushIdx);
|
|
|
pushResultDto.setPatientIdx(patientIdx);
|
|
|
pushResultDto.setDeviceToken(token);
|
|
@@ -133,9 +137,14 @@ public class PushController {
|
|
|
String pushTitle = list.get(i).getPushTitle();
|
|
|
String pushContent = list.get(i).getPushContent();
|
|
|
String sendTime = list.get(i).getSendTime();
|
|
|
+ int logIdx = 0;
|
|
|
|
|
|
+ logger.error("EEEEEEEE1111 IDX -- > " + list.get(i).getIdx());
|
|
|
if (pushUtils.compareTime(sendTime) == true) {
|
|
|
int idx = service.insertEveryDayPushLog(list.get(i));
|
|
|
+ logIdx = list.get(i).getIdx();
|
|
|
+ logger.error("EEEEEEEE2222 IDX -- > " + list.get(i).getIdx());
|
|
|
+ logger.error("EEEEEEEE2222 IDX -- > " + logIdx);
|
|
|
if (idx == 0) {
|
|
|
} else {
|
|
|
list.get(i).setSendState("I");
|
|
@@ -150,6 +159,7 @@ public class PushController {
|
|
|
|
|
|
PushResultDTO pushResultDto = new PushResultDTO();
|
|
|
pushResultDto.setYm(pushUtils.getNowYm());
|
|
|
+ pushResultDto.setLogIdx(logIdx);
|
|
|
pushResultDto.setPushIdx(pushIdx);
|
|
|
pushResultDto.setPatientIdx(patientIdx);
|
|
|
pushResultDto.setDeviceToken(token);
|