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

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingEnterpriseSmsPackageServiceImpl.java

@@ -18,6 +18,8 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
+
 /**
  *
  * @ClassName: BillingEnterpriseSmsPackageServiceImpl
@@ -77,19 +79,17 @@ public class BillingEnterpriseSmsPackageServiceImpl implements BillingEnterprise
     @Override
     public RAtomicLong getTotalSmsInPackageByEnterpriseId(Integer enterpriseId) {
         RedissonClient redisClient = RedisUtil.getRedisClient();
-        RAtomicLong smsCountR = redisClient.getAtomicLong(Constants.ENTERPRISE_BILLING_SMS_PACKAGE_COUNT + enterpriseId);
-        long smsPackageCount = smsCountR.get();
-        if (smsPackageCount == 0) {
-            RedisUtil.lock(Constants.ENTERPRISE_BILLING_SMS_PACKAGE_COUNT_LOCK + enterpriseId, 30L);
-            logger.info("redis中没有套餐包 查询数据库:{}", enterpriseId);
-            Integer totalSms = tabBillingEnterpriseSmsPackageMapper.getTotalSmsInPackageByEnterpriseId(enterpriseId);
-            if (totalSms != null) {
-                smsCountR.set(totalSms);
-            } else {
-                smsCountR.set(0);
+        Long smsCountCache = RedisUtil.getCache(Constants.ENTERPRISE_BILLING_SMS_PACKAGE_COUNT + enterpriseId, Long.class);
+        if (smsCountCache == null) {
+            try {
+                RedisUtil.lock(Constants.ENTERPRISE_BILLING_SMS_PACKAGE_COUNT_LOCK + enterpriseId, 30L);
+                logger.info("redis中没有套餐包 查询数据库:{}", enterpriseId);
+                Integer totalSms = tabBillingEnterpriseSmsPackageMapper.getTotalSmsInPackageByEnterpriseId(enterpriseId);
+                RedisUtil.setCache(Constants.ENTERPRISE_BILLING_SMS_PACKAGE_COUNT + enterpriseId, totalSms != null ? totalSms : 0, 1L, TimeUnit.HOURS);
+            }finally {
+                RedisUtil.unlock(Constants.ENTERPRISE_BILLING_SMS_PACKAGE_COUNT_LOCK + enterpriseId);
             }
-            RedisUtil.unlock(Constants.ENTERPRISE_BILLING_SMS_PACKAGE_COUNT_LOCK + enterpriseId);
         }
-        return smsCountR;
+        return redisClient.getAtomicLong(Constants.ENTERPRISE_BILLING_SMS_PACKAGE_COUNT + enterpriseId);
     }
 }

gic-platform-enterprise-web/pom.xml

@@ -209,6 +209,11 @@
             <artifactId>gic-goods-api</artifactId>
             <version>${gic-goods-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-spark-run-api</artifactId>
+            <version>${gic-spark-run-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/DataConfigController.java

 package com.gic.enterprise.web.controller;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
-import com.gic.enterprise.ano.IgnoreLogin;
-import com.gic.enterprise.dto.EnterpriseDTO;
-import com.gic.enterprise.service.EnterpriseApiService;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.StringUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.download.utils.OperationResultUtils;
+import com.gic.enterprise.ano.IgnoreLogin;
+import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.dto.data.*;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.service.DataConfigApiService;
+import com.gic.enterprise.service.EnterpriseApiService;
 import com.gic.enterprise.service.EnterpriseInitApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
@@ -36,6 +24,18 @@ import com.gic.member.config.api.service.AppletsConfigApiService;
 import com.gic.member.config.api.service.EnterpriseConfigApiService;
 import com.gic.member.config.api.service.MemberCardApiService;
 import com.gic.member.config.api.service.ServiceConfigApiService;
+import com.gic.spark.api.service.SparkJobApiService;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+import java.util.stream.Collectors;
 /**
  *
  * @ClassName: DataConfigController
@@ -62,6 +62,8 @@ public class DataConfigController {
     private EnterpriseInitApiService enterpriseInitApiService;
     @Autowired
     private EnterpriseApiService enterpriseApiService;
+    @Autowired
+    private SparkJobApiService sparkJobApiService;
 
 
     @RequestMapping("list-all-applet")
@@ -247,6 +249,7 @@ public class DataConfigController {
                 }
             }
         }
+        sparkJobApiService.enterMemberUpdateIndex(enterpriseId);
         return ResultControllerUtils.commonResult(response);
     }