diff --git a/api-admin/src/main/java/com/glxp/sale/admin/idc/controller/IdcController.java b/api-admin/src/main/java/com/glxp/sale/admin/idc/controller/IdcController.java index cc2d640..dd3fd61 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/idc/controller/IdcController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/idc/controller/IdcController.java @@ -57,6 +57,20 @@ public class IdcController { return idcService.receive(request, content, files); } + @RequestMapping(value = "/spssync/common/uploadJson") + @ResponseBody + public BaseResponse uploadJson(HttpServletRequest request,@RequestBody Map params) { + // + return idcService.receiveJson(request, params); + } + + @RequestMapping(value = "/spssync/common/uploadFile") + public BaseResponse uploadFile(HttpServletRequest request, + @RequestParam("content") String content, + @RequestParam(value = "files", required = false) MultipartFile[] files) { + // + return idcService.receive(request, content, files); + } //@Log("数据同步测试") @RequestMapping(value = "/spssync/common/test") 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 4d2afad..932968c 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 @@ -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); 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 0060d96..afffe9c 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 @@ -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) { + + } + } }