上架包迁移

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/down/AcqShelfLoadDownBiz.java

@@ -0,0 +1,79 @@
+//package com.emato.cus.supervise.biz.acqShelfLoad;
+//
+//import com.emato.cus.supervise.biz.CusWmsTask;
+//import com.emato.cus.supervise.constant.EmtRecordTimeEnum;
+//import com.emato.cus.supervise.domain.WmsAcqShelfLoad;
+//import com.emato.cus.supervise.domainCus.CusAcqShelfLoad04;
+//import com.emato.cus.supervise.util.LocalDateTimeUtils;
+//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 11:25
+// */
+//@Component
+//public class AcqShelfLoadDownBiz implements CusWmsTask{
+//
+//    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadDownBiz.class);
+//
+//    private static final String DATA_TYPE_INFO = "[" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getCode() + "]" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getName();
+//
+//    @Autowired
+//    private AcqShelfLoadRecordTime acqShelfLoadRecordTime;
+//
+//    @Autowired
+//    private AcqShelfLoadCusData acqShelfLoadCusData;
+//
+//    @Autowired
+//    private AcqShelfLoadWmsData acqShelfLoadWmsData;
+//
+//    @Autowired
+//    private AcqShelfLoadDataConversion acqShelfLoadDataConversion;
+//
+//    /**
+//     * 任务入口
+//     */
+//    @Override
+//    public void task() {
+//        // 获取扫描时间
+//        String oldThisTime = acqShelfLoadRecordTime.getEmtRecordTime();
+//        if (StringUtils.isBlank(oldThisTime)) {
+//            logger.info("--- 【" + DATA_TYPE_INFO + "】未获取到本次扫描时间, 本次扫描提前结束！！！");
+//            //下次扫描时间
+//            acqShelfLoadRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
+//                    LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN));
+//            return;
+//
+//        }
+//
+//        // 扫描WMS 数据
+//        List<WmsAcqShelfLoad> wmsList = acqShelfLoadWmsData.getWmsData(oldThisTime);
+//        if (wmsList == null || wmsList.size() == 0) {
+//            logger.info("--- 【" + DATA_TYPE_INFO + "】获取到本次扫描数据为空, 不执行写数据操作, 本次扫描提前结束！！！");
+//            //下次扫描时间
+//            acqShelfLoadRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
+//                    LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN));
+//            return;
+//        }
+//        Map params = Maps.newHashMap();
+//        params.put("wmsList",wmsList);
+//        //组装CUS 数据
+//        List<CusAcqShelfLoad04> cusList = acqShelfLoadDataConversion.conversion(params);
+//
+//        // 写CUS 数据
+//        int res = acqShelfLoadCusData.insertCus(cusList);
+//
+//        // 更新扫描时间
+//        boolean bl = acqShelfLoadRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
+//                oldThisTime);
+//    }
+//}

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/AcqShelfLoadBiz.java → src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/up/AcqShelfLoadUpBiz.java

@@ -1,4 +1,4 @@
-package com.emato.cus.supervise.biz.acqShelfLoad;
+package com.emato.cus.supervise.biz.acqShelfLoad.up;
 
 import com.emato.cus.supervise.biz.CusWmsTask;
 import com.emato.cus.supervise.constant.EmtRecordTimeEnum;
@@ -21,23 +21,23 @@ import java.util.Map;
  * 2018-02-03 11:25
  */
 @Component
-public class AcqShelfLoadBiz  implements CusWmsTask{
+public class AcqShelfLoadUpBiz implements CusWmsTask{
 
-    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadBiz.class);
+    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadUpBiz.class);
 
     private static final String DATA_TYPE_INFO = "[" + EmtRecordTimeEnum.ACQ_SHELF_LOAD.getCode() + "]" + EmtRecordTimeEnum.ACQ_SHELF_LOAD.getName();
 
     @Autowired
-    private AcqShelfLoadRecordTime acqShelfLoadRecordTime;
+    private AcqShelfLoadUpRecordTime acqShelfLoadUpRecordTime;
 
     @Autowired
-    private AcqShelfLoadCusData acqShelfLoadCusData;
+    private AcqShelfLoadUpCusData acqShelfLoadUpCusData;
 
     @Autowired
-    private AcqShelfLoadWmsData acqShelfLoadWmsData;
+    private AcqShelfLoadUpWmsData acqShelfLoadUpWmsData;
 
     @Autowired
-    private AcqShelfLoadDataConversion acqShelfLoadDataConversion;
+    private AcqShelfLoadUpDataConversion acqShelfLoadUpDataConversion;
 
     /**
      * 任务入口
@@ -45,35 +45,35 @@ public class AcqShelfLoadBiz  implements CusWmsTask{
     @Override
     public void task() {
         // 获取扫描时间
-        String oldThisTime = acqShelfLoadRecordTime.getEmtRecordTime();
+        String oldThisTime = acqShelfLoadUpRecordTime.getEmtRecordTime();
         if (StringUtils.isBlank(oldThisTime)) {
             logger.info("--- 【" + DATA_TYPE_INFO + "】未获取到本次扫描时间, 本次扫描提前结束！！！");
             //下次扫描时间
-            acqShelfLoadRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
+            acqShelfLoadUpRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
                     LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN));
             return;
 
         }
 
         // 扫描WMS 数据
-        List<WmsAcqShelfLoad> wmsList = acqShelfLoadWmsData.getWmsData(oldThisTime);
+        List<WmsAcqShelfLoad> wmsList = acqShelfLoadUpWmsData.getWmsData(oldThisTime);
         if (wmsList == null || wmsList.size() == 0) {
             logger.info("--- 【" + DATA_TYPE_INFO + "】获取到本次扫描数据为空, 不执行写数据操作, 本次扫描提前结束！！！");
             //下次扫描时间
-            acqShelfLoadRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
+            acqShelfLoadUpRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
                     LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN));
             return;
         }
         Map params = Maps.newHashMap();
         params.put("wmsList",wmsList);
         //组装CUS 数据
-        List<CusAcqShelfLoad04> cusList = acqShelfLoadDataConversion.conversion(params);
+        List<CusAcqShelfLoad04> cusList = acqShelfLoadUpDataConversion.conversion(params);
 
         // 写CUS 数据
-        int res = acqShelfLoadCusData.insertCus(cusList);
+        int res = acqShelfLoadUpCusData.insertCus(cusList);
 
         // 更新扫描时间
-        boolean bl = acqShelfLoadRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
+        boolean bl = acqShelfLoadUpRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
                 oldThisTime);
     }
 }

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/AcqShelfLoadCusData.java → src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/up/AcqShelfLoadUpCusData.java

@@ -1,8 +1,7 @@
-package com.emato.cus.supervise.biz.acqShelfLoad;
+package com.emato.cus.supervise.biz.acqShelfLoad.up;
 
 import com.emato.cus.supervise.biz.CusData;
 import com.emato.cus.supervise.constant.EmtRecordTimeEnum;
-import com.emato.cus.supervise.domain.WmsAcqShelfLoad;
 import com.emato.cus.supervise.domainCus.CusAcqShelfLoad04;
 import com.emato.cus.supervise.service.cus.CusAcqShelfLoadService04;
 import org.slf4j.Logger;
@@ -19,8 +18,8 @@ import java.util.List;
  * 2017-10-31 12:38
  */
 @Component
-public class AcqShelfLoadCusData implements CusData {
-    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadCusData.class);
+public class AcqShelfLoadUpCusData implements CusData {
+    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadUpCusData.class);
 
     @Autowired
     private CusAcqShelfLoadService04 cusAcqShelfLoadService04;

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/AcqShelfLoadDataConversion.java → src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/up/AcqShelfLoadUpDataConversion.java

@@ -1,12 +1,9 @@
-package com.emato.cus.supervise.biz.acqShelfLoad;
+package com.emato.cus.supervise.biz.acqShelfLoad.up;
 
 import com.emato.cus.supervise.biz.DataConversion;
 import com.emato.cus.supervise.constant.Dict;
-import com.emato.cus.supervise.domain.WmsAcqInventoryInfo;
 import com.emato.cus.supervise.domain.WmsAcqShelfLoad;
-import com.emato.cus.supervise.domainCus.CusAcqInventoryInfo03;
 import com.emato.cus.supervise.domainCus.CusAcqShelfLoad04;
-import com.emato.cus.supervise.domainOms.OmsAcqInventoryInfo;
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,7 +12,6 @@ import org.springframework.stereotype.Component;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  *
@@ -24,10 +20,10 @@ import java.util.stream.Collectors;
  * 2018-02-03 13:40
  */
 @Component
-public class AcqShelfLoadDataConversion implements DataConversion {
+public class AcqShelfLoadUpDataConversion implements DataConversion {
 
 
-    private final static Logger logger = LoggerFactory.getLogger(AcqShelfLoadDataConversion.class);
+    private final static Logger logger = LoggerFactory.getLogger(AcqShelfLoadUpDataConversion.class);
 
     /**
      * 企业货物上下架信息组装

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/AcqShelfLoadRecordTime.java → src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/up/AcqShelfLoadUpRecordTime.java

@@ -1,4 +1,4 @@
-package com.emato.cus.supervise.biz.acqShelfLoad;
+package com.emato.cus.supervise.biz.acqShelfLoad.up;
 
 import com.emato.cus.supervise.biz.RecordTime;
 import com.emato.cus.supervise.constant.CommonConstant;
@@ -25,8 +25,8 @@ import java.util.Map;
  * 2017-10-31 12:18
  */
 @Component
-public class AcqShelfLoadRecordTime implements RecordTime {
-    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadRecordTime.class);
+public class AcqShelfLoadUpRecordTime implements RecordTime {
+    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadUpRecordTime.class);
 
     @Autowired
     private EmtRecordTimeService emtRecordTimeService;

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/AcqShelfLoadWmsData.java → src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/up/AcqShelfLoadUpWmsData.java

@@ -1,4 +1,4 @@
-package com.emato.cus.supervise.biz.acqShelfLoad;
+package com.emato.cus.supervise.biz.acqShelfLoad.up;
 
 import com.emato.cus.supervise.biz.WmsData;
 import com.emato.cus.supervise.constant.EmtRecordTimeEnum;
@@ -21,8 +21,8 @@ import java.util.List;
  * 2017-10-31 12:24
  */
 @Component
-public class AcqShelfLoadWmsData implements WmsData {
-    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadWmsData.class);
+public class AcqShelfLoadUpWmsData implements WmsData {
+    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadUpWmsData.class);
 
     @Autowired
     private WmsAcqShelfLoadService wmsAcqShelfLoadService;

src/main/java/com/emato/cus/supervise/constant/EmtRecordTimeEnum.java

@@ -8,6 +8,7 @@ package com.emato.cus.supervise.constant;
 public enum EmtRecordTimeEnum {
     I_ACQ_INVENTORY_INFO("ACQ_INVENTORY_INFO", "企业库存信息"),
     ACQ_SHELF_LOAD("ACQ_SHELF_LOAD", "企业货物上下架信息"),
+    ACQ_SHELF_LOAD_DOWN("ACQ_SHELF_LOAD", "企业货物上下架信息:下架"),
     I_00("00", "货物库存数据"),
     I_01_01("01_01", "货物上下架_上架"),
     I_01_02("01_02", "货物上下架_退港"),

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

@@ -1,6 +1,7 @@
 package com.emato.cus.supervise.schedule;
 
-import com.emato.cus.supervise.biz.acqShelfLoad.AcqShelfLoadBiz;
+import com.emato.cus.supervise.biz.acqShelfLoad.AcqShelfLoadDownBiz;
+import com.emato.cus.supervise.biz.acqShelfLoad.up.AcqShelfLoadUpBiz;
 import com.emato.cus.supervise.util.LocalDateTimeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,19 +25,22 @@ public class AcqShelfLoadSchedule {
     private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadSchedule.class);
 
     @Autowired
-    private AcqShelfLoadBiz acqShelfLoadBiz;
+    private AcqShelfLoadUpBiz acqShelfLoadUpBiz;
+
+    @Autowired
+    private AcqShelfLoadDownBiz acqShelfLoadDownBiz;
+
     /**
      * 上架
      */
     //每月1号开始,每天10,18点执行各1次,共2次
-    //@Scheduled(cron = "0 0 10,18 1/1 * ?")
-    @Scheduled(cron = "0/10 * * * * ? ")
+    @Scheduled(cron = "0 0 10,18 1/1 * ?")
     public void timerUp() {
         logger.info("==================== 货物上下架数据::上架::监控数据读取开始 ====================");
         String begDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);
         logger.info("--- 任务开始时间: {}", begDateTime);
 
-        acqShelfLoadBiz.task();
+        acqShelfLoadUpBiz.task();
 
 
         String endDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);
@@ -45,4 +49,24 @@ public class AcqShelfLoadSchedule {
 
     }
 
+    /**
+     * 下架
+     */
+    //每月1号开始,每天18点执行1次,共1次
+    //@Scheduled(cron = "0 0 18 1/1 * ?")
+    @Scheduled(cron = "0/10 * * * * ? ")
+    public void timerDown() {
+        logger.info("==================== 货物上下架数据::下架::监控数据读取开始 ====================");
+        String begDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);
+        logger.info("--- 任务开始时间: {}", begDateTime);
+
+        acqShelfLoadDownBiz.task();
+
+        String endDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);
+        logger.info("--- 任务结束时间: {}", endDateTime);
+        logger.info("==================== 货物上下架数据::下架::监控数据读取结束 ====================");
+
+    }
+
+
 }