From 233ca8601c74147db0f4f281ca3929f969f28654 Mon Sep 17 00:00:00 2001 From: chengqf <584883665@139.com> Date: Sat, 8 Apr 2023 20:42:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=B8=8D=E5=8A=A0=E5=85=A5=E4=B8=8A=E4=BC=A0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/idc/service/IdcService.java | 6 ++- .../api/idc/service/impl/IdcServiceImpl.java | 42 +++++++++++++++---- .../com/glxp/api/task/AsyncFetchUdiTask.java | 4 +- src/main/resources/application.yml | 12 +++++- 4 files changed, 51 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/glxp/api/idc/service/IdcService.java b/src/main/java/com/glxp/api/idc/service/IdcService.java index 8bbf9cdf2..72c697400 100644 --- a/src/main/java/com/glxp/api/idc/service/IdcService.java +++ b/src/main/java/com/glxp/api/idc/service/IdcService.java @@ -16,7 +16,9 @@ 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); @@ -26,10 +28,12 @@ public interface IdcService { public void asyncFetchTask(); public void asyncFetchUdiTask(); + BaseResponse downlaodSuccess(HttpServletRequest request,Map params); public void asyncIdcTask(); void asyncUdiTask(); void asyncSpsTask(); + void downloadFile(String fileName,HttpServletResponse response) ; } diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 85c033a96..16fa13db6 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -119,7 +119,7 @@ public class IdcServiceImpl implements IdcService { BaseResponse response = JSON.parseObject(json, BaseResponse.class); return response; } - logger.info("json-->" + json); + return ResultVOUtils.success(object); } @@ -348,6 +348,17 @@ public class IdcServiceImpl implements IdcService { return ResultVOUtils.success(); } + + @Override + public BaseResponse receiveJson(HttpServletRequest request,Map params) { + + return ResultVOUtils.success(); + } + @Override + public BaseResponse uploadFile(HttpServletRequest request, + String content,MultipartFile[] files) { + return ResultVOUtils.success(); + } /****/ @Override public BaseResponse receive(HttpServletRequest request, @@ -573,7 +584,7 @@ public class IdcServiceImpl implements IdcService { String fileNames = list.get(m).get(filePathColumn).toString(); String[] str = fileNames.split(","); for (int r = 0; r < str.length; r++) { - if (!StringUtils.isEmpty(str[r])) + if (!StringUtils.isEmpty(str[r])&&FileUtils.isFileExist(filePath + filePathSlash + "register/file/image2/" + str[r])) files.add(filePath + filePathSlash + "register/file/image2/" + str[r]); } } @@ -596,7 +607,8 @@ public class IdcServiceImpl implements IdcService { if (childList.get(i).get(chidTnames[7]) != null) { String[] str = childList.get(i).get(chidTnames[7]).toString().split(","); for (int s = 0; s < str.length; s++) { - files.add(filePath + filePathSlash + "register/file/image2/" + str[s]); + if (!StringUtils.isEmpty(str[s])&&FileUtils.isFileExist(filePath + filePathSlash + "register/file/image2/" + str[s])) + files.add(filePath + filePathSlash + "register/file/image2/" + str[s]); } } } @@ -927,7 +939,7 @@ public class IdcServiceImpl implements IdcService { try { Response response = client.newCall(req).execute(); result = response.body().string(); - log.debug("result--->" + result); + log.info("result--->" + result); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -1161,10 +1173,13 @@ public class IdcServiceImpl implements IdcService { alterTable("idc_log", "create table idc_log (id varchar(36),orderNum int,taskId varchar(60),type varchar(60),content varchar(2000),offset int,total int,createTime datetime,PRIMARY KEY (id))"); dbDao.delete("delete from idc_record where createTime map = dbDao.getMysql(tableName); if (!(map != null && map.get("tableName") != null)) { - jdbcTemplate.execute(sql); + executeSql(sql); } } + + private void executeSql(String sql) { + try { + jdbcTemplate.execute(sql); + + } catch (Exception e) { + + } + } } diff --git a/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java b/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java index c9a91e4c5..3f49738f5 100644 --- a/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java +++ b/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java @@ -36,12 +36,12 @@ public class AsyncFetchUdiTask implements SchedulingConfigurer { scheduledRequest.setCronName("syncFetch"); logger.info("syncFetch----------------"); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); - String cron = scheduledEntity!=null ? scheduledEntity.getCron() : "0 0/1 * * * ?"; + String cron = scheduledEntity!=null ? scheduledEntity.getCron() : "0 0/3 * * * ?"; if (cron.isEmpty()) { logger.error("cron is null"); } - logger.info("syncFetch----------------"); + logger.info("syncFetch----------------"+cron); return new CronTrigger(cron).nextExecutionTime(triggerContext); }); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1c0966353..cc8bc4c7a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,7 +3,10 @@ spring: active: dev jmx: enabled: false - + servlet: + multipart: + max-file-size: 200MB + max-request-size: 200MB mybatis-plus: mapper-locations: classpath:mybatis/mapper/*/*.xml configuration: @@ -24,3 +27,10 @@ pagehelper: auto-dialect: true auto-runtime-dialect: true +server: + tomcat: + max-http-form-post-size: 100MB + max-http-post-size: 100MB + max-http-header-size: 100MB + +