【博思达】【小米物料WIP对接 修改】

src/main/java/com/uas/eis/task/SyncProductStockTask.java

@@ -36,7 +36,7 @@ public class SyncProductStockTask {
     @Scheduled(cron = "0 0/1 * * * ?")
     public void SyncProductStock() {
         System.out.println("13434");
-        X5JsonHttpClient x5JsonHttpClient = new X5JsonHttpClient(configuration.getX5appid(),configuration.getX5appkey(),configuration.getX5ProductStockUrl(),baseDao);
+        X5JsonHttpClient x5JsonHttpClient = new X5JsonHttpClient(configuration.getX5appid(),configuration.getX5appkey(),configuration.getX5ProductStockUrl());
         Map<String,Object> data = new HashMap<>();
         SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format = sf.format(new Date());
@@ -65,7 +65,7 @@ public class SyncProductStockTask {
         System.out.println("1啊"+data);
         System.out.println("2啊"+ JSON.toJSONString(data));
         if(list.size()>0){
-            x5JsonHttpClient.post(data, "ProductStock");
+            x5JsonHttpClient.post(data, configuration, baseDao, "ProductStock");
         }
     }
 }

src/main/java/com/uas/eis/task/SyncProductWIPTask.java

@@ -36,7 +36,7 @@ public class SyncProductWIPTask {
     @Scheduled(cron = "0 0/1 * * * ?")
     public void SyncProductWIP() {
         System.out.println("13434");
-        X5JsonHttpClient x5JsonHttpClient = new X5JsonHttpClient(configuration.getX5appid(),configuration.getX5appkey(),configuration.getX5ProductWIPUrl(),baseDao);
+        X5JsonHttpClient x5JsonHttpClient = new X5JsonHttpClient(configuration.getX5appid(),configuration.getX5appkey(),configuration.getX5ProductWIPUrl());
         Map<String,Object> data = new HashMap<>();
         SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format = sf.format(new Date());
@@ -63,7 +63,7 @@ public class SyncProductWIPTask {
         System.out.println("1啊"+data);
         System.out.println("2啊"+ JSON.toJSONString(data));
         if(list.size()>0){
-            x5JsonHttpClient.post(data,"ProductWIP");
+            x5JsonHttpClient.post(data, configuration, baseDao, "ProductWIP");
         }
     }
 }

src/main/java/com/uas/eis/task/httpclient/X5HttpClient.java

@@ -1,6 +1,5 @@
 package com.uas.eis.task.httpclient;
 
-import com.uas.eis.dao.BaseDao;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -15,8 +14,6 @@ public class X5HttpClient {
     /*请求的URL*/
     protected String url;
 
-    protected BaseDao baseDao;
-
     public String getAppid() {
         return appid;
     }
@@ -41,12 +38,4 @@ public class X5HttpClient {
         this.url = url;
     }
 
-    public BaseDao getBaseDao() {
-        return baseDao;
-    }
-
-    public void setBaseDao(BaseDao baseDao) {
-        this.baseDao = baseDao;
-    }
-
 }

src/main/java/com/uas/eis/task/httpclient/X5JsonHttpClient.java

@@ -16,29 +16,24 @@ import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Resource;
 import javax.xml.bind.DatatypeConverter;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 
 public class X5JsonHttpClient extends X5HttpClient {
 
-    @Resource(name = "configuration")
-    private Configuration configuration;
-
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     /**
      * 构造器
      */
-    public X5JsonHttpClient(String appId, String appKey, String url,BaseDao baseDao) {
+    public X5JsonHttpClient(String appId, String appKey, String url) {
         this.appid = appId;
         this.appkey = appKey;
         this.url = url;
-        this.baseDao = baseDao;
     }
 
-    public <T> X5Response<T> post(Object body, String type) {
+    public <T> X5Response<T> post(Object body, Configuration configuration, BaseDao baseDao, String type) {
         String kind="";
         if("ProductStock".equals(type)){
             kind="物料库存同步";
@@ -49,7 +44,6 @@ public class X5JsonHttpClient extends X5HttpClient {
         if (X5StringUtils.isEmpty(appid) || X5StringUtils.isEmpty(appkey) || X5StringUtils.isEmpty(url)) {
             throw new X5Exception("1016", "The request at least contains appid appkey and url.");
         }
-        System.out.println("appid哈哈:"+appid+":"+appkey+":"+url);
         String bodyString = null;
         if (body instanceof String) {
             bodyString = body.toString();
@@ -71,7 +65,7 @@ public class X5JsonHttpClient extends X5HttpClient {
         String data = X5StringUtils.encodeBase64(JSON.toJSONString(x5Request));
         System.out.println("4啊"+data);
         String encoding = null;
-        String account=configuration.getX5username()+":"+configuration.getX5username();
+        String account=configuration.getX5username()+":"+configuration.getX5password();
         try {
             encoding = DatatypeConverter.printBase64Binary(account.getBytes("UTF-8"));  //username  password 自行修改  中间":"不可少
         } catch (UnsupportedEncodingException e) {