Merge branch 'master' of csk/cus-wms-supervise2.0 into master

src/main/java/com/emato/cus/supervise/biz/acqInventoryInfo/AcqInventoryInfoCusData.java

@@ -5,6 +5,7 @@ import com.emato.cus.supervise.constant.EmtRecordTimeEnum;
 import com.emato.cus.supervise.domainCus.CusAcqGoodsMove05;
 import com.emato.cus.supervise.domainCus.CusAcqInventoryInfo03;
 import com.emato.cus.supervise.domainOms.OmsCusUnitCode;
+import com.emato.cus.supervise.domainOms.OmsMerchInfo;
 import com.emato.cus.supervise.mapperOms.OmsCusUnitCodeMapper;
 import com.emato.cus.supervise.service.cus.CusAcqInventoryInfoService03;
 import com.google.common.collect.Lists;
@@ -70,8 +71,21 @@ public class AcqInventoryInfoCusData implements CusData {
                 });
         // 查询已有库存信息表对应sku数据
         List<CusAcqInventoryInfo03> listInveInfo = cusAcqInventoryInfoService03.listCusAcqInventoryInfo(listSku);
-        Map<String, String> exitInveInfo = listInveInfo.stream().collect(Collectors.toMap(k->k.getSkuNo(), v->v.getLocalEmsNo()));
-
+        Map<String, CusAcqInventoryInfo03> exitInveInfo = new HashMap<>();
+        // 会报异常："Duplicate key 99999"，即可能出现重复的id，
+        //Map<String, String> exitInveInfo = listInveInfo.stream().collect(Collectors.toMap(k->k.getSkuNo(), v->v.getId()));
+        //exitInveInfo = listInveInfo.stream().collect(Collectors.toMap(k -> k.getSkuNo() + "_" + k.getLocalEmsNo(), v -> v));
+        /*List<String> exitInveInfo = new ArrayList<>();
+        listInveInfo.stream().forEach(i->exitInveInfo.add(i.getSkuNo()));*/
+
+        for (int i = 0, len = listInveInfo.size(); i < len; i++) {
+            String key = listInveInfo.get(i).getSkuNo() + "_" + listInveInfo.get(i).getLocalEmsNo();
+            if (exitInveInfo.containsKey(key)) {
+                continue;
+            } else {
+                exitInveInfo.put(key, listInveInfo.get(i));
+            }
+        }
 
         List<OmsCusUnitCode> codeList = omsCusUnitCodeMapper.getOmsCusUnitCodeList(gUnitNameList);
         Map<String,OmsCusUnitCode> omsCusUnitCodeMap = codeList.stream().collect(Collectors.toMap(k->k.getgUnitName(), v->v));
@@ -89,7 +103,7 @@ public class AcqInventoryInfoCusData implements CusData {
                 info.setgUnit(omsProductInfo.getgUnitCode());
             }
 
-            if (exitInveInfo.containsKey(info.getSkuNo())) {
+            if (exitInveInfo.containsKey(info.getSkuNo() + "_" + info.getLocalEmsNo())) {
                 // 存在, 则更新
                 updateList.add(info);
             } else {

src/main/java/com/emato/cus/supervise/config/ds/primary/PrimaryDataSourceConfig.java

@@ -80,23 +80,4 @@ public class PrimaryDataSourceConfig {
         return new SqlSessionTemplate(primarySqlSessionFactory);
     }
 
-
-    /*private String configLocationByYml() {
-        String path = MYBATIS_MAPPER_CONFIG_YML_PATH;
-        String key = "mybatis.primary.config-location";
-        return YmlUtils.instance().getValue(key, path);
-    }
-
-    private String mapperLocationsByYml() {
-        String path = MYBATIS_MAPPER_CONFIG_YML_PATH;
-        String key = "mybatis.primary.mapper-locations-config";
-        return YmlUtils.instance().getValue(key, path);
-    }
-
-    private String typeAliasesByYml() {
-        String path = MYBATIS_MAPPER_CONFIG_YML_PATH;
-        String key = "mybatis.primary.type-aliases-package";
-        return YmlUtils.instance().getValue(key, path);
-    }*/
-
 }

src/main/java/com/emato/cus/supervise/config/ds/primary/PrimaryMapperConfig.java

@@ -4,6 +4,8 @@ import com.emato.cus.supervise.util.YmlUtils;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -16,9 +18,10 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 public class PrimaryMapperConfig {
+    private static final Logger logger = LoggerFactory.getLogger(PrimaryMapperConfig.class);
 
     @Bean
-    public static MapperScannerConfigurer primaryMapperScannerConfigurer() {
+    public MapperScannerConfigurer primaryMapperScannerConfigurer() {
         MapperScannerConfigurer mapperScannerConfigurer = new MapperScannerConfigurer();
         //Mapper接口包
         mapperScannerConfigurer.setBasePackage(mapperPackageByYml());
@@ -33,8 +36,10 @@ public class PrimaryMapperConfig {
      *
      * @return
      */
-    private static String mapperPackageByYml() {
+    private String mapperPackageByYml() {
         String path = PrimaryMybatisConfigProperties.MYBATIS_MAPPER_CONFIG_YML_PATH;
+        logger.debug("yml: {}", path);
+
         String key = "mybatis.primary.mapper-scanner-package";
         return YmlUtils.instance().getValue(key, path);
     }

src/main/java/com/emato/cus/supervise/config/ds/second/SecondMapperConfig.java

@@ -1,9 +1,12 @@
 package com.emato.cus.supervise.config.ds.second;
 
+import com.emato.cus.supervise.config.ds.primary.PrimaryMapperConfig;
 import com.emato.cus.supervise.util.YmlUtils;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -17,9 +20,10 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  */
 @Configuration
 public class SecondMapperConfig {
+    private static final Logger logger = LoggerFactory.getLogger(SecondMapperConfig.class);
 
     @Bean
-    public static MapperScannerConfigurer secondMapperScannerConfigurer() {
+    public MapperScannerConfigurer secondMapperScannerConfigurer() {
         MapperScannerConfigurer mapperScannerConfigurer = new MapperScannerConfigurer();
         //Mapper接口包
         mapperScannerConfigurer.setBasePackage(mapperPackageByYml());
@@ -34,8 +38,10 @@ public class SecondMapperConfig {
      *
      * @return
      */
-    private static String mapperPackageByYml() {
+    private String mapperPackageByYml() {
         String path = SecondMybatisConfigProperties.MYBATIS_MAPPER_CONFIG_YML_PATH;
+        logger.debug("yml: {}", path);
+
         String key = "mybatis.second.mapper-scanner-package";
         return YmlUtils.instance().getValue(key, path);
     }

src/main/java/com/emato/cus/supervise/config/ds/third/ThirdMapperConfig.java

@@ -1,10 +1,13 @@
 package com.emato.cus.supervise.config.ds.third;
 
+import com.emato.cus.supervise.config.ds.second.SecondMapperConfig;
 import com.emato.cus.supervise.config.ds.second.SecondMybatisConfigProperties;
 import com.emato.cus.supervise.util.YmlUtils;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -17,9 +20,10 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 public class ThirdMapperConfig {
+    private static final Logger logger = LoggerFactory.getLogger(ThirdMapperConfig.class);
 
     @Bean
-    public static MapperScannerConfigurer thirdMapperScannerConfigurer() {
+    public MapperScannerConfigurer thirdMapperScannerConfigurer() {
         MapperScannerConfigurer mapperScannerConfigurer = new MapperScannerConfigurer();
         //Mapper接口包
         mapperScannerConfigurer.setBasePackage(mapperPackageByYml());
@@ -34,8 +38,10 @@ public class ThirdMapperConfig {
      *
      * @return
      */
-    private static String mapperPackageByYml() {
+    private String mapperPackageByYml() {
         String path = ThirdMybatisConfigProperties.MYBATIS_MAPPER_CONFIG_YML_PATH;
+        logger.debug("yml: {}", path);
+
         String key = "mybatis.third.mapper-scanner-package";
         return YmlUtils.instance().getValue(key, path);
     }

src/main/java/com/emato/cus/supervise/util/YmlUtils.java

@@ -164,7 +164,7 @@ public class YmlUtils {
 
     public static void main(String[] args) {
         String ymlPath = "application.yml";
-        String key = "spring.app.name";
+        String key = "spring.profiles.active";
         System.out.println(YmlUtils.instance().getValue(key, ymlPath));
     }
 

src/main/resources/application-dev.yml

@@ -9,9 +9,6 @@ server:
 spring:
     profiles: dev
 
-    aop:
-        proxy-target-class: true
-
     # 数据源
     datasource:
         primary:
@@ -63,6 +60,7 @@ spring:
                 maximumPoolSize: 10
                 minimumIdle: 3
 
+
 # 调试任务配置
 jobs:
     schedule:

src/main/resources/application.yml

@@ -9,9 +9,9 @@ app:
 # 服务配置
 server:
     ## 生产环境
-    # address: 172.18.0.193
+    address: 172.18.0.193
     ## 开发测试环境
-    address: 127.0.0.1
+    # address: 127.0.0.1
     port: 6666
 
 
@@ -25,10 +25,13 @@ ds:
 # 使用环境
 spring:
     profiles:
+        # 使用环境
+        ## active 的配置项一定不能为空，后端使用了snakeyaml Yaml读取application.yml配置文件，为空报错
+        ## 生产环境请一定使用 default
         ## 生产环境
-        #active:
+        active: default
         ## 开发测试环境
-        active: dev
+        #active: dev
     aop:
         proxy-target-class: true
 
@@ -38,14 +41,14 @@ spring:
             # 数据源zaxxer HikariCP 读取通天晓数据库
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
-            ## 开发测试环境
-            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/wms_qhds?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-            username: cout_qw
-            password: 1#DR1yZCN$
-            ## 生产环境
-            #      url: jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/wms_qhds?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-            #      username: qhdsf_wms
-            #      password: g$2tX98$tX
+            #            # 开发测试环境
+            #            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/wms_qhds?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            #            username: cout_qw
+            #            password: 1#DR1yZCN$
+            # 生产环境
+            url: jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/wms_qhds?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            username: qhdsf_wms
+            password: g$2tX98$tX
             # hikari连接池配置
             hikari:
                 readOnly: true
@@ -59,6 +62,11 @@ spring:
             # 数据源zaxxer HikariCP 写入数据库
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
+            #            # 开发测试环境
+            #            url: jdbc:mysql://127.0.0.1:3306/wms_data?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            #            username: root
+            #            password: 111111
+            # 生产环境
             url: jdbc:mysql://183.3.221.144:3306/wms_data?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
             username: wms_admin
             password: DsuBkL2w$q
@@ -75,13 +83,13 @@ spring:
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
             ## 开发测试环境
-            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-            username: out_qhm
-            password: r%4PEusOn&
-            ## 生产环境
-            #          url: jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-            #          username: qhdsi_oms
-            #          password: ZuQhCA#px3
+            #            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            #            username: out_qhm
+            #            password: r%4PEusOn&
+            # 生产环境
+            url: jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            username: qhdsi_oms
+            password: ZuQhCA#px3
             # hikari连接池配置
             hikari:
                 connectionTimeout: 10000