From e68acd032f3f7a6b672873a57e21dd6069d41907 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 04 四月 2019 14:50:14 +0800
Subject: [PATCH] 删除员工

---
 Api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java b/Api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java
index 32e834b..7c904ce 100644
--- a/Api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java
+++ b/Api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java
@@ -11,6 +11,7 @@
 import com.java110.common.log.LoggerEngine;
 import com.java110.common.util.DateUtil;
 import com.java110.common.util.StringUtil;
+import com.java110.core.client.RestTemplate;
 import com.java110.core.context.ApiDataFlow;
 import com.java110.core.context.DataFlow;
 import com.java110.core.factory.AuthenticationFactory;
@@ -22,11 +23,13 @@
 import com.java110.event.service.api.ServiceDataFlowEventPublishing;
 import com.java110.service.smo.IQueryServiceSMO;
 import org.apache.commons.lang3.math.NumberUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
+
 
 import java.util.Date;
 import java.util.List;
@@ -41,6 +44,7 @@
 //@Transactional
 public class ApiServiceSMOImpl extends LoggerEngine implements IApiServiceSMO {
 
+    private final static Logger logger = LoggerFactory.getLogger(ApiServiceSMOImpl.class);
 
     @Autowired
     private RestTemplate restTemplate;
@@ -240,17 +244,22 @@
             DataFlowFactory.addCostTime(dataFlow, "judgeAuthority", "閴存潈鑰楁椂", startDate);
             throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "requestTime 鏍煎紡涓嶅锛岄伒寰獃yyyMMddHHmmss鏍煎紡");
         }
+        //鐢ㄦ埛ID鏍¢獙
+        if (StringUtil.isNullOrNone(dataFlow.getUserId())){
+             throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "USER_ID 涓嶈兘涓虹┖");
+        }
 
 
         //鍒ゆ柇 AppId 鏄惁鏈夋潈闄愭搷浣滅浉搴旂殑鏈嶅姟
         AppService appService = DataFlowFactory.getService(dataFlow, dataFlow.getRequestHeaders().get(CommonConstant.HTTP_SERVICE));
 
-                //杩欓噷璋冪敤缂撳瓨 鏌ヨ缂撳瓨淇℃伅
-        if (appService == null) {
+        //杩欓噷璋冪敤缂撳瓨 鏌ヨ缂撳瓨淇℃伅
+        if (appService == null || !CommonConstant.HTTP_SERVICE_API.equals(appService.getBusinessTypeCd())) {
             //娣诲姞鑰楁椂
             DataFlowFactory.addCostTime(dataFlow, "judgeAuthority", "閴存潈鑰楁椂", startDate);
             throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "AppId 娌℃湁鏉冮檺璁块棶 serviceCode = " + dataFlow.getRequestHeaders().get(CommonConstant.HTTP_SERVICE));
         }
+
 
         //妫�楠岀櫧鍚嶅崟
         List<String> whileListIp = dataFlow.getAppRoutes().get(0).getWhileListIp();
@@ -284,6 +293,12 @@
         AppService appService = DataFlowFactory.getService(dataFlow, dataFlow.getRequestHeaders().get(CommonConstant.HTTP_SERVICE));
         //杩欓噷瀵归�忎紶绫诲鐞�
         if("NT".equals(appService.getIsInstance())){
+            //濡傛灉鏄�忎紶绫� 璇锋眰鏂瑰紡蹇呴』涓庢帴鍙f彁渚涙柟璋冪敤鏂瑰紡涓�鑷�
+            String httpMethod = dataFlow.getRequestCurrentHeaders().get(CommonConstant.HTTP_METHOD);
+            if(!appService.getMethod().equals(httpMethod)) {
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR,
+                        "鏈嶅姟銆�" + appService.getServiceCode() + "銆戣皟鐢ㄦ柟寮忎笉瀵硅妫�鏌�,褰撳墠璇锋眰鏂瑰紡涓猴細"+httpMethod);
+            }
             dataFlow.setApiCurrentService(ServiceCodeConstant.SERVICE_CODE_DO_SERVICE_TRANSFER);
         }else{
             dataFlow.setApiCurrentService(dataFlow.getRequestHeaders().get(CommonConstant.HTTP_SERVICE));

--
Gitblit v1.8.0