Merge remote-tracking branch 'origin/1008-采集入库数据重复' into release

dxhy-core/pom.xml

@@ -164,6 +164,10 @@
             <artifactId>itext-asian</artifactId>
             <version>5.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>

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

@@ -0,0 +1,33 @@
+package com.dxhy.core.config;
+
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class RedissionConfig {
+
+    @Value("${spring.redis.host}")
+    private String host;
+
+    @Value("${spring.redis.port}")
+    private String port;
+
+    @Value("${spring.redis.password}")
+    private String redisPassword;
+
+    @Bean
+    public RedissonClient getRedisson(){
+
+        Config config = new Config();
+        //单机模式  依次设置redis地址和密码
+        config.useSingleServer()
+                .setAddress("redis://" + host + ":" + port)
+                .setPassword(redisPassword);
+        return Redisson.create(config);
+    }
+}
+

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

@@ -14,7 +14,10 @@ import javax.crypto.spec.SecretKeySpec;
 
 import com.dxhy.core.job.thread.InvoiceParseHandle;
 import org.apache.commons.lang.StringUtils;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
@@ -72,6 +75,16 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
     @Resource
     private Sender sender;
 
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Resource
+    private RedissonClient redisson;
+
+    private static final String REDIS_KEY = "collect_invoice_";
+
+    private static final int MAX_SIZE = 1000;
+
     @Value("${jxjk.collectUrl}")
     private String collectUrl;
     @Value("${jxjk.invoiceGet}")
@@ -644,6 +657,9 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
             String company = tDxRecordInvoiceJobDao.findCompany(taxno);
             List<InvoiceLog> logList = new ArrayList<>();
             for (InvoiceSelectInfo invoiceSelectInfo : invoicesList) {
+                //加分布式锁
+                String lockKey = REDIS_KEY + invoiceSelectInfo.getUuid();
+                RLock lock = redisson.getLock(lockKey);
                 invoiceSelectInfo.setUuid(invoiceSelectInfo.getInvoiceCode() + invoiceSelectInfo.getInvoiceNo());
                 if ("1".equals(invoiceSelectInfo.getLegalizeState())) {
                     //认证处理状态 0-未认证 1-已勾选未确认，2已确认 3 已发送认证 4 认证成功 5 认证失败
@@ -651,10 +667,15 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
                 } else {
                     invoiceSelectInfo.setAuthStatus("0");
                 }
+                try {
+                    boolean isLock = lock.tryLock();
+
+                    if(!isLock){
+                        log.info("当前已有线程获取到锁");
+                    }else {
                         // 判断库里是否已经存在，存在则只更新发票状态，状态更新时间，认证状态以及相关字段更新
                         DynamicContextHolder.push(db + DbConstant.BUSINESS_READ);
-                TDxRecordInvoiceJobEntity entity = tDxRecordInvoiceJobDao
+                        TDxRecordInvoiceJobEntity entity = tDxRecordInvoiceJobDao.findInvoiceByUUid(invoiceSelectInfo.getUuid());
-                        .findInvoiceByUUid(invoiceSelectInfo.getUuid());
                         if (entity != null) {
                             boolean flag = false;
                             if (StringUtils.isBlank(entity.getCheckCode())
@@ -765,6 +786,13 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
                         invoiceLog.setInputName("系统自动");
                         logList.add(invoiceLog);
                     }
+                }catch (Exception e) {
+                    e.printStackTrace();
+                } finally {
+                    //关锁
+                    lock.unlock();
+                }
+            }
             httpLog.setStatus("1");
             httpLog.setTotal(total);
             DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE);