fix:多数据源及扫描配置

pom.xml

@@ -61,7 +61,6 @@
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
-            <version>6.2.2.jre8</version>
             <scope>runtime</scope>
         </dependency>
         <!-- TCP -->

src/main/java/net/vtstar/zhongtong/avi/demo/controller/DemoController.java

-package net.vtstar.zhongtong.avi.demo.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import net.vtstar.user.search.controller.vo.SearchVo;
-import net.vtstar.utils.domain.Return;
-import net.vtstar.zhongtong.avi.demo.service.DemoService;
-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;
-
-@Slf4j
-@RestController
-@RequestMapping("/api/demo")
-@Api(description = "demo")
-public class DemoController {
-
-    @Autowired
-    private DemoService demoService;
-
-
-    @ApiOperation("列表")
-    @PostMapping("/page")
-    public Return demoList(@RequestBody SearchVo pageFilter) {
-        return Return.success(demoService.pageList(pageFilter.toJSONObject()));
-    }
-}

src/main/java/net/vtstar/zhongtong/avi/demo/domain/Demo.java

-package net.vtstar.zhongtong.avi.demo.domain;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import net.vtstar.user.mybatis.domain.CommonField;
-import net.vtstar.user.search.Search;
-
-import javax.persistence.Column;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-@ApiModel(value = "测试用类")
-@Data
-@Search(code = "DEMO")
-@Table(name = "demo")
-public class Demo {
-
-    @Column(name = "id")
-    private Long id;
-
-    @ApiModelProperty(notes = "名字")
-    @Column(name = "name")
-    @NotNull(message = "name is null")
-    @Search
-    private String name;
-}

src/main/java/net/vtstar/zhongtong/avi/demo/mapper/DemoMapper.java

-package net.vtstar.zhongtong.avi.demo.mapper;
-
-import net.vtstar.user.mybatis.BaseMapper;
-import net.vtstar.zhongtong.avi.demo.domain.Demo;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface DemoMapper extends BaseMapper<Demo> {
-}

src/main/java/net/vtstar/zhongtong/avi/demo/service/DemoService.java

-package net.vtstar.zhongtong.avi.demo.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.PageHelper;
-import net.vtstar.user.mybatis.provider.Operation;
-import net.vtstar.user.mybatis.provider.WhereFilter;
-import net.vtstar.user.search.service.SearchService;
-import net.vtstar.zhongtong.avi.demo.domain.Demo;
-import net.vtstar.zhongtong.avi.demo.mapper.DemoMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class DemoService {
-
-    @Autowired
-    private DemoMapper demoMapper;
-    @Autowired
-    private SearchService searchService;
-
-    /**
-     * 分页查询
-     */
-    public List<Demo> pageList(JSONObject pageFilter) {
-        PageHelper.startPage(pageFilter.getIntValue("pageNum"), pageFilter.getIntValue("pageSize"));
-        return demoMapper.findList(searchService.pageFilter2Filter(pageFilter, new WhereFilter() {{
-            // 查询所有状态的数据，否则默认查询状态为1的数据
-            addFilter(Demo.class, "status", Operation.NOT_EQUAL, "");
-        }}), Demo.class);
-    }
-}

src/main/java/net/vtstar/zhongtong/avi/global/config/DataSourceConfig.java

@@ -29,13 +29,13 @@ public class DataSourceConfig {
 
     @Bean
     @ConfigurationProperties(prefix = "sqlserver")
-    DataSource sqlserverDatasource() {
+    DataSource sqlServerDatasource() {
         return DataSourceBuilder.create().build();
     }
 
     @Bean
     JdbcTemplate sqlserverJdbcTemplate(JdbcProperties properties) {
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(sqlserverDatasource());
+        JdbcTemplate jdbcTemplate = new JdbcTemplate(sqlServerDatasource());
         JdbcProperties.Template template = properties.getTemplate();
         jdbcTemplate.setFetchSize(template.getFetchSize());
         jdbcTemplate.setMaxRows(template.getMaxRows());
@@ -44,5 +44,4 @@ public class DataSourceConfig {
         }
         return jdbcTemplate;
     }
-
 }

src/main/java/net/vtstar/zhongtong/avi/global/config/MybatisMySQLConfig.java

+package net.vtstar.zhongtong.avi.global.config;
+
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+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.jdbc.core.JdbcTemplate;
+
+import javax.sql.DataSource;
+
+@Configuration
+@MapperScan(
+        basePackages = {
+                "net.vtstar.user.mapper",
+                "net.vtstar.scada.base.equipmgt.mapper",
+        },
+        sqlSessionFactoryRef = "sqlSessionFactoryMySQL")
+public class MybatisMySQLConfig {
+
+    @Autowired
+    @Qualifier("dataSource")
+    private DataSource dataSource;
+
+    @Bean(name = "jdbcTemplate")
+    @Primary
+    public JdbcTemplate mySqlJdbcTemplate(
+            @Qualifier("dataSource") DataSource dataSource) {
+        return new JdbcTemplate(dataSource);
+    }
+
+    @Bean
+    public SqlSessionFactory sqlSessionFactoryMySQL() throws Exception {
+        SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean();
+        factoryBean.setDataSource(dataSource);
+        //factoryBean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/mysql/*.xml"));
+        return factoryBean.getObject();
+    }
+
+    @Bean
+    public SqlSessionTemplate sqlSessionTemplate2() throws Exception {
+        SqlSessionTemplate template = new SqlSessionTemplate(sqlSessionFactoryMySQL()); // 使用上面配置的Factory
+        return template;
+    }
+}

src/main/java/net/vtstar/zhongtong/avi/global/config/MybatisSqlServerConfig.java

+package net.vtstar.zhongtong.avi.global.config;
+
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import javax.sql.DataSource;
+
+@Configuration
+@MapperScan(basePackages = {"net.vtstar.xiongbo.iqc.mapper.sqlserver",
+        "net.vtstar.xiongbo.erp.mapper"},
+        sqlSessionFactoryRef = "sqlSessionFactorySqlServer")
+public class MybatisSqlServerConfig {
+
+    @Autowired
+    @Qualifier("sqlServerDatasource")
+    private DataSource sqlServerDatasource;
+
+    @Bean
+    public SqlSessionFactory sqlSessionFactorySqlServer() throws Exception {
+        SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean();
+        factoryBean.setDataSource(sqlServerDatasource);
+        //factoryBean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/sqlserver/*.xml"));
+        return factoryBean.getObject();
+    }
+
+    @Bean
+    public SqlSessionTemplate sqlSessionTemplate3() throws Exception {
+        SqlSessionTemplate template = new SqlSessionTemplate(sqlSessionFactorySqlServer()); // 使用上面配置的Factory
+        return template;
+    }
+}

src/main/resources/config/application-dev-yxh.properties

@@ -6,6 +6,11 @@ spring.datasource.url=jdbc:mysql://localhost:3306/zhongtong_dev?useSSL=false&use
 spring.datasource.username=root
 spring.datasource.password=123456
 
+sqlserver.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
+sqlserver.jdbc-url=jdbc:sqlserver://10.100.172.118:1433;DatabaseName=UFDATA_101_2016
+sqlserver.username=sa
+sqlserver.password=!QAZ0okm
+
 # redis
 spring.redis.host=10.100.172.102
 spring.redis.port=6379

src/main/resources/config/application-quartz.properties

@@ -24,4 +24,4 @@ quartz.job.taskInfos[0].jobName=net.vtstar.zhongtong.avi.stamping.job.LaserCutti
 quartz.job.taskInfos[0].jobGroup=LaserCuttingMachineJob
 quartz.job.taskInfos[0].jobDescription=\u5C01\u88C5\u7EBF\u9884\u710A\u673A\u6570\u636E\u91C7\u96C6job
 quartz.job.taskInfos[0].cronExpression=0/10 * * * * ?
-quartz.job.taskInfos[0].start=false
\ No newline at end of file
+quartz.job.taskInfos[0].start=true
\ No newline at end of file