任务

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

@@ -1,59 +0,0 @@
-//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/config/Db1Configuration.java

@@ -0,0 +1,54 @@
+//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
+//@MapperScan(basePackages = "com.hssx.pcbms.mapper", sqlSessionTemplateRef = "db1SqlSessionTemplate")
+//public class Db1Configuration {
+//    @Bean(name = "db1DataSource")
+//    @ConfigurationProperties(prefix = "spring.datasource.hikari.db1")
+//    @Primary
+//    public DataSource testDataSource() {
+//        return DataSourceBuilder.create().build();
+//    }
+//
+//    @Bean(name = "db1SqlSessionFactory")
+//    @Primary
+//    public SqlSessionFactory testSqlSessionFactory(@Qualifier("db1DataSource") DataSource dataSource) throws Exception {
+//        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+//        bean.setDataSource(dataSource);
+//        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/*.xml"));//指定mapper.xml路径
+//        return bean.getObject();
+//    }
+//
+//    @Bean(name = "db1TransactionManager")
+//    @Primary
+//    public DataSourceTransactionManager testTransactionManager(@Qualifier("db1DataSource") DataSource dataSource) {
+//        return new DataSourceTransactionManager(dataSource);
+//    }
+//
+//    @Bean(name = "db1SqlSessionTemplate")
+//    @Primary
+//    public SqlSessionTemplate testSqlSessionTemplate(@Qualifier("db1SqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
+//        return new SqlSessionTemplate(sqlSessionFactory);
+//    }
+//}

pcbms/src/main/java/com/hssx/pcbms/mapper/DepartmentMapper.java

@@ -2,6 +2,7 @@ package com.hssx.pcbms.mapper;
 
 import com.hssx.pcbms.entity.Department;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author 吴涛涛
  * @since 2019-11-06
  */
+@Qualifier("db1SqlSessionTemplate")
 public interface DepartmentMapper extends BaseMapper<Department> {
 
 }

pcbms/src/main/java/com/hssx/pcbms/mapper/UserMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hssx.pcbms.entity.vo.DepartmentVO;
 import com.hssx.pcbms.entity.vo.UserVO;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 import java.util.List;
 
@@ -16,6 +17,7 @@ import java.util.List;
  * @author 吴涛涛
  * @since 2019-10-24
  */
+@Qualifier("db1SqlSessionTemplate")
 public interface UserMapper extends BaseMapper<User> {
 
     UserVO selectUserRolesAndPermisssuons(@Param("user") User systemUser);

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

@@ -111,28 +111,36 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         HttpRespMsg msg = new HttpRespMsg();
         PageHelper.startPage(page.getPageNum(), page.getPageSize());
         List<GoodsVO> list = new ArrayList<>();
-        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();
-            if(keyName!=null && !"".equals(keyName)){
-                qw.eq("device_name",keyName);
+        if(tagId != null){
+            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();
+                if(keyName!=null && !"".equals(keyName)){
+                    qw.eq("device_name",keyName);
+                }
+                List <GoodsNo> equipmentList = goodsNoMapper.selectList(qw.eq("type",1).select("id", "model_no", "state","indate", "goods_id"
+                        ,"user_id", "update_indate", "is_maintain", "type", " device_name", "device_model", "good_sn_no",
+                        "label_id", "rack_id", "model_id", "u_bit_num","current_state","alarm_level").orderByDesc("id"));
+                PageInfo<GoodsNo> info = new PageInfo<>(equipmentList);
+                msg.data = info;
+                return msg;
+            }else{
+                list = goodsMapper.getListBycondition(keyName, tagId, uid);
+                PageInfo<GoodsVO> info = new PageInfo<>(list);
+                msg.data = info;
+                return msg;
             }
-            List <GoodsNo> equipmentList = goodsNoMapper.selectList(qw.eq("type",1).select("id", "model_no", "state","indate", "goods_id"
-                    ,"user_id", "update_indate", "is_maintain", "type", " device_name", "device_model", "good_sn_no",
-                    "label_id", "rack_id", "model_id", "u_bit_num","current_state","alarm_level").orderByDesc("id"));
-            PageInfo<GoodsNo> info = new PageInfo<>(equipmentList);
+        }else{
+            list = goodsMapper.getListBycondition(keyName, tagId, uid);
+            PageInfo<GoodsVO> info = new PageInfo<>(list);
             msg.data = info;
-            return msg;
         }
-        list = goodsMapper.getListBycondition(keyName, tagId, uid);
-        PageInfo<GoodsVO> info = new PageInfo<>(list);
-        msg.data = info;
         return msg;
     }
 

pcbms/src/main/resources/application.properties

@@ -16,6 +16,17 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://118.190.47.230:3306/lishui_app?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya1026
+##Ö÷Êý¾Ý¿â
+#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.hikari.db1.jdbc-url=jdbc:mysql://118.190.47.230:3306/lishui_app?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#spring.datasource.hikari.db1.username=root
+#spring.datasource.hikari.db1.password=p011430seya1026
+##´ÓÊý¾Ý¿â
+#spring.datasource.hikari.db2.jdbc-url=jdbc:mysql://localhost:3306/lishui_app?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#spring.datasource.hikari.db2.username=root
+#spring.datasource.hikari.db2.password=p011430seya
+#spring.datasource.hikari.db2.driver-class-name=com.mysql.cj.jdbc.Driver
+
 #spring.datasource.druid.test-on-borrow=true
 #spring.datasource.druid.test-while-idle=true
 # ####################################################################################################

pcbms/src/main/resources/mapper/GoodsMapper.xml

@@ -114,7 +114,7 @@
         from
         goods
         <where>
-            is_delete = 0
+            is_delete = 0 and good_type = 0
             <if test="keyName != null and keyName != ''">
                 and name like concat('%',#{keyName},'%')
             </if>