Browse Source

去掉java.sql.Date类型

yingp 8 years ago
parent
commit
7becf49db8

+ 1 - 1
src/main/java/com/uas/erp/schedular/b2b/domain/Make.java

@@ -1,6 +1,6 @@
 package com.uas.erp.schedular.b2b.domain;
 
-import java.sql.Date;
+import java.util.Date;
 
 /**
  * ERP系统的委外加工单

+ 1 - 1
src/main/java/com/uas/erp/schedular/b2b/domain/Purchase.java

@@ -2,7 +2,7 @@ package com.uas.erp.schedular.b2b.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import java.sql.Date;
+import java.util.Date;
 import java.util.List;
 
 /**

+ 1 - 1
src/main/java/com/uas/erp/schedular/b2b/domain/PurchaseDetail.java

@@ -1,6 +1,6 @@
 package com.uas.erp.schedular.b2b.domain;
 
-import java.sql.Date;
+import java.util.Date;
 
 /**
  * ERP系统的采购订单明细

+ 0 - 2
src/main/java/com/uas/erp/schedular/b2b/task/AbstractTask.java

@@ -240,9 +240,7 @@ public class AbstractTask {
 
         public AbstractStatusBasedHandler(String tableName, String idColumn, String statusColumn, String postUri, List<T> data) {
             super(postUri, data);
-            logger.debug("========================[data size]" + data.size());
             this.idStr = CollectionUtil.getKeyString(data);
-            logger.debug("========================[id str]" + idStr);
             this.tableName = tableName;
             this.idColumn = idColumn;
             this.statusColumn = statusColumn;

+ 2 - 1
src/main/java/com/uas/erp/schedular/task/support/MasterTaskRunner.java

@@ -43,7 +43,8 @@ public class MasterTaskRunner implements Runnable{
 
             this.method.invoke(this.bean);
             // 记录成功日志,包括数据传输size等
-            logger.info(StringUtil.nvl(ContextHolder.getDataSize()), args);
+            if (null != ContextHolder.getDataSize())
+                logger.info(String.valueOf(ContextHolder.getDataSize()), args);
         } catch (IllegalAccessException e) {
             logger.error("无法访问方法", args);
         } catch (InvocationTargetException e) {

+ 1 - 1
src/main/java/com/uas/erp/schedular/util/BeanUtil.java

@@ -32,7 +32,7 @@ public class BeanUtil {
 
     private static boolean isNormalType(Class<?> type) {
         return Number.class.isAssignableFrom(type) || type.isAssignableFrom(String.class)
-                || type.isAssignableFrom(Date.class);
+                || Date.class.isAssignableFrom(type);
     }
 
 }

+ 3 - 0
src/test/java/com/uas/erp/test/BeanTest.java

@@ -1,5 +1,6 @@
 package com.uas.erp.test;
 
+import com.uas.erp.schedular.b2b.domain.Purchase;
 import com.uas.erp.schedular.b2b.domain.PurchaseProdInOut;
 import com.uas.erp.schedular.util.BeanUtil;
 
@@ -12,5 +13,7 @@ public class BeanTest {
     public static void main(String[] args) {
         String[] props = BeanUtil.getProperties(PurchaseProdInOut.class);
         System.out.println(Arrays.toString(props));
+        props = BeanUtil.getProperties(Purchase.class);
+        System.out.println(Arrays.toString(props));
     }
 }