文件上传方法更改为分布式事务

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountPaymentServiceImpl.java

@@ -23,6 +23,7 @@ import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.utils.UserUtil;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -117,7 +118,7 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
      * @param accountPaymentDto
      */
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @GlobalTransactional(rollbackFor = Exception.class)
     public void add(AccountPaymentDto accountPaymentDto) {
         AccountRemainder accountRemainder = accountRemainderService.getOne(Wrappers.<AccountRemainder>lambdaQuery()
                 .eq(AccountRemainder::getAccountManagementId, accountPaymentDto.getAccountManagementId())

hx-common/src/main/java/com/fjhx/common/entity/coding/dto/DefaultRule.java

@@ -0,0 +1,32 @@
+package com.fjhx.common.entity.coding.dto;
+
+import cn.hutool.core.util.ArrayUtil;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.enums.RuleTypeEnum;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DefaultRule {
+
+    /**
+     * 编码规则
+     */
+    private RuleTypeEnum ruleTypeEnum;
+
+    /**
+     * 值
+     */
+    private Object value;
+
+    public DefaultRule(RuleTypeEnum ruleTypeEnum) {
+        this.ruleTypeEnum = ruleTypeEnum;
+    }
+
+    public DefaultRule(RuleTypeEnum ruleTypeEnum, Object value) {
+        this.ruleTypeEnum = ruleTypeEnum;
+        this.value = value;
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/entity/coding/dto/RuleVo.java

@@ -0,0 +1,20 @@
+package com.fjhx.common.entity.coding.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class RuleVo {
+
+    /**
+     * 编码规则
+     */
+    private Integer ruleType;
+
+    /**
+     * 值
+     */
+    private Object value;
+
+}

hx-common/src/main/java/com/fjhx/common/enums/CodingRuleEnum.java

@@ -0,0 +1,59 @@
+package com.fjhx.common.enums;
+
+import com.fjhx.common.entity.coding.dto.DefaultRule;
+import com.fjhx.common.entity.coding.dto.RuleVo;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+@AllArgsConstructor
+public enum CodingRuleEnum {
+
+    test("test", "aaa", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "TEST"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM"),
+            getDefaultRule(RuleTypeEnum.COUNTRY_CODE),
+            getDefaultRule(RuleTypeEnum.CUSTOMER_CODE),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, 5)
+    )),
+
+
+    ;
+
+    /**
+     * 编码规则key
+     */
+    private final String key;
+
+    /**
+     * 功能名称
+     */
+    private final String name;
+
+    /**
+     * 默认规则
+     */
+    private final List<DefaultRule> defaultRule;
+
+    private static DefaultRule getDefaultRule(RuleTypeEnum ruleTypeEnum) {
+        return new DefaultRule(ruleTypeEnum);
+    }
+
+    private static DefaultRule getDefaultRule(RuleTypeEnum ruleTypeEnum, Object value) {
+        return new DefaultRule(ruleTypeEnum, value);
+    }
+
+    public List<RuleVo> getDefaultRuleVoList() {
+        return defaultRule.stream().map(item -> {
+            RuleVo ruleVo = new RuleVo();
+            ruleVo.setRuleType(item.getRuleTypeEnum().getType());
+            ruleVo.setValue(item.getValue());
+            return ruleVo;
+        }).collect(Collectors.toList());
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/enums/RuleTypeEnum.java

@@ -0,0 +1,21 @@
+package com.fjhx.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum RuleTypeEnum {
+
+    CUSTOMIZE(1, "自定义字符"),
+    COUNTRY_CODE(2, "客户国家编码"),
+    SALESMAN_CODE(3, "业务员代码"),
+    CUSTOMER_CODE(4, "客户编码"),
+    AUTOINCREMENT(5, "自增编号"),
+    DATE_FORMAT(6, "日期");
+
+    private final Integer type;
+
+    private final String name;
+
+}

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -25,6 +25,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.service.ISysDeptService;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -138,7 +139,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         return result;
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Override
     public void add(ProductInfoDto productInfoDto) {
         // 赋值产品编号
@@ -154,7 +155,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         productInfoDto.setVictoriatouristJson(json.toJSONString());
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Override
     public void edit(ProductInfoDto productInfoDto) {
         // 禁止产品编号修改
@@ -165,7 +166,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         ObsFileUtil.editFile(productInfoDto.getFileList(), productInfoDto.getId());
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Override
     public void delete(Long id) {
         this.removeById(id);

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionProcessesServiceImpl.java

@@ -9,6 +9,7 @@ import com.fjhx.mes.entity.production.po.ProductionProcesses;
 import com.fjhx.mes.mapper.production.ProductionProcessesMapper;
 import com.fjhx.mes.service.production.ProductionProcessesService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -57,7 +58,7 @@ public class ProductionProcessesServiceImpl extends ServiceImpl<ProductionProces
         return result;
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Override
     public void add(ProductionProcessesDto productionProcessesDto) {
         ObsFile obsFile = productionProcessesDto.getFileList().get(0);
@@ -66,7 +67,7 @@ public class ProductionProcessesServiceImpl extends ServiceImpl<ProductionProces
         ObsFileUtil.saveFile(productionProcessesDto.getFileList(), productionProcessesDto.getId());
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Override
     public void edit(ProductionProcessesDto productionProcessesDto) {
         ObsFile obsFile = productionProcessesDto.getFileList().get(0);
@@ -75,7 +76,7 @@ public class ProductionProcessesServiceImpl extends ServiceImpl<ProductionProces
         ObsFileUtil.editFile(productionProcessesDto.getFileList(), productionProcessesDto.getId());
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Override
     public void delete(Long id) {
         this.removeById(id);

hx-oa/src/main/java/com/fjhx/oa/service/daily/impl/DailyReportServiceImpl.java

@@ -18,6 +18,7 @@ import com.fjhx.socket.service.WebSocketServer;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -91,7 +92,7 @@ public class DailyReportServiceImpl extends ServiceImpl<DailyReportMapper, Daily
         return result;
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Override
     public void add(DailyReportDto dailyReportDto) {
         this.save(dailyReportDto);
@@ -116,7 +117,7 @@ public class DailyReportServiceImpl extends ServiceImpl<DailyReportMapper, Daily
         }
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Override
     public void edit(DailyReportDto dailyReportDto) {
         this.updateById(dailyReportDto);

hx-oa/src/main/java/com/fjhx/oa/service/work/impl/WorkTasksServiceImpl.java

@@ -57,7 +57,7 @@ public class WorkTasksServiceImpl extends ServiceImpl<WorkTasksMapper, WorkTasks
         return result;
     }
 
-    @GlobalTransactional
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Override
     public void add(WorkTasksDto workTasksDto) {
         List<ObsFile> fileList = workTasksDto.getFileList();

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -16,6 +16,7 @@ import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.fjhx.supply.utils.CodeEnum;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -82,6 +83,7 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
         return result;
     }
 
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Override
     public void add(SupplierInfoDto supplierInfoDto) {
         supplierInfoDto.setCode(CodeEnum.SUPPLIER_INFO.getCode());
@@ -89,6 +91,7 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
         ObsFileUtil.saveFile(supplierInfoDto.getFileList(), supplierInfoDto.getId());
     }
 
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Override
     public void edit(SupplierInfoDto supplierInfoDto) {
         supplierInfoDto.setCode(null);
@@ -96,6 +99,7 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
         ObsFileUtil.editFile(supplierInfoDto.getFileList(), supplierInfoDto.getId());
     }
 
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Override
     public void delete(Long id) {
         this.removeById(id);