瀏覽代碼

代码格式化

lixing 4 年之前
父節點
當前提交
5bbaca1614

+ 1 - 1
pom.xml

@@ -11,7 +11,7 @@
     <groupId>com.persagy.dmp.starter</groupId>
     <artifactId>dmp-alarm-starter</artifactId>
 <!--    <version>4.0.0-SNAPSHOT</version>-->
-    <version>4.0.5</version>
+    <version>4.0.6</version>
     <name>dmp-alarm-starter</name>
     <description>dmp_alarm_starter</description>
 

+ 1 - 2
src/main/java/com/persagy/dmp/starter/alarm/communication/mq/JmsConfig.java

@@ -1,5 +1,6 @@
 package com.persagy.dmp.starter.alarm.communication.mq;
 
+import com.persagy.dmp.alarm.jms.model.OrderStateMessage;
 import com.persagy.dmp.starter.alarm.communication.mq.model.DmpMessage;
 import com.persagy.dmp.starter.alarm.communication.netty.NettyAlarmMsgBaseHandler;
 import com.persagy.dmp.starter.alarm.service.OrderStateChangeService;
@@ -13,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.persagy.dmp.alarm.jms.model.OrderStateMessage;
 
 import java.io.IOException;
 
@@ -134,5 +134,4 @@ public class JmsConfig {
             }
         }
     }
-
 }

+ 0 - 2
src/main/java/com/persagy/dmp/starter/alarm/feign/fallback/AlarmClientFallbackFactory.java

@@ -8,8 +8,6 @@ import com.persagy.dmp.starter.alarm.feign.client.AlarmClient;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.List;
-
 
 /**
  * @description: 降级处理

+ 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";
-            obj.put("projectId", "0");
-        } else {
-            // 如果projectId为多个项目(用逗号分隔), param中projectId传0
-            String[] projectIds = projectId.split(",");
-            if (projectIds.length > 1) {
+            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");
+                }
             }
-        }
-        this.checkRequestParam(obj);
+            this.checkRequestParam(obj);
 
-        return new AlarmUrlParam(
+            return new AlarmUrlParam(
                 obj.getString("userId"),
                 obj.getString("groupCode"),
                 projectId,