1.单推推送日志兼容群推

src/main/java/com/weface/serviceimpl/PushLogServiceImpl.java

@@ -12,6 +12,7 @@ import com.weface.dto.InformForm;
 import com.weface.entity.PushLogEntity;
 import com.weface.service.PushLogService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -38,10 +39,16 @@ public class PushLogServiceImpl extends ServiceImpl<PushLogDao, PushLogEntity> i
                 pushLogEntity.setAppName(informForm.getEquipmentType());
                 pushLogEntity.setTaskId(key);
                 pushLogEntity.setResult(data.toString());
+                String phone = informForm.getPhone();
+                if (StringUtils.isNotEmpty(phone)){
                     DES des = DES.getInstanceDes();
-                pushLogEntity.setPhone(des.encrypt(informForm.getPhone()));
-                pushLogEntity.setMessageTemplate(informForm.getMessageTemplate());
-                pushLogEntity.setPushTarget(informForm.getCid());
+                    pushLogEntity.setPhone(des.encrypt(phone));
+                }
+                Integer messageTemplate = informForm.getMessageTemplate();
+                if (messageTemplate!=null){
+                    pushLogEntity.setMessageTemplate(messageTemplate);
+                }
+                pushLogEntity.setPushTarget(informForm.getCid() == null ? "all" : informForm.getCid());
                 pushLogEntity.setPushContent(informForm.getBody());
                 pushLogEntity.setArriveStatus(1001);
                 pushLogEntity.setUpdateTime(new Date());

src/main/java/com/weface/task/UserTagsTask.java

@@ -62,6 +62,9 @@ public class UserTagsTask {
      */
     private static final Integer TIME = 2;
 
+    /**
+     * 查询未推送消息成功记录,发送短信通知
+     */
     @Scheduled(cron = "0 0 0/1 * * ? ")
     public void sendMessage() {
         try {
@@ -73,6 +76,7 @@ public class UserTagsTask {
                 DES des = DES.getInstanceDes();
                 for (PushLogEntity pushLogEntity : list) {
                     String phone = pushLogEntity.getPhone();
+                    if (StringUtils.isNotEmpty(phone)){
                         if (CommonUtil.isBase64(phone)) {
                             phone = des.decrypt(phone);
                         }
@@ -84,11 +88,13 @@ public class UserTagsTask {
                             if (b) {
                                 log.info("执行短信发送成功");
                                 pushLogEntity.setArriveStatus(1003);
+                                pushLogEntity.setUpdateTime(new Date());
                                 updateBatch.add(pushLogEntity);
                             }
                         }
                     }
                 }
+            }
             if (updateBatch != null) {
                 pushLogService.updateBatchById(updateBatch);
             }