修改代码

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/config/DataSourceConfiguration.java

-//package com.yeejoin.amos.boot.module.hygf.biz.config;
+//package com.yeejoin.amos.workflow.config;
 //
 //import com.baomidou.mybatisplus.core.config.GlobalConfig;
 //import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 //import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+//import com.github.pagehelper.PageInterceptor;
 //import com.yeejoin.amos.boot.biz.config.MetaHandler;
-//import com.yeejoin.amos.boot.biz.config.MybatisSqlInjector;
+//import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpowerInterceptor;
 //import com.zaxxer.hikari.HikariDataSource;
 //import io.seata.rm.datasource.DataSourceProxy;
-//import javax.sql.DataSource;
 //import org.apache.ibatis.plugin.Interceptor;
 //import org.apache.ibatis.session.SqlSessionFactory;
+//import org.mybatis.spring.SqlSessionTemplate;
 //import org.springframework.beans.factory.annotation.Autowired;
 //import org.springframework.beans.factory.annotation.Qualifier;
 //import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//import org.springframework.boot.jdbc.DataSourceBuilder;
 //import org.springframework.context.annotation.Bean;
 //import org.springframework.context.annotation.Configuration;
 //import org.springframework.context.annotation.Primary;
 //import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 //import org.springframework.core.io.support.ResourcePatternResolver;
+//import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+//
+//import javax.sql.DataSource;
+//import java.util.Properties;
 //
 ///**
 // * 数据源代理
@@ -26,14 +33,17 @@
 // */
 //@Configuration
 //public class DataSourceConfiguration {
+//    @Autowired
+//    MetaHandler metaHandler;
+//    private static final String MAPPER_LOCATION = "classpath*:mapper/mysql/*.xml";
 //
 //    @Autowired
 //    private DataSourceProperties dsp;
 //
-//    @Bean(name = "hikariDataSource")
-//    public HikariDataSource hikariDataSource() {
+//    @Bean(name = "mysqlDataSource")
+//    @Primary
+//    public DataSource mysqlDataSource() {
 //        HikariDataSource hds = new HikariDataSource();
-//        hds.setSchema(dsp.getSchema().get(0));
 //        hds.setUsername(dsp.getUsername());
 //        hds.setPassword(dsp.getPassword());
 //        hds.setJdbcUrl(dsp.getUrl());
@@ -44,30 +54,65 @@
 //        return hds;
 //    }
 //
-//    @Primary
-//    @Bean("dataSource")
-//    public DataSourceProxy dataSourceProxy(@Qualifier("dataSource") DataSource hikariDataSource) {
+//    @Bean("mysqlDataSourceProxy")
+//    public DataSourceProxy dataSourceProxy(DataSource hikariDataSource) {
 //        return new DataSourceProxy(hikariDataSource);
 //    }
 //
-//    @Bean(name = "sqlSessionFactory")
-//    @Autowired
-//    public SqlSessionFactory sqlSessionFactoryBean(@Qualifier("dataSource") DataSource dataSourceProxy, PaginationInterceptor paginationInterceptor, MetaHandler metaHandler) throws Exception {
+//    @Bean(name = "mysqlSqlSessionFactory")
+//    @Primary
+//    public SqlSessionFactory mysqlSqlSessionFactory(@Qualifier("mysqlDataSourceProxy") DataSource dataSource, GlobalConfig globalConfig) throws Exception {
+//        //注意这里一定要用MybatisSqlSessionFactoryBean，如果用SqlSessionFactory，配置无效
 //        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
-//        bean.setDataSource(dataSourceProxy);
-//        ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
-//        bean.setMapperLocations(resolver.getResources("classpath*:mapper/*.xml"));
-//        GlobalConfig globalConfig = new GlobalConfig();
-//        globalConfig.setSqlInjector(new MybatisSqlInjector());
+//        bean.setDataSource(dataSource);
+//        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(MAPPER_LOCATION));
 //        globalConfig.setMetaObjectHandler(metaHandler);
 //        bean.setGlobalConfig(globalConfig);
-//        Interceptor[] plugins = {paginationInterceptor};
-//        bean.setPlugins(plugins);
+//        //分页插件
+//        Interceptor interceptor = new PageInterceptor();
+//        Properties properties = new Properties();
+//        properties.setProperty("helperDialect", "mysql");
+//        properties.setProperty("offsetAsPageNum", "true");
+//        properties.setProperty("rowBoundsWithCount", "true");
+//        properties.setProperty("reasonable", "true");
+//        properties.setProperty("supportMethodsArguments","true");
+//        properties.setProperty("params","pageNum=current;pageSize=size" +
+//                "" +
+//                ";");
+//        interceptor.setProperties(properties);
+//        bean.setPlugins(new Interceptor[] {interceptor,
+//                userEmpowerInterceptor(),
+//                paginationInterceptor()
+//        });
 //        return bean.getObject();
 //    }
 //
+//    @Bean(name = "mysqlTransactionManager")
+//    @Primary
+//    public DataSourceTransactionManager mysqlTransactionManager(@Qualifier("mysqlDataSource") DataSource dataSource) {
+//        return new DataSourceTransactionManager(dataSource);
+//    }
+//
+//    @Bean(name = "mysqlSqlSessionTemplate")
+//    @Primary
+//    public SqlSessionTemplate mysqlSqlSessionTemplate(@Qualifier("mysqlSqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
+//        return new SqlSessionTemplate(sqlSessionFactory);
+//    }
+//
+//    @Bean
+//    public PaginationInterceptor paginationInterceptor() {
+//        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+//        paginationInterceptor.setDialectType("mysql");
+//        return paginationInterceptor;
+//    }
+//
+//
 //    @Bean
-//    public MetaHandler metaHandler() {
-//        return new MetaHandler();
+//    public UserEmpowerInterceptor userEmpowerInterceptor() {
+//        UserEmpowerInterceptor userEmpowerInterceptor = new UserEmpowerInterceptor();
+//
+//        return userEmpowerInterceptor;
 //    }
+//
+//
 //}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceRectificationOrderServiceImpl.java

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceRectificationOrder
 import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceRectificationOrderService;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -98,7 +99,7 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
      * 提交整改并触发工作流
      */
 
-    @Transactional
+    @GlobalTransactional
     public AcceptanceRectificationOrderDto updateAndDriveWorkflow(AcceptanceRectificationOrderDto model, String userId) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceServiceImpl.java

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceService;
+import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -109,7 +110,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         return Optional.ofNullable(item).orElse(new AcceptanceCheckItem());
     }
     @Override
-    @Transactional
+    @GlobalTransactional
     public void  checkAccept( Long  basicGridAcceptanceId   ,String userId){
         BasicGridAcceptance basicGridAcceptanc=  basicGridAcceptanceMapper.selectById(basicGridAcceptanceId);
         basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.待投融验收.getCode());

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IBasicGridAcceptanceService;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
+import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -90,7 +91,7 @@ public class BasicGridAcceptanceServiceImpl
 		return grid;
 	}
 
-	@Transactional
+	@GlobalTransactional
 	public HygfOnGrid saveAndCommit(HygfOnGrid grid, String userId) {
 
 		BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper
@@ -192,7 +193,7 @@ public class BasicGridAcceptanceServiceImpl
 		return bool;
 	}
 
-	@Transactional
+	@GlobalTransactional
 	public void execute(AcceptanceCheckItem dto, String userId) {
 		// 查询并网审批信息
 		BasicGridAcceptance basicGridAcceptanc = basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingInfoServiceImpl.java

@@ -33,6 +33,7 @@ import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -112,7 +113,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         return this.queryForList("", false);
     }
 
-    @Transactional
+    @GlobalTransactional
     public FinancingInfoDto saveModel(FinancingInfoDto model) {
         List<String> ids;
         if (model.getPeasantHouseholdIds().contains(",")) {
@@ -156,7 +157,6 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
             actWorkflowBatchDTO.setProcess(list);
             List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
             List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
-
             WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
             FinancingAuditingDto financingAuditingDto = new FinancingAuditingDto();
             BeanUtils.copyProperties(workflowResultDto, financingAuditingDto);
@@ -203,6 +203,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
 
 
     @Override
+    @GlobalTransactional
     public void rollback(String processId, String peasantHouseholdId) {
         workFlowService.stopProcess(processId);
         LambdaQueryWrapper<FinancingInfo> queryWrapper = new LambdaQueryWrapper<>();
@@ -227,7 +228,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     }
 
     @Override
-    @Transactional
+    @GlobalTransactional
     public void execueFlow(Map<String, Object> params) {
         LambdaQueryWrapper<FinancingAuditing> query = new LambdaQueryWrapper<>();
         query.eq(FinancingAuditing::getInstanceId, params.get("instanceId").toString());

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java

@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
@@ -232,7 +233,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 	}
 
 	@Override
-	@Transactional
+	@GlobalTransactional
 	public String powerStationExamine(long pageId, String nodeCode, String stationId, String taskId,
 			String planInstanceId, Map<String, Object> kv) {
 		String meg = "";

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java

@@ -24,6 +24,7 @@ import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -142,7 +143,7 @@ public class SurveyInformationServiceImpl
         return this.queryForList("", false);
     }
 
-    @Transactional
+    @GlobalTransactional
     public SurveyInfoAllDto saveSurveyInfo(SurveyInfoAllDto surveyInfoAllDto, String operationType) {
         try {
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java

@@ -29,6 +29,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -161,7 +162,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
     }
 
     @Override
-    @Transactional
+    @GlobalTransactional
     public UnitRegisterDto registerUnit(UnitRegisterDto model) {
 
         UnitInfoDto regUnitInfo = model.getUnitInfoDto();
@@ -576,7 +577,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
 
 
     @Override
-    @Transactional
+    @GlobalTransactional
     public String powerStationExamine(long pageId, String nodeCode, String stationId, String taskId, String planInstanceId, Map<String, Object> kv) {
 
         // 2.更新审核记录表

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkflowImpl.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;