upush

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/UpushTargetType.java

@@ -28,9 +28,9 @@ public enum UpushTargetType {
 
     TARGET_TYPE16("票务首页", 16),
     TARGET_TYPE17("商品首页", 17),
-    TARGET_TYPE28("消息列表", 28),
-    TARGET_TYPE32("系统消息列表", 32),
-    TARGET_TYPE33("会员消息列表", 33);
+//    TARGET_TYPE28("消息列表", 28),
+    TARGET_TYPE32("系统消息列表", 32);
+//    TARGET_TYPE33("会员消息列表", 33);
 
     private String name;
     private int index;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/AdminUpushServiceImpl.java

@@ -10,10 +10,7 @@ import com.liquidnet.client.admin.zhengzai.kylin.utils.upush.PushClient;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.upush.android.AndroidBroadcast;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.upush.ios.IOSBroadcast;
 import com.liquidnet.commons.lang.constant.LnsEnum;
-import com.liquidnet.commons.lang.util.BeanUtil;
-import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.kylin.dao.UpushDetailsListDao;
 import com.liquidnet.service.kylin.dto.param.admin.UpushParam;
 import com.liquidnet.service.kylin.dto.param.admin.UpushSearchParam;
@@ -29,6 +26,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -126,13 +124,15 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
     }
 
     public void sendAndroidBroadcast(AdminUpush adminUpush) {
+        AdminUpush updatePush = new AdminUpush();
         try {
             AndroidBroadcast broadcast = new AndroidBroadcast(androidAppkey, androidAppMasterSecret);
             broadcast.setTicker(adminUpush.getPushTitle());
             broadcast.setTitle(adminUpush.getPushTitle());
             broadcast.setText(adminUpush.getPushContent());
-            broadcast.goAppAfterOpen();
+            broadcast.goCustomAfterOpen("ad_link");
             broadcast.setDisplayType(AndroidNotification.DisplayType.NOTIFICATION);
+//            broadcast.setCustomField("ad_like");
             if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE))) {
                 broadcast.setTestMode();
             } else {
@@ -147,13 +147,50 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
                 String pushTime = adminUpush.getPushTime();
                 broadcast.setPredefinedKeyValue("start_time", pushTime);
             }
-            client.send(broadcast);
+            String sendRes = client.send(broadcast);
+            HashMap hashMap = JsonUtils.fromJson(sendRes, HashMap.class);
+            String ret = (String) hashMap.get("ret");
+            if (ret.equals("SUCCESS")) {
+                HashMap data = (HashMap) hashMap.get("data");
+                String msg_id = (String) data.get("msg_id");
+                String task_id = (String) data.get("task_id");
+                if (null != msg_id && !msg_id.isEmpty()) {
+                    updatePush.setMsgId(msg_id);
+                }
+                if (null != task_id && !task_id.isEmpty()) {
+                    updatePush.setTaskId(task_id);
+                }
+            } else {
+                HashMap data = (HashMap) hashMap.get("data");
+                String msg_id = (String) data.get("msg_id");
+                String task_id = (String) data.get("task_id");
+                String error_code = (String) data.get("error_code");
+                String error_msg = (String) data.get("error_msg");
+                if (null != msg_id && !msg_id.isEmpty()) {
+                    updatePush.setMsgId(msg_id);
+                }
+                if (null != task_id && !task_id.isEmpty()) {
+                    updatePush.setTaskId(task_id);
+                }
+                if (null != error_code && !error_code.isEmpty()) {
+                    updatePush.setErrorCode(error_code);
+                }
+                if (null != error_msg && !error_msg.isEmpty()) {
+                    updatePush.setErrorMsg(error_msg);
+                }
+            }
+            updatePush.setUpdatedAt(DateUtil.getNowTime());
+            adminUpushMapper.update(updatePush, Wrappers.lambdaUpdate(AdminUpush.class).eq(AdminUpush::getUpushId, adminUpush.getUpushId()));
         } catch (Exception e) {
-
+            updatePush.setErrorMsg(e.getMessage());
+            updatePush.setUpdatedAt(DateUtil.getNowTime());
+            adminUpushMapper.update(updatePush, Wrappers.lambdaUpdate(AdminUpush.class).eq(AdminUpush::getUpushId, adminUpush.getUpushId()));
+            e.printStackTrace();
         }
     }
 
     public void sendIOSBroadcast(AdminUpush adminUpush) {
+        AdminUpush updatePush = new AdminUpush();
         try {
             IOSBroadcast broadcast = new IOSBroadcast(iosAppkey, iosAppMasterSecret);
             //alert的值设置为字典
@@ -174,9 +211,45 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
                 String pushTime = adminUpush.getPushTime();
                 broadcast.setPredefinedKeyValue("start_time", pushTime);
             }
-            client.send(broadcast);
+            String sendRes = client.send(broadcast);
+            HashMap hashMap = JsonUtils.fromJson(sendRes, HashMap.class);
+            String ret = (String) hashMap.get("ret");
+            if (ret.equals("SUCCESS")) {
+                HashMap data = (HashMap) hashMap.get("data");
+                String msg_id = (String) data.get("msg_id");
+                String task_id = (String) data.get("task_id");
+                if (null != msg_id && !msg_id.isEmpty()) {
+                    updatePush.setMsgId(msg_id);
+                }
+                if (null != task_id && !task_id.isEmpty()) {
+                    updatePush.setTaskId(task_id);
+                }
+            } else {
+                HashMap data = (HashMap) hashMap.get("data");
+                String msg_id = (String) data.get("msg_id");
+                String task_id = (String) data.get("task_id");
+                String error_code = (String) data.get("error_code");
+                String error_msg = (String) data.get("error_msg");
+                if (null != msg_id && !msg_id.isEmpty()) {
+                    updatePush.setMsgId(msg_id);
+                }
+                if (null != task_id && !task_id.isEmpty()) {
+                    updatePush.setTaskId(task_id);
+                }
+                if (null != error_code && !error_code.isEmpty()) {
+                    updatePush.setErrorCode(error_code);
+                }
+                if (null != error_msg && !error_msg.isEmpty()) {
+                    updatePush.setErrorMsg(error_msg);
+                }
+            }
+            updatePush.setUpdatedAt(DateUtil.getNowTime());
+            adminUpushMapper.update(updatePush, Wrappers.lambdaUpdate(AdminUpush.class).eq(AdminUpush::getUpushId, adminUpush.getUpushId()));
         } catch (Exception e) {
-
+            updatePush.setErrorMsg(e.getMessage());
+            updatePush.setUpdatedAt(DateUtil.getNowTime());
+            adminUpushMapper.update(updatePush, Wrappers.lambdaUpdate(AdminUpush.class).eq(AdminUpush::getUpushId, adminUpush.getUpushId()));
+            e.printStackTrace();
         }
 
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/upush/PushClient.java

@@ -29,7 +29,7 @@ public class PushClient {
 	// The post path
 	protected static final String postPath = "/api/send";
 
-	public boolean send(UmengNotification msg) throws Exception {
+	public String send(UmengNotification msg) throws Exception {
 		// TODO: 2021/7/14 上线去掉 
 		msg.setTestMode();
 		String timestamp = Integer.toString((int)(System.currentTimeMillis() / 1000));
@@ -51,13 +51,8 @@ public class PushClient {
         while ((line = rd.readLine()) != null) {
             result.append(line);
         }
-        System.out.println(result.toString());
-        if (status == 200) {
-            System.out.println("Notification sent successfully.");
-        } else {
-            System.out.println("Failed to send the notification!");
-        }
-        return true;
+
+        return result.toString();
     }
 
 	// Upload file with device_tokens to Umeng

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/AdminUpush.java

@@ -33,11 +33,6 @@ public class AdminUpush implements Serializable {
      */
     private Integer pushRange;
 
-    /**
-     * 推送类型 unicast broadcast
-     */
-    private Integer pushType;
-
     /**
      * 推送号码
      */
@@ -78,16 +73,6 @@ public class AdminUpush implements Serializable {
      */
     private String pushTime;
 
-    /**
-     * 推送者姓名
-     */
-    private String pushedName;
-
-    /**
-     * 推送任务ID
-     */
-    private String taskId;
-
     /**
      * 是否发送推送消息，2不发送 1发送推送消息
      */
@@ -113,13 +98,24 @@ public class AdminUpush implements Serializable {
      */
     private Integer messageShowType;
 
-    private String showContent;
-
     /**
      * 推送者ID
      */
     private String pushedBy;
 
+    /**
+     * 推送者姓名
+     */
+    private String pushedName;
+
+    /**
+     * 推送任务ID
+     */
+    private String taskId;
+    private String msgId;
+    private String errorCode;
+    private String errorMsg;
+
     private String createdAt;
 
     private String updatedAt;