duty值班优化

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/View3dController.java

@@ -170,7 +170,7 @@ public class View3dController extends BaseController {
 		product = getProduct();
 		staticOrgCode = orgCode;
 		token = getToken();
-		return view3dService.getStatisticsDuty(getAppKey(),getProduct(),orgCode);
+		return view3dService.getStatisticsDuty(getAppKey(),getProduct(),token,orgCode);
 	}
 
 	@Permission

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/DutyModeServerFallback.java

@@ -6,7 +6,7 @@ import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 public class DutyModeServerFallback implements IDutyModeServer{
 
 	@Override
-	public CommonResponse dutyListByDay(String appKey,String product,String orgCode,String dutyDate) {
+	public CommonResponse dutyListByDay(String appKey,String product, String token,String orgCode,String dutyDate) {
 		return CommonResponseUtil.failure("fegin调用失败！！！");
 	}
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/IDutyModeServer.java

@@ -13,6 +13,7 @@ public interface IDutyModeServer {
 	public CommonResponse dutyListByDay(
 			@RequestHeader(name="appKey",required = true) String appKey,
 			@RequestHeader(name="product",required = true) String product,
+			@RequestHeader(name="token",required = true) String token,
 			@RequestHeader(name="orgCode",required = true) String orgCode,
 			@RequestBody String param);
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/View3dServiceImpl.java

@@ -492,12 +492,12 @@ public class View3dServiceImpl implements IView3dService {
 	}
 
 	@Override
-	public CommonResponse getStatisticsDuty(String appKey,String product,String orgCode) {
+	public CommonResponse getStatisticsDuty(String appKey,String product,String token, String orgCode) {
 		Date curDate = new Date();
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 		JSONObject param = new JSONObject();
 		param.put("dutyDate", curDate);
-		return dutyModeServer.dutyListByDay(appKey,product,orgCode,param.toJSONString());
+		return dutyModeServer.dutyListByDay(appKey,product,token,orgCode,param.toJSONString());
 	}
 
 	@Override

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IView3dService.java

@@ -104,7 +104,7 @@ public interface IView3dService {
 	 * 今日值班统计
 	 * @return
 	 */
-	CommonResponse getStatisticsDuty(String appKey, String product, String orgCode);
+	CommonResponse getStatisticsDuty(String appKey, String product, String token, String orgCode);
 
 	/**
 	 * 设备状态消息最新5条

pom.xml

@@ -35,7 +35,7 @@
 	      <groupId>com.yeejoin</groupId>
 	      <artifactId>amos-component-rule</artifactId>
 	      <version>1.2.0-SNAPSHOT</version>
-       </dependency> 
+       </dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>