安捷诚新宝

src/main/java/com/uas/eis/config/PNSConfig.java → src/main/java/com/uas/eis/config/DonlimConfig.java

@@ -5,19 +5,15 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 @Component
-@ConfigurationProperties(prefix = "extral.panasonic")
+@ConfigurationProperties(prefix = "extral.donlim")
 @Data
-public class PNSConfig {
+public class DonlimConfig {
     /**
      * 请求路径
      */
    private String route ;
    /**
-    * 密钥
+    * 供应商code
     * */
-   private String if_key;
-   /**
-    * 经销商ID
-    * */
-   private String cust_id;
+   private String supplyCode;
 }

src/main/java/com/uas/eis/task/PnsDataSyncTask.java → src/main/java/com/uas/eis/task/DataSyncTask.java

@@ -1,15 +1,13 @@
 package com.uas.eis.task;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.uas.eis.config.PNSConfig;
+import com.uas.eis.config.DonlimConfig;
 import com.uas.eis.dao.BaseDao;
 import com.uas.eis.entity.PNSSendData;
 import com.uas.eis.entity.PNSSendResp;
 import com.uas.eis.utils.FlexJsonUtil;
 import com.uas.eis.utils.HttpUtil;
-import com.uas.eis.utils.StringUtil;
 import net.sf.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,18 +19,16 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Component
-public class PnsDataSyncTask {
+public class DataSyncTask {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     private int  pageSize = 50;
     @Autowired
-    private PNSConfig pnsConfig;
+    private DonlimConfig donlimConfig;
     @Autowired
     private BaseDao baseDao;
 

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

@@ -1,27 +0,0 @@
-package com.uas.eis.task;
-
-import com.uas.eis.dao.BaseDao;
-import com.uas.eis.dao.SqlRowList;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author: zhouy
- * @date: 2022/5/6 17:18
- * @desc: 型号MI路径更新
- */
-@Component
-@EnableAsync
-@EnableScheduling
-public class ProductMITask {
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-}

src/main/resources/application-prod.yml

@@ -2,9 +2,9 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: YITOA_DATACENTER
+        username: DATACENTER
         password: select!#%*(
-        url: jdbc:oracle:thin:@10.10.10.103:1521:orcl
+        url: jdbc:oracle:thin:@usoft.f3322.net:11526:orcl
         initialSize: 1
         maxActive: 3
         maxWait: 30000
@@ -30,7 +30,6 @@ action:
     public_actions: /EIS/logout,/EIS/hello1
 
 extral:
-    panasonic:
-        route: http://47.100.162.77:10001/esb/open/api/ISP_customerEDI/route
-        if_key: 230517Vxy3rDjP5VgcNoyoknUnrHTw
-        cust_id: 80946488
+    donlim:
+        route: https://tscp.donlim.com/supply-api/open
+        supplyCode: 230517Vxy3rDjP5VgcNoyoknUnrHTw

src/test/java/com/uas/eis/UasEisApplicationTests.java

@@ -1,8 +1,6 @@
 package com.uas.eis;
 
-import com.uas.eis.beans.result.CrmQueryResult;
-import com.uas.eis.listener.UasProdInOutListener;
-import com.uas.eis.task.PnsDataSyncTask;
+import com.uas.eis.task.DataSyncTask;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +10,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @SpringBootTest(classes = {UasEisApplication.class})
 public class UasEisApplicationTests {
 	@Autowired
-	private PnsDataSyncTask pnsDataSyncTask;
+	private DataSyncTask dataSyncTask;
 
 
 	@Test