Merge branch 'master_xgh_pendingid' into 'developer'

Master xgh pendingid

See merge request !296

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/QwFriendApiService.java

@@ -68,4 +68,5 @@ public interface QwFriendApiService {
     public ServiceResponse<List<QwPendingIdDTO>> listPendingIdByExternalid(String enterpriseId,
             List<String> externalUserIdList);
 
+    public ServiceResponse<Object> getTestTimes(String wxEnterpriseId) ;
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QwFriendApiServiceImpl.java

@@ -102,7 +102,7 @@ public class QwFriendApiServiceImpl implements QwFriendApiService {
         ServiceResponse<PendingIdDTO> qwResp = this.qywxExternalUserService.unionidToExternalUserid(corpid, suiteid,
                 unionid, openid, 0);
         QwTimesUtils.addTimes(wxEnterpriseId, QwInterfaceLimitEnum.GET_PENDING_ID);
-        log.info("获取pendingid,参数={},{},返回={}", unionid, openid, JSON.toJSONString(qwResp));
+        log.info("Unionid获取pendingid,参数={},{},返回={}", unionid, openid, JSON.toJSONString(qwResp));
         if (!qwResp.isSuccess()) {
             return ServiceResponse.failure(qwResp.getCode(), qwResp.getMessage());
         }
@@ -123,7 +123,7 @@ public class QwFriendApiServiceImpl implements QwFriendApiService {
         String corpid = qwDTO.getThirdCorpid();
         ServiceResponse<List<PendingIdDTO>> qwResp = this.qywxExternalUserService.externalUseridToPendingId(corpid,
                 suiteid, Arrays.asList(externalUserId));
-        log.info("获取pendingid,参数={},返回={}", externalUserId, JSON.toJSONString(qwResp));
+        log.info("Externalid获取pendingid,参数={},返回={}", externalUserId, JSON.toJSONString(qwResp));
         if (!qwResp.isSuccess()) {
             return ServiceResponse.failure(qwResp.getCode(), qwResp.getMessage());
         }
@@ -193,5 +193,10 @@ public class QwFriendApiServiceImpl implements QwFriendApiService {
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         return ServiceResponse.success(qwDTO);
     }
+    
+    @Override
+    public ServiceResponse<Object> getTestTimes(String wxEnterpriseId) {
+        return ServiceResponse.success(QwTimesUtils.getTestTimes(wxEnterpriseId));
+    }
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/QwTimesUtils.java

 package com.gic.haoban.manage.service.util;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -39,6 +40,26 @@ public class QwTimesUtils {
         QwTimesUtils.enterpriseService = enterpriseService;
     }
 
+    public static  Map<String,Object> getTestTimes(String wxEnterpriseId) {
+        QwInterfaceLimitEnum qwInterface = QwInterfaceLimitEnum.GET_PENDING_ID ;
+        Date now = new Date();
+        String dateStr = getDateStr(now);
+        String interfaceName = qwInterface.getName();
+        String keyMonth = getCacheKey(wxEnterpriseId, interfaceName, dateStr.substring(0, 6));
+        Integer doneTimesMonth = RedisUtil.getCache(keyMonth, Integer.class);
+        String keyDay = getCacheKey(wxEnterpriseId, interfaceName, dateStr.substring(0, 8));
+        Integer doneTimesDay = RedisUtil.getCache(keyDay, Integer.class);
+        String keyHour = getCacheKey(wxEnterpriseId, interfaceName, dateStr.substring(0, 10));
+        Integer doneTimesHour = RedisUtil.getCache(keyHour, Integer.class);
+        Map<String,Object> map = new HashMap<String, Object>() ;
+        map.put("小时调用数", doneTimesHour) ;
+        map.put("每天调用数", doneTimesDay) ;
+        map.put("每月调用数", doneTimesMonth) ;
+        QwLimitTimesBO setTimeBO = getSettingTimes(wxEnterpriseId, qwInterface);
+        map.put("配置数", JSON.toJSON(setTimeBO)) ;
+        return map ;
+    }
+    
     public static boolean isLimit(String wxEnterpriseId, String enterpriseId, QwInterfaceLimitEnum qwInterface) {
         QwLimitTimesBO setTimeBO = getSettingTimes(wxEnterpriseId, qwInterface);
         logger.info("获取配置次数={},wxEnterpriseId={}", JSON.toJSONString(setTimeBO), wxEnterpriseId);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java

@@ -56,8 +56,6 @@ public class TestController extends WebBaseController {
     @Autowired
     private QywxSuiteApiService qywxSuiteApiService;
     @Autowired
-    private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
-    @Autowired
     private TestApiService testApiService;
     @Autowired
     private MaidianLogApiService maidianLogApiService;
@@ -77,8 +75,14 @@ public class TestController extends WebBaseController {
     private HmQrcodeApiService hmQrcodeApiService;
     @Autowired
     private QywxCorpApiService qywxCorpApiService;
+    @Autowired
+    private QwFriendApiService qwFriendApiService ;
     
     
+    @RequestMapping("/get-pending-times")
+    public HaobanResponse getTestTimes(String wxEnterpriseId) {
+        return this.resultResponse(HaoBanErrCode.ERR_0,this.qwFriendApiService.getTestTimes(wxEnterpriseId));
+    }
 
     @RequestMapping("/send-message-test")
     public HaobanResponse testSendMessage(QywxXcxSendMessageQo qo) {

haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml

@@ -15,7 +15,7 @@
 
 	<dubbo:protocol name="dubbo" port="30009"/>
 	
-	
+	<dubbo:reference interface="com.gic.haoban.manage.api.service.QwFriendApiService" id="qwFriendApiService"	 timeout="10000"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.hm.WxUserAddLogApiService" id="wxUserAddLogApiService"	 timeout="10000"/>
 	<dubbo:reference interface="com.gic.member.tag.api.service.MemberTagApiService" id="memberTagApiService"	 timeout="10000"/>
 	<dubbo:reference interface="com.gic.clerk.api.service.PowerService" id="powerService"	 timeout="10000"/>