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

src/main/java/com/emato/cus/supervise/biz/OutFee/OutFeeBiz.java

@@ -0,0 +1,85 @@
+package com.emato.cus.supervise.biz.OutFee;
+
+import com.emato.cus.supervise.biz.CusWmsTask;
+import com.emato.cus.supervise.biz.acqGoodsMoveSchedule.up.AcqGoodsMoveUpCusData;
+import com.emato.cus.supervise.biz.acqGoodsMoveSchedule.up.AcqGoodsMoveUpDataConversion;
+import com.emato.cus.supervise.biz.acqGoodsMoveSchedule.up.AcqGoodsMoveUpRecordTime;
+import com.emato.cus.supervise.biz.acqGoodsMoveSchedule.up.AcqGoodsMoveUpWmsData;
+import com.emato.cus.supervise.biz.acqInventoryInfo.AcqInventoryInfoOmsData;
+import com.emato.cus.supervise.constant.EmtRecordTimeEnum;
+import com.emato.cus.supervise.domain.WmsAcqGoodsMove;
+import com.emato.cus.supervise.domainCus.CusAcqGoodsMove05;
+import com.emato.cus.supervise.domainOms.OmsProductInfo;
+import com.emato.cus.supervise.util.GsonUtil;
+import com.emato.cus.supervise.util.LocalDateTimeUtils;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zengjunlin
+ * @version 1.0
+ * 2018-02-03 15:21
+ */
+@Component
+public class OutFeeBiz implements CusWmsTask {
+    private static final Logger logger = LoggerFactory.getLogger(OutFeeBiz.class);
+
+    @Autowired
+    private AcqGoodsMoveUpWmsData acqGoodsMoveUpWmsData;
+
+    @Autowired
+    private AcqGoodsMoveUpCusData acqGoodsMoveUpCusData;
+
+    @Autowired
+    private AcqGoodsMoveUpDataConversion acqGoodsMoveUpDataConversion;
+
+    @Autowired
+    private AcqInventoryInfoOmsData acqInventoryInfoOmsData;
+
+    private static final String DATA_TYPE_INFO = "[" + EmtRecordTimeEnum.ACQ_GOODS_MOVE_UP.getCode() + "]" + EmtRecordTimeEnum.ACQ_GOODS_MOVE_UP.getName();
+
+
+    /**
+     * 任务入口
+     */
+    @Override
+    public void task() {
+
+
+        // 扫描旧系统数据，
+//        List<WmsAcqGoodsMove> wmsList = acqGoodsMoveUpWmsData.getWmsData(oldThisTime);
+//        if (wmsList == null || wmsList.size() == 0) {
+//            logger.info("--- 【" + DATA_TYPE_INFO + "】获取到本次扫描数据为空, 不执行写数据操作, 本次扫描提前结束！！！");
+//            return;
+//        }
+//
+//        List<String> skuList = Lists.newArrayList();
+//        wmsList.forEach(i -> skuList.add(i.getSkuNo()));
+//
+//        List<OmsProductInfo> productList = acqInventoryInfoOmsData.getOmsProductData(skuList);
+//
+//        if (productList == null || productList.isEmpty()) {
+//            logger.error("oms扫描到的数据" + GsonUtil.toJson(productList));
+//            logger.info("--- 【" + DATA_TYPE_INFO + "】获取到本次扫描OMS数据为空, 不执行写数据操作, 本次扫描提前结束！！！");
+//            return;
+//        }
+//
+//        Map params = Maps.newHashMap();
+//        params.put("wmsList",wmsList);
+//        params.put("productInfoList", productList);
+//        //将wms数据转换cus
+//        List<CusAcqGoodsMove05> cusList = acqGoodsMoveUpDataConversion.conversion(params);
+//
+//        // 写CUS 数据
+//        int res = acqGoodsMoveUpCusData.insertCus(cusList);
+
+    }
+}

src/main/java/com/emato/cus/supervise/schedule/OutFeeSchedule.java

@@ -0,0 +1,47 @@
+package com.emato.cus.supervise.schedule;
+
+import com.emato.cus.supervise.biz.OutFee.OutFeeBiz;
+import com.emato.cus.supervise.biz.acqGoodsMoveSchedule.up.AcqGoodsMoveUpBiz;
+import com.emato.cus.supervise.util.LocalDateTimeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+/**
+ *
+ * 货物库位移动数据 计划任务
+ * @author zengjunlin
+ * @version 1.0
+ * 2018-02-03 15:18
+ */
+@Configuration
+@EnableScheduling
+public class OutFeeSchedule {
+    private static final Logger logger = LoggerFactory.getLogger(OutFeeSchedule.class);
+
+    @Autowired
+    private OutFeeBiz outFeeBiz;
+
+
+    /**
+     *
+     */
+    @Scheduled(cron = "0/10 * * * * ? ")
+    public void timerUp() {
+        logger.info("==================== 计算关税开始 ====================");
+        String begDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);
+        logger.info("--- 任务开始时间: {}", begDateTime);
+        outFeeBiz.task();
+
+
+        String endDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);
+        logger.info("--- 任务结束时间: {}", endDateTime);
+        logger.info("==================== 计算关税结束 ====================");
+
+    }
+
+
+}

src/main/resources/application-dev.yml

@@ -1,11 +1,77 @@
+#---------- Spring Boot 项目 ----------#
 
-# 当前环境
+# 服务配置
+server:
+  address: 127.0.0.1
+  port: 8081
+
+# 使用环境
 spring:
   profiles: dev
 
+  aop:
+    proxy-target-class: true
 
+  # 数据源
+  datasource:
+    primary:
+      # 数据源zaxxer HikariCP 读取通天晓数据库
+      type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: org.mariadb.jdbc.Driver
+      # url: jdbc:sqlserver://120.24.12.161:60001;DatabaseName=qhwms
+      url: jdbc:mysql://127.0.0.1:3306/wms_test?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+      username: root
+      password: root
+      # hikari连接池配置
+      hikari:
+        readOnly: true
+        connectionTimeout: 10000
+        validationTimeout: 5000
+        idleTimeout: 600000
+        maxLifetime: 1200000
+        maximumPoolSize: 3
+        minimumIdle: 3
+    second:
+      # 数据源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: root
+      # hikari连接池配置
+      hikari:
+        connectionTimeout: 10000
+        validationTimeout: 5000
+        idleTimeout: 600000
+        maxLifetime: 1200000
+        maximumPoolSize: 10
+        minimumIdle: 3
+    third:
+          # 数据源zaxxer HikariCP 读取oms
+          type: com.zaxxer.hikari.HikariDataSource
+          driver-class-name: org.mariadb.jdbc.Driver
+          url: jdbc:mysql://120.76.84.45:3306/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+          username: ceshi
+          password: abc-123
+          # hikari连接池配置
+          hikari:
+            connectionTimeout: 10000
+            validationTimeout: 5000
+            idleTimeout: 600000
+            maxLifetime: 1200000
+            maximumPoolSize: 10
+            minimumIdle: 3
 
 
 
-
-
+# mybatis config 多数据源
+mybatis:
+  primary:
+      config-location: classpath:mybatis/mybatis-config.xml
+      type-aliases-package: com.emato.cus.supervise.domain
+  second:
+      config-location: classpath:mybatis/mybatis-config-cus.xml
+      type-aliases-package: com.emato.cus.supervise.domainCus
+  third:
+      config-location: classpath:mybatis/mybatis-config-oms.xml
+      type-aliases-package: com.emato.cus.supervise.domainOms

src/main/resources/application-test.yml

@@ -0,0 +1,75 @@
+#---------- Spring Boot 项目 ----------#
+# 服务配置
+server:
+  address: 127.0.0.1
+  port: 6666
+
+# 使用环境
+spring:
+  profiles: test
+
+  aop:
+    proxy-target-class: true
+
+  # 数据源
+  datasource:
+    primary:
+      # 数据源zaxxer HikariCP 读取通天晓数据库
+      type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: org.mariadb.jdbc.Driver
+      url: jdbc:mysql://120.24.12.161:60002/wms_qhds?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+      username: cout_qw
+      password: OqiIQ#p3
+      # hikari连接池配置
+      hikari:
+        readOnly: true
+        connectionTimeout: 10000
+        validationTimeout: 5000
+        idleTimeout: 600000
+        maxLifetime: 1200000
+        maximumPoolSize: 3
+        minimumIdle: 3
+    second:
+      # 数据源zaxxer HikariCP 写入数据库
+      type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: org.mariadb.jdbc.Driver
+      url: jdbc:mysql://120.76.84.45:3306/wms_data?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+      username: ceshi
+      password: abc-123
+      # hikari连接池配置
+      hikari:
+        connectionTimeout: 10000
+        validationTimeout: 5000
+        idleTimeout: 600000
+        maxLifetime: 1200000
+        maximumPoolSize: 10
+        minimumIdle: 3
+    third:
+          # 数据源zaxxer HikariCP 读取oms
+          type: com.zaxxer.hikari.HikariDataSource
+          driver-class-name: org.mariadb.jdbc.Driver
+          url: jdbc:mysql://120.24.12.161:60002/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+          username: out_qhm
+          password: QhpC7op3
+          # hikari连接池配置
+          hikari:
+            connectionTimeout: 10000
+            validationTimeout: 5000
+            idleTimeout: 600000
+            maxLifetime: 1200000
+            maximumPoolSize: 10
+            minimumIdle: 3
+
+
+
+# mybatis config 多数据源
+mybatis:
+  primary:
+      config-location: classpath:mybatis/mybatis-config.xml
+      type-aliases-package: com.emato.cus.supervise.domain
+  second:
+      config-location: classpath:mybatis/mybatis-config-cus.xml
+      type-aliases-package: com.emato.cus.supervise.domainCus
+  third:
+      config-location: classpath:mybatis/mybatis-config-oms.xml
+      type-aliases-package: com.emato.cus.supervise.domainOms

src/main/resources/application.yml

@@ -8,8 +8,7 @@ app:
 
 # 服务配置
 server:
-#  address: 172.18.0.193
-  address: 127.0.0.1
+  address: 172.18.0.193
   port: 6666
 
 
@@ -23,7 +22,7 @@ ds:
 # 使用环境
 spring:
   profiles:
-    active:
+    active: dev
   aop:
     proxy-target-class: true
 
@@ -52,12 +51,9 @@ 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
+      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
       # hikari连接池配置
       hikari:
         connectionTimeout: 10000