去除seata

hx-account/src/main/java/com/fjhx/account/controller/account/AccountManagementController.java

@@ -1,17 +1,18 @@
 package com.fjhx.account.controller.account;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.account.entity.account.po.AccountManagement;
-import com.fjhx.common.constant.SourceConstant;
-import org.checkerframework.checker.units.qual.A;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountManagementVo;
-import com.fjhx.account.entity.account.dto.AccountManagementSelectDto;
 import com.fjhx.account.entity.account.dto.AccountManagementDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.account.entity.account.dto.AccountManagementSelectDto;
+import com.fjhx.account.entity.account.vo.AccountManagementVo;
 import com.fjhx.account.service.account.AccountManagementService;
+import com.fjhx.common.constant.SourceConstant;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-account/src/main/java/com/fjhx/account/flow/AccountRequestFundsFlow.java

@@ -1,22 +1,17 @@
 package com.fjhx.account.flow;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.account.entity.account.dto.AccountPaymentDto;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
 import com.fjhx.account.entity.account.enums.AccountRequestFundsStatusEnum;
 import com.fjhx.account.entity.account.enums.PaymentStatusEnum;
 import com.fjhx.account.entity.account.enums.PaymentTypeEnum;
-import com.fjhx.account.entity.account.po.AccountPayment;
 import com.fjhx.account.entity.account.po.AccountRequestFunds;
 import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
-import com.fjhx.account.entity.account.vo.AccountPaymentVo;
 import com.fjhx.account.service.account.AccountPaymentService;
 import com.fjhx.account.service.account.AccountRequestFundsDetailService;
 import com.fjhx.account.service.account.AccountRequestFundsService;
@@ -24,13 +19,9 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
 import com.obs.services.internal.ServiceException;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import oshi.util.FileUtil;
 
-import java.util.Date;
 import java.util.List;
 
 /**

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

@@ -1,44 +1,32 @@
 package com.fjhx.account.service.account.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
 import com.fjhx.account.entity.account.po.AccountRequestFunds;
 import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
 import com.fjhx.account.mapper.account.AccountRequestFundsMapper;
 import com.fjhx.account.service.account.AccountRequestFundsDetailService;
 import com.fjhx.account.service.account.AccountRequestFundsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
-import com.fjhx.file.utils.ObsFileUtil;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.utils.UserUtil;
-import org.abego.treelayout.internal.util.java.util.ListUtil;
-import org.apache.catalina.valves.Constants;
-import org.apache.commons.collections4.ListUtils;
-import org.checkerframework.checker.units.qual.A;
-import org.omg.DynamicAny.DynAnyFactoryHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
-import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
-import cn.hutool.core.bean.BeanUtil;
 
-import javax.sql.DataSource;
-import javax.swing.plaf.ListUI;
-import javax.xml.crypto.Data;
-import java.rmi.ServerException;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

hx-admin/src/main/resources/application-dev.yml

@@ -2,7 +2,6 @@
 spring:
     datasource:
         dynamic:
-            seata: true
             strict: true
             primary: base
             datasource:
@@ -86,21 +85,6 @@ spring:
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
 
-seata:
-    config:
-        type: file
-    application-id: springboot-seata
-    #  enable-auto-data-source-proxy: false
-    registry:
-        type: file
-    service:
-        group-list:
-            default: 116.205.247.33:8091
-        vgroup-mapping:
-            springboot-seata-group: default
-    # seata 事务组编号 用于TC集群名
-    tx-service-group: springboot-seata-group
-
 mail:
     # 调用邮箱服务url前缀
     urlPrefix: http://localhost:8088/mailService/

hx-admin/src/main/resources/application-prod.yml

@@ -2,7 +2,6 @@
 spring:
     datasource:
         dynamic:
-            seata: true
             strict: true
             primary: base
             datasource:
@@ -90,21 +89,6 @@ server:
     servlet:
         context-path: /prod-api
 
-seata:
-    config:
-        type: file
-    application-id: springboot-seata
-    #  enable-auto-data-source-proxy: false
-    registry:
-        type: file
-    service:
-        group-list:
-            default: 127.0.0.1:8091
-        vgroup-mapping:
-            springboot-seata-group: default
-    # seata 事务组编号 用于TC集群名
-    tx-service-group: springboot-seata-group
-
 mail:
     # 调用邮箱服务url前缀
     urlPrefix: http://localhost:8088/mailService/

hx-admin/src/main/resources/application-test.yml

@@ -2,7 +2,6 @@
 spring:
     datasource:
         dynamic:
-            seata: true
             strict: true
             primary: base
             datasource:
@@ -90,21 +89,6 @@ server:
     servlet:
         context-path: /test-api
 
-seata:
-    config:
-        type: file
-    application-id: springboot-seata
-    #  enable-auto-data-source-proxy: false
-    registry:
-        type: file
-    service:
-        group-list:
-            default: 116.205.247.33:8091
-        vgroup-mapping:
-            springboot-seata-group: default
-    # seata 事务组编号 用于TC集群名
-    tx-service-group: springboot-seata-group
-
 mail:
     # 调用邮箱服务url前缀
     urlPrefix: http://localhost:8088/mailService/

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

@@ -1,28 +1,24 @@
 package com.fjhx.mes.service.production.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.mes.entity.production.dto.ProductionTaskDto;
+import com.fjhx.mes.entity.production.dto.ProductionTaskSelectDto;
 import com.fjhx.mes.entity.production.po.ProductionPlan;
 import com.fjhx.mes.entity.production.po.ProductionTask;
+import com.fjhx.mes.entity.production.vo.ProductionTaskVo;
 import com.fjhx.mes.mapper.production.ProductionTaskMapper;
 import com.fjhx.mes.service.production.ProductionPlanService;
 import com.fjhx.mes.service.production.ProductionTaskService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.mes.utils.code.CodeEnum;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
-import org.apache.ibatis.annotations.Param;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mes.entity.production.vo.ProductionTaskVo;
-import com.fjhx.mes.entity.production.dto.ProductionTaskSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.mes.entity.production.dto.ProductionTaskDto;
-import cn.hutool.core.bean.BeanUtil;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;

hx-oa/src/main/java/com/fjhx/oa/controller/daily/DailyReportDetailsController.java

@@ -1,13 +1,13 @@
 package com.fjhx.oa.controller.daily;
 
-import com.fjhx.oa.entity.daily.po.DailyReportDetails;
-import com.fjhx.oa.entity.daily.vo.DailyReportCommentsVo;
 import com.fjhx.oa.entity.daily.vo.DailyReportDetailsVo;
 import com.fjhx.oa.service.daily.DailyReportDetailsService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 

hx-purchase/src/main/java/com/fjhx/purchase/flow/PayFlow.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.account.entity.account.enums.PaymentStatusEnum;
 import com.fjhx.account.entity.account.enums.PaymentTypeEnum;
 import com.fjhx.account.entity.account.po.AccountPayment;
@@ -16,17 +15,9 @@ import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.purchase.entity.pay.enums.PayStatusEnum;
 import com.fjhx.purchase.entity.pay.po.Pay;
 import com.fjhx.purchase.entity.pay.po.PayDetail;
-import com.fjhx.purchase.entity.purchase.enums.PurchaseDetailStatusEnum;
-import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
-import com.fjhx.purchase.entity.purchase.po.Purchase;
-import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.fjhx.purchase.service.pay.PayDetailService;
 import com.fjhx.purchase.service.pay.PayService;
-import com.fjhx.purchase.service.purchase.PurchaseDetailService;
-import com.fjhx.purchase.service.purchase.PurchaseService;
-import com.fjhx.purchase.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

hx-purchase/src/main/java/com/fjhx/purchase/flow/PurchaseFlow.java

@@ -12,17 +12,10 @@ import com.fjhx.purchase.entity.purchase.enums.PurchaseDetailStatusEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
-import com.fjhx.purchase.entity.subscribe.enums.SubscribeDetailStatusEnum;
-import com.fjhx.purchase.entity.subscribe.enums.SubscribeStatusEnum;
-import com.fjhx.purchase.entity.subscribe.po.Subscribe;
-import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
-import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
-import com.fjhx.purchase.service.subscribe.SubscribeService;
 import com.fjhx.purchase.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

hx-purchase/src/main/java/com/fjhx/purchase/flow/SubscribeFlow.java

@@ -16,7 +16,6 @@ import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.purchase.service.subscribe.SubscribeService;
 import com.fjhx.purchase.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseDetailServiceImpl.java

@@ -1,21 +1,18 @@
 package com.fjhx.purchase.service.purchase.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.purchase.entity.purchase.dto.PurchaseDetailDto;
+import com.fjhx.purchase.entity.purchase.dto.PurchaseDetailSelectDto;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
+import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
 import com.fjhx.purchase.mapper.purchase.PurchaseDetailMapper;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.utils.StringUtils;
-import io.seata.spring.annotation.GlobalTransactional;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
-import com.fjhx.purchase.entity.purchase.dto.PurchaseDetailSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.purchase.entity.purchase.dto.PurchaseDetailDto;
-import cn.hutool.core.bean.BeanUtil;
+import org.springframework.stereotype.Service;
 
 
 /**

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -1,43 +1,39 @@
 package com.fjhx.purchase.service.purchase.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.purchase.entity.invoice.po.Invoice;
-import com.fjhx.purchase.entity.invoice.po.InvoiceDetails;
 import com.fjhx.purchase.entity.invoice.vo.InvoiceDetailsVo;
 import com.fjhx.purchase.entity.pay.vo.PayDetailVo;
+import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
+import com.fjhx.purchase.entity.purchase.dto.PurchaseSelectDto;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
+import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
 import com.fjhx.purchase.mapper.purchase.PurchaseMapper;
 import com.fjhx.purchase.service.arrival.ArrivalDetailService;
 import com.fjhx.purchase.service.invoice.InvoiceDetailsService;
 import com.fjhx.purchase.service.pay.PayDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.purchase.util.code.CodeEnum;
 import com.fjhx.supply.entity.supplier.po.SupplierInfo;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
-import io.seata.spring.annotation.GlobalTransactional;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
-import com.fjhx.purchase.entity.purchase.dto.PurchaseSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
-import cn.hutool.core.bean.BeanUtil;
 
 import java.math.BigDecimal;
 import java.util.List;

hx-purchase/src/main/java/com/fjhx/purchase/service/refund/impl/RefundServiceImpl.java

@@ -1,29 +1,27 @@
 package com.fjhx.purchase.service.refund.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.entity.account.enums.PaymentStatusEnum;
 import com.fjhx.account.entity.account.po.AccountPayment;
 import com.fjhx.account.service.account.AccountPaymentService;
-import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
+import com.fjhx.purchase.entity.refund.dto.RefundDto;
+import com.fjhx.purchase.entity.refund.dto.RefundSelectDto;
 import com.fjhx.purchase.entity.refund.po.Refund;
+import com.fjhx.purchase.entity.refund.vo.RefundVo;
 import com.fjhx.purchase.mapper.refund.RefundMapper;
 import com.fjhx.purchase.service.refund.RefundService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.supply.entity.supplier.po.SupplierInfo;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import org.apache.commons.collections4.MapUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.refund.vo.RefundVo;
-import com.fjhx.purchase.entity.refund.dto.RefundSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.purchase.entity.refund.dto.RefundDto;
-import cn.hutool.core.bean.BeanUtil;
 
 import java.math.BigDecimal;
 import java.util.List;

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/WdlyServiceImpl.java

@@ -2,11 +2,8 @@ package com.fjhx.victoriatourist.service;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.fjhx.purchase.service.WdlyService;
-import com.fjhx.purchase.service.sales.SalesReturnService;
 import com.fjhx.victoriatourist.entity.deliver.po.DeliverGoods;
 import com.fjhx.victoriatourist.service.deliver.DeliverGoodsService;
-import org.checkerframework.checker.units.qual.A;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service