改正超时问题以及推进日志系统功能

data-service/src/main/java/com/zksy/data/constant/RedisKeyConstant.java

@@ -3,4 +3,5 @@ package com.zksy.data.constant;
 public class RedisKeyConstant {
     public static final String HUAIHUA_TOKEN_KEY = "xinyonghuaihua:token";
     public static final String HUAIHUA_LOCK_KEY = "xinyonghuaihua:lock";
+    public static final String LOCK_SERVICE = "lockservice:";
 }

data-service/src/main/java/com/zksy/data/controller/InvokerController.java

@@ -1,7 +1,7 @@
 package com.zksy.data.controller;
 
 import com.zksy.common.domain.Result;
-import com.zksy.data.schedule.CollectDataSchedule;
+import com.zksy.data.constant.RedisKeyConstant;
 import com.zksy.data.service.IBaseSaveDataInterface;
 import com.zksy.data.utils.PublisherMessage;
 import io.swagger.annotations.Api;
@@ -9,13 +9,12 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Optional;
-
 @RestController
 @RequestMapping("/invoker")
 @Api(tags = "调用接口",description = "调用接口")
@@ -24,10 +23,15 @@ public class InvokerController {
     private ApplicationContext applicationContext;
     @Autowired
     private PublisherMessage publisherMessage;
+    @Autowired
+    private RedisTemplate<String,String> redisTemplate;
     @GetMapping
     @ApiOperation("调用指定的表同步")
     public Result invokerTargetTable(@RequestParam String targetTableString) {
         Object bean = null;
+        if(Boolean.TRUE.equals(redisTemplate.hasKey(RedisKeyConstant.LOCK_SERVICE + targetTableString))){
+            return Result.error("当前表正在同步中，请勿重复调用");
+        }
         try {
             bean = applicationContext.getBean(targetTableString);
         } catch (BeansException e) {

data-service/src/main/java/com/zksy/data/controller/TimeTaskController.java

@@ -1,20 +1,23 @@
 package com.zksy.data.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zksy.common.domain.Result;
-import com.zksy.common.exception.BizIllegalException;
+import com.zksy.common.domain.dto.PageDTO;
+import com.zksy.common.utils.SearchUtil;
 import com.zksy.data.domain.dto.TimeTaskDto;
 import com.zksy.data.domain.po.XhScheduleType;
 import com.zksy.data.domain.po.XhTimeTask;
-import com.zksy.data.schedule.CollectDataSchedule;
 import com.zksy.data.service.XhScheduleTypeService;
 import com.zksy.data.service.XhTimeTaskService;
 import com.zksy.data.utils.TaskManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Optional;
 
 @RestController
 @RequestMapping("/timeTask")
@@ -54,6 +57,21 @@ public class TimeTaskController {
     	return xhTimeTaskService.getAllTask();
     }
 
+    @SneakyThrows
+    @GetMapping("/list")
+    @ApiOperation("分页获取所有的可以执行的任务")
+    public Result list(@RequestParam Optional<Long> pageNum, @RequestParam Optional<Long> pageSize, @RequestParam Optional<String> conditionJson) {
+        long defaultPageNum = 1L;
+        long defaultPageSize = 10L;
+        String defaultCondition = "";
+        Page<XhTimeTask> page = xhTimeTaskService.page(
+                new Page<>(pageNum.orElse(defaultPageNum), pageSize.orElse(defaultPageSize)),
+                SearchUtil.parseWhereSql(conditionJson.orElse(defaultCondition))
+        );
+        PageDTO<XhTimeTask> dto = PageDTO.of(page, XhTimeTask.class);
+        return Result.ok(dto);
+    }
+
     @GetMapping("/getAllTaskType")
     @ApiOperation("获取所有的定时任务类型")
     public Result<List<XhScheduleType>> getAllTaskType() {

data-service/src/main/java/com/zksy/data/listener/InvokerListener.java

@@ -1,6 +1,7 @@
 package com.zksy.data.listener;
 
 import com.zksy.data.constant.RabbitMqConstant;
+import com.zksy.data.constant.RedisKeyConstant;
 import com.zksy.data.schedule.CollectDataSchedule;
 import com.zksy.data.service.IBaseSaveDataInterface;
 import lombok.extern.slf4j.Slf4j;
@@ -11,6 +12,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.RedisTemplate;
 
 import java.util.Optional;
 
@@ -21,6 +23,8 @@ public class InvokerListener {
     private CollectDataSchedule collectDataSchedule;
     @Autowired
     private ApplicationContext applicationContext;
+    @Autowired
+    private RedisTemplate<String,String> redisTemplate;
 
     @RabbitListener(bindings = @QueueBinding(
             value = @Queue(name = RabbitMqConstant.INVOKER_QUEUE_NAME, durable = "true"),
@@ -28,10 +32,20 @@ public class InvokerListener {
             key = RabbitMqConstant.INVOKER_ROUTING_KEY
     ))
     public void listenForInvoker(String targetTableString) {
-        Optional.ofNullable(targetTableString).ifPresent(q -> {
-            String address = collectDataSchedule.serviceMap.get(targetTableString);
-            Object bean = applicationContext.getBean(targetTableString);
-            ((IBaseSaveDataInterface) bean).saveDataByUniCode(address);
-        });
+        try {
+            redisTemplate.opsForValue().set(RedisKeyConstant.LOCK_SERVICE+targetTableString,targetTableString);
+//            try {
+//                Thread.sleep(10000);
+//            } catch (InterruptedException e) {
+//                throw new RuntimeException(e);
+//            }
+            Optional.ofNullable(targetTableString).ifPresent(q -> {
+                String address = collectDataSchedule.serviceMap.get(targetTableString);
+                Object bean = applicationContext.getBean(targetTableString);
+                ((IBaseSaveDataInterface) bean).saveDataByUniCode(address);
+            });
+        } finally {
+            redisTemplate.delete(RedisKeyConstant.LOCK_SERVICE+targetTableString);
+        }
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAbnormalBusinessOperationsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAbnormalBusinessOperations;
 import com.zksy.data.domain.response.XcrAbnormalBusinessOperationsResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,14 +31,15 @@ public class XcrAbnormalBusinessOperationsServiceImpl extends ServiceImpl<XcrAbn
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    @XhDataLogRecord("同步企业异常名录详细信息")
+    @Override@XhDataLogRecord("同步企业异常名录详细信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
         List<String> creditCodes = (List<String>) redisService.getList("creditCodes").get(0);
         Vector<XcrAbnormalBusinessOperations> toDatabaseList = new Vector<>();
+        //这个方法会占用特别长的时间
         creditCodes.parallelStream().forEach(creditCode -> {
             List<XcrAbnormalBusinessOperations> list = xhRequestUtil.httpRequestByUniCode(creditCode, address,
                     XcrAbnormalBusinessOperationsResponse.class,
@@ -46,8 +49,16 @@ public class XcrAbnormalBusinessOperationsServiceImpl extends ServiceImpl<XcrAbn
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业异常名录详细信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAbnormalHouseholdIdentificationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAbnormalHouseholdIdentification;
 import com.zksy.data.domain.response.XcrAbnormalHouseholdIdentificationResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,10 +31,10 @@ public class XcrAbnormalHouseholdIdentificationServiceImpl extends ServiceImpl<X
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    @XhDataLogRecord("同步非正常户认定信息")
+    @Override@XhDataLogRecord("同步非正常户认定信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
         List<String> creditCodes = (List<String>) redisService.getList("creditCodes").get(0);
@@ -47,8 +49,16 @@ public class XcrAbnormalHouseholdIdentificationServiceImpl extends ServiceImpl<X
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("非正常户认定信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAbnormalHouseholdTerminationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAbnormalHouseholdTermination;
 import com.zksy.data.domain.response.XcrAbnormalHouseholdTerminationResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -30,9 +32,10 @@ public class XcrAbnormalHouseholdTerminationServiceImpl extends ServiceImpl<XcrA
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步非正常户解除信息表")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -48,8 +51,16 @@ public class XcrAbnormalHouseholdTerminationServiceImpl extends ServiceImpl<XcrA
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("非正常户解除信息表同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAbnormalOperationAnnouncementServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAbnormalOperationAnnouncement;
 import com.zksy.data.domain.response.XcrAbnormalOperationAnnouncementResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,11 @@ public class XcrAbnormalOperationAnnouncementServiceImpl extends ServiceImpl<Xcr
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+
     @XhDataLogRecord("同步经营异常公告批量名单信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +50,16 @@ public class XcrAbnormalOperationAnnouncementServiceImpl extends ServiceImpl<Xcr
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("经营异常公告批量名单信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAdministrativeLicensingAgriculturalCollegesServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAdministrativeLicensingAgriculturalColleges;
 import com.zksy.data.domain.response.XcrAdministrativeLicensingAgriculturalCollegesResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrAdministrativeLicensingAgriculturalCollegesServiceImpl extends S
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步农专年报行政许可信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrAdministrativeLicensingAgriculturalCollegesServiceImpl extends S
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("农专年报行政许可信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAdministrativeLicensingServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAdministrativeLicensing;
 import com.zksy.data.domain.response.XcrAdministrativeLicensingResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,8 +32,9 @@ public class XcrAdministrativeLicensingServiceImpl extends ServiceImpl<XcrAdmini
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步行政许可信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -58,8 +61,16 @@ public class XcrAdministrativeLicensingServiceImpl extends ServiceImpl<XcrAdmini
                 }
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("行政许可信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAdministrativePenaltyServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAdministrativePenalty;
 import com.zksy.data.domain.response.XcrAdministrativePenaltyResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,8 +32,9 @@ public class XcrAdministrativePenaltyServiceImpl extends ServiceImpl<XcrAdminist
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步行政处罚信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -58,8 +61,16 @@ public class XcrAdministrativePenaltyServiceImpl extends ServiceImpl<XcrAdminist
                 }
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("行政处罚信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAffiliatedEnterpriseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAffiliatedEnterprise;
 import com.zksy.data.domain.response.XcrAffiliatedEnterpriseResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrAffiliatedEnterpriseServiceImpl extends ServiceImpl<XcrAffiliate
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步隶属企业信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrAffiliatedEnterpriseServiceImpl extends ServiceImpl<XcrAffiliate
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("隶属企业信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAgriculturalCollegeAnnualReportServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAgriculturalCollegeAnnualReport;
 import com.zksy.data.domain.response.XcrAgriculturalCollegeAnnualReportResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrAgriculturalCollegeAnnualReportServiceImpl extends ServiceImpl<X
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步农专年报基本信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrAgriculturalCollegeAnnualReportServiceImpl extends ServiceImpl<X
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("农专年报基本信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAgriculturalSpecializedWebsiteServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAgriculturalSpecializedWebsite;
 import com.zksy.data.domain.po.XcrAgriculturalSupplement;
@@ -14,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -31,9 +33,10 @@ public class XcrAgriculturalSpecializedWebsiteServiceImpl extends ServiceImpl<Xc
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步农专年报网站或网店信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -48,8 +51,16 @@ public class XcrAgriculturalSpecializedWebsiteServiceImpl extends ServiceImpl<Xc
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("农专年报网站或网店信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAgriculturalSupplementServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAgriculturalSupplement;
 import com.zksy.data.domain.response.XcrAgriculturalSupplementResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrAgriculturalSupplementServiceImpl extends ServiceImpl<XcrAgricul
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步农专补充信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrAgriculturalSupplementServiceImpl extends ServiceImpl<XcrAgricul
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("农专补充信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAnSfcBranchinfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAnSfcBranchinfo;
 import com.zksy.data.domain.response.XcrAnSfcBranchinfoResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrAnSfcBranchinfoServiceImpl extends ServiceImpl<XcrAnSfcBranchinf
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步农专年报分支机构信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrAnSfcBranchinfoServiceImpl extends ServiceImpl<XcrAnSfcBranchinf
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("农专年报分支机构信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAnnualReportBaseInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAnnualReportBaseInfo;
 import com.zksy.data.domain.response.XcrAnnualReportBaseInfoResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -30,9 +32,10 @@ public class XcrAnnualReportBaseInfoServiceImpl extends ServiceImpl<XcrAnnualRep
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业年报基本信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +50,16 @@ public class XcrAnnualReportBaseInfoServiceImpl extends ServiceImpl<XcrAnnualRep
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业年报基本信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAnnualReportExternalInvestmentServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAnnualReportExternalInvestment;
 import com.zksy.data.domain.response.XcrAnnualReportExternalInvestmentResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrAnnualReportExternalInvestmentServiceImpl extends ServiceImpl<Xc
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业年报对外投资信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrAnnualReportExternalInvestmentServiceImpl extends ServiceImpl<Xc
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业年报对外投资信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAnnualReportUpdateServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAnnualReportUpdate;
 import com.zksy.data.domain.response.XcrAnnualReportUpdateResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrAnnualReportUpdateServiceImpl extends ServiceImpl<XcrAnnualRepor
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步个体年报修改信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrAnnualReportUpdateServiceImpl extends ServiceImpl<XcrAnnualRepor
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("个体年报修改信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrAppointDelegatesServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAppointDelegates;
 import com.zksy.data.domain.response.XcrAppointDelegatesResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrAppointDelegatesServiceImpl extends ServiceImpl<XcrAppointDelega
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步委派代表信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrAppointDelegatesServiceImpl extends ServiceImpl<XcrAppointDelega
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("委派代表信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrBasicSupplementAgriculturalCollegeAnnualServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrBasicSupplementAgriculturalCollegeAnnual;
 import com.zksy.data.domain.response.XcrBasicSupplementAgriculturalCollegeAnnualResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrBasicSupplementAgriculturalCollegeAnnualServiceImpl extends Serv
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步农专年报基本信息补充")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrBasicSupplementAgriculturalCollegeAnnualServiceImpl extends Serv
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("农专年报基本信息补充同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrBranchOfficesInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrBranchOfficesInfo;
 import com.zksy.data.domain.response.XcrBranchOfficesInfoResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrBranchOfficesInfoServiceImpl extends ServiceImpl<XcrBranchOffice
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步分支机构备案信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrBranchOfficesInfoServiceImpl extends ServiceImpl<XcrBranchOffice
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("分支机构备案信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrCancelTaxRegistrationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrCancelTaxRegistration;
 import com.zksy.data.domain.response.XcrCancelTaxRegistrationResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrCancelTaxRegistrationServiceImpl extends ServiceImpl<XcrCancelTa
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步注销税务登记信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +50,16 @@ public class XcrCancelTaxRegistrationServiceImpl extends ServiceImpl<XcrCancelTa
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("注销税务登记信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrCancellationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrCancellation;
 import com.zksy.data.domain.response.XcrCancellationResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrCancellationServiceImpl extends ServiceImpl<XcrCancellationMappe
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步注销信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrCancellationServiceImpl extends ServiceImpl<XcrCancellationMappe
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("注销信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrChangeFilingServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrChangeFiling;
 import com.zksy.data.domain.response.XcrChangeFilingResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrChangeFilingServiceImpl extends ServiceImpl<XcrChangeFilingMappe
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步变更备案信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrChangeFilingServiceImpl extends ServiceImpl<XcrChangeFilingMappe
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("变更备案信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrCheckWorkInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrCheckWorkInfo;
 import com.zksy.data.domain.response.XcrCheckWorkInfoResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrCheckWorkInfoServiceImpl extends ServiceImpl<XcrCheckWorkInfoMap
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步检查工作信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrCheckWorkInfoServiceImpl extends ServiceImpl<XcrCheckWorkInfoMap
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("检查工作信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrCompanyInvestmentServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrCompanyInvestment;
 import com.zksy.data.domain.response.XcrCompanyInvestmentResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrCompanyInvestmentServiceImpl extends ServiceImpl<XcrCompanyInves
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业公示_股东及出资修改信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrCompanyInvestmentServiceImpl extends ServiceImpl<XcrCompanyInves
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业公示_股东及出资修改同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrConfirmationTerminationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrConfirmationTermination;
 import com.zksy.data.domain.response.XcrConfirmationTerminationResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -30,9 +32,10 @@ public class XcrConfirmationTerminationServiceImpl extends ServiceImpl<XcrConfir
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步非正常户认定解除信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -48,8 +51,16 @@ public class XcrConfirmationTerminationServiceImpl extends ServiceImpl<XcrConfir
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("非正常户认定解除信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrContactInformationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrContactInformation;
 import com.zksy.data.domain.response.XcrContactInformationResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrContactInformationServiceImpl extends ServiceImpl<XcrContactInfo
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步联络员信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrContactInformationServiceImpl extends ServiceImpl<XcrContactInfo
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("联络员信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrDeregistrationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrDeregistration;
 import com.zksy.data.domain.response.XcrDeregistrationResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrDeregistrationServiceImpl extends ServiceImpl<XcrDeregistrationM
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步撤销登记信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrDeregistrationServiceImpl extends ServiceImpl<XcrDeregistrationM
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("撤销登记信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrDishonestyPunishment19ServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrDishonestyPunishment19;
 import com.zksy.data.domain.response.XcrDishonestyPunishment19Response;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,8 +32,9 @@ public class XcrDishonestyPunishment19ServiceImpl extends ServiceImpl<XcrDishone
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步严重失信主体名单表")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -63,8 +66,16 @@ public class XcrDishonestyPunishment19ServiceImpl extends ServiceImpl<XcrDishone
             });
             log.info("inventorywe为:{}完成",inventory);
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("严重失信主体名单表同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrDomesticCapitalSupplementServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrDomesticCapitalSupplement;
 import com.zksy.data.domain.response.XcrDomesticCapitalSupplementResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrDomesticCapitalSupplementServiceImpl extends ServiceImpl<XcrDome
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步内资补充信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrDomesticCapitalSupplementServiceImpl extends ServiceImpl<XcrDome
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("内资补充信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEBaseinfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zksy.api.client.TableDataClient;
 import com.zksy.api.dto.tableData.EBaseinfo;
 import com.zksy.common.domain.Result;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.domain.po.XcrEBaseinfo;
 import com.zksy.data.service.XcrEBaseinfoService;
 import com.zksy.data.mapper.XcrEBaseinfoMapper;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,20 +29,29 @@ public class XcrEBaseinfoServiceImpl extends ServiceImpl<XcrEBaseinfoMapper, Xcr
     implements XcrEBaseinfoService{
     @Autowired
     private TableDataClient tableDataClient;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void saveDataByUniCode(String address) {
         Result<List<EBaseinfo>> baseinfoAll = tableDataClient.getEBaseinfoAll();
         if(baseinfoAll.getCode() != 200){
             throw new RuntimeException(baseinfoAll.getMsg());
         }
-        List<XcrEBaseinfo> xcrEBaseinfos = BeanUtil.copyToList(baseinfoAll.getData(), XcrEBaseinfo.class);
-        xcrEBaseinfos.stream().map(q->{
+        List<XcrEBaseinfo> toDatabaseList = BeanUtil.copyToList(baseinfoAll.getData(), XcrEBaseinfo.class);
+        toDatabaseList.stream().map(q->{
             q.setUniCode(q.getUniscid());
             return q;
         }).collect(Collectors.toList());
-        this.remove(null);
-        this.saveBatch(xcrEBaseinfos);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
     }
 }
 

data-service/src/main/java/com/zksy/data/service/impl/XcrEnterpriseAnnualReportEquityChangeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEnterpriseAnnualReportEquityChange;
 import com.zksy.data.domain.response.XcrEnterpriseAnnualReportEquityChangeResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrEnterpriseAnnualReportEquityChangeServiceImpl extends ServiceImp
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业年报股权变更信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrEnterpriseAnnualReportEquityChangeServiceImpl extends ServiceImp
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业年报股权变更信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEnterpriseAnnualReportShareholderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEnterpriseAnnualReportShareholder;
 import com.zksy.data.domain.po.XcrEnterpriseAnnualReportWebsite;
@@ -14,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -31,9 +33,11 @@ public class XcrEnterpriseAnnualReportShareholderServiceImpl extends ServiceImpl
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+
     @XhDataLogRecord("同步企业年报股东及出资信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -48,8 +52,16 @@ public class XcrEnterpriseAnnualReportShareholderServiceImpl extends ServiceImpl
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业年报股东及出资信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEnterpriseAnnualReportWebsiteServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEnterpriseAnnualReportWebsite;
 import com.zksy.data.domain.response.XcrEnterpriseAnnualReportWebsiteResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +31,10 @@ public class XcrEnterpriseAnnualReportWebsiteServiceImpl extends ServiceImpl<Xcr
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业年报网站或网店信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrEnterpriseAnnualReportWebsiteServiceImpl extends ServiceImpl<Xcr
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业年报网站或网店信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEnterpriseBasicInformationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEnterpriseBasicInformation;
 import com.zksy.data.domain.response.XcrEnterpriseBasicInformationResponse;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,8 +31,9 @@ public class XcrEnterpriseBasicInformationServiceImpl extends ServiceImpl<XcrEnt
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord(value = "企业基本信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -45,8 +48,16 @@ public class XcrEnterpriseBasicInformationServiceImpl extends ServiceImpl<XcrEnt
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业基本信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEnterpriseExceptionListServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEnterpriseExceptionList;
 import com.zksy.data.domain.response.XcrEnterpriseExceptionListResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrEnterpriseExceptionListServiceImpl extends ServiceImpl<XcrEnterp
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业异常名录信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrEnterpriseExceptionListServiceImpl extends ServiceImpl<XcrEnterp
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业异常名录信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEnterpriseNameApprovalServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEnterpriseNameApproval;
 import com.zksy.data.domain.response.XcrEnterpriseNameApprovalResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,8 +30,9 @@ public class XcrEnterpriseNameApprovalServiceImpl extends ServiceImpl<XcrEnterpr
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业名称信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -45,8 +47,16 @@ public class XcrEnterpriseNameApprovalServiceImpl extends ServiceImpl<XcrEnterpr
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业名称信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEnterprisePollutionPermitInfoServiceImpl.java

@@ -1,17 +1,18 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEnterprisePollutionPermitInfo;
 import com.zksy.data.domain.response.XcrEnterprisePollutionPermitInfoResponse;
-import com.zksy.data.service.XcrEnterprisePollutionPermitInfoService;
 import com.zksy.data.mapper.XcrEnterprisePollutionPermitInfoMapper;
+import com.zksy.data.service.XcrEnterprisePollutionPermitInfoService;
 import com.zksy.data.utils.RedisService;
 import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -19,7 +20,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Vector;
-import java.util.stream.Collectors;
 
 /**
  * @author 邵洋
@@ -34,9 +34,10 @@ public class XcrEnterprisePollutionPermitInfoServiceImpl extends ServiceImpl<Xcr
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业排污许可信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -61,13 +62,20 @@ public class XcrEnterprisePollutionPermitInfoServiceImpl extends ServiceImpl<Xcr
                 "yyyy.MM.dd",
                 "MM-MMMM -yy hh.mm.ss.SSSSSSSSS a"
         };
-        List<XcrEnterprisePollutionPermitInfo> enterprisePollutionPermitInfoList = toDatabaseList.stream().map(q -> {
+        toDatabaseList.stream().forEach(q -> {
             Date date = parseDate(q.getXKZFFSJ(), datePatterns);
             q.setA(formatDate(date));
-            return q;
-        }).collect(Collectors.toList());
-        this.remove(null);
-        this.saveBatch(enterprisePollutionPermitInfoList);
+        });
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业排污许可信息同步完成");
     }
 

data-service/src/main/java/com/zksy/data/service/impl/XcrEnterprisePublicationSupplySubscribedDetailsInvestorsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEnterprisePublicationSupplySubscribedDetailsInvestors;
 import com.zksy.data.domain.response.XcrEnterprisePublicationSupplySubscribedDetailsInvestorsResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrEnterprisePublicationSupplySubscribedDetailsInvestorsServiceImpl
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord(value = "企业公示_出资人认缴明细")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrEnterprisePublicationSupplySubscribedDetailsInvestorsServiceImpl
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业公示_出资人认缴明细同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEnterprisePublicityDetailsContributionsContributorsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEnterprisePublicityDetailsContributionsContributors;
 import com.zksy.data.domain.response.XcrEnterprisePublicityDetailsContributionsContributorsResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrEnterprisePublicityDetailsContributionsContributorsServiceImpl e
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业公示_出资人实缴明细")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrEnterprisePublicityDetailsContributionsContributorsServiceImpl e
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业公示_出资人实缴明细同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEnterprisePublicityEquityChangeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEnterprisePublicityEquityChange;
 import com.zksy.data.domain.response.XcrEnterprisePublicityEquityChangeResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrEnterprisePublicityEquityChangeServiceImpl extends ServiceImpl<X
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业公示_股权变更信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrEnterprisePublicityEquityChangeServiceImpl extends ServiceImpl<X
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业公示_股权变更信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEnterprisePublicityInvestorInformationStatusServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEnterprisePublicityInvestorInformationStatus;
 import com.zksy.data.domain.response.XcrEnterprisePublicityInvestorInformationStatusResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrEnterprisePublicityInvestorInformationStatusServiceImpl extends
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业公示_出资人信息情况")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrEnterprisePublicityInvestorInformationStatusServiceImpl extends
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业公示_出资人信息情况同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEnterprisePublicityLicenseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEnterprisePublicityLicense;
 import com.zksy.data.domain.response.XcrEnterprisePublicityLicenseResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrEnterprisePublicityLicenseServiceImpl extends ServiceImpl<XcrEnt
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业公示_许可信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrEnterprisePublicityLicenseServiceImpl extends ServiceImpl<XcrEnt
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业公示_许可信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEnvironmentalPenaltyDecisionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEnvironmentalPenaltyDecision;
 import com.zksy.data.domain.response.XcrEnvironmentalPenaltyDecisionResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrEnvironmentalPenaltyDecisionServiceImpl extends ServiceImpl<XcrE
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("环保处罚决定情况信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +49,16 @@ public class XcrEnvironmentalPenaltyDecisionServiceImpl extends ServiceImpl<XcrE
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("环保处罚决定情况信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEquityChangeInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEquityChangeInfo;
 import com.zksy.data.domain.response.XcrEquityChangeInfoResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrEquityChangeInfoServiceImpl extends ServiceImpl<XcrEquityChangeI
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步股权变更信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrEquityChangeInfoServiceImpl extends ServiceImpl<XcrEquityChangeI
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("股权变更信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEquityChangeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEquityChange;
 import com.zksy.data.domain.response.XcrEquityChangeResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -30,9 +31,10 @@ public class XcrEquityChangeServiceImpl extends ServiceImpl<XcrEquityChangeMappe
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步股权出质变更信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +49,16 @@ public class XcrEquityChangeServiceImpl extends ServiceImpl<XcrEquityChangeMappe
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("股权出质变更信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEquityFreezeExecutionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEquityFreezeExecution;
 import com.zksy.data.domain.response.XcrEquityFreezeExecutionResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrEquityFreezeExecutionServiceImpl extends ServiceImpl<XcrEquityFr
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步股权冻结被执行人信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrEquityFreezeExecutionServiceImpl extends ServiceImpl<XcrEquityFr
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("股权冻结被执行人信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEquityFreezeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEquityFreeze;
 import com.zksy.data.domain.response.XcrEquityFreezeResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrEquityFreezeServiceImpl extends ServiceImpl<XcrEquityFreezeMappe
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("股权冻结信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrEquityFreezeServiceImpl extends ServiceImpl<XcrEquityFreezeMappe
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("股权冻结信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrEquityPledgeInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrEquityPledgeInfo;
 import com.zksy.data.domain.response.XcrEquityPledgeInfoResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrEquityPledgeInfoServiceImpl extends ServiceImpl<XcrEquityPledgeI
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("股权出质登记信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrEquityPledgeInfoServiceImpl extends ServiceImpl<XcrEquityPledgeI
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("股权出质登记信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrExternalGuaranteeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrExternalGuarantee;
 import com.zksy.data.domain.response.XcrExternalGuaranteeResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrExternalGuaranteeServiceImpl extends ServiceImpl<XcrExternalGuar
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业年报对外提供保证担保信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrExternalGuaranteeServiceImpl extends ServiceImpl<XcrExternalGuar
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业年报对外提供保证担保信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrFarmSpecialAbnormalDetailServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrFarmSpecialAbnormalDetail;
 import com.zksy.data.domain.response.XcrFarmSpecialAbnormalDetailResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrFarmSpecialAbnormalDetailServiceImpl extends ServiceImpl<XcrFarm
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步农专异常名录详细信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrFarmSpecialAbnormalDetailServiceImpl extends ServiceImpl<XcrFarm
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("农专异常名录详细信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrFinancialManagerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrFinancialManager;
 import com.zksy.data.domain.response.XcrFinancialManagerResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrFinancialManagerServiceImpl extends ServiceImpl<XcrFinancialMana
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步财务负责人信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrFinancialManagerServiceImpl extends ServiceImpl<XcrFinancialMana
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("财务负责人信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrFoodBusinessLicenseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrFoodBusinessLicense;
 import com.zksy.data.domain.response.XcrFoodBusinessLicenseResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -30,9 +31,10 @@ public class XcrFoodBusinessLicenseServiceImpl extends ServiceImpl<XcrFoodBusine
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步食品经营许可证基本信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -48,8 +50,16 @@ public class XcrFoodBusinessLicenseServiceImpl extends ServiceImpl<XcrFoodBusine
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("食品经营许可证基本信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrFoodProductionLicenseDetaliServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrFoodProductionLicenseDetali;
 import com.zksy.data.domain.response.XcrFoodProductionLicenseDetaliResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrFoodProductionLicenseDetaliServiceImpl extends ServiceImpl<XcrFo
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步食品生产许可证品种明细")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +49,16 @@ public class XcrFoodProductionLicenseDetaliServiceImpl extends ServiceImpl<XcrFo
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("食品生产许可证品种明细同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrFoodProductionLicenseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrFoodProductionLicense;
 import com.zksy.data.domain.response.XcrFoodProductionLicenseResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrFoodProductionLicenseServiceImpl extends ServiceImpl<XcrFoodProd
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步食品生产许可证基本信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +49,16 @@ public class XcrFoodProductionLicenseServiceImpl extends ServiceImpl<XcrFoodProd
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("食品生产许可证基本信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrHighTechServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrHighTech;
 import com.zksy.data.domain.response.XcrHighTechResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrHighTechServiceImpl extends ServiceImpl<XcrHighTechMapper, XcrHi
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步高新技术企业名单")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +49,16 @@ public class XcrHighTechServiceImpl extends ServiceImpl<XcrHighTechMapper, XcrHi
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("高新技术企业名单同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrHistoricalLegalRepresentativeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrHistoricalLegalRepresentative;
 import com.zksy.data.domain.response.XcrHistoricalLegalRepresentativeResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrHistoricalLegalRepresentativeServiceImpl extends ServiceImpl<Xcr
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步历史法定代表人信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrHistoricalLegalRepresentativeServiceImpl extends ServiceImpl<Xcr
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("历史法定代表人信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrHistoryNameServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrHistoryName;
 import com.zksy.data.domain.response.XcrHistoryNameResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,11 @@ public class XcrHistoryNameServiceImpl extends ServiceImpl<XcrHistoryNameMapper,
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+
     @XhDataLogRecord("同步历史名称信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrHistoryNameServiceImpl extends ServiceImpl<XcrHistoryNameMapper,
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("历史名称信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrIncomeTaxReturnServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrIncomeTaxReturn;
 import com.zksy.data.domain.response.XcrIncomeTaxReturnResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrIncomeTaxReturnServiceImpl extends ServiceImpl<XcrIncomeTaxRetur
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步企业所得税申报信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +49,16 @@ public class XcrIncomeTaxReturnServiceImpl extends ServiceImpl<XcrIncomeTaxRetur
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业所得税申报信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrIndividualBusinessAbnormalityServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrIndividualBusinessAbnormality;
 import com.zksy.data.domain.response.XcrIndividualBusinessAbnormalityResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrIndividualBusinessAbnormalityServiceImpl extends ServiceImpl<Xcr
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步个体经营异常标记信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrIndividualBusinessAbnormalityServiceImpl extends ServiceImpl<Xcr
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("个体经营异常标记信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrIndividualBusinessInformationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrIndividualBusinessInformation;
 import com.zksy.data.domain.response.XcrIndividualBusinessInformationResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrIndividualBusinessInformationServiceImpl extends ServiceImpl<Xcr
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步个体经营者基本信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrIndividualBusinessInformationServiceImpl extends ServiceImpl<Xcr
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("个体经营者基本信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrIndividualCancellationObjectionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrIndividualCancellationObjection;
 import com.zksy.data.domain.response.XcrIndividualCancellationObjectionResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrIndividualCancellationObjectionServiceImpl extends ServiceImpl<X
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步简易注销异议信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrIndividualCancellationObjectionServiceImpl extends ServiceImpl<X
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("简易注销异议信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrIndividualCancellationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrIndividualCancellation;
 import com.zksy.data.domain.response.XcrIndividualCancellationResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrIndividualCancellationServiceImpl extends ServiceImpl<XcrIndivid
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步个体注销信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrIndividualCancellationServiceImpl extends ServiceImpl<XcrIndivid
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("个体注销信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrIndividualChangeInformationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrIndividualChangeInformation;
 import com.zksy.data.domain.response.XcrIndividualChangeInformationResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrIndividualChangeInformationServiceImpl extends ServiceImpl<XcrIn
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步个体变更信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrIndividualChangeInformationServiceImpl extends ServiceImpl<XcrIn
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("个体变更信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrIndividualLicenseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrIndividualLicense;
 import com.zksy.data.domain.response.XcrIndividualLicenseResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrIndividualLicenseServiceImpl extends ServiceImpl<XcrIndividualLi
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步个体许可信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrIndividualLicenseServiceImpl extends ServiceImpl<XcrIndividualLi
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("个体许可信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrIndustryCommerceServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrIndustryCommerce;
 import com.zksy.data.domain.response.XcrIndustryCommerceResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrIndustryCommerceServiceImpl extends ServiceImpl<XcrIndustryComme
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步个体工商户基本信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrIndustryCommerceServiceImpl extends ServiceImpl<XcrIndustryComme
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("个体工商户基本信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrInnovationPlatformServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrInnovationPlatform;
 import com.zksy.data.domain.response.XcrInnovationPlatformResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrInnovationPlatformServiceImpl extends ServiceImpl<XcrInnovationP
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步国家、省、市创新平台名单")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +49,16 @@ public class XcrInnovationPlatformServiceImpl extends ServiceImpl<XcrInnovationP
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("国家、省、市创新平台名单同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrInspectionResultsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrInspectionResults;
 import com.zksy.data.domain.response.XcrInspectionResultsResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,11 @@ public class XcrInspectionResultsServiceImpl extends ServiceImpl<XcrInspectionRe
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+
     @XhDataLogRecord("同步抽查结果信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrInspectionResultsServiceImpl extends ServiceImpl<XcrInspectionRe
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("抽查结果信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrInstallmentPaymentServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrInstallmentPayment;
 import com.zksy.data.domain.response.XcrInstallmentPaymentResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrInstallmentPaymentServiceImpl extends ServiceImpl<XcrInstallment
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步分期实缴信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrInstallmentPaymentServiceImpl extends ServiceImpl<XcrInstallment
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("分期实缴信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrInstallmentSubscriptionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrInstallmentSubscription;
 import com.zksy.data.domain.response.XcrInstallmentSubscriptionResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrInstallmentSubscriptionServiceImpl extends ServiceImpl<XcrInstal
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("分期认缴信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrInstallmentSubscriptionServiceImpl extends ServiceImpl<XcrInstal
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("分期认缴信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrInstitutionalClientsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrInstitutionalClients;
 import com.zksy.data.domain.response.XcrInstitutionalClientsResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -30,9 +31,10 @@ public class XcrInstitutionalClientsServiceImpl extends ServiceImpl<XcrInstituti
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步机构客户信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -48,8 +50,16 @@ public class XcrInstitutionalClientsServiceImpl extends ServiceImpl<XcrInstituti
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("机构客户信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrInvestorAbnormalRecordServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrInvestorAbnormalRecord;
 import com.zksy.data.domain.response.XcrInvestorAbnormalRecordResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,11 @@ public class XcrInvestorAbnormalRecordServiceImpl extends ServiceImpl<XcrInvesto
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+
     @XhDataLogRecord("同步企业经营异常名录股东信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +49,16 @@ public class XcrInvestorAbnormalRecordServiceImpl extends ServiceImpl<XcrInvesto
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("企业经营异常名录股东信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrInvestorSubscriptionDetailsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrInvestorSubscriptionDetails;
 import com.zksy.data.domain.response.XcrInvestorSubscriptionDetailsResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrInvestorSubscriptionDetailsServiceImpl extends ServiceImpl<XcrIn
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步投资人认缴详细")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrInvestorSubscriptionDetailsServiceImpl extends ServiceImpl<XcrIn
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("投资人认缴详细同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrInvoiceIssuanceServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrInvoiceIssuance;
 import com.zksy.data.domain.response.XcrInvoiceIssuanceResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -19,7 +20,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Vector;
-import java.util.stream.Collectors;
 
 /**
 * @author 邵洋
@@ -34,9 +34,10 @@ public class XcrInvoiceIssuanceServiceImpl extends ServiceImpl<XcrInvoiceIssuanc
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("发票开票信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -53,7 +54,7 @@ public class XcrInvoiceIssuanceServiceImpl extends ServiceImpl<XcrInvoiceIssuanc
             }
         });
         SimpleDateFormat inputFormat = new SimpleDateFormat("dd-MMM-yy", Locale.US);
-        List<XcrInvoiceIssuance> xcrInvoiceIssuances = toDatabaseList.stream().map(q -> {
+        toDatabaseList.stream().forEach(q -> {
             Date date;
             try {
                 date = inputFormat.parse(q.getAPPLYDATE());
@@ -61,10 +62,17 @@ public class XcrInvoiceIssuanceServiceImpl extends ServiceImpl<XcrInvoiceIssuanc
                 throw new RuntimeException(e);
             }
             q.setA(date);
-            return q;
-        }).collect(Collectors.toList());
-        this.remove(null);
-        this.saveBatch(xcrInvoiceIssuances);
+        });
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("发票开票信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrKeyPollutionSourcesServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrKeyPollutionSources;
 import com.zksy.data.domain.response.XcrKeyPollutionSourcesResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrKeyPollutionSourcesServiceImpl extends ServiceImpl<XcrKeyPolluti
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步重点排污单位名录信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +49,16 @@ public class XcrKeyPollutionSourcesServiceImpl extends ServiceImpl<XcrKeyPolluti
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("重点排污单位名录同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrLegalRepresentativeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrLegalRepresentative;
 import com.zksy.data.domain.response.XcrLegalRepresentativeResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrLegalRepresentativeServiceImpl extends ServiceImpl<XcrLegalRepre
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步食品生产法定代表人信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +49,16 @@ public class XcrLegalRepresentativeServiceImpl extends ServiceImpl<XcrLegalRepre
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("食品生产法定代表人信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrLicenseInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrLicenseInfo;
 import com.zksy.data.domain.response.XcrLicenseInfoResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrLicenseInfoServiceImpl extends ServiceImpl<XcrLicenseInfoMapper,
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步许可信息信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrLicenseInfoServiceImpl extends ServiceImpl<XcrLicenseInfoMapper,
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("许可信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrLiquidationBasicInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrLiquidationBasicInfo;
 import com.zksy.data.domain.response.XcrLiquidationBasicInfoResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrLiquidationBasicInfoServiceImpl extends ServiceImpl<XcrLiquidati
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步清算基本信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrLiquidationBasicInfoServiceImpl extends ServiceImpl<XcrLiquidati
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("清算基本信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrLiquidationMemberInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrLiquidationMemberInfo;
 import com.zksy.data.domain.response.XcrLiquidationMemberInfoResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -30,9 +31,10 @@ public class XcrLiquidationMemberInfoServiceImpl extends ServiceImpl<XcrLiquidat
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步清算成员信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +49,16 @@ public class XcrLiquidationMemberInfoServiceImpl extends ServiceImpl<XcrLiquidat
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("清算成员信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrMainFinancialStatementsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrMainFinancialStatements;
 import com.zksy.data.domain.response.XcrMainFinancialStatementsResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -30,9 +31,10 @@ public class XcrMainFinancialStatementsServiceImpl extends ServiceImpl<XcrMainFi
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("财务报表主表信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -48,8 +50,16 @@ public class XcrMainFinancialStatementsServiceImpl extends ServiceImpl<XcrMainFi
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("财务报表主表信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrMajorMembersServiceImpl.java

@@ -1,19 +1,18 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrMajorMembers;
-import com.zksy.data.domain.po.XcrMinorEnterprises;
 import com.zksy.data.domain.response.XcrMajorMembersResponse;
-import com.zksy.data.domain.response.XcrMinorEnterprisesResponse;
-import com.zksy.data.service.XcrMajorMembersService;
 import com.zksy.data.mapper.XcrMajorMembersMapper;
+import com.zksy.data.service.XcrMajorMembersService;
 import com.zksy.data.utils.RedisService;
 import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -31,9 +30,10 @@ public class XcrMajorMembersServiceImpl extends ServiceImpl<XcrMajorMembersMappe
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("主要人员信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -48,8 +48,16 @@ public class XcrMajorMembersServiceImpl extends ServiceImpl<XcrMajorMembersMappe
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("主要人员信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrMinorEnterprisesServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrMinorEnterprises;
 import com.zksy.data.domain.response.XcrMinorEnterprisesResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrMinorEnterprisesServiceImpl extends ServiceImpl<XcrMinorEnterpri
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("科技型中小企业名单")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +49,16 @@ public class XcrMinorEnterprisesServiceImpl extends ServiceImpl<XcrMinorEnterpri
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("科技型中小企业名单同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrMoveInServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrMoveIn;
 import com.zksy.data.domain.response.XcrMoveInResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrMoveInServiceImpl extends ServiceImpl<XcrMoveInMapper, XcrMoveIn
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步迁入信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrMoveInServiceImpl extends ServiceImpl<XcrMoveInMapper, XcrMoveIn
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("迁入信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrMoveOutServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrMoveOut;
 import com.zksy.data.domain.response.XcrMoveOutResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrMoveOutServiceImpl extends ServiceImpl<XcrMoveOutMapper, XcrMove
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步迁出信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrMoveOutServiceImpl extends ServiceImpl<XcrMoveOutMapper, XcrMove
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("迁出信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrMsAdministrativeLicenseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrMsAdministrativeLicense;
 import com.zksy.data.domain.response.XcrMsAdministrativeLicenseResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrMsAdministrativeLicenseServiceImpl extends ServiceImpl<XcrMsAdmi
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步市场监管_行政许可信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrMsAdministrativeLicenseServiceImpl extends ServiceImpl<XcrMsAdmi
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("市场监管_行政许可信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrNaturalPersonContributionsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrNaturalPersonContributions;
 import com.zksy.data.domain.response.XcrNaturalPersonContributionsResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrNaturalPersonContributionsServiceImpl extends ServiceImpl<XcrNat
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步自然人出资信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrNaturalPersonContributionsServiceImpl extends ServiceImpl<XcrNat
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("自然人出资信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrNonNaturalPersonContributionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrNonNaturalPersonContribution;
 import com.zksy.data.domain.response.XcrNonNaturalPersonContributionResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrNonNaturalPersonContributionServiceImpl extends ServiceImpl<XcrN
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步非自然人出资信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrNonNaturalPersonContributionServiceImpl extends ServiceImpl<XcrN
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("非自然人出资信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrNoticeRecordServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrNoticeRecord;
 import com.zksy.data.domain.response.XcrNoticeRecordResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrNoticeRecordServiceImpl extends ServiceImpl<XcrNoticeRecordMappe
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步公示公告信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrNoticeRecordServiceImpl extends ServiceImpl<XcrNoticeRecordMappe
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("公示公告信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrOtherInfo36ServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrOtherInfo36;
 import com.zksy.data.domain.response.XcrOtherInfo36Response;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,8 +31,10 @@ public class XcrOtherInfo36ServiceImpl extends ServiceImpl<XcrOtherInfo36Mapper,
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
     @Override
-    @Transactional(rollbackFor = Exception.class)
+
     @XhDataLogRecord("同步水费清单表")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -63,8 +66,16 @@ public class XcrOtherInfo36ServiceImpl extends ServiceImpl<XcrOtherInfo36Mapper,
             });
             log.info("inventorywe为:{}完成",inventory);
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("水费清单表同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrOtherInfo37ServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrOtherInfo37;
 import com.zksy.data.domain.response.XcrOtherInfo37Response;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,8 +31,10 @@ public class XcrOtherInfo37ServiceImpl extends ServiceImpl<XcrOtherInfo37Mapper,
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
     @Override
-    @Transactional(rollbackFor = Exception.class)
+
     @XhDataLogRecord("同步燃气费清单表信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -63,8 +66,16 @@ public class XcrOtherInfo37ServiceImpl extends ServiceImpl<XcrOtherInfo37Mapper,
             });
             log.info("inventorywe为:{}完成",inventory);
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("燃气费清单表同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrOtherInfo38ServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrOtherInfo38;
 import com.zksy.data.domain.response.XcrOtherInfo38Response;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,8 +31,9 @@ public class XcrOtherInfo38ServiceImpl extends ServiceImpl<XcrOtherInfo38Mapper,
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步科技研发清单表")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -63,8 +65,16 @@ public class XcrOtherInfo38ServiceImpl extends ServiceImpl<XcrOtherInfo38Mapper,
             });
             log.info("inventorywe为:{}完成",inventory);
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("科技研发清单表同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrOtherInfo39ServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrOtherInfo39;
 import com.zksy.data.domain.response.XcrOtherInfo39Response;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,8 +31,9 @@ public class XcrOtherInfo39ServiceImpl extends ServiceImpl<XcrOtherInfo39Mapper,
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步农业主体信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -63,8 +65,16 @@ public class XcrOtherInfo39ServiceImpl extends ServiceImpl<XcrOtherInfo39Mapper,
             });
             log.info("inventorywe为:{}完成",inventory);
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("农业主体清单表同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrPersonalRevokeRecordServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrPersonalRevokeRecord;
 import com.zksy.data.domain.response.XcrPersonalRevokeRecordResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrPersonalRevokeRecordServiceImpl extends ServiceImpl<XcrPersonalR
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步个体吊销信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrPersonalRevokeRecordServiceImpl extends ServiceImpl<XcrPersonalR
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("个体吊销信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrRandomInspectionTaskServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrRandomInspectionTask;
 import com.zksy.data.domain.response.XcrRandomInspectionTaskResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrRandomInspectionTaskServiceImpl extends ServiceImpl<XcrRandomIns
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步抽查任务信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrRandomInspectionTaskServiceImpl extends ServiceImpl<XcrRandomIns
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("抽查任务信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrRecordDishonestyServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrRecordDishonesty;
 import com.zksy.data.domain.response.XcrRecordDishonestyResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,11 @@ public class XcrRecordDishonestyServiceImpl extends ServiceImpl<XcrRecordDishone
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+
     @XhDataLogRecord("同步失信记录名单")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -47,8 +50,16 @@ public class XcrRecordDishonestyServiceImpl extends ServiceImpl<XcrRecordDishone
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("失信记录名单信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrRevisionInformationAgriculturalCollegeAnnualReportServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrRevisionInformationAgriculturalCollegeAnnualReport;
 import com.zksy.data.domain.response.XcrRevisionInformationAgriculturalCollegeAnnualReportResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrRevisionInformationAgriculturalCollegeAnnualReportServiceImpl ex
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步农专年报修改信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrRevisionInformationAgriculturalCollegeAnnualReportServiceImpl ex
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("农专年报修改信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrRevokeInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrRevokeInfo;
 import com.zksy.data.domain.response.XcrRevokeInfoResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrRevokeInfoServiceImpl extends ServiceImpl<XcrRevokeInfoMapper, X
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步吊销信息")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrRevokeInfoServiceImpl extends ServiceImpl<XcrRevokeInfoMapper, X
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("吊销信息同步完成");
     }
 }

data-service/src/main/java/com/zksy/data/service/impl/XcrRevokeRegistrationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrRevokeRegistration;
 import com.zksy.data.domain.response.XcrRevokeRegistrationResponse;
@@ -11,7 +12,7 @@ import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
 import java.util.Vector;
@@ -29,9 +30,10 @@ public class XcrRevokeRegistrationServiceImpl extends ServiceImpl<XcrRevokeRegis
     private XhRequestUtil xhRequestUtil;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @XhDataLogRecord("同步个体撤销登记信息表")
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
@@ -46,8 +48,16 @@ public class XcrRevokeRegistrationServiceImpl extends ServiceImpl<XcrRevokeRegis
                 toDatabaseList.addAll(list);
             }
         });
-        this.remove(null);
-        this.saveBatch(toDatabaseList);
+        transactionTemplate.execute((s)->{
+            try {
+                this.remove(null);
+                this.saveBatch(toDatabaseList);
+            } catch (Exception e) {
+                s.setRollbackOnly();
+                throw new DbException(e);
+            }
+            return null;
+        });
         log.info("个体撤销登记信息同步完成");
     }