Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/MqInit.java

@@ -59,6 +59,7 @@ public class MqInit implements ApplicationRunner {
         //新增MQ公共异常
         dynamicRabbitMq.addQueue(BizConstant.MQ_GLOBAL_EXCEPTION);
         dynamicRabbitMq.startListener(BizConstant.MQ_GLOBAL_EXCEPTION);
+        //dynamicRabbitMq.startListener(BizConstant.MQ_EQUIPMENT_STATUS);
 
         //添加三个线边库轮询虚拟的MQ
 //        dynamicRabbitMq.addQueue(DemoLineConstant.NODE_RESOURCE_ZLZX_XBK);

imcs-admin-boot/imcs-common/src/main/java/com/github/zuihou/common/constant/BizConstant.java

@@ -204,6 +204,7 @@ public interface BizConstant {
 
     String MQ_GLOBAL_EXCEPTION = "GLOBAL_EXCEPTION";
 
+    String MQ_EQUIPMENT_STATUS = "EquipmentStatus";
 
 
 }

imcs-admin-boot/imcs-oauth-controller/src/main/java/com/github/zuihou/oauth/controller/OauthController.java

@@ -95,7 +95,7 @@ public class OauthController {
 
         //产线登录账号隔离处理
         String zoneType = login.getZoneType();
-        if(!zoneType.equals("1")){
+        if(null!=zoneType && !zoneType.equals("1")){
             if((u.getRoles().indexOf("舱体")>=0 && zoneType.equals("3")) ||
                (u.getRoles().indexOf("框体")>=0 && zoneType.equals("2"))){
                 return R.fail("该用户不存在，请确认产线或登录账号是否正确");