上传数据调试

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

@@ -59,6 +59,7 @@ public class PnsDataSyncTask {
          pageReq.put("total_page", String.valueOf(pages));
          pageReq.put("total_data_count", String.valueOf(saleUploads.size()));
          logger.info("Sale Upload totalSize {}", pages);
+         int flag = 0;
         for(int i = 0 ; i < pages; i++) {
             pageReq.put("current_page", String.valueOf(i+1));
             if((i+1)*pageSize > saleUploads.size()) {
@@ -69,7 +70,8 @@ public class PnsDataSyncTask {
                 pageReq.put("detail", JSONArray.toJSONString(saleUploads.subList(i*pageSize, (i+1)*pageSize),SerializerFeature.WriteMapNullValue));
             }
             try {
-               HttpUtil.Response response = HttpUtil.sendPostRequest(pnsConfig.getRoute(), reqHeader, pageReq.toString());
+               logger.info("上传数据{}",pageReq.toString());
+             /*  HttpUtil.Response response = HttpUtil.sendPostRequest(pnsConfig.getRoute(), reqHeader, pageReq.toString());
                logger.info("{}, statusCode{},{}",response.getResponseText(), response.getStatusCode(), response.getStatusCode() == HttpStatus.OK.value());
                 if (response.getStatusCode() == HttpStatus.OK.value()) {
                     String data = response.getResponseText();
@@ -81,14 +83,21 @@ public class PnsDataSyncTask {
                             pageReq.put("if_batch_no",resp.getIf_batch_no());
                         }
                     }
-                }
+                }else {
+                    flag= 1;
+                }*/
             } catch (Exception e) {
+                flag= 1;
                 logger.info(e.getMessage());
                 e.printStackTrace();
 
             }
 
         }
+        if(flag == 0 ) {
+            baseDao.execute("UPDATE PNS_SENDDATADETAIL SET UPLOAD=-1 WHERE NVL(CONFIRM_STATUS,'已确认')='已确认' AND UPLOAD=0");
+            baseDao.execute("UPDATE PNS_SENDDATAMAIN SET LAST_SENDDATE=SYSDATE,SENDSTATUS_='已发送' WHERE NVL(SENDSTATUS_,' ')='待发送'");
+        }
     }
 
     public List<PNSSendData> getSaleDataUpload() {
@@ -96,7 +105,7 @@ public class PnsDataSyncTask {
             List<PNSSendData> sendSales = baseDao
                     .getJdbcTemplate()
                     .query(" SELECT SUBSTR(YEAR_MONTH,1,4)||'-'||SUBSTR(YEAR_MONTH,5,2) ymonth,MODEL_NO_CUST,MODEL_NO_ISP,(CASE WHEN FINAL_BUYER_ISP IS NOT NULL THEN FINAL_BUYER_ISP ELSE FINAL_BUYER_CUST END ) FINAL_BUYER_CUST,FINAL_BUYER_ISP,FINAL_BUYER_NAME,CONFIRM_DATE,DATA_TYPE,DIVISION_NO,ROUND(SUM(QUANTITY),0) QUANTITY,CUST_ID,CUST_NAME FROM PNS_SENDDATADETAIL LEFT JOIN  PNS_SENDDATAMAIN ON PNS_SENDDATADETAIL.MM_ID=PNS_SENDDATAMAIN.MAIN_ID " +
-                            " WHERE SENDSTATUS_='待发送' AND NVL(CONFIRM_STATUS,'已确认')='已确认' GROUP BY YEAR_MONTH,MODEL_NO_CUST,MODEL_NO_ISP,FINAL_BUYER_CUST,FINAL_BUYER_ISP,FINAL_BUYER_NAME,CONFIRM_DATE,DATA_TYPE,DIVISION_NO,CUST_ID,CUST_NAME ORDER BY DATA_TYPE DESC,CONFIRM_DATE ASC,MODEL_NO_ISP ASC", new BeanPropertyRowMapper<PNSSendData>(PNSSendData.class));
+                            " WHERE NVL(SENDSTATUS_,' ')='待发送' AND NVL(CONFIRM_STATUS,'已确认')='已确认' GROUP BY YEAR_MONTH,MODEL_NO_CUST,MODEL_NO_ISP,FINAL_BUYER_CUST,FINAL_BUYER_ISP,FINAL_BUYER_NAME,CONFIRM_DATE,DATA_TYPE,DIVISION_NO,CUST_ID,CUST_NAME ORDER BY DATA_TYPE DESC,CONFIRM_DATE ASC,MODEL_NO_ISP ASC", new BeanPropertyRowMapper<PNSSendData>(PNSSendData.class));
             int num = 0;
             for(PNSSendData sendSale : sendSales) {
                 num ++;
@@ -108,7 +117,6 @@ public class PnsDataSyncTask {
                 sendSale.setCust_name("华商龙商务互联");
                 sendSale.setYmonth("2023-04");*/
             }
-            baseDao.execute("UPDATE PNS_SENDDATADETAIL SET UPLOAD=-1 WHERE UPLOAD=0");
             return sendSales;
         } catch (EmptyResultDataAccessException e) {
             return null;