Просмотр исходного кода

fix:
时间发布取消事务的时间差

18339543638 2 лет назад
Родитель
Сommit
1553a32817

+ 2 - 5
tr-modules/tr-module-quartz/src/main/java/cn/tr/module/quartz/job/service/impl/SysJobServiceImpl.java

@@ -105,7 +105,6 @@ public class SysJobServiceImpl extends ServiceImpl<SysJobRepository,SysJobPO> im
      * @author  lf
      * @date     2023/05/05 10:55
      */
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean updateSysJobById(SysJobDTO source){
         int rows = baseMapper.updateById(SysJobMapper.INSTANCE.convertPO(source));
@@ -122,7 +121,6 @@ public class SysJobServiceImpl extends ServiceImpl<SysJobRepository,SysJobPO> im
      * @date  2023/05/05 10:55
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public boolean insertSysJob(SysJobDTO source) {
         source.setStatus(ScheduleConstants.Status.PAUSE.getValue());
         SysJobPO po = SysJobMapper.INSTANCE.convertPO(source);
@@ -140,16 +138,16 @@ public class SysJobServiceImpl extends ServiceImpl<SysJobRepository,SysJobPO> im
      * @date    2023/05/05 10:55
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public int removeSysJobByIds(Collection<String> ids) {
         List<SysJobPO> jobs = this.listByIds(ids);
         if(CollectionUtil.isEmpty(jobs)){
             return CollectionUtil.size(ids);
         }
+        int result = baseMapper.deleteBatchIds(ids);
         for (SysJobDTO sysJobDTO : SysJobMapper.INSTANCE.convertDtoList(jobs)) {
             eventBus.publishShare(JOB_REMOVE_TOPIC,sysJobDTO);
         }
-        return baseMapper.deleteBatchIds(ids);
+        return result;
     }
 
     @Override
@@ -173,7 +171,6 @@ public class SysJobServiceImpl extends ServiceImpl<SysJobRepository,SysJobPO> im
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public boolean changeStatus(String id, String status) throws SchedulerException {
         SysJobPO job = this.baseMapper.selectById(id);
         if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) {

+ 2 - 5
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/numStrategy/service/impl/SysNumberingStrategyServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.tr.module.sys.numStrategy.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.tr.core.exception.ServiceException;
 import cn.tr.core.exception.TRExcCode;
@@ -117,14 +118,12 @@ public class SysNumberingStrategyServiceImpl implements ISysNumberingStrategySer
      * @author  lf
      * @date     2023/04/24 17:22
      */
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean updateSysNumberingStrategyById(SysNumberingStrategyDTO source){
         SysNumberingStrategyPO strategyPO = SysNumberingStrategyMapper.INSTANCE.convertPO(source);
         validateNumberingStrategySource(strategyPO);
         if(baseRepository.updateById(strategyPO)!=0){
-//            strategyClientFactory.createOrUpdateSmsClient(SysNumberingStrategyMapper.INSTANCE.convertProperty(source));
-            eventBus.publishShare(STRATEGY_REFRESH_TOPIC,null);
+            eventBus.publishShare(STRATEGY_REFRESH_TOPIC, new Object());
             return true;
         }
         return false;
@@ -137,7 +136,6 @@ public class SysNumberingStrategyServiceImpl implements ISysNumberingStrategySer
      * @date  2023/04/24 17:22
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public boolean insertSysNumberingStrategy(SysNumberingStrategyDTO source){
         SysNumberingStrategyPO strategyPO = SysNumberingStrategyMapper.INSTANCE.convertPO(source);
         validateNumberingStrategySource(strategyPO);
@@ -155,7 +153,6 @@ public class SysNumberingStrategyServiceImpl implements ISysNumberingStrategySer
      * @date    2023/04/24 17:22
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public int removeSysNumberingStrategyByIds(Collection<String> ids){
         if(CollectionUtil.isEmpty(ids)){
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");

+ 0 - 3
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/sms/service/impl/SysSmsChannelServiceImpl.java

@@ -96,7 +96,6 @@ public class SysSmsChannelServiceImpl implements ISysSmsChannelService {
      * @author  lf
      * @date     2023/04/19 18:18
      */
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean updateSysSmsChannelById(SysSmsChannelDTO source){
         boolean result = baseRepository.updateById(SysSmsChannelMapper.INSTANCE.convertPO(source)) != 0;
@@ -113,7 +112,6 @@ public class SysSmsChannelServiceImpl implements ISysSmsChannelService {
      * @date  2023/04/19 18:18
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public boolean insertSysSmsChannel(SysSmsChannelDTO source){
         boolean result = baseRepository.insert(SysSmsChannelMapper.INSTANCE.convertPO(source)) != 0;
         if(result){
@@ -129,7 +127,6 @@ public class SysSmsChannelServiceImpl implements ISysSmsChannelService {
      * @date    2023/04/19 18:18
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public int removeSysSmsChannelByIds(Collection<String> ids){
         if(CollectionUtil.isEmpty(ids)){
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");

+ 0 - 2
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/sms/service/impl/SysSmsTempServiceImpl.java

@@ -85,7 +85,6 @@ public class SysSmsTempServiceImpl implements ISysSmsTempService {
      * @author  lf
      * @date     2023/04/21 10:29
      */
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean updateSysSmsTempById(SysSmsTempDTO source){
         validateSmsTempSource(source);
@@ -103,7 +102,6 @@ public class SysSmsTempServiceImpl implements ISysSmsTempService {
      * @date  2023/04/21 10:29
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public boolean insertSysSmsTemp(SysSmsTempDTO source){
         validateSmsTempSource(source);
         boolean result = baseRepository.insert(SysSmsTempMapper.INSTANCE.convertPO(source)) != 0;

+ 3 - 7
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/storage/service/impl/SysStorageConfigServiceImpl.java

@@ -58,6 +58,7 @@ public class SysStorageConfigServiceImpl implements ISysStorageConfigService, Co
 
     @Subscribe(STORAGE_CONFIG_TOPIC)
     public void storageConfigUpdate(String configId){
+        log.info("存储配置{}刷新成功",configId);
         storageFileService.refreshConfig(configId);
     }
     /**
@@ -101,8 +102,8 @@ public class SysStorageConfigServiceImpl implements ISysStorageConfigService, Co
      * @date     2023/05/09 14:29
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public boolean updateSysStorageConfigById(SysStorageConfigDTO source){
+        source.setMaster(null);
         SysStorageConfigPO config = SysStorageConfigMapper.INSTANCE.convertPO(source);
         config.setConfig(parseClientConfig(config.getType(), source.getConfig()));
         if (baseRepository.updateById(config)!=0) {
@@ -119,7 +120,6 @@ public class SysStorageConfigServiceImpl implements ISysStorageConfigService, Co
      * @date  2023/05/09 14:29
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public boolean insertSysStorageConfig(SysStorageConfigDTO source){
         Long count = baseRepository.selectCount(new LambdaQueryWrapper<>());
         boolean master=count==0;
@@ -128,11 +128,7 @@ public class SysStorageConfigServiceImpl implements ISysStorageConfigService, Co
                 .setConfig(parseClientConfig(config.getType(), source.getConfig()))
                 // 默认非 master
                 .setMaster(master);
-        if (baseRepository.insert(config)!=0) {
-            eventBus.publishShare(STORAGE_CONFIG_TOPIC,new Object());
-            return true;
-        }
-        return false;
+        return baseRepository.insert(config)!=0;
     };
 
     /**