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

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -515,13 +515,13 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 				Long auditDepartmentId = failureRepairlog.getProcessDepartmentId();
 				if (auditDepartmentId.intValue() == seq.intValue()) {
 					countNum++;
-					continue;
+					break;
 				}
 			} else {
 				// 判断当前节点任务属于送达部门节点时需要判断当前登录人所在的部门id是否与表单发起时设置的送达部门一致
 				if (failureDetails.getFailureEquipmentId().intValue() == seq.intValue()) {
 					countNum++;
-					continue;
+					break;
 				}
 			}
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureVerifyServiceImpl.java

@@ -89,7 +89,7 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
             this.createWithModel(model);
         } else {*/
             this.createWithModel(model);
-            if (!failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo, condition + "")) {
+            if (!failureDetailsService.excuteTask(failureDetailsDto.getSequenceNbr(), userInfo, condition + "")) {
                 throw new Exception("执行流程失败");
             }
      /*   }*/

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/EquipFeignClient.java

@@ -12,7 +12,7 @@ import java.util.Map;
 /**
  * @author DELL
  */ //装备
-@FeignClient(name = "${equip.feign.name}")
+@FeignClient(name = "${equip.feign.name}",configuration = FeignConfiguration.class)
 public interface EquipFeignClient {
     String PREFIX = "${equip.feign.prefix}";
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/FeignBasicAuthRequestInterceptor.java

@@ -21,9 +21,12 @@ public class FeignBasicAuthRequestInterceptor implements RequestInterceptor {
         }
         ServletRequestAttributes attributes = (ServletRequestAttributes) requestAttributes;
         HttpServletRequest request = attributes.getRequest();
-  
+
         //设置header
-        String token = request.getHeader("X-Access-Token");
+        String token = request.getHeader("token");
+        if (token == null) {
+            token = request.getHeader("X-Access-Token");
+        }
         String product = request.getHeader("product");
         String appKey = request.getHeader("appKey");
         template.header("token", token);

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/FeignConfiguration.java

 package com.yeejoin.amos.maintenance.business.feign;
 
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.context.annotation.Bean;
 
-import feign.codec.Encoder;
-import feign.form.spring.SpringFormEncoder;
-
 public class FeignConfiguration {
 
-	   @Autowired
-		private ObjectFactory<HttpMessageConverters> messageConverters;
-		@Bean
-		public Encoder feignFormEncoder() {
-			return new SpringFormEncoder(new SpringEncoder(messageConverters));
-		}
-		 @Bean
-		    public FeignBasicAuthRequestInterceptor basicAuthRequestInterceptor() {
-		        return new FeignBasicAuthRequestInterceptor();
-		    }
+    @Autowired
+    private ObjectFactory<HttpMessageConverters> messageConverters;
+
+    @Bean
+    public Encoder feignFormEncoder() {
+        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+    }
+
+    @Bean
+    public FeignBasicAuthRequestInterceptor basicAuthRequestInterceptor() {
+        return new FeignBasicAuthRequestInterceptor();
+    }
 }