Merge remote-tracking branch 'origin/1019-分布式Reddision' into release

# Conflicts:
#	dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java

dxhy-core/src/main/java/com/dxhy/core/config/RedissionConfig.java

@@ -1,33 +1,135 @@
 package com.dxhy.core.config;
 
+import org.springframework.context.annotation.Configuration;
+import org.apache.commons.lang3.StringUtils;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
+import org.redisson.config.ClusterServersConfig;
 import org.redisson.config.Config;
-import org.springframework.beans.factory.annotation.Value;
+import org.redisson.config.SentinelServersConfig;
+import org.redisson.config.SingleServerConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
-//@Configuration
+import java.util.List;
-//public class RedissionConfig {
+import java.util.Objects;
-//
+
-//    @Value("${spring.redis.host}")
+@Configuration
-//    private String host;
+public class RedissionConfig {
-//
+    Logger log = LoggerFactory.getLogger(RedissionConfig.class);
-//    @Value("${spring.redis.port}")
+
-//    private String port;
+    //直接使用starter注入的redis配置信息
-//
+    @Autowired
-//    @Value("${spring.redis.password}")
+    private RedisProperties redisProperties;
-//    private String redisPassword;
+
-//
+    private int timeout = 3000;
-//    @Bean
+    private int connectionPoolSize = 64;
-//    public RedissonClient getRedisson(){
+    private int connectionMinimumIdleSize = 10;
-//
+    private int pingConnectionInterval = 60000;
-//        Config config = new Config();
+    private static String ADDRESS_PREFIX = "redis://";
-//        //单机模式  依次设置redis地址和密码
+
-//        config.useSingleServer()
+    /**
-//                .setAddress("redis://" + host + ":" + port)
+     * 单机模式
-//                .setPassword(redisPassword);
+     */
-//        return Redisson.create(config);
+    @Bean
-//    }
+    public RedissonClient initBean() {
-//}
+        // 哨兵模式
-//
+        RedisProperties.Sentinel sentinel = redisProperties.getSentinel();
+        if (Objects.nonNull(sentinel)) {
+            log.info("redis is sentinel mode");
+            return redissonSentinel();
+        }
+        // 集群模式
+        RedisProperties.Cluster cluster = redisProperties.getCluster();
+        if (Objects.nonNull(cluster)) {
+            log.info("redis is cluster mode");
+            return redissonCluster();
+        }
+        // 单机模式
+        String host = redisProperties.getHost();
+        if (StringUtils.isNotBlank(host)) {
+            log.info("redis is single mode");
+            return redissonSingle();
+        }
+
+        log.error("redisson config can not support this redis mode");
+        return null;
+    }
+
+    /**
+     * 单机模式
+     */
+    private RedissonClient redissonSingle() {
+        String host = redisProperties.getHost();
+        String password = redisProperties.getPassword();
+        int port = redisProperties.getPort();
+        // 声明一个配置类
+        Config config = new Config();
+        SingleServerConfig serverConfig = config.useSingleServer()
+                .setAddress(ADDRESS_PREFIX + host + ":" + port)
+                .setTimeout(timeout)
+                .setPingConnectionInterval(pingConnectionInterval)
+                .setConnectionPoolSize(this.connectionPoolSize)
+                .setConnectionMinimumIdleSize(this.connectionMinimumIdleSize);
+        // 判断密码
+        if (!StringUtils.isEmpty(password)) {
+            serverConfig.setPassword(password);
+        }
+        return Redisson.create(config);
+    }
+
+
+    /**
+     * 哨兵模式
+     */
+    private RedissonClient redissonSentinel() {
+        // mymaster
+        String masterName = redisProperties.getSentinel().getMaster();
+        // 127.0.0.1:26389,127.0.0.1:26379
+        List<String> nodes = redisProperties.getSentinel().getNodes();
+        String password = redisProperties.getPassword();
+        // 声明一个配置类
+        Config config = new Config();
+        SentinelServersConfig sentinelServersConfig = config.useSentinelServers();
+        // 扫描间隔
+        sentinelServersConfig.setScanInterval(2000);
+        // 判断密码
+        if (!StringUtils.isEmpty(password)) {
+            sentinelServersConfig.setPassword(password);
+        }
+        sentinelServersConfig.setMasterName(masterName);
+        String[] nodeArr = nodes.toArray(new String[nodes.size()]);
+        for (int i = 0; i < nodeArr.length; i++) {
+            nodeArr[i] = ADDRESS_PREFIX + nodeArr[i];
+        }
+        // 添加redis节点
+        sentinelServersConfig.addSentinelAddress(nodeArr);
+        return Redisson.create(config);
+    }
+
+    /**
+     * 集群模式
+     */
+    private RedissonClient redissonCluster() {
+        // 192.168.116.156:1901,192.168.116.156:1902
+        List<String> nodes = redisProperties.getCluster().getNodes();
+        String password = redisProperties.getPassword();
+        // 声明一个配置类
+        Config config = new Config();
+        ClusterServersConfig clusterServersConfig = config.useClusterServers();
+        // 扫描间隔
+        clusterServersConfig.setScanInterval(2000);
+        // 判断密码
+        if (!StringUtils.isEmpty(password)) {
+            clusterServersConfig.setPassword(password);
+        }
+        // 添加redis节点
+        for (String node : nodes) {
+            clusterServersConfig.addNodeAddress(ADDRESS_PREFIX + node);
+        }
+        return Redisson.create(config);
+    }
+}

dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java

@@ -75,8 +75,8 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
     @Resource
     private StringRedisTemplate stringRedisTemplate;
 
-//    @Resource
+    @Resource
-//    private RedissonClient redisson;
+    private RedissonClient redisson;
 
     private static final String REDIS_KEY = "collect_invoice_";
 
@@ -644,8 +644,8 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
             List<InvoiceLog> logList = new ArrayList<>();
             for (InvoiceSelectInfo invoiceSelectInfo : invoicesList) {
                 //加分布式锁
-//                String lockKey = REDIS_KEY + invoiceSelectInfo.getUuid();
+                String lockKey = REDIS_KEY + invoiceSelectInfo.getUuid();
-//                RLock lock = redisson.getLock(lockKey);
+                RLock lock = redisson.getLock(lockKey);
                 invoiceSelectInfo.setUuid(invoiceSelectInfo.getInvoiceCode() + invoiceSelectInfo.getInvoiceNo());
                 if ("1".equals(invoiceSelectInfo.getLegalizeState())) {
                     //认证处理状态 0-未认证 1-已勾选未确认，2已确认 3 已发送认证 4 认证成功 5 认证失败
@@ -654,11 +654,11 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
                     invoiceSelectInfo.setAuthStatus("0");
                 }
                 try {
-//                    boolean isLock = lock.tryLock();
+                    boolean isLock = lock.tryLock();
 
-//                    if(!isLock){
+                    if(!isLock){
-//                        log.info("当前已有线程获取到锁");
+                        log.info("当前已有线程获取到锁");
-//                    }else {
+                    }else {
                         // 判断库里是否已经存在，存在则只更新发票状态，状态更新时间，认证状态以及相关字段更新
                         TDxRecordInvoiceJobEntity entity = tDxRecordInvoiceJobDao.findInvoiceByUUid(invoiceSelectInfo.getUuid());
                         if (entity != null) {
@@ -767,7 +767,7 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
                         invoiceLog.setCreateDate(new Date());
                         invoiceLog.setInputName("系统自动");
                         logList.add(invoiceLog);
-//                    }
+                    }
                 }catch (Exception e) {
                     e.printStackTrace();
                 }

dxhy-core/src/main/resources/mapper/ConfirmDao.xml

@@ -9,6 +9,9 @@
             and cj_status = '1'
             and g.ace_id is not null
             and g.ace_key is not null
+            and g.taxno is not null
+            and g.taxno !=''
+        group by g.taxno
     </select>
     <select id="getUpgradTaxno" resultType="com.dxhy.core.job.entity.TAcOrg">
         select g.taxno, g.db_name, g.company, g.taxname