Ver Fonte

Merge remote-tracking branch 'origin/master'

syh há 4 anos atrás
pai
commit
476a78e463

+ 27 - 19
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleGroupServiceImpl.java

@@ -592,8 +592,6 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                 }
                 if (ACCOUNT.equals(type)) {
                     msg += "请您及时查看并调整!";
-                } else {
-                    msg += "现已被关停,请您及时查看并调整!";
                 }
             } else {
                 msg += "请您及时查看并调整!";
@@ -664,26 +662,34 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
     private String kuaiShoushutDown(Long accountId, String ids, String type, String userId, String msg) {
         CtopOauthToken token = tokenService.getTokenByAccountId(accountId);
         Map<String, Object> updateMap = new HashMap<>();
-        if (!Check.isNull(token) && !Check.isNull(ids)) {
-            String[] idSplit = ids.split(",");
-            for (String id : idSplit) {
-                if (CREATIVE.equals(type)) {
-                    updateMap = kuaiShouUpdateService.updateCreativeStatus(token.getAccessToken(), accountId, Long.valueOf(id), NoEn.NO2.valueInt(), userId);
-                    if (!(boolean) updateMap.get("success")) {
-                        msg = msg.replace(id, id + "(F)");
-                    }
-                } else if (UNIT.equals(type)) {
-                    updateMap = kuaiShouUpdateService.updateUnitStatus(token.getAccessToken(), accountId, Long.valueOf(id), NoEn.NO2.valueInt(), userId);
-                    if (!(boolean) updateMap.get("success")) {
-                        msg = msg.replace(id, id + "(F)");
-                    }
-                } else if (PLAN.equals(type)) {
-                    updateMap = kuaiShouUpdateService.updateCampaignStatus(token.getAccessToken(), accountId, Long.valueOf(id), NoEn.NO2.valueInt(), userId);
-                    if (!(boolean) updateMap.get("success")) {
-                        msg = msg.replace(id, id + "(F)");
+        try {
+            if (!Check.isNull(token) && !Check.isNull(ids)) {
+                String[] idSplit = ids.split(",");
+                for (String id : idSplit) {
+                    if (CREATIVE.equals(type)) {
+                        updateMap = kuaiShouUpdateService.updateCreativeStatus(token.getAccessToken(), accountId, Long.valueOf(id), NoEn.NO2.valueInt(), userId);
+                        if (!(boolean) updateMap.get("success")) {
+                            msg = msg.replace(id, id + "(F)");
+                        }
+                    } else if (UNIT.equals(type)) {
+                        updateMap = kuaiShouUpdateService.updateUnitStatus(token.getAccessToken(), accountId, Long.valueOf(id), NoEn.NO2.valueInt(), userId);
+                        if (!(boolean) updateMap.get("success")) {
+                            msg = msg.replace(id, id + "(F)");
+                        }
+                    } else if (PLAN.equals(type)) {
+                        updateMap = kuaiShouUpdateService.updateCampaignStatus(token.getAccessToken(), accountId, Long.valueOf(id), NoEn.NO2.valueInt(), userId);
+                        if (!(boolean) updateMap.get("success")) {
+                            msg = msg.replace(id, id + "(F)");
+                        }
                     }
                 }
+                msg += "现已被关停,请您及时查看并调整!";
+            } else {
+                msg = msg + "(F)获取签证失败!请联系管理员!";
             }
+        } catch (NumberFormatException e) {
+            log.error("快手关停操作异常", e);
+            msg = msg + "(F)操作关停失败!请联系管理员!";
         }
         return msg;
     }
@@ -721,9 +727,11 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                             }
                         }
                     }
+                    msg += "现已被关停,请您及时查看并调整!";
                 }
             }
         } catch (Exception e) {
+            msg = msg + "(F)操作关停失败!请联系管理员!";
             log.error("头条账户:{},关停{}失败", accountId, type, e);
         }
         return msg;