From bc51eb494d793a5c262a8e3a53f678cc6879d0be Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 24 Mar 2023 11:47:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/admin/idc/controller/IdcController.java | 13 ++++++------- .../sale/admin/idc/service/impl/IdcServiceImpl.java | 10 +++++++++- 2 files changed, 15 insertions(+), 8 deletions(-) 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 51ccdba..a10c1e3 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 @@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.glxp.sale.admin.annotation.Log; import com.glxp.sale.admin.idc.dao.DbDao; import com.glxp.sale.admin.idc.service.IdcService; import com.glxp.sale.common.res.BaseResponse; @@ -28,7 +27,7 @@ public class IdcController { @Resource DbDao dbDao; /*通用上传接口*/ - @Log("中继服务数据接收,下级往上级上传") + //@Log("中继服务数据接收,下级往上级上传") @RequestMapping(value = "/spssync/common/upload") public BaseResponse upload(HttpServletRequest request, @RequestParam("content") String content, @@ -37,7 +36,7 @@ public class IdcController { return idcService.receive("U",request, content, files); } /*通用下发接口*/ - @Log("中继服务数据接收,上级往下级下发") + //@Log("中继服务数据接收,上级往下级下发") @RequestMapping(value = "/spssync/common/issued") public BaseResponse issued(HttpServletRequest request, @RequestParam("content") String content, @@ -46,27 +45,27 @@ public class IdcController { return idcService.receive("I",request, content, files); } - @Log("数据同步测试") + //@Log("数据同步测试") @RequestMapping(value = "/spssync/common/test") public BaseResponse test(HttpServletRequest request,@RequestBody Map params) { // return idcService.send(params); } - @Log("数据同步任务列表拉取") + //@Log("数据同步任务列表拉取") @RequestMapping(value = "/spssync/common/list") public BaseResponse list(HttpServletRequest request,@RequestBody(required = false) Map params) { return idcService.taskList(request,params); } - @Log("数据同步任务根据任务ID下载数据") + //@Log("数据同步任务根据任务ID下载数据") @RequestMapping(value = "/spssync/common/download") @ResponseBody public BaseResponse download(HttpServletRequest request,@RequestBody Map params) { return idcService.download(request,params); } - @Log("数据同步任务根据任务ID,返回下载成功标记") + //@Log("数据同步任务根据任务ID,返回下载成功标记") @RequestMapping(value = "/spssync/common/success") @ResponseBody public BaseResponse success(HttpServletRequest request,@RequestBody 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 fcfebe9..8828c47 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 @@ -303,12 +303,20 @@ public class IdcServiceImpl implements IdcService { /*数据同步，从数据库获取数据下发或上传下级中继服务*/ @Override public BaseResponse send(Map params) { - return send(params.get("messageType").toString(),params.get("tableName").toString(),params); + + return send(params.get("messageType").toString(),params.get("tableName").toString(),params); + + } @Override public BaseResponse send(String messageType,String tableName,Map params) { + try + { if(sendOnPage(messageType,tableName,params)) return ResultVOUtils.success(); + } catch (Exception ex) { + logger.error(ex.getMessage()); + } return ResultVOUtils.error(9999, ""); }