From e1c9174268e295714a4eafe4ac0724d7e5d5d65c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 19 Apr 2023 11:01:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/admin/idc/service/IdcService.java | 58 +++++++----- .../idc/service/impl/IdcServiceImpl.java | 90 +++++++++---------- .../sale/admin/thread/DlAllDataService.java | 13 ++- 3 files changed, 89 insertions(+), 72 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java index ab283cf..b697bab 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java @@ -12,31 +12,41 @@ import com.glxp.sale.common.res.BaseResponse; /*数据中继数据中心(接收)*/ public interface IdcService { - - BaseResponse receive(HttpServletRequest request, - String content,MultipartFile[] files); - - BaseResponse receiveJson(HttpServletRequest request,Map params); - BaseResponse uploadFile(HttpServletRequest request, - String content,MultipartFile[] files); - BaseResponse send(Map params); - BaseResponse send(String messageType,String tableName,Map params); - - BaseResponse taskList(HttpServletRequest request,Map params); - - BaseResponse download(HttpServletRequest request,Map params); - BaseResponse uploadStatus(HttpServletRequest request,Map params); - BaseResponse downloadStatus(HttpServletRequest request,Map params); - public void asyncFetchTask(); - public void asyncFetchUdiTask(); - - BaseResponse downlaodSuccess(HttpServletRequest request,Map params); - + + BaseResponse receive(HttpServletRequest request, + String content, MultipartFile[] files); + + BaseResponse receiveJson(HttpServletRequest request, Map params); + + BaseResponse uploadFile(HttpServletRequest request, + String content, MultipartFile[] files); + + BaseResponse send(Map params); + + BaseResponse send(String messageType, String tableName, Map params); + + BaseResponse taskList(HttpServletRequest request, Map params); + + BaseResponse download(HttpServletRequest request, Map params); + + BaseResponse uploadStatus(HttpServletRequest request, Map params); + + BaseResponse downloadStatus(HttpServletRequest request, Map params); + + public void asyncFetchTask(); + + public void asyncFetchUdiTask(); + + BaseResponse downlaodSuccess(HttpServletRequest request, Map params); + void asyncUdiTask(); + void asyncSpsTask(); - - void downloadFile(String fileName,HttpServletResponse response) ; - - BaseResponse onceSync(String tableName,boolean isUpload); + + void downloadFile(String fileName, HttpServletResponse response); + + boolean batchDownloadFile(String syncIp, String[] files); + + BaseResponse onceSync(String tableName, boolean isUpload); boolean signleDownloadFile(String syncIp, String fileName); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java index 85cc7ff..aaa63e4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java @@ -86,6 +86,7 @@ public class IdcServiceImpl implements IdcService { private ScheduledDao scheduledDao; private String imagePath = "register/file/image2/"; + /*获取拉取任务列表*/ @Override public BaseResponse taskList(HttpServletRequest request, Map params) { @@ -203,13 +204,13 @@ public class IdcServiceImpl implements IdcService { } } - + private void fetchFailFile(String host) { - Map map = new HashMap(); + Map map = new HashMap(); map.put("sql", "select * from idc_file where createTime> list = dbDao.list(map); - for(int i=0;i> list = dbDao.list(map); + for (int i = 0; i < list.size(); i++) { + signleDownloadFile(host, list.get(i).get("filePath").toString()); } } @@ -408,7 +409,7 @@ public class IdcServiceImpl implements IdcService { try { String[] tnames = t.split("/"); - String lastUpdateTime = getUpdateTime(tnames[2] + "." + tnames[0]+"."+tnames[1]); + String lastUpdateTime = getUpdateTime(tnames[2] + "." + tnames[0] + "." + tnames[1]); Date nowUpdateTime = new Date(); // if (!StringUtils.isEmpty(tnames[0])) { @@ -424,7 +425,7 @@ public class IdcServiceImpl implements IdcService { if (!StringUtils.isEmpty(updateTimeColumn)) { - sqlWhere += " " + updateTimeColumn + " between cast('" + lastUpdateTime + "' as datetime) and cast('"+DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss")+"' as datetime)"; + sqlWhere += " " + updateTimeColumn + " between cast('" + lastUpdateTime + "' as datetime) and cast('" + DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss") + "' as datetime)"; //sqlWhere += " and not exists (select fkId from idc_record where type='" + tnames[2] + "' and fkId=" + tnames[2] + "." + keyColumn + " and createTime>date_sub(now(),interval 15 MINUTE))"; } else { sqlWhere = "not exists (select fkId from idc_record where type='" + tnames[2] + "' and fkId=" + tnames[2] + "." + keyColumn + ")"; @@ -454,7 +455,7 @@ public class IdcServiceImpl implements IdcService { if (sync) { result = syncMasterData(map, isUpload, syncIp); if (result) { - setUpdateTime(tnames[2] + "." + tnames[0]+"."+tnames[1], DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss")); + setUpdateTime(tnames[2] + "." + tnames[0] + "." + tnames[1], DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss")); } } //} @@ -552,7 +553,7 @@ public class IdcServiceImpl implements IdcService { IDCUtils.createDirectory(filePath + filePathSlash + datePath + "/"); if (!FileUtils.makeDirectory(backFilePath + backFileSlash + datePath)) IDCUtils.createDirectory(filePath + backFileSlash + datePath + "/"); - if(!FileUtils.makeDirectory(filePath + filePathSlash + imagePath)) + if (!FileUtils.makeDirectory(filePath + filePathSlash + imagePath)) IDCUtils.createDirectory(filePath + filePathSlash + imagePath); FileUtils.SaveFileAs(content, fileName); FileUtils.SaveFileAs(content, backFileName); @@ -629,7 +630,7 @@ public class IdcServiceImpl implements IdcService { public void downloadFile(String fileName, HttpServletResponse response) { OutputStream os; String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : fileName.substring(0, 1).equals("/") ? "" : "/"; - String sourceFileName = filePath +filePathSlash+imagePath +fileName; + String sourceFileName = filePath + filePathSlash + imagePath + fileName; try { if (FileUtils.isFileExist(sourceFileName)) { byte[] bytes = FileUtils.readFileByBytes(sourceFileName); @@ -638,7 +639,7 @@ public class IdcServiceImpl implements IdcService { os.flush(); os.close(); } else { - logger.error("file not exists:"+sourceFileName); + logger.error("file not exists:" + sourceFileName); } } catch (IOException e) { // TODO Auto-generated catch block @@ -716,8 +717,8 @@ public class IdcServiceImpl implements IdcService { Map whereParams = new HashMap(); whereParams.put("sqlWhere", params.get("sqlWhere")); - - String dataWhere = params.get("dataWhere")!=null ? params.get("dataWhere").toString() : ""; + + String dataWhere = params.get("dataWhere") != null ? params.get("dataWhere").toString() : ""; Map map = new HashMap(); String where = DBAUtils.convertWhere(column, whereParams, dataWhere); sql += !StringUtils.isEmpty(where) ? " where " + where : ""; @@ -927,7 +928,7 @@ public class IdcServiceImpl implements IdcService { for (int i = 0; i < list.size(); i++) { if (!StringUtils.isEmpty(filePathColumn)) { files[i] = list.get(i).get(filePathColumn) != null ? list.get(i).get(filePathColumn).toString() : ""; - logger.info("file-->"+files[i]); + logger.info("file-->" + files[i]); } for (int z = 0; z < 30; z++) { if (list.get(i).get("data" + z) != null) { @@ -951,7 +952,7 @@ public class IdcServiceImpl implements IdcService { private boolean analyToDB(String host, String tableName, String uniqueColumn, String filePathColumn, List> list, boolean isUpload) { - + String tName = DBAUtils.tableRealName(tableName); String sql = "replace " + tName + "("; String del = "delete from " + tName + " where "; @@ -967,7 +968,7 @@ public class IdcServiceImpl implements IdcService { if (col > 0) sql += ","; columnList.get(i).put("attrName", columnList.get(i).get("columnName")); - sql += "`"+columnList.get(i).get("columnName").toString()+"`"; + sql += "`" + columnList.get(i).get("columnName").toString() + "`"; col++; if (uniqueColumn != null && columnList.get(i).get("columnKey") != null && ("," + uniqueColumn + ",").contains("," + columnList.get(i).get("columnName") + ",")) { keyColumn[key] = columnList.get(i).get("columnName").toString(); @@ -1145,7 +1146,7 @@ public class IdcServiceImpl implements IdcService { } /*下载文件*/ - private boolean batchDownloadFile(String syncIp, String[] files) { + public boolean batchDownloadFile(String syncIp, String[] files) { boolean success = true; for (String fileName : files) { if (!StringUtils.isEmpty(fileName)) { @@ -1165,7 +1166,7 @@ public class IdcServiceImpl implements IdcService { @Override public boolean signleDownloadFile(String syncIp, String fileName) { String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/"; - if(!FileUtils.makeDirectory(filePath + filePathSlash + imagePath)) + if (!FileUtils.makeDirectory(filePath + filePathSlash + imagePath)) IDCUtils.createDirectory(filePath + filePathSlash + imagePath); OkHttpClient client = new OkHttpClient().newBuilder() .build(); @@ -1182,38 +1183,37 @@ public class IdcServiceImpl implements IdcService { int total=0; try { Response result = client.newCall(request).execute(); - String msg = result!=null ? result.message().length()>200 ? result.message().substring(0,200) : result.message() : ""; + String msg = result != null ? result.message().length() > 200 ? result.message().substring(0, 200) : result.message() : ""; - if (result!=null&&result.isSuccessful()&&MediaType.parse("application/force-download").equals(result.body().contentType())) { + if (result != null && result.isSuccessful() && MediaType.parse("application/force-download").equals(result.body().contentType())) { try (InputStream inputStream = result.body().byteStream()) { - - - - FileOutputStream outputStream = new FileOutputStream(filePath + filePathSlash + imagePath+fileName); - - byte b[] = new byte[1024]; - - int len = 0; - while ((len = inputStream.read(b)) != -1) { - total += len; - outputStream.write(b, 0, len); - - } - - outputStream.flush(); - outputStream.close(); - if(!(total>0)) { - new File(filePath + filePathSlash + imagePath+fileName).delete(); - executeSql("delete from idc_file where filePath='"+fileName+"'"); - } - + + + FileOutputStream outputStream = new FileOutputStream(filePath + filePathSlash + imagePath + fileName); + + byte b[] = new byte[1024]; + + int len = 0; + while ((len = inputStream.read(b)) != -1) { + total += len; + outputStream.write(b, 0, len); + + } + + outputStream.flush(); + outputStream.close(); + if (!(total > 0)) { + new File(filePath + filePathSlash + imagePath + fileName).delete(); + executeSql("delete from idc_file where filePath='" + fileName + "'"); + } + } catch (Exception e) { } } - if(!(total>0)) { - String sql = "replace idc_file (filePath,createTime,msg) values ('"+fileName+"',now(),'"+msg+"')"; + if (!(total > 0)) { + String sql = "replace idc_file (filePath,createTime,msg) values ('" + fileName + "',now(),'" + msg + "')"; executeSql(sql); } @@ -1405,7 +1405,7 @@ public class IdcServiceImpl implements IdcService { } - + private void executeSql(String sql) { try { jdbcTemplate.execute(sql); @@ -1416,4 +1416,4 @@ public class IdcServiceImpl implements IdcService { } -} \ No newline at end of file +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java index 3b2b6a5..8393305 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.thread; import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.constant.ConstantStatus; @@ -11,6 +12,7 @@ import com.glxp.sale.admin.entity.sync.BasicExportStatusEntity; import com.glxp.sale.admin.entity.sync.ProductInfoEntity; import com.glxp.sale.admin.entity.sync.UdiCompanyEntity; import com.glxp.sale.admin.http.SpGetHttp; +import com.glxp.sale.admin.idc.service.IdcService; import com.glxp.sale.admin.req.sync.BasicExportStatusRequest; import com.glxp.sale.admin.req.sync.SpsSyncDataRequest; import com.glxp.sale.admin.res.sync.*; @@ -45,7 +47,8 @@ public class DlAllDataService { GennerOrderUtils gennerOrderUtils; @Value("${file_path}") private String filePath; - + @Resource + IdcService idcService; public void dllNewAllData() { log.info("下载所有基础信息---"); @@ -178,17 +181,21 @@ public class DlAllDataService { BasicExportStatusEntity myEntity = new BasicExportStatusEntity(); myEntity.setId(key); String taskId = syncOrderResponse.getString("taskId"); + JSONArray fileJson = syncOrderResponse.getJSONArray("files"); + List syncFiles = fileJson.toJavaList(String.class); + if (CollUtil.isNotEmpty(syncFiles)) { + idcService.batchDownloadFile(spGetHttp.getSpmsUrl(), syncFiles.toArray(new String[syncFiles.size()])); + } + myEntity.setTaskId(taskId); myEntity.setStatus(0); myEntity.setUpdateTime(new Date()); myEntity.setStartTime(DateUtil.getDateTime()); myEntity.setIdDatas(ConstantStatus.SYNC_SCAN_ORDER); myEntity.setType(BasicProcessStatus.NEW_ALL_ORDER); -// myEntity.setRemark(syncOrderResponse.toString()); basicExportService.insertExportStatus(myEntity); myEntity.setStatus(Constant.SYNC_STATUS_WAIT); if (downstream.getParamValue().equals("1")) { -// redisUtil.set(key, baseResponse.getData()); FileUtils.makeDirectory(filePath + "upload/"); String fileName = filePath + "upload/" + BasicProcessStatus.NEW_ALL_ORDER + "-" + key + ".udi"; FileUtils.SaveFileAs(baseResponse.getData(), fileName);