Ver Fonte

push_result 데이터 추가

junekeunsong há 4 anos atrás
pai
commit
399a07fb2b

+ 12 - 2
src/main/java/com/lemon/lifecenter/scheduler/controller/PushController.java

@@ -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);

+ 7 - 0
src/main/java/com/lemon/lifecenter/scheduler/dto/PushResultDTO.java

@@ -2,6 +2,7 @@ package com.lemon.lifecenter.scheduler.dto;
 
 public class PushResultDTO {
     private String ym          = "";
+    private int logIdx         = 0;
     private int pushIdx        = 0;
     private int patientIdx     = 0;
     private String deviceToken = "";
@@ -18,6 +19,12 @@ public class PushResultDTO {
     public void setYm(String ym) {
         this.ym = ym;
     }
+    public int getLogIdx() {
+        return logIdx;
+    }
+    public void setLogIdx(int logIdx) {
+        this.logIdx = logIdx;
+    }
     public int getPushIdx() {
         return pushIdx;
     }

+ 3 - 2
src/main/resources/mybatis/mapper/push/push.xml

@@ -13,6 +13,7 @@
         <![CDATA[
             CREATE TABLE `push_result_${ym}` (
                 `idx` INTEGER AUTO_INCREMENT(1,1) NOT NULL COMMENT 'IDX',
+                `log_idx` INTEGER NOT NULL COMMENT 'log테이블의 idx',
                 `push_idx` INTEGER NOT NULL,
                 `patient_idx` INTEGER NOT NULL,
                 `device_key` CHARACTER VARYING (255) COLLATE utf8_ko_cs COMMENT '발송 당시 device_key',
@@ -236,8 +237,8 @@
     <insert id="insertPushResult" parameterType="PushResultDTO">
         <![CDATA[
             INSERT INTO PUSH_RESULT_${ym}
-                        (PUSH_IDX,   PATIENT_IDX,   DEVICE_KEY,   STATE,    CREATE_DATE)
-                 VALUES (#{pushIdx}, #{patientIdx}, #{deviceToken}, #{state}, NOW())
+                        (PUSH_IDX,   LOG_IDX,   PATIENT_IDX,   DEVICE_KEY,   STATE,    CREATE_DATE)
+                 VALUES (#{pushIdx}, #{logIdx}, #{patientIdx}, #{deviceToken}, #{state}, NOW())
         ]]>
     </insert>