Browse Source

代码格式化

lixing 4 years ago
parent
commit
3d0bd96f7b

+ 1 - 1
src/main/java/com/persagy/dmp/starter/alarm/feign/AlarmFeignLogger.java

@@ -38,7 +38,7 @@ public class AlarmFeignLogger extends feign.Logger {
     @Override
     protected void log(String configKey, String format, Object... args) {
         if (log.isInfoEnabled()) {
-            log.info(String.format(methodTag(configKey) + format, args));
+            //log.info(String.format(methodTag(configKey) + format, args));
         }
     }
 }

+ 12 - 12
src/main/java/com/persagy/dmp/starter/alarm/service/BaseService.java

@@ -47,21 +47,21 @@ public class BaseService {
      * @version: V1.0
      */
     public AlarmUrlParam getAlarmUrlParam(JSONObject obj) throws Exception {
-            String projectId = obj.getString("projectId");
-            // 如果projectId为空,设置为0,查询集团下所有项目的数据
-            if (StringUtils.isEmpty(projectId)) {
-                projectId = "0";
+        String projectId = obj.getString("projectId");
+        // 如果projectId为空,设置为0,查询集团下所有项目的数据
+        if (StringUtils.isEmpty(projectId)) {
+            projectId = "0";
+            obj.put("projectId", "0");
+        } else {
+            // 如果projectId为多个项目(用逗号分隔), param中projectId传0
+            String[] projectIds = projectId.split(",");
+            if (projectIds.length > 1) {
                 obj.put("projectId", "0");
-            } else {
-                // 如果projectId为多个项目(用逗号分隔), param中projectId传0
-                String[] projectIds = projectId.split(",");
-                if (projectIds.length > 1) {
-                    obj.put("projectId", "0");
-                }
             }
-            this.checkRequestParam(obj);
+        }
+        this.checkRequestParam(obj);
 
-            return new AlarmUrlParam(
+        return new AlarmUrlParam(
                 obj.getString("userId"),
                 obj.getString("groupCode"),
                 projectId,