Browse Source

【博思达】【定时任务时间点修改测试】

samhoo 3 years ago
parent
commit
fc48d2fb6f

+ 5 - 1
src/main/java/com/uas/eis/task/SyncProductStockTask.java

@@ -32,7 +32,7 @@ public class SyncProductStockTask {
 
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
 
-    @Scheduled(cron = "0 0 8,12,17,20 * * ?")
+    @Scheduled(cron = "0 0 8,13,17,20 * * ?")
     public void SyncProductStock() {
     public void SyncProductStock() {
         X5JsonHttpClient x5JsonHttpClient = new X5JsonHttpClient(configuration.getX5appid(),configuration.getX5appkey(),configuration.getX5ProductStockUrl());
         X5JsonHttpClient x5JsonHttpClient = new X5JsonHttpClient(configuration.getX5appid(),configuration.getX5appkey(),configuration.getX5ProductStockUrl());
         Map<String,Object> data = new HashMap<>();
         Map<String,Object> data = new HashMap<>();
@@ -45,6 +45,8 @@ public class SyncProductStockTask {
                 "                 (select ct_id from (select ct_id from CUSTOMTABLE where ct_caller='XiaoMiProduct' and trunc(ct_recorddate)=trunc(sysdate) and ct_statuscode='AUDITED' and nvl(CT_SENDSTATUS,' ')<>'已上传' order by ct_id desc) where rownum=1)" +
                 "                 (select ct_id from (select ct_id from CUSTOMTABLE where ct_caller='XiaoMiProduct' and trunc(ct_recorddate)=trunc(sysdate) and ct_statuscode='AUDITED' and nvl(CT_SENDSTATUS,' ')<>'已上传' order by ct_id desc) where rownum=1)" +
                 "                 order by cd_detno) A) where rn<=1000";
                 "                 order by cd_detno) A) where rn<=1000";
         SqlRowList rs = baseDao.queryForRowSet(Sql);
         SqlRowList rs = baseDao.queryForRowSet(Sql);
+        baseDao.execute("insert into XIAOMIDOCKINGLOG(ML_ID,ML_DATE,ML_CONTENT,ML_RESULT,ML_TYPE)" +
+                "values(XIAOMIDOCKINGLOG_seq.nextval,sysdate,'1上传失败!',to_char(sysdate,'yyyy-mm-dd HH24:mi:ss'),'')");
         while (rs.next()){
         while (rs.next()){
             Map<String,Object> map = new HashMap<>();
             Map<String,Object> map = new HashMap<>();
             map.put("factory_code",configuration.getX5vendercode());
             map.put("factory_code",configuration.getX5vendercode());
@@ -61,6 +63,8 @@ public class SyncProductStockTask {
         }
         }
         data.put("data",list);
         data.put("data",list);
         if(list.size()>0){
         if(list.size()>0){
+            baseDao.execute("insert into XIAOMIDOCKINGLOG(ML_ID,ML_DATE,ML_CONTENT,ML_RESULT,ML_TYPE)" +
+                    "values(XIAOMIDOCKINGLOG_seq.nextval,sysdate,'2上传失败!',to_char(sysdate,'yyyy-mm-dd HH24:mi:ss'),'')");
             x5JsonHttpClient.post(data, configuration, baseDao, "ProductStock");
             x5JsonHttpClient.post(data, configuration, baseDao, "ProductStock");
         }
         }
     }
     }

+ 6 - 1
src/main/java/com/uas/eis/task/SyncProductWIPTask.java

@@ -33,7 +33,7 @@ public class SyncProductWIPTask {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
 
     //@Scheduled(cron = "0 0 2,8,14,20 * * ?")
     //@Scheduled(cron = "0 0 2,8,14,20 * * ?")
-    @Scheduled(cron = "0 0 2,8,12,14,17,20 * * ?")
+    @Scheduled(cron = "0 0 2,8,13,14,17,20 * * ?")
     public void SyncProductWIP() {
     public void SyncProductWIP() {
         X5JsonHttpClient x5JsonHttpClient = new X5JsonHttpClient(configuration.getX5appid(),configuration.getX5appkey(),configuration.getX5ProductWIPUrl());
         X5JsonHttpClient x5JsonHttpClient = new X5JsonHttpClient(configuration.getX5appid(),configuration.getX5appkey(),configuration.getX5ProductWIPUrl());
         Map<String,Object> data = new HashMap<>();
         Map<String,Object> data = new HashMap<>();
@@ -46,6 +46,9 @@ public class SyncProductWIPTask {
                 " (select ct_id from (select ct_id from CUSTOMTABLE where ct_caller='XiaoMiProductWIP' and trunc(ct_recorddate)=trunc(sysdate) and ct_statuscode='AUDITED' and nvl(CT_SENDSTATUS,' ')<>'已上传' order by ct_id desc) where rownum=1)" +
                 " (select ct_id from (select ct_id from CUSTOMTABLE where ct_caller='XiaoMiProductWIP' and trunc(ct_recorddate)=trunc(sysdate) and ct_statuscode='AUDITED' and nvl(CT_SENDSTATUS,' ')<>'已上传' order by ct_id desc) where rownum=1)" +
                 " order by cd_detno) A) where rn<=1000";
                 " order by cd_detno) A) where rn<=1000";
         SqlRowList rs = baseDao.queryForRowSet(Sql);
         SqlRowList rs = baseDao.queryForRowSet(Sql);
+        baseDao.execute("insert into XIAOMIDOCKINGLOG(ML_ID,ML_DATE,ML_CONTENT,ML_RESULT,ML_TYPE)" +
+                "values(XIAOMIDOCKINGLOG_seq.nextval,sysdate,'11上传失败!',to_char(sysdate,'yyyy-mm-dd HH24:mi:ss'),'')");
+        x5JsonHttpClient.post(data, configuration, baseDao, "ProductStock");
         while (rs.next()){
         while (rs.next()){
             Map<String,Object> map = new HashMap<>();
             Map<String,Object> map = new HashMap<>();
             map.put("factory_code",configuration.getX5vendercode());
             map.put("factory_code",configuration.getX5vendercode());
@@ -62,6 +65,8 @@ public class SyncProductWIPTask {
         }
         }
         data.put("data",list);
         data.put("data",list);
         if(list.size()>0){
         if(list.size()>0){
+            baseDao.execute("insert into XIAOMIDOCKINGLOG(ML_ID,ML_DATE,ML_CONTENT,ML_RESULT,ML_TYPE)" +
+                    "values(XIAOMIDOCKINGLOG_seq.nextval,sysdate,'22上传失败!',to_char(sysdate,'yyyy-mm-dd HH24:mi:ss'),'')");
             x5JsonHttpClient.post(data, configuration, baseDao, "ProductWIP");
             x5JsonHttpClient.post(data, configuration, baseDao, "ProductWIP");
         }
         }
     }
     }

+ 4 - 0
src/main/java/com/uas/eis/task/httpclient/X5JsonHttpClient.java

@@ -42,6 +42,8 @@ public class X5JsonHttpClient extends X5HttpClient {
         }else if("ProductWIP".equals(type)){
         }else if("ProductWIP".equals(type)){
             kind="物料WIP同步";
             kind="物料WIP同步";
         }
         }
+        baseDao.execute("insert into XIAOMIDOCKINGLOG(ML_ID,ML_DATE,ML_CONTENT,ML_RESULT,ML_TYPE)" +
+                "values(XIAOMIDOCKINGLOG_seq.nextval,sysdate,'3上传失败!',to_char(sysdate,'yyyy-mm-dd HH24:mi:ss'),'"+kind+"')");
         X5Response<T> x5Response;
         X5Response<T> x5Response;
         if (X5StringUtils.isEmpty(appid) || X5StringUtils.isEmpty(appkey) || X5StringUtils.isEmpty(url)) {
         if (X5StringUtils.isEmpty(appid) || X5StringUtils.isEmpty(appkey) || X5StringUtils.isEmpty(url)) {
             throw new X5Exception("1016", "The request at least contains appid appkey and url.");
             throw new X5Exception("1016", "The request at least contains appid appkey and url.");
@@ -66,6 +68,8 @@ public class X5JsonHttpClient extends X5HttpClient {
         String data = X5StringUtils.encodeBase64(JSON.toJSONString(x5Request));
         String data = X5StringUtils.encodeBase64(JSON.toJSONString(x5Request));
         String encoding = null;
         String encoding = null;
         String account=configuration.getX5username()+":"+configuration.getX5password();
         String account=configuration.getX5username()+":"+configuration.getX5password();
+        baseDao.execute("insert into XIAOMIDOCKINGLOG(ML_ID,ML_DATE,ML_CONTENT,ML_RESULT,ML_TYPE)" +
+                "values(XIAOMIDOCKINGLOG_seq.nextval,sysdate,'4上传失败!',to_char(sysdate,'yyyy-mm-dd HH24:mi:ss'),'"+kind+"')");
         try {
         try {
             encoding = DatatypeConverter.printBase64Binary(account.getBytes("UTF-8"));  //username  password 自行修改  中间":"不可少
             encoding = DatatypeConverter.printBase64Binary(account.getBytes("UTF-8"));  //username  password 自行修改  中间":"不可少
         } catch (UnsupportedEncodingException e) {
         } catch (UnsupportedEncodingException e) {