Merge branch 'master' of http://47.100.37.243:10080/wutt/lsappBms

pcbms/src/main/java/com/hssx/pcbms/config/DateSourceConfiguration.java

@@ -0,0 +1,59 @@
+//package com.hssx.pcbms.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.Qualifier;
+//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.jdbc.datasource.DataSourceTransactionManager;
+//
+//import javax.sql.DataSource;
+//
+///**
+// * Author: 吴涛涛 cuiyi@itany.com
+// * Date : 2019 - 11 - 14 15:16
+// * Description:<描述>
+// * Version: 1.0
+// */
+//@Configuration
+//public class DateSourceConfiguration {
+//    @Configuration
+//    @MapperScan(basePackages = "数据源1的mapper路径：com.dao.mapper.interface1", sqlSessionTemplateRef  = "test1SqlSessionTemplate")
+//    public class DataSource1Config {
+//
+//        @Bean(name = "test1DataSource")
+//        @ConfigurationProperties(prefix = "spring.datasource.primary")
+//        @Primary
+//        public DataSource testDataSource() {
+//            return DataSourceBuilder.create().build();
+//        }
+//
+//        @Bean(name = "test1SqlSessionFactory")
+//        @Primary
+//        public SqlSessionFactory testSqlSessionFactory(@Qualifier("test1DataSource") DataSource dataSource) throws Exception {
+//            SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+//            bean.setDataSource(dataSource);
+//            bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mybatis/mapper/数据源1/*.xml"));//指定mapper.xml路径
+//            return bean.getObject();
+//        }
+//
+//        @Bean(name = "test1TransactionManager")
+//        @Primary
+//        public DataSourceTransactionManager testTransactionManager(@Qualifier("test1DataSource") DataSource dataSource) {
+//            return new DataSourceTransactionManager(dataSource);
+//        }
+//
+//        @Bean(name = "test1SqlSessionTemplate")
+//        @Primary
+//        public SqlSessionTemplate testSqlSessionTemplate(@Qualifier("test1SqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
+//            return new SqlSessionTemplate(sqlSessionFactory);
+//        }
+//
+//    }
+//}

pcbms/src/main/java/com/hssx/pcbms/service/impl/GoodsServiceImpl.java

@@ -114,6 +114,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         if(tagId==-1){
             //机柜列表
             list = goodsMapper.getRackListBycondition(keyName, tagId, uid);
+            PageInfo<GoodsVO> info = new PageInfo<>(list);
+            msg.data = info;
+            return msg;
         }else if(tagId==-2){
             //设备列表
             QueryWrapper<GoodsNo> qw = new QueryWrapper();
@@ -126,9 +129,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             PageInfo<GoodsNo> info = new PageInfo<>(equipmentList);
             msg.data = info;
             return msg;
-        }else{
-            list = goodsMapper.getListBycondition(keyName, tagId, uid);
         }
+        list = goodsMapper.getListBycondition(keyName, tagId, uid);
         PageInfo<GoodsVO> info = new PageInfo<>(list);
         msg.data = info;
         return msg;