From b000b48929e4699a19ba72b4ede2c37f774ca89c Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 15 Nov 2018 18:34:23 +0800 Subject: [PATCH] =?UTF-8?q?[admin=20log][=E6=96=B0=E5=A2=9E]:admin?= =?UTF-8?q?=E7=AB=AF=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E6=93=8D=E4=BD=9C?= =?UTF-8?q?ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxBLogController.java | 5 + .../controller/WxBillDepositController.java | 6 + .../controller/WxBillOtherController.java | 8 +- .../controller/WxBillPropertyController.java | 6 + .../WxBillPropertyDepositController.java | 6 + .../controller/WxBillRentController.java | 7 + .../controller/WxBusinessController.java | 5 + .../iformall/controller/WxCLogController.java | 7 +- .../WxCUserBasicInfoController.java | 8 + .../controller/WxCUserCarController.java | 5 + .../controller/WxCUserController.java | 7 +- .../controller/WxCUserDataController.java | 499 +++++++++--------- .../controller/WxCUserTagsController.java | 5 + .../controller/WxCampaignController.java | 6 + .../controller/WxCarCallBackController.java | 12 +- .../controller/WxCarCmdLogController.java | 5 + .../iformall/controller/WxCarController.java | 7 +- .../controller/WxChannelController.java | 5 + .../WxCouponActionLogController.java | 5 + .../controller/WxCouponCarController.java | 5 + .../controller/WxCouponChannelController.java | 6 + .../controller/WxCouponController.java | 6 + .../controller/WxCouponInjectController.java | 6 +- .../controller/WxCouponOrderController.java | 3 + .../controller/WxCouponSendController.java | 5 + .../controller/WxCouponSpreadController.java | 6 + .../controller/WxCouponTypeController.java | 5 + .../iformall/controller/WxGameController.java | 5 + .../controller/WxGameTemplateController.java | 6 + .../controller/WxGroupController.java | 5 + .../controller/WxLevelConfigController.java | 4 + .../controller/WxMallApplyController.java | 6 + .../controller/WxMallBuildingController.java | 11 +- .../controller/WxMallConfigController.java | 6 + .../iformall/controller/WxMallController.java | 6 + .../controller/WxMallFloorController.java | 8 +- .../controller/WxMerchantBUserController.java | 6 + .../controller/WxMerchantController.java | 11 + .../controller/WxMerchantShopController.java | 6 + .../WxMerchantTradeDailyController.java | 3 + .../controller/WxMsgCallbackController.java | 8 + .../controller/WxMsgConfigController.java | 5 + .../iformall/controller/WxMsgController.java | 6 + .../controller/WxMsgModelController.java | 6 + .../controller/WxMsgSignatureController.java | 6 + .../WxMsgValidationcodeController.java | 11 +- .../WxMsgValidationcodeModelController.java | 5 + .../controller/WxOrderController.java | 7 +- .../iformall/controller/WxParkController.java | 5 + .../controller/WxPayAccountController.java | 11 +- .../controller/WxPayBillController.java | 4 +- .../iformall/controller/WxPayController.java | 4 +- .../controller/WxPayOrderController.java | 29 +- .../WxProfitSharingReceiverController.java | 3 + .../WxPropertyContractController.java | 11 + .../controller/WxQuestionController.java | 2 + .../controller/WxRefundOrderController.java | 5 + .../controller/WxRentContractController.java | 10 + .../controller/WxScoreHistoryController.java | 5 + .../controller/WxScoreRulesController.java | 2 + .../WxScoreValidityPeriodController.java | 5 + .../iformall/controller/WxShopController.java | 9 + .../iformall/controller/WxTagsController.java | 3 + .../controller/WxUserChannelController.java | 5 + .../controller/WxUserCouponController.java | 3 +- .../controller/WxUserStructureController.java | 15 +- 66 files changed, 635 insertions(+), 289 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBLogController.java index 1e90ba7b5..eb1c92101 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBLogController.java @@ -27,6 +27,7 @@ public class WxBLogController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxBLog wxBLog, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBLogController::list"); if (null == wxBLog) wxBLog = new WxBLog(); final PageInfo page = wxBLogService.listAsPage(wxBLog, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxBLogController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxBLog wxBLog) { + logger.debug("[" + getIpAddr() + "] WxBLogController::add"); //Assert.notNull(wxBLog.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxBLogService.saveOrUpdate(wxBLog); @@ -44,6 +46,7 @@ public class WxBLogController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxBLog wxBLog) { + logger.debug("[" + getIpAddr() + "] WxBLogController::update"); wxBLogService.saveOrUpdate(wxBLog); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxBLogController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxBLogController::delete"); wxBLogService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,6 +64,7 @@ public class WxBLogController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxBLogController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxBLogService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java index c529b3d71..3a65f0a5e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java @@ -30,6 +30,7 @@ public class WxBillDepositController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxBillDeposit wxBillDeposit, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillDepositController::list"); if (null == wxBillDeposit) { wxBillDeposit = new WxBillDeposit(); } @@ -40,6 +41,7 @@ public class WxBillDepositController extends BaseController { @PostMapping("add") public ResultData add(@RequestBody WxBillDeposit wxBillDeposit) { + logger.debug("[" + getIpAddr() + "] WxBillDepositController::add"); wxBillDeposit.setTenantId(getTenantId()); return wxBillDepositService.saveOrUpdate(wxBillDeposit); @@ -47,6 +49,7 @@ public class WxBillDepositController extends BaseController { @PostMapping("update") public ResultData update(@RequestBody WxBillDeposit wxBillDeposit) { + logger.debug("[" + getIpAddr() + "] WxBillDepositController::update"); return wxBillDepositService.saveOrUpdate(wxBillDeposit); } @@ -54,6 +57,7 @@ public class WxBillDepositController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillDepositController::delete"); wxBillDepositService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -61,12 +65,14 @@ public class WxBillDepositController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillDepositController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxBillDepositService.getById(id)); } @GetMapping("/updatePaid") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData updatePaid(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillDepositController::updatePaid"); return wxBillDepositService.updatePaid(id); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherController.java index 7f4613982..089738ff2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherController.java @@ -31,6 +31,7 @@ public class WxBillOtherController extends BaseController @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxBillOther wxBillOther,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillOtherController::list"); if (null == wxBillOther) { wxBillOther = new WxBillOther(); } @@ -41,18 +42,21 @@ public class WxBillOtherController extends BaseController @PostMapping("add") public ResultData add(@RequestBody WxBillOther wxBillOther) { + logger.debug("[" + getIpAddr() + "] WxBillOtherController::add"); wxBillOther.setTenantId(getTenantId()); return wxBillOtherService.saveOrUpdate(wxBillOther); } @PostMapping("update") public ResultData update(@RequestBody WxBillOther wxBillOther) { + logger.debug("[" + getIpAddr() + "] WxBillOtherController::update"); return wxBillOtherService.saveOrUpdate(wxBillOther); } @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillOtherController::delete"); wxBillOtherService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,12 +64,14 @@ public class WxBillOtherController extends BaseController @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxBillOtherService.getById(id)); + logger.debug("[" + getIpAddr() + "] WxBillOtherController::findById"); + return new ResultData(Result.SUCCESS,"查询成功",wxBillOtherService.getById(id)); } @GetMapping("/updatePaid") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData updatePaid(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillOtherController::updatePaid"); return wxBillOtherService.updatePaid(id); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java index 9013d04d1..a3fbe8d50 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java @@ -30,6 +30,7 @@ public class WxBillPropertyController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxBillProperty wxBillProperty, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyController::list"); if (null == wxBillProperty) { wxBillProperty = new WxBillProperty(); } @@ -40,6 +41,7 @@ public class WxBillPropertyController extends BaseController { @PostMapping("add") public ResultData add(@RequestBody WxBillProperty wxBillProperty) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyController::add"); wxBillProperty.setTenantId(getTenantId()); wxBillPropertyService.saveOrUpdate(wxBillProperty); return new ResultData(); @@ -47,6 +49,7 @@ public class WxBillPropertyController extends BaseController { @PostMapping("update") public ResultData update(@RequestBody WxBillProperty wxBillProperty) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyController::update"); wxBillPropertyService.saveOrUpdate(wxBillProperty); return new ResultData(); } @@ -54,6 +57,7 @@ public class WxBillPropertyController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyController::delete"); wxBillPropertyService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -61,12 +65,14 @@ public class WxBillPropertyController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxBillPropertyService.getById(id)); } @GetMapping("/updatePaid") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData updatePaid(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyController::updatePaid"); return wxBillPropertyService.updatePaid(id); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java index 13c8a7f38..f039fbf67 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java @@ -31,6 +31,7 @@ public class WxBillPropertyDepositController extends BaseController @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxBillPropertyDeposit wxBillPropertyDeposit, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyDepositController::list"); if (null == wxBillPropertyDeposit) { wxBillPropertyDeposit = new WxBillPropertyDeposit(); } @@ -41,6 +42,7 @@ public class WxBillPropertyDepositController extends BaseController @PostMapping("add") public ResultData add(@RequestBody WxBillPropertyDeposit wxBillPropertyDeposit) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyDepositController::add"); wxBillPropertyDeposit.setTenantId(getTenantId()); wxBillPropertyDepositService.saveOrUpdate(wxBillPropertyDeposit); return new ResultData(); @@ -48,6 +50,7 @@ public class WxBillPropertyDepositController extends BaseController @PostMapping("update") public ResultData update(@RequestBody WxBillPropertyDeposit wxBillPropertyDeposit) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyDepositController::update"); wxBillPropertyDepositService.saveOrUpdate(wxBillPropertyDeposit); return new ResultData(); } @@ -55,6 +58,7 @@ public class WxBillPropertyDepositController extends BaseController @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyDepositController::delete"); wxBillPropertyDepositService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -62,12 +66,14 @@ public class WxBillPropertyDepositController extends BaseController @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyDepositController::findById"); return new ResultData(Result.SUCCESS,"查询成功",wxBillPropertyDepositService.getById(id)); } @GetMapping("/updatePaid") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData updatePaid(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyDepositController::updatePaid"); return wxBillPropertyDepositService.updatePaid(id); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java index cdd746179..dc10f7ca4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java @@ -30,6 +30,7 @@ public class WxBillRentController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxBillRent wxBillRent, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::list"); if (null == wxBillRent) { wxBillRent = new WxBillRent(); } @@ -41,18 +42,21 @@ public class WxBillRentController extends BaseController { @PostMapping("add") public ResultData add(@RequestBody WxBillRent wxBillRent) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::add"); wxBillRent.setTenantId(getTenantId()); return wxBillRentService.saveOrUpdate(wxBillRent); } @PostMapping("update") public ResultData update(@RequestBody WxBillRent wxBillRent) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::update"); return wxBillRentService.saveOrUpdate(wxBillRent); } @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::delete"); wxBillRentService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,18 +64,21 @@ public class WxBillRentController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxBillRentService.getById(id)); } @GetMapping("/findByMerchantId") @ApiImplicitParam(name = "merchantId", value = "merchantId", dataType = "Long", paramType = "query", required = true) public ResultData findByMerchantId(Long merchantId) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::findByMerchantId"); return new ResultData(Result.SUCCESS, "查询成功", wxBillRentService.findByMerchantId(merchantId)); } @GetMapping("/updatePaid") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData updatePaid(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::updatePaid"); return wxBillRentService.updatePaid(id); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java index bd29b32ee..ce6ff2e3d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java @@ -27,6 +27,7 @@ public class WxBusinessController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxBusiness wxBusiness, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBusinessController::list"); if (null == wxBusiness) wxBusiness = new WxBusiness(); final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxBusinessController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxBusiness wxBusiness) { + logger.debug("[" + getIpAddr() + "] WxBusinessController::add"); //Assert.notNull(wxBusiness.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxBusinessService.saveOrUpdate(wxBusiness); @@ -44,6 +46,7 @@ public class WxBusinessController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxBusiness wxBusiness) { + logger.debug("[" + getIpAddr() + "] WxBusinessController::update"); wxBusinessService.saveOrUpdate(wxBusiness); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxBusinessController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxBusinessController::delete"); wxBusinessService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,6 +64,7 @@ public class WxBusinessController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxBusinessController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxBusinessService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCLogController.java index ec1ff80df..997f7da99 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCLogController.java @@ -29,6 +29,7 @@ public class WxCLogController extends BaseController { @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxCLog wxCLog,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCLogController::list"); if (null == wxCLog) wxCLog = new WxCLog(); final PageInfo page = wxCLogService.listAsPage(wxCLog, pageNum, pageSize); return new ResultData(page); @@ -37,6 +38,7 @@ public class WxCLogController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCLog wxCLog) { + logger.debug("[" + getIpAddr() + "] WxCLogController::add"); //Assert.notNull(wxCLog.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxCLogService.saveOrUpdate(wxCLog); @@ -46,6 +48,7 @@ public class WxCLogController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCLog wxCLog) { + logger.debug("[" + getIpAddr() + "] WxCLogController::update"); wxCLogService.saveOrUpdate(wxCLog); return new ResultData(); } @@ -54,6 +57,7 @@ public class WxCLogController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCLogController::delete"); wxCLogService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -62,7 +66,8 @@ public class WxCLogController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCLogService.getById(id)); + logger.debug("[" + getIpAddr() + "] WxCLogController::findById"); + return new ResultData(Result.SUCCESS,"查询成功",wxCLogService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java index e6b036e05..1a6c79237 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java @@ -101,6 +101,7 @@ public class WxCUserBasicInfoController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCUserBasicInfo wxCUserBasicInfo, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::list"); if (null == wxCUserBasicInfo) { wxCUserBasicInfo = new WxCUserBasicInfo(); } else { @@ -135,6 +136,7 @@ public class WxCUserBasicInfoController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) { + logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::update"); MallUserInfo currentUser = getUser(); WxCUserBasicInfo oldInfo = wxCUserBasicInfoService.getById(wxCUserBasicInfo.getId()); if (!oldInfo.getPhone().equals(wxCUserBasicInfo.getPhone())) { @@ -170,6 +172,7 @@ public class WxCUserBasicInfoController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::delete"); wxCUserBasicInfoService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -178,6 +181,7 @@ public class WxCUserBasicInfoController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findById"); WxCUserBasicInfo info = wxCUserBasicInfoService.getById(id); if (info == null) @@ -193,6 +197,7 @@ public class WxCUserBasicInfoController extends BaseController { @GetMapping("/findOrderCouponByUserId") @ApiImplicitParam(name = "userId", value = "userId", dataType = "Long", paramType = "query", required = true) public ResultData findOrderCouponByUserId(Long userId, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findOrderCouponByUserId"); WxCouponOrder corder = new WxCouponOrder(); corder.setCUserId(userId); corder.setTenantId(getTenantId()); @@ -210,6 +215,7 @@ public class WxCUserBasicInfoController extends BaseController { @RequestMapping("/exportData") public void exportData(HttpServletRequest request, HttpServletResponse response){ + logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::exportData"); wxCUserBasicInfoService.exportData(request,response,getTenantId()); @@ -217,6 +223,7 @@ public class WxCUserBasicInfoController extends BaseController { @RequestMapping("/exportTemplate") public void exportTemplate(HttpServletRequest request, HttpServletResponse response){ + logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::exportTemplate"); wxCUserBasicInfoService.exportTemplate(request,response,getTenantId()); @@ -225,6 +232,7 @@ public class WxCUserBasicInfoController extends BaseController { @Transactional @RequestMapping("/importTemplate") public ResultData importTemplate(@RequestParam("file") MultipartFile file){ + logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::importTemplate"); if (file.isEmpty()) { throw new MallinkException(500,"上传文件不能为空"); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserCarController.java index b3267278a..3dd1ecf0b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserCarController.java @@ -27,6 +27,7 @@ public class WxCUserCarController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCUserCar wxCUserCar, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCUserCarController::list"); if (null == wxCUserCar) wxCUserCar = new WxCUserCar(); final PageInfo page = wxCUserCarService.listAsPage(wxCUserCar, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxCUserCarController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCUserCar wxCUserCar) { + logger.debug("[" + getIpAddr() + "] WxCUserCarController::add"); //Assert.notNull(wxCUserCar.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxCUserCarService.saveOrUpdate(wxCUserCar); @@ -44,6 +46,7 @@ public class WxCUserCarController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCUserCar wxCUserCar) { + logger.debug("[" + getIpAddr() + "] WxCUserCarController::update"); wxCUserCarService.saveOrUpdate(wxCUserCar); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxCUserCarController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCUserCarController::delete"); wxCUserCarService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,6 +64,7 @@ public class WxCUserCarController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxCUserCarController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxCUserCarService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserController.java index 15f66fe0f..7f669f3f9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserController.java @@ -29,6 +29,7 @@ public class WxCUserController extends BaseController { @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxCUser wxCUser,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCUserController::list"); if (null == wxCUser) wxCUser = new WxCUser(); final PageInfo page = wxCUserService.listAsPage(wxCUser, pageNum, pageSize); return new ResultData(page); @@ -37,6 +38,7 @@ public class WxCUserController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCUser wxCUser) { + logger.debug("[" + getIpAddr() + "] WxCUserController::add"); //Assert.notNull(wxCUser.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxCUserService.saveOrUpdate(wxCUser); @@ -46,6 +48,7 @@ public class WxCUserController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCUser wxCUser) { + logger.debug("[" + getIpAddr() + "] WxCUserController::update"); wxCUserService.saveOrUpdate(wxCUser); return new ResultData(); } @@ -54,6 +57,7 @@ public class WxCUserController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCUserController::delete"); wxCUserService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -62,7 +66,8 @@ public class WxCUserController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCUserService.getById(id)); + logger.debug("[" + getIpAddr() + "] WxCUserController::findById"); + return new ResultData(Result.SUCCESS,"查询成功",wxCUserService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java index 77609fd06..4ac9004ac 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java @@ -31,268 +31,271 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxCUserData") -@Api(description="会员首页报表数据") +@Api(description = "会员首页报表数据") public class WxCUserDataController extends BaseController { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private WxCUserService wxCUserService; - @Autowired - private WxUserVisitService wxUserVisitService; - @Autowired - private WxCouponOrderService wxCouponOrderService; - - @GetMapping("findUserCountData") - @ApiOperation("查询用户数量接口") - public ResultData findUserCountData() { - WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(getTenantId()); - long allCount = wxCUserService.findCount(dto);//总数 - Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, 0); - c.set(Calendar.MINUTE,0); - c.set(Calendar.SECOND,0); - Date today = c.getTime(); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - long todayCount=0; - long yesterdayCount =0; - long dayOfWeekCount=0; - List weekVos = new ArrayList<>();//周会员数 - List monthVos = new ArrayList<>();//周会员数 + @Autowired + private WxCUserService wxCUserService; + @Autowired + private WxUserVisitService wxUserVisitService; + @Autowired + private WxCouponOrderService wxCouponOrderService; - for(int i=29,sortNum=0;i>=0;i--) { - c.clear(); - c.setTime(today); - c.add(Calendar.DAY_OF_YEAR, -i); - dto.setStartTime(c.getTime()); - c.add(Calendar.DAY_OF_YEAR, 1); - dto.setEndTime(c.getTime()); - long count= wxCUserService.findCount(dto); - UserStructureVo vo = new UserStructureVo(); + @GetMapping("findUserCountData") + @ApiOperation("查询用户数量接口") + public ResultData findUserCountData() { + logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserCountData"); + WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); + dto.setTenantId(getTenantId()); + long allCount = wxCUserService.findCount(dto);//总数 + Calendar c = Calendar.getInstance(); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + Date today = c.getTime(); - vo.setName(new SimpleDateFormat("MM/dd").format(dto.getStartTime())); - vo.setSortNum(sortNum++); - vo.setCount(count); - if (i <= 7) { - UserStructureVo vow = new UserStructureVo(); - vow.setSortNum(vo.getSortNum()); - vow.setName(vo.getName()); - vow.setCount(vo.getCount()); + long todayCount = 0; + long yesterdayCount = 0; + long dayOfWeekCount = 0; + List weekVos = new ArrayList<>();//周会员数 + List monthVos = new ArrayList<>();//周会员数 - if (i == 1) { - yesterdayCount = vow.getCount(); - } - if (i == 0) { - todayCount = vow.getCount(); - } - if (i == 7) { - dayOfWeekCount = vow.getCount(); - } else { - weekVos.add(vow); - } - } - monthVos.add(vo); - } + for (int i = 29, sortNum = 0; i >= 0; i--) { + c.clear(); + c.setTime(today); + c.add(Calendar.DAY_OF_YEAR, -i); + dto.setStartTime(c.getTime()); + c.add(Calendar.DAY_OF_YEAR, 1); + dto.setEndTime(c.getTime()); + long count = wxCUserService.findCount(dto); + UserStructureVo vo = new UserStructureVo(); - NumberFormat nf = NumberFormat.getPercentInstance(); - nf.setMinimumFractionDigits(2); - String dayPercentage ="--"; - if(yesterdayCount>0) { - Long count =todayCount-yesterdayCount; - dayPercentage=nf.format(count.doubleValue()/new Double(yesterdayCount).doubleValue()); - } - String weekPercentage ="--"; - if(dayOfWeekCount>0) { - Long count =todayCount-dayOfWeekCount; - weekPercentage=nf.format(count.doubleValue()/new Double(dayOfWeekCount).doubleValue()); - } - Map map = new HashMap<>(); - map.put("allCount", allCount);//会员总数 - map.put("todayCount", todayCount);//今日新增会员数 - map.put("weekVos", weekVos);//月用户增加数列表 - map.put("monthVos", monthVos);//月用户增加数列表 - map.put("dayPercentage",dayPercentage);//日环比 - map.put("weekPercentage",weekPercentage); //周同比 - return new ResultData(map); - } - - @ApiOperation("查询用户活跃量") - @GetMapping("findUserVisitData") - public ResultData findUserVisitData() { - HashMap params =new HashMap<>(); - Calendar c = Calendar.getInstance(); - c.add(Calendar.DAY_OF_YEAR, -1); - c.set(Calendar.HOUR_OF_DAY, 0); - c.set(Calendar.MINUTE,0); - c.set(Calendar.SECOND,0); - Date endTime = c.getTime(); - c.add(Calendar.DAY_OF_YEAR, -30); - Date startTime = c.getTime(); - params.put("startTime", startTime); - params.put("endTime", endTime); - params.put("tenantId", getTenantId()); - List list = wxUserVisitService.touchUsersReportList(params); - Map dateMap = new HashMap<>(); - for(TouchUsersReportVo vo :list) { - dateMap.put(vo.getxTime(), vo); - } - List weekVos = new ArrayList<>();//每周uv - List monthVos =new ArrayList<>();//每月uv + vo.setName(new SimpleDateFormat("MM/dd").format(dto.getStartTime())); + vo.setSortNum(sortNum++); + vo.setCount(count); + if (i <= 7) { + UserStructureVo vow = new UserStructureVo(); + vow.setSortNum(vo.getSortNum()); + vow.setName(vo.getName()); + vow.setCount(vo.getCount()); - long yesterdayCount =0;//昨天活跃数 - long beforeYesterdayCount=0;//前天活跃数 - long thisMonthCount=0;//月总数 - long dayOfWeekCount=0;//上周周x数 - for(int i=29,sortNum=0;i>=0;i--) { - c.clear(); - c.setTime(endTime); - c.add(Calendar.DAY_OF_YEAR, -i); - String dayStr = new SimpleDateFormat("yyyy-MM-dd").format(c.getTime()); - UserStructureVo vo = new UserStructureVo(); - vo.setName(new SimpleDateFormat("MM/dd").format(c.getTime())); - vo.setSortNum(sortNum++); - if(dateMap.get(dayStr)!=null) { - TouchUsersReportVo rv = dateMap.get(dayStr); - Long l = new Long((long) rv.getUv()); - vo.setCount(l); - }else { - vo.setCount(0); - } + if (i == 1) { + yesterdayCount = vow.getCount(); + } + if (i == 0) { + todayCount = vow.getCount(); + } + if (i == 7) { + dayOfWeekCount = vow.getCount(); + } else { + weekVos.add(vow); + } + } + monthVos.add(vo); + } - if (i <= 7) { - UserStructureVo vow = new UserStructureVo(); - vow.setName(vo.getName()); - vow.setSortNum(vo.getSortNum()); - vow.setCount(vo.getCount()); + NumberFormat nf = NumberFormat.getPercentInstance(); + nf.setMinimumFractionDigits(2); + String dayPercentage = "--"; + if (yesterdayCount > 0) { + Long count = todayCount - yesterdayCount; + dayPercentage = nf.format(count.doubleValue() / new Double(yesterdayCount).doubleValue()); + } + String weekPercentage = "--"; + if (dayOfWeekCount > 0) { + Long count = todayCount - dayOfWeekCount; + weekPercentage = nf.format(count.doubleValue() / new Double(dayOfWeekCount).doubleValue()); + } + Map map = new HashMap<>(); + map.put("allCount", allCount);//会员总数 + map.put("todayCount", todayCount);//今日新增会员数 + map.put("weekVos", weekVos);//月用户增加数列表 + map.put("monthVos", monthVos);//月用户增加数列表 + map.put("dayPercentage", dayPercentage);//日环比 + map.put("weekPercentage", weekPercentage); //周同比 + return new ResultData(map); + } - if (i == 0) { - yesterdayCount = vow.getCount(); - } - if (i == 1) { - beforeYesterdayCount = vow.getCount(); - } - if (i == 7) { - dayOfWeekCount = vow.getCount(); - } else { - weekVos.add(vow); - } + @ApiOperation("查询用户活跃量") + @GetMapping("findUserVisitData") + public ResultData findUserVisitData() { + logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserVisitData"); + HashMap params = new HashMap<>(); + Calendar c = Calendar.getInstance(); + c.add(Calendar.DAY_OF_YEAR, -1); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + Date endTime = c.getTime(); + c.add(Calendar.DAY_OF_YEAR, -30); + Date startTime = c.getTime(); + params.put("startTime", startTime); + params.put("endTime", endTime); + params.put("tenantId", getTenantId()); + List list = wxUserVisitService.touchUsersReportList(params); + Map dateMap = new HashMap<>(); + for (TouchUsersReportVo vo : list) { + dateMap.put(vo.getxTime(), vo); + } + List weekVos = new ArrayList<>();//每周uv + List monthVos = new ArrayList<>();//每月uv - } - monthVos.add(vo); - thisMonthCount+=vo.getCount(); - } + long yesterdayCount = 0;//昨天活跃数 + long beforeYesterdayCount = 0;//前天活跃数 + long thisMonthCount = 0;//月总数 + long dayOfWeekCount = 0;//上周周x数 + for (int i = 29, sortNum = 0; i >= 0; i--) { + c.clear(); + c.setTime(endTime); + c.add(Calendar.DAY_OF_YEAR, -i); + String dayStr = new SimpleDateFormat("yyyy-MM-dd").format(c.getTime()); + UserStructureVo vo = new UserStructureVo(); + vo.setName(new SimpleDateFormat("MM/dd").format(c.getTime())); + vo.setSortNum(sortNum++); + if (dateMap.get(dayStr) != null) { + TouchUsersReportVo rv = dateMap.get(dayStr); + Long l = new Long((long) rv.getUv()); + vo.setCount(l); + } else { + vo.setCount(0); + } - NumberFormat nf = NumberFormat.getPercentInstance(); - nf.setMinimumFractionDigits(2); - String dayPercentage ="--"; - if(beforeYesterdayCount>0) { - Long count =yesterdayCount-beforeYesterdayCount; - dayPercentage=nf.format(count.doubleValue()/new Double(beforeYesterdayCount).doubleValue()); - } - String weekPercentage ="--"; - if(dayOfWeekCount>0) { - Long count =yesterdayCount-dayOfWeekCount; - weekPercentage=nf.format(count.doubleValue()/new Double(dayOfWeekCount).doubleValue()); - } - Map mapVo =new HashMap<>(); - mapVo.put("yesterdayCount", yesterdayCount);//昨日活跃数 - mapVo.put("thisMonthCount", thisMonthCount);//近一个月活跃数 - mapVo.put("weekVos", weekVos);//周活跃数列表 - mapVo.put("monthVos", monthVos);//月活跃数列表 - mapVo.put("dayPercentage",dayPercentage);//日环比 - mapVo.put("weekPercentage",weekPercentage); //周同比 - return new ResultData(mapVo); - } + if (i <= 7) { + UserStructureVo vow = new UserStructureVo(); + vow.setName(vo.getName()); + vow.setSortNum(vo.getSortNum()); + vow.setCount(vo.getCount()); - @ApiOperation("查询用户消费金额") - @GetMapping("findUserAmountData") - private ResultData findUserAmountData() { - String tenantId = getTenantId(); - Calendar c =Calendar.getInstance(); - Date today = c.getTime(); - c.add(Calendar.DAY_OF_YEAR, 1); - c.set(Calendar.HOUR_OF_DAY, 0); - c.set(Calendar.MINUTE,0); - c.set(Calendar.SECOND,0); - Date endTime = c.getTime();//明天0点 - c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 - Date startTime = c.getTime(); - int thisMonthCount =wxCouponOrderService.queryPriceTotal(tenantId, startTime, endTime);//月消费金额 - c.clear(); - c.setTime(endTime); - Date eTime=c.getTime(); - c.add(Calendar.DAY_OF_YEAR, -30); - Date sTime =c.getTime(); - List datas = wxCouponOrderService.queryPriceTotalGroup(tenantId, sTime, eTime); - Map dataMap = new HashMap<>(); - for(CUserDateAmountVo v:datas) { - dataMap.put(v.getxTime(), v.getPrice()); - } - Integer todayCount=0;//今日金额数 - Integer yesterdayCount =0;//昨日金额数 - Integer dayOfWeekCount=0;//上周x - List weekVos = new ArrayList<>();//周消费金额 - List monthVos = new ArrayList<>();//周消费金额 - for(int i=29,sortNum=0;i>=0;i--) { - c.clear(); - c.setTime(today); - c.add(Calendar.DAY_OF_YEAR, -i); - String dateStr = new SimpleDateFormat("yyyy-MM-dd").format(c.getTime()); - UserStructureVo vo = new UserStructureVo(); - vo.setName(new SimpleDateFormat("MM/dd").format(c.getTime())); - vo.setSortNum(sortNum++); - if(dataMap.get(dateStr)!=null) { - int price= dataMap.get(dateStr); - vo.setPrice(price); - }else { - vo.setPrice(0); - } - if (i <= 7) { - UserStructureVo vow = new UserStructureVo(); - vow.setName(vo.getName()); - vow.setSortNum(vo.getSortNum()); - vow.setPrice(vo.getPrice()); + if (i == 0) { + yesterdayCount = vow.getCount(); + } + if (i == 1) { + beforeYesterdayCount = vow.getCount(); + } + if (i == 7) { + dayOfWeekCount = vow.getCount(); + } else { + weekVos.add(vow); + } + + } + monthVos.add(vo); + thisMonthCount += vo.getCount(); + } + + NumberFormat nf = NumberFormat.getPercentInstance(); + nf.setMinimumFractionDigits(2); + String dayPercentage = "--"; + if (beforeYesterdayCount > 0) { + Long count = yesterdayCount - beforeYesterdayCount; + dayPercentage = nf.format(count.doubleValue() / new Double(beforeYesterdayCount).doubleValue()); + } + String weekPercentage = "--"; + if (dayOfWeekCount > 0) { + Long count = yesterdayCount - dayOfWeekCount; + weekPercentage = nf.format(count.doubleValue() / new Double(dayOfWeekCount).doubleValue()); + } + Map mapVo = new HashMap<>(); + mapVo.put("yesterdayCount", yesterdayCount);//昨日活跃数 + mapVo.put("thisMonthCount", thisMonthCount);//近一个月活跃数 + mapVo.put("weekVos", weekVos);//周活跃数列表 + mapVo.put("monthVos", monthVos);//月活跃数列表 + mapVo.put("dayPercentage", dayPercentage);//日环比 + mapVo.put("weekPercentage", weekPercentage); //周同比 + return new ResultData(mapVo); + } + + @ApiOperation("查询用户消费金额") + @GetMapping("findUserAmountData") + private ResultData findUserAmountData() { + logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserAmountData"); + String tenantId = getTenantId(); + Calendar c = Calendar.getInstance(); + Date today = c.getTime(); + c.add(Calendar.DAY_OF_YEAR, 1); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + Date endTime = c.getTime();//明天0点 + c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 + Date startTime = c.getTime(); + int thisMonthCount = wxCouponOrderService.queryPriceTotal(tenantId, startTime, endTime);//月消费金额 + c.clear(); + c.setTime(endTime); + Date eTime = c.getTime(); + c.add(Calendar.DAY_OF_YEAR, -30); + Date sTime = c.getTime(); + List datas = wxCouponOrderService.queryPriceTotalGroup(tenantId, sTime, eTime); + Map dataMap = new HashMap<>(); + for (CUserDateAmountVo v : datas) { + dataMap.put(v.getxTime(), v.getPrice()); + } + Integer todayCount = 0;//今日金额数 + Integer yesterdayCount = 0;//昨日金额数 + Integer dayOfWeekCount = 0;//上周x + List weekVos = new ArrayList<>();//周消费金额 + List monthVos = new ArrayList<>();//周消费金额 + for (int i = 29, sortNum = 0; i >= 0; i--) { + c.clear(); + c.setTime(today); + c.add(Calendar.DAY_OF_YEAR, -i); + String dateStr = new SimpleDateFormat("yyyy-MM-dd").format(c.getTime()); + UserStructureVo vo = new UserStructureVo(); + vo.setName(new SimpleDateFormat("MM/dd").format(c.getTime())); + vo.setSortNum(sortNum++); + if (dataMap.get(dateStr) != null) { + int price = dataMap.get(dateStr); + vo.setPrice(price); + } else { + vo.setPrice(0); + } + if (i <= 7) { + UserStructureVo vow = new UserStructureVo(); + vow.setName(vo.getName()); + vow.setSortNum(vo.getSortNum()); + vow.setPrice(vo.getPrice()); + + if (i == 0) { + todayCount = vow.getPrice(); + } + if (i == 1) { + yesterdayCount = vow.getPrice(); + } + if (i == 7) { + dayOfWeekCount = vow.getPrice(); + } else { + weekVos.add(vow); + } + } + monthVos.add(vo); + } + + NumberFormat nf = NumberFormat.getPercentInstance(); + nf.setMinimumFractionDigits(2); + String dayPercentage = "--"; + if (yesterdayCount > 0) { + Integer count = todayCount - yesterdayCount; + dayPercentage = nf.format(count.doubleValue() / new Double(yesterdayCount).doubleValue()); + } + String weekPercentage = "--"; + if (dayOfWeekCount > 0) { + Integer count = todayCount - dayOfWeekCount; + weekPercentage = nf.format(count.doubleValue() / new Double(dayOfWeekCount).doubleValue()); + } + Map map = new HashMap<>(); + DecimalFormat df = new DecimalFormat("0.00"); + map.put("todayCount", df.format((float) todayCount / 100));//今日消费金额 + String thisMonthCountStr = df.format((float) thisMonthCount / 100); + map.put("thisMonthCount", thisMonthCountStr);//近一个月消费金额数 + map.put("dayPercentage", dayPercentage);//日环比 + map.put("weekPercentage", weekPercentage); //周同比 + map.put("weekVos", weekVos);//一周金额列表 + map.put("monthVos", monthVos);//一月金额列表 + return new ResultData(map); + } - if (i == 0) { - todayCount = vow.getPrice(); - } - if (i == 1) { - yesterdayCount = vow.getPrice(); - } - if (i == 7) { - dayOfWeekCount = vow.getPrice(); - } else { - weekVos.add(vow); - } - } - monthVos.add(vo); - } - NumberFormat nf = NumberFormat.getPercentInstance(); - nf.setMinimumFractionDigits(2); - String dayPercentage ="--"; - if(yesterdayCount>0) { - Integer count =todayCount-yesterdayCount; - dayPercentage=nf.format(count.doubleValue()/new Double(yesterdayCount).doubleValue()); - } - String weekPercentage ="--"; - if(dayOfWeekCount>0) { - Integer count =todayCount-dayOfWeekCount; - weekPercentage=nf.format(count.doubleValue()/new Double(dayOfWeekCount).doubleValue()); - } - Map map =new HashMap<>(); - DecimalFormat df=new DecimalFormat("0.00"); - map.put("todayCount", df.format((float)todayCount/100));//今日消费金额 - String thisMonthCountStr = df.format((float)thisMonthCount/100); - map.put("thisMonthCount", thisMonthCountStr);//近一个月消费金额数 - map.put("dayPercentage",dayPercentage);//日环比 - map.put("weekPercentage",weekPercentage); //周同比 - map.put("weekVos", weekVos);//一周金额列表 - map.put("monthVos", monthVos);//一月金额列表 - return new ResultData(map); - } - - } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserTagsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserTagsController.java index d169174b6..4b32ff061 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserTagsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserTagsController.java @@ -27,6 +27,7 @@ public class WxCUserTagsController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCUserTags wxCUserTags, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCUserTagsController::list"); if (null == wxCUserTags) wxCUserTags = new WxCUserTags(); final PageInfo page = wxCUserTagsService.listAsPage(wxCUserTags, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxCUserTagsController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCUserTags wxCUserTags) { + logger.debug("[" + getIpAddr() + "] WxCUserTagsController::add"); //Assert.notNull(wxCUserTags.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxCUserTagsService.saveOrUpdate(wxCUserTags); @@ -44,6 +46,7 @@ public class WxCUserTagsController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCUserTags wxCUserTags) { + logger.debug("[" + getIpAddr() + "] WxCUserTagsController::update"); wxCUserTagsService.saveOrUpdate(wxCUserTags); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxCUserTagsController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCUserTagsController::delete"); wxCUserTagsService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,6 +64,7 @@ public class WxCUserTagsController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxCUserTagsController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxCUserTagsService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java index 3487de078..06199f77c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java @@ -46,6 +46,7 @@ public class WxCampaignController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCampaign wxCampaign, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCampaignController::list"); if (null == wxCampaign) wxCampaign = new WxCampaign(); if (wxCampaign.getStatus() != null && wxCampaign.getStatus() == -1) { wxCampaign.setStatus(null); @@ -59,6 +60,7 @@ public class WxCampaignController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCampaign wxCampaign) { + logger.debug("[" + getIpAddr() + "] WxCampaignController::add"); //Assert.notNull(wxCampaign.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); // int sortNum = wxCampaignService.getMaxSortNum(getTenantId()); @@ -78,6 +80,7 @@ public class WxCampaignController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCampaign wxCampaign) { + logger.debug("[" + getIpAddr() + "] WxCampaignController::update"); if (StringUtils.isNotBlank(wxCampaign.getCouponIds())) { String[] arys = wxCampaign.getCouponIds().split(","); wxCampaign.setCouponIds(JSON.toJSONString(arys)); @@ -92,6 +95,7 @@ public class WxCampaignController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCampaignController::delete"); wxCampaignService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -100,6 +104,7 @@ public class WxCampaignController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxCampaignController::findById"); WxCampaign wxCampaign = wxCampaignService.getById(id); if (wxCampaign != null) { WxCouponChannel wxCouponChannel = new WxCouponChannel(); @@ -119,6 +124,7 @@ public class WxCampaignController extends BaseController { @ApiImplicitParam(name = "sourceId", value = "", dataType = "Long", paramType = "query", required = true), @ApiImplicitParam(name = "targetId", value = "", dataType = "Long", paramType = "query", required = true)}) public ResultData move(Long sourceId, Long targetId) { + logger.debug("[" + getIpAddr() + "] WxCampaignController::move"); WxCampaign source = wxCampaignService.getById(sourceId); WxCampaign target = wxCampaignService.getById(targetId); if (source == null || target == null) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java index b86bf8e58..70af61096 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java @@ -67,7 +67,7 @@ public class WxCarCallBackController extends BaseController { */ @PostMapping(value = "/etcpParkInCallback") public Result etcpParkInCallback(@RequestBody Map paramMap) { - logger.info("etcpParkInCallback: " + paramMap.toString()); + logger.info("["+getIpAddr()+"] etcpParkInCallback: " + paramMap.toString()); Date currentDate = new Date(); WxCarCmdLog wxCarCmdLog = new WxCarCmdLog(); @@ -137,7 +137,7 @@ public class WxCarCallBackController extends BaseController { */ @PostMapping(value = "/etcpParkOutCallback") public Result etcpParkOutCallback(@RequestBody Map paramMap) { - logger.info("etcpParkOutCallback: " + paramMap.toString()); + logger.info("["+getIpAddr()+"etcpParkOutCallback: " + paramMap.toString()); Date currentDate = new Date(); WxCarCmdLog wxCarCmdLog = new WxCarCmdLog(); @@ -180,7 +180,7 @@ public class WxCarCallBackController extends BaseController { */ @PostMapping(value = "/etcpUnbindCarCallBack") public Result etcpUnbindCarCallBack(@RequestBody Map paramMap) { - logger.info("etcpUnbindCarCallBack: " + paramMap.toString()); + logger.info("["+getIpAddr()+"etcpUnbindCarCallBack: " + paramMap.toString()); String carNumber = paramMap.get("plateNumber"); // TODO how to get the parkId @@ -225,7 +225,7 @@ public class WxCarCallBackController extends BaseController { */ @PostMapping(value = "/etcpPaidCallback") public Result etcpPaidCallback(@RequestBody Map paramMap) { - logger.info("etcpPaidCallback: " + paramMap.toString()); + logger.info("["+getIpAddr()+"etcpPaidCallback: " + paramMap.toString()); String carNumber = paramMap.get("plateNumber"); // TODO how to get the parkId @@ -269,7 +269,7 @@ public class WxCarCallBackController extends BaseController { */ @RequestMapping(value = "/tjdParkInCallback") public Map tjdParkInCallback(@RequestBody Map paramMap) { - logger.info("tjdParkInCallback: " + paramMap.toString()); + logger.info("["+getIpAddr()+"tjdParkInCallback: " + paramMap.toString()); Map map = new HashMap(); @@ -322,7 +322,7 @@ public class WxCarCallBackController extends BaseController { */ @RequestMapping(value = "/tjdParkoutCallback") public Map tjdParkOutCallback(@RequestBody Map paramMap) { - logger.info("tjdParkoutCallback: " + paramMap.toString()); + logger.info("["+getIpAddr()+"tjdParkoutCallback: " + paramMap.toString()); Map map = new HashMap(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCmdLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCmdLogController.java index cf9392dbb..4a173bd93 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCmdLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCmdLogController.java @@ -27,6 +27,7 @@ public class WxCarCmdLogController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCarCmdLog wxCarCmdLogs, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCarCmdLogController::list"); if (null == wxCarCmdLogs) wxCarCmdLogs = new WxCarCmdLog(); final PageInfo page = wxCarCmdLogService.listAsPage(wxCarCmdLogs, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxCarCmdLogController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCarCmdLog wxCarCmdLog) { + logger.debug("[" + getIpAddr() + "] WxCarCmdLogController::add"); //Assert.notNull(wxCarCmdLogs.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxCarCmdLogService.saveOrUpdate(wxCarCmdLog); @@ -44,6 +46,7 @@ public class WxCarCmdLogController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCarCmdLog wxCarCmdLog) { + logger.debug("[" + getIpAddr() + "] WxCarCmdLogController::update"); wxCarCmdLogService.saveOrUpdate(wxCarCmdLog); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxCarCmdLogController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCarCmdLogController::delete"); wxCarCmdLogService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,6 +64,7 @@ public class WxCarCmdLogController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxCarCmdLogController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxCarCmdLogService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java index d6aed1563..c74b6163e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java @@ -64,6 +64,7 @@ public class WxCarController extends BaseController { @ApiOperation(value = "获取车场支持的厂家", notes = "{}") @GetMapping("/getVendor") public ResultData getVendor() { + logger.debug("[" + getIpAddr() + "] WxCarController::getVendor"); MallUserInfo user = getUser(); // 1, get mall's park WxPark park = getCurrentPark(user); @@ -117,7 +118,7 @@ public class WxCarController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData quanTemplate(String merchantId, Integer pageNum, Integer pageSize) { - logger.info("quanTemplate: " + merchantId); + logger.debug("[" + getIpAddr() + "] WxCarController::quanTemplate"); MallUserInfo user = getUser(); /// 1, get mall's park WxPark park = getCurrentPark(user); @@ -177,6 +178,7 @@ public class WxCarController extends BaseController { @ApiOperation("新增停车券接口") @PostMapping("save") public ResultData save(@RequestBody WxCouponCarVo coupon) { + logger.debug("[" + getIpAddr() + "] WxCarController::save"); logger.info(coupon.toString()); //Assert.notNull(wxCoupon.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); @@ -272,6 +274,7 @@ public class WxCarController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "templateId", value = "模板ID", dataType = "Long", paramType = "query", required = true)}) public ResultData getTemplateAmountSum(Long templateId) { + logger.debug("[" + getIpAddr() + "] WxCarController::getTemplateAmountSum"); Map map = new HashMap(); Integer amountCount = 0; try { @@ -288,6 +291,7 @@ public class WxCarController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "templateId", value = "模板ID", dataType = "Long", paramType = "query", required = true)}) public ResultData getTemplateAvailSum(Long templateId) { + logger.debug("[" + getIpAddr() + "] WxCarController::getTemplateAvailSum"); Map map = new HashMap(); Integer availCount = 0; try { @@ -302,6 +306,7 @@ public class WxCarController extends BaseController { @ApiOperation("停车券detail") @GetMapping("/detail") public ResultData getCouponCarDetail(@ModelAttribute WxCoupon coupon) { + logger.debug("[" + getIpAddr() + "] WxCarController::getCouponCarDetail"); MallUserInfo user = getUser(); coupon.setTenantId(user.getTenantId()); try { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxChannelController.java index 77f55a158..b1f69f335 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxChannelController.java @@ -27,6 +27,7 @@ public class WxChannelController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxChannel wxChannel, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxChannelController::list"); if (null == wxChannel) wxChannel = new WxChannel(); final PageInfo page = wxChannelService.listAsPage(wxChannel, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxChannelController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxChannel wxChannel) { + logger.debug("[" + getIpAddr() + "] WxChannelController::add"); //Assert.notNull(wxChannel.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxChannelService.saveOrUpdate(wxChannel); @@ -44,6 +46,7 @@ public class WxChannelController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxChannel wxChannel) { + logger.debug("[" + getIpAddr() + "] WxChannelController::update"); wxChannelService.saveOrUpdate(wxChannel); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxChannelController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxChannelController::delete"); wxChannelService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,6 +64,7 @@ public class WxChannelController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxChannelController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxChannelService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponActionLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponActionLogController.java index e6b0bfe52..017a7d93d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponActionLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponActionLogController.java @@ -27,6 +27,7 @@ public class WxCouponActionLogController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCouponActionLog wxCouponActionLog, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCouponActionLogController::list"); if (null == wxCouponActionLog) wxCouponActionLog = new WxCouponActionLog(); final PageInfo page = wxCouponActionLogService.listAsPage(wxCouponActionLog, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxCouponActionLogController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponActionLog wxCouponActionLog) { + logger.debug("[" + getIpAddr() + "] WxCouponActionLogController::add"); //Assert.notNull(wxCouponActionLog.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxCouponActionLogService.saveOrUpdate(wxCouponActionLog); @@ -44,6 +46,7 @@ public class WxCouponActionLogController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCouponActionLog wxCouponActionLog) { + logger.debug("[" + getIpAddr() + "] WxCouponActionLogController::update"); wxCouponActionLogService.saveOrUpdate(wxCouponActionLog); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxCouponActionLogController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponActionLogController::delete"); wxCouponActionLogService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,6 +64,7 @@ public class WxCouponActionLogController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponActionLogController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxCouponActionLogService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponCarController.java index 09c3b9f49..219b1333d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponCarController.java @@ -27,6 +27,7 @@ public class WxCouponCarController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCouponCar wxCouponCar, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCouponCarController::list"); if (null == wxCouponCar) wxCouponCar = new WxCouponCar(); final PageInfo page = wxCouponCarService.listAsPage(wxCouponCar, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxCouponCarController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponCar wxCouponCar) { + logger.debug("[" + getIpAddr() + "] WxCouponCarController::add"); //Assert.notNull(wxCouponCar.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxCouponCarService.save(wxCouponCar); @@ -44,6 +46,7 @@ public class WxCouponCarController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCouponCar wxCouponCar) { + logger.debug("[" + getIpAddr() + "] WxCouponCarController::update"); wxCouponCarService.update(wxCouponCar); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxCouponCarController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponCarController::delete"); wxCouponCarService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,6 +64,7 @@ public class WxCouponCarController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponCarController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxCouponCarService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java index ddd1742ed..e30db9ebe 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -45,6 +45,7 @@ public class WxCouponChannelController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCouponChannelController::list"); if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) { wxCouponChannel.setStatus(null); @@ -59,6 +60,7 @@ public class WxCouponChannelController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCouponChannel wxCouponChannel) { + logger.debug("[" + getIpAddr() + "] WxCouponChannelController::update"); wxCouponChannel.setTenantId(getUser().getTenantId()); if (wxCouponChannel.getCouponId() != null && wxCouponChannel.getStatus() != null) { WxCouponChannel orignal = wxCouponChannelService.getById(wxCouponChannel.getId()); @@ -91,6 +93,7 @@ public class WxCouponChannelController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponChannelController::delete"); wxCouponChannelService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -99,12 +102,14 @@ public class WxCouponChannelController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponChannelController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxCouponChannelService.getById(id)); } @ApiOperation("批量新增") @PostMapping("/addbatch") public ResultData addbatch(@RequestBody WxCouponChannelDto wxCouponChannelDto) { + logger.debug("[" + getIpAddr() + "] WxCouponChannelController::addbatch"); String[] ids = wxCouponChannelDto.getCouponIds().split(","); String[] channelId = wxCouponChannelDto.getChannelId().split(","); MallUserInfo user = getUser(); @@ -115,6 +120,7 @@ public class WxCouponChannelController extends BaseController { @GetMapping("/findChannelByCouponId") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findChannelByCouponId(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponChannelController::findChannelByCouponId"); List channellist = new ArrayList<>(); WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setTenantId(getTenantId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java index 7d18a0990..8a4b029d7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java @@ -48,6 +48,7 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCouponController::list"); if (null == wxCoupon) wxCoupon = new WxCoupon(); wxCoupon.setTenantId(getTenantId()); wxCoupon.setSortColumns(WxCoupon.Field.Id_DESC); @@ -100,6 +101,7 @@ public class WxCouponController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCoupon wxCoupon) { + logger.debug("[" + getIpAddr() + "] WxCouponController::add"); //Assert.notNull(wxCoupon.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); if (StringUtils.isNotEmpty(wxCoupon.getSalePriceStr())) { @@ -124,6 +126,7 @@ public class WxCouponController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCoupon wxCoupon) { + logger.debug("[" + getIpAddr() + "] WxCouponController::update"); if (wxCoupon.getId() == null) { return new ResultData(ResultData.ERROR, "缺少id"); } @@ -138,6 +141,7 @@ public class WxCouponController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponController::delete"); wxCouponService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -146,6 +150,7 @@ public class WxCouponController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponController::findById"); WxCoupon c = wxCouponService.getById(id); WxMerchant merchant = wxMerchantService.getById(c.getMerchantId()); if(merchant.getStatus().equals(EnumMerchantStatus.NOT_VALID.getCode())) @@ -163,6 +168,7 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData sendList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCouponController::sendList"); if (null == wxCoupon) wxCoupon = new WxCoupon(); wxCoupon.setTenantId(getTenantId()); wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponInjectController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponInjectController.java index bfa7c95a6..a869963eb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponInjectController.java @@ -39,6 +39,7 @@ public class WxCouponInjectController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCouponInject couponInject, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCouponInjectController::list"); if (null == couponInject) couponInject = new WxCouponInject(); if (couponInject.getStatus() != null && couponInject.getStatus() == -1) { couponInject.setStatus(null); @@ -52,6 +53,7 @@ public class WxCouponInjectController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponInject couponInject) { + logger.debug("[" + getIpAddr() + "] WxCouponInjectController::add"); couponInject.setTenantId(getUser().getTenantId()); couponInject.setMUserId(getUser().getId()); @@ -62,6 +64,7 @@ public class WxCouponInjectController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCouponInject couponInject) { + logger.debug("[" + getIpAddr() + "] WxCouponInjectController::update"); String[] arys = couponInject.getTags().split(","); List tagids = new ArrayList<>(); for (int i = 0; i < arys.length; i++) { @@ -76,6 +79,7 @@ public class WxCouponInjectController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponInjectController::delete"); wxCouponInjectService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -84,7 +88,7 @@ public class WxCouponInjectController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - + logger.debug("[" + getIpAddr() + "] WxCouponInjectController::findById"); WxCouponInject couponInject = wxCouponInjectService.getById(id); if (couponInject != null) { List tagids = JSON.parseArray(couponInject.getTags(), Long.class); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java index d270e2e0a..198ee6554 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -53,6 +53,7 @@ public class WxCouponOrderController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCouponOrderBVo wxCouponOrder, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCouponOrderController::list"); if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); wxCouponOrder.setTenantId(getTenantId()); wxCouponOrder.setSortColumns(WxCouponOrder.Field.Id_DESC); @@ -67,6 +68,7 @@ public class WxCouponOrderController extends BaseController { @RequestParam("couponOrderStatus") String couponOrderStatus, @RequestParam("id") String id, HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] WxCouponOrderController::exportData"); WxCouponOrderBVo wxCouponOrder = new WxCouponOrderBVo(); wxCouponOrder.setTenantId(getTenantId()); @@ -101,6 +103,7 @@ public class WxCouponOrderController extends BaseController { @ApiOperation(value = "退券退款", notes = "{\"couponOrderId\":\"string\"}") @PostMapping("/refund") public ResultData create(@RequestBody Map paramMap) { + logger.debug("[" + getIpAddr() + "] WxCouponOrderController::create"); //Assert.notNull(wxRefundOrder.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); logger.info(paramMap.toString()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java index 676b5fc13..2591dd78a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -41,6 +41,7 @@ public class WxCouponSendController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCouponSend wxCouponSend, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCouponSendController::list"); if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); @@ -56,6 +57,7 @@ public class WxCouponSendController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponSend wxCouponSend) { + logger.debug("[" + getIpAddr() + "] WxCouponSendController::add"); if (null == wxCouponSend) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } @@ -89,6 +91,7 @@ public class WxCouponSendController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCouponSend wxCouponSend) { + logger.debug("[" + getIpAddr() + "] WxCouponSendController::update"); wxCouponSend.setTenantId(getTenantId()); wxCouponSendService.saveOrUpdate(wxCouponSend); return new ResultData(); @@ -98,6 +101,7 @@ public class WxCouponSendController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponSendController::delete"); //wxCouponSendService.deleteById(id); //return new ResultData(Result.SUCCESS, "删除成功", null); WxCouponSend wxCouponSend = wxCouponSendService.getById(id); @@ -113,6 +117,7 @@ public class WxCouponSendController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponSendController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxCouponSendService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSpreadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSpreadController.java index ea9f48177..7d2297f5c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSpreadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSpreadController.java @@ -31,6 +31,7 @@ public class WxCouponSpreadController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCouponSpread wxCouponSpread, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCouponSpreadController::list"); if (null == wxCouponSpread) wxCouponSpread = new WxCouponSpread(); final PageInfo page = wxCouponSpreadService.listAsPage(wxCouponSpread, pageNum, pageSize); return new ResultData(page); @@ -39,6 +40,7 @@ public class WxCouponSpreadController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponSpread wxCouponSpread) { + logger.debug("[" + getIpAddr() + "] WxCouponSpreadController::add"); if (wxCouponSpread.getCouponId() == null) { return new ResultData(Result.ERROR, "没有找到券id"); } @@ -51,6 +53,7 @@ public class WxCouponSpreadController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCouponSpread wxCouponSpread) { + logger.debug("[" + getIpAddr() + "] WxCouponSpreadController::update"); wxCouponSpreadService.saveOrUpdate(wxCouponSpread); return new ResultData(); } @@ -59,6 +62,7 @@ public class WxCouponSpreadController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponSpreadController::delete"); wxCouponSpreadService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -67,6 +71,7 @@ public class WxCouponSpreadController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponSpreadController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxCouponSpreadService.getById(id)); } @@ -74,6 +79,7 @@ public class WxCouponSpreadController extends BaseController { @GetMapping("/findByCouponId") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findByCouponId(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponSpreadController::findByCouponId"); WxCouponSpread result = null; if (id != null) { WxCouponSpread wxCouponSpread = new WxCouponSpread(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponTypeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponTypeController.java index 044c87938..98801451b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponTypeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponTypeController.java @@ -29,6 +29,7 @@ public class WxCouponTypeController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCouponType wxCouponType, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCouponTypeController::list"); if (null == wxCouponType) wxCouponType = new WxCouponType(); final PageInfo page = wxCouponTypeService.listAsPage(wxCouponType, pageNum, pageSize); return new ResultData(page); @@ -37,6 +38,7 @@ public class WxCouponTypeController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponType wxCouponType) { + logger.debug("[" + getIpAddr() + "] WxCouponTypeController::add"); //Assert.notNull(wxCouponType.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxCouponTypeService.saveOrUpdate(wxCouponType); @@ -46,6 +48,7 @@ public class WxCouponTypeController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCouponType wxCouponType) { + logger.debug("[" + getIpAddr() + "] WxCouponTypeController::update"); wxCouponTypeService.saveOrUpdate(wxCouponType); return new ResultData(); } @@ -54,6 +57,7 @@ public class WxCouponTypeController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponTypeController::delete"); wxCouponTypeService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -62,6 +66,7 @@ public class WxCouponTypeController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxCouponTypeController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxCouponTypeService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxGameController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxGameController.java index d0fea6479..dfc115b0f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxGameController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxGameController.java @@ -30,6 +30,7 @@ public class WxGameController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxGame wxGame, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxGameController::list"); if (null == wxGame) wxGame = new WxGame(); wxGame.setTenantId(getTenantId()); wxGame.setSortColumns(WxGame.Field.Id_DESC); @@ -40,6 +41,7 @@ public class WxGameController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxGame wxGame) { + logger.debug("[" + getIpAddr() + "] WxGameController::add"); //Assert.notNull(wxGame.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); if (StringUtils.isBlank(wxGame.getCouponIds())) { @@ -54,6 +56,7 @@ public class WxGameController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxGame wxGame) { + logger.debug("[" + getIpAddr() + "] WxGameController::update"); if (StringUtils.isBlank(wxGame.getCouponIds())) { wxGame.setCouponIds(JSONArray.toJSONString(new String[0])); } @@ -66,6 +69,7 @@ public class WxGameController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxGameController::delete"); wxGameService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -74,6 +78,7 @@ public class WxGameController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxGameController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxGameService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxGameTemplateController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxGameTemplateController.java index 63bf46b59..6aff36372 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxGameTemplateController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxGameTemplateController.java @@ -29,6 +29,7 @@ public class WxGameTemplateController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData listPage(@ModelAttribute WxGameTemplate wxGameTemplate, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxGameTemplateController::listPage"); if (null == wxGameTemplate) wxGameTemplate = new WxGameTemplate(); final PageInfo page = wxGameTemplateService.listAsPage(wxGameTemplate, pageNum, pageSize); return new ResultData(page); @@ -37,6 +38,7 @@ public class WxGameTemplateController extends BaseController { @ApiOperation("列表接口") @GetMapping("list") public ResultData list(@ModelAttribute WxGameTemplate wxGameTemplate) { + logger.debug("[" + getIpAddr() + "] WxGameTemplateController::list"); if (null == wxGameTemplate) wxGameTemplate = new WxGameTemplate(); final List page = wxGameTemplateService.getList(wxGameTemplate); return new ResultData(page); @@ -45,6 +47,7 @@ public class WxGameTemplateController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxGameTemplate wxGameTemplate) { + logger.debug("[" + getIpAddr() + "] WxGameTemplateController::add"); //Assert.notNull(wxGameTemplate.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxGameTemplateService.saveOrUpdate(wxGameTemplate); @@ -54,6 +57,7 @@ public class WxGameTemplateController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxGameTemplate wxGameTemplate) { + logger.debug("[" + getIpAddr() + "] WxGameTemplateController::update"); wxGameTemplateService.saveOrUpdate(wxGameTemplate); return new ResultData(); } @@ -62,6 +66,7 @@ public class WxGameTemplateController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxGameTemplateController::delete"); wxGameTemplateService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -70,6 +75,7 @@ public class WxGameTemplateController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxGameTemplateController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxGameTemplateService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxGroupController.java index 177c5fd7c..ddc286bc8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxGroupController.java @@ -25,6 +25,7 @@ public class WxGroupController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxGroup wxGroup, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxGroupController::list"); if (null == wxGroup) wxGroup = new WxGroup(); final PageInfo page = wxGroupService.listAsPage(wxGroup, pageNum, pageSize); return new ResultData(page); @@ -32,6 +33,7 @@ public class WxGroupController extends BaseController { @PostMapping("add") public ResultData add(@RequestBody WxGroup wxGroup) { + logger.debug("[" + getIpAddr() + "] WxGroupController::add"); //Assert.notNull(wxGroup.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxGroupService.saveOrUpdate(wxGroup); @@ -40,6 +42,7 @@ public class WxGroupController extends BaseController { @PostMapping("update") public ResultData update(@RequestBody WxGroup wxGroup) { + logger.debug("[" + getIpAddr() + "] WxGroupController::update"); wxGroupService.saveOrUpdate(wxGroup); return new ResultData(); } @@ -47,6 +50,7 @@ public class WxGroupController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData delete(String id) { + logger.debug("[" + getIpAddr() + "] WxGroupController::delete"); wxGroupService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -54,6 +58,7 @@ public class WxGroupController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData findById(String id) { + logger.debug("[" + getIpAddr() + "] WxGroupController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxGroupService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java index 20e3049ed..16e3dc2fd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java @@ -37,6 +37,7 @@ public class WxLevelConfigController extends BaseController { @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxLevelConfig wxLevelConfig,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list"); if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); wxLevelConfig.setTenantId(getTenantId()); wxLevelConfig.setSortColumns(WxLevelConfig.Field.Points_ASC); @@ -47,6 +48,7 @@ public class WxLevelConfigController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxLevelConfigDto dto) { + logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); //Assert.notNull(wxLevelConfig.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); String[] points = dto.getPoints().split("&"); @@ -81,6 +83,7 @@ public class WxLevelConfigController extends BaseController { @PostMapping("/del") // @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(@RequestBody WxLevelConfig wxLevelConfig) { + logger.debug("[" + getIpAddr() + "] WxLevelConfigController::delete"); wxLevelConfigService.deleteById(wxLevelConfig.getId()); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -89,6 +92,7 @@ public class WxLevelConfigController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxLevelConfigController::findById"); return new ResultData(Result.SUCCESS,"查询成功",wxLevelConfigService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallApplyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMallApplyController.java index 17d88c607..36c0830d1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallApplyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMallApplyController.java @@ -26,6 +26,7 @@ public class WxMallApplyController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxMallApply wxMallApply, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMallApplyController::list"); if (null == wxMallApply) wxMallApply = new WxMallApply(); final PageInfo page = wxMallApplyService.listAsPage(wxMallApply, pageNum, pageSize); return new ResultData(page); @@ -33,6 +34,7 @@ public class WxMallApplyController extends BaseController { @PostMapping("add") public ResultData add(@RequestBody WxMallApply wxMallApply) { + logger.debug("[" + getIpAddr() + "] WxMallApplyController::add"); //Assert.notNull(wxMallApply.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); return wxMallApplyService.saveOrUpdate(wxMallApply); @@ -41,12 +43,14 @@ public class WxMallApplyController extends BaseController { @PostMapping("update") public ResultData update(@RequestBody WxMallApply wxMallApply) { + logger.debug("[" + getIpAddr() + "] WxMallApplyController::update"); return wxMallApplyService.saveOrUpdate(wxMallApply); } @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData delete(String id) { + logger.debug("[" + getIpAddr() + "] WxMallApplyController::delete"); wxMallApplyService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -54,6 +58,7 @@ public class WxMallApplyController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData findById(String id) { + logger.debug("[" + getIpAddr() + "] WxMallApplyController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxMallApplyService.getById(id)); } @@ -63,6 +68,7 @@ public class WxMallApplyController extends BaseController { @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "type", value = "场景", dataType = "Integer", paramType = "query", required = true)}) public ResultData sendvalidationcode(String phone, Integer type) { + logger.debug("[" + getIpAddr() + "] WxMallApplyController::sendvalidationcode"); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); wxMsgValidationcode.setTenantId("1"); wxMsgValidationcode.setPhone(phone); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallBuildingController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMallBuildingController.java index 4ff4cf2b2..da2374966 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMallBuildingController.java @@ -27,6 +27,7 @@ public class WxMallBuildingController extends BaseController { @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxMallBuilding wxMallBuilding,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMallBuildingController::list"); if (null == wxMallBuilding) wxMallBuilding = new WxMallBuilding(); final PageInfo page = wxMallBuildingService.listAsPage(wxMallBuilding, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxMallBuildingController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMallBuilding wxMallBuilding) { + logger.debug("[" + getIpAddr() + "] WxMallBuildingController::add"); //Assert.notNull(wxMallBuilding.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMallBuildingService.saveOrUpdate(wxMallBuilding); @@ -44,6 +46,7 @@ public class WxMallBuildingController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxMallBuilding wxMallBuilding) { + logger.debug("[" + getIpAddr() + "] WxMallBuildingController::update"); wxMallBuildingService.saveOrUpdate(wxMallBuilding); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxMallBuildingController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxMallBuildingController::delete"); wxMallBuildingService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,6 +64,7 @@ public class WxMallBuildingController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMallBuildingController::findById"); return new ResultData(Result.SUCCESS,"查询成功",wxMallBuildingService.getById(id)); } @@ -67,13 +72,15 @@ public class WxMallBuildingController extends BaseController { @ApiOperation("获取所有数据") @GetMapping("getbuildinglist") public ResultData getbuildinglist() { - return wxMallBuildingService.getbuildinglist(getTenantId()); + logger.debug("[" + getIpAddr() + "] WxMallBuildingController::getbuildinglist"); + return wxMallBuildingService.getbuildinglist(getTenantId()); } @ApiOperation("获取楼层楼座数据") @GetMapping("getbuildingfloorlist") public ResultData getbuildingfloorlist() { - return wxMallBuildingService.getbuildingfloorlist(getTenantId()); + logger.debug("[" + getIpAddr() + "] WxMallBuildingController::getbuildingfloorlist"); + return wxMallBuildingService.getbuildingfloorlist(getTenantId()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMallConfigController.java index 4acb68444..12117628d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMallConfigController.java @@ -23,6 +23,7 @@ public class WxMallConfigController extends BaseController { @ApiOperation("获取停车劵开关") @GetMapping("getStopCarCoupon") public ResultData getStopCarConpon() { + logger.debug("[" + getIpAddr() + "] WxMallConfigController::getStopCarConpon"); WxMallConfig wxMallConfig = new WxMallConfig(); wxMallConfig.setKey("stopCarCouponSwitch"); wxMallConfig.setTenantId(getTenantId()); @@ -37,6 +38,7 @@ public class WxMallConfigController extends BaseController { @ApiOperation("获取核销劵开关") @GetMapping("getVerifyCoupon") public ResultData getVerifyConpon() { + logger.debug("[" + getIpAddr() + "] WxMallConfigController::getVerifyConpon"); WxMallConfig wxMallConfig = new WxMallConfig(); wxMallConfig.setKey("verifyCouponSwitch"); wxMallConfig.setTenantId(getTenantId()); @@ -51,6 +53,7 @@ public class WxMallConfigController extends BaseController { @ApiOperation("获取B端刷卡支付发劵开关") @GetMapping("getMicroPayCouponSwitch") public ResultData getMicroPayConpon() { + logger.debug("[" + getIpAddr() + "] WxMallConfigController::getMicroPayConpon"); WxMallConfig wxMallConfig = new WxMallConfig(); wxMallConfig.setKey("microPayCouponSwitch"); wxMallConfig.setTenantId(getTenantId()); @@ -65,6 +68,7 @@ public class WxMallConfigController extends BaseController { @PostMapping("updateStopCarCoupon") @ApiOperation("修改停车发券开关") public ResultData updateStopCarConpon(@RequestBody WxMallConfig wxMallConfig) { + logger.debug("[" + getIpAddr() + "] WxMallConfigController::updateStopCarConpon"); WxMallConfig temp = new WxMallConfig(); // temp.setKey("stopCarCouponSwitch"); temp.setValue(wxMallConfig.getValue()); @@ -76,6 +80,7 @@ public class WxMallConfigController extends BaseController { @PostMapping("updateVerifyCoupon") @ApiOperation("修改核销发券开关") public ResultData updateVerifyConpon(@RequestBody WxMallConfig wxMallConfig) { + logger.debug("[" + getIpAddr() + "] WxMallConfigController::updateVerifyConpon"); WxMallConfig temp = new WxMallConfig(); // temp.setKey("verifyCouponSwitch"); temp.setValue(wxMallConfig.getValue()); @@ -88,6 +93,7 @@ public class WxMallConfigController extends BaseController { @PostMapping("updateMicroPayCouponSwitch") @ApiOperation("修改刷卡支付发券开关") public ResultData updateMicroPayCoupon(@RequestBody WxMallConfig wxMallConfig) { + logger.debug("[" + getIpAddr() + "] WxMallConfigController::updateMicroPayCoupon"); WxMallConfig temp = new WxMallConfig(); // temp.setKey("verifyCouponSwitch"); temp.setValue(wxMallConfig.getValue()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java index 398af5a23..4ac38e422 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java @@ -27,6 +27,7 @@ public class WxMallController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxMall wxMall, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMallController::list"); if (null == wxMall) wxMall = new WxMall(); final PageInfo page = wxMallService.listAsPage(wxMall, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxMallController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMall wxMall) { + logger.debug("[" + getIpAddr() + "] WxMallController::add"); //Assert.notNull(wxMall.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMallService.saveOrUpdate(wxMall); @@ -44,6 +46,7 @@ public class WxMallController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxMall wxMall) { + logger.debug("[" + getIpAddr() + "] WxMallController::update"); wxMallService.saveOrUpdate(wxMall); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxMallController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxMallController::delete"); wxMallService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,12 +64,14 @@ public class WxMallController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMallController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxMallService.getById(id)); } @ApiOperation("查询当前mall的信息") @GetMapping("/mallinfo") public ResultData mallinfo() { + logger.debug("[" + getIpAddr() + "] WxMallController::mallinfo"); return new ResultData(wxMallService.getByTenantId(getTenantId())); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallFloorController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMallFloorController.java index 897063b81..400bd19aa 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallFloorController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMallFloorController.java @@ -29,6 +29,7 @@ public class WxMallFloorController extends BaseController { @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxMallFloor wxMallFloor,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMallFloorController::list"); if (null == wxMallFloor) wxMallFloor = new WxMallFloor(); final PageInfo page = wxMallFloorService.listAsPage(wxMallFloor, pageNum, pageSize); return new ResultData(page); @@ -37,6 +38,7 @@ public class WxMallFloorController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMallFloor wxMallFloor) { + logger.debug("[" + getIpAddr() + "] WxMallFloorController::add"); //Assert.notNull(wxMallFloor.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMallFloorService.saveOrUpdate(wxMallFloor); @@ -46,6 +48,7 @@ public class WxMallFloorController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxMallFloor wxMallFloor) { + logger.debug("[" + getIpAddr() + "] WxMallFloorController::update"); wxMallFloorService.saveOrUpdate(wxMallFloor); return new ResultData(); } @@ -54,6 +57,7 @@ public class WxMallFloorController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxMallFloorController::delete"); wxMallFloorService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -62,7 +66,8 @@ public class WxMallFloorController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMallFloorService.getById(id)); + logger.debug("[" + getIpAddr() + "] WxMallFloorController::findById"); + return new ResultData(Result.SUCCESS,"查询成功",wxMallFloorService.getById(id)); } @ApiOperation("获取所有数据") @@ -70,6 +75,7 @@ public class WxMallFloorController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name="buildingId",value="楼座ID",dataType="Long", paramType = "query",required=true)}) public ResultData getfloorlist(Long buildingId){ + logger.debug("[" + getIpAddr() + "] WxMallFloorController::getfloorlist"); return wxMallFloorService.getfloorlist(getTenantId(),buildingId); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantBUserController.java index bc274be35..7337e2309 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -27,6 +27,7 @@ public class WxMerchantBUserController extends BaseController { @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxMerchantBUser wxMerchantBUser,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantBUserController::list"); if (null == wxMerchantBUser) wxMerchantBUser = new WxMerchantBUser(); final PageInfo page = wxMerchantBUserService.listAsPage(wxMerchantBUser, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxMerchantBUserController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMerchantBUser wxMerchantBUser) { + logger.debug("[" + getIpAddr() + "] WxMerchantBUserController::add"); //Assert.notNull(wxMerchantBUser.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMerchantBUser.setTenantId(getTenantId()); @@ -45,6 +47,7 @@ public class WxMerchantBUserController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxMerchantBUser wxMerchantBUser) { + logger.debug("[" + getIpAddr() + "] WxMerchantBUserController::update"); Long id = wxMerchantBUserService.saveOrUpdate(wxMerchantBUser); return new ResultData(Result.SUCCESS,"更新成功",id); } @@ -53,6 +56,7 @@ public class WxMerchantBUserController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantBUserController::delete"); wxMerchantBUserService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -61,6 +65,7 @@ public class WxMerchantBUserController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantBUserController::findById"); return new ResultData(Result.SUCCESS,"查询成功",wxMerchantBUserService.getById(id)); } @@ -68,6 +73,7 @@ public class WxMerchantBUserController extends BaseController { @GetMapping("/hasphone") @ApiImplicitParam(name="phone",value="phone",dataType="String", paramType = "query",required=true) public ResultData hasphone(String phone) { + logger.debug("[" + getIpAddr() + "] WxMerchantBUserController::hasphone"); boolean has=wxMerchantBUserService.hasphone(phone,getTenantId()); return new ResultData(Result.SUCCESS,"查询成功",has); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java index 4cff936fb..433198ebb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java @@ -37,6 +37,7 @@ public class WxMerchantController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.setTenantId(getTenantId()); wxMerchant.setSortColumns(WxMerchant.Field.Id_DESC); @@ -47,6 +48,7 @@ public class WxMerchantController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMerchant wxMerchant) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::add"); wxMerchant.setTenantId(getTenantId()); wxMerchantService.saveOrUpdate(wxMerchant); return new ResultData(); @@ -55,6 +57,7 @@ public class WxMerchantController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxMerchant wxMerchant) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::update"); wxMerchantService.saveOrUpdate(wxMerchant); return new ResultData(); } @@ -62,6 +65,7 @@ public class WxMerchantController extends BaseController { @ApiOperation("ETCP商户列表") @GetMapping("etcplist") public ResultData etcpList(@ModelAttribute WxMerchant wxMerchant) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::etcpList"); if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.setTenantId(getTenantId()); final List merchantList = wxMerchantService.etcpList(wxMerchant); @@ -72,6 +76,7 @@ public class WxMerchantController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::delete"); wxMerchantService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -80,6 +85,7 @@ public class WxMerchantController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::findById"); WxMerchant wxMerchant = wxMerchantService.getById(id); if (wxMerchant != null) { WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant); @@ -96,6 +102,7 @@ public class WxMerchantController extends BaseController { @GetMapping("disable") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData disable(Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::disable"); wxMerchantService.disable(id); return new ResultData(Result.SUCCESS, "停用成功"); } @@ -103,6 +110,7 @@ public class WxMerchantController extends BaseController { @ApiOperation("新增商户接口") @PostMapping("addMerchant") public ResultData addMerchant(@RequestBody WxMerchant wxMerchant) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::addMerchant"); wxMerchant.setTenantId(getTenantId()); return wxMerchantService.addMerchant(wxMerchant); } @@ -110,6 +118,7 @@ public class WxMerchantController extends BaseController { @ApiOperation("更新商户接口") @PostMapping("updateMerchant") public ResultData updateMerchant(@RequestBody WxMerchant wxMerchant) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchant"); wxMerchant.setTenantId(getTenantId()); return wxMerchantService.updateMerchant(wxMerchant); } @@ -117,6 +126,7 @@ public class WxMerchantController extends BaseController { @ApiOperation("更新账户接口") @PostMapping("updateMerchantAccount") public ResultData updateMerchantAccount(@RequestBody WxMerchant wxMerchant) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAccount"); wxMerchant.setTenantId(getTenantId()); return wxMerchantService.updateMerchantAccount(wxMerchant); } @@ -124,6 +134,7 @@ public class WxMerchantController extends BaseController { @ApiOperation("更新管理员接口") @PostMapping("updateMerchantAdmin") public ResultData updateMerchantAdmin(@RequestBody WxMerchant wxMerchant) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAdmin"); wxMerchant.setTenantId(getTenantId()); return wxMerchantService.updateMerchantAdmin(wxMerchant); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantShopController.java index 5f0ca4a30..afbe00f4c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantShopController.java @@ -28,6 +28,7 @@ public class WxMerchantShopController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxMerchantShop wxMerchantShop, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantShopController::list"); if (null == wxMerchantShop) wxMerchantShop = new WxMerchantShop(); final PageInfo page = wxMerchantShopService.listAsPage(wxMerchantShop, pageNum, pageSize); return new ResultData(page); @@ -39,6 +40,7 @@ public class WxMerchantShopController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData queryShopList(@ModelAttribute WxMerchantShop wxMerchantShop, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantShopController::queryShopList"); if (null == wxMerchantShop) wxMerchantShop = new WxMerchantShop(); final PageInfo page = wxMerchantShopService.queryShopList(wxMerchantShop, pageNum, pageSize); return new ResultData(page); @@ -48,6 +50,7 @@ public class WxMerchantShopController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMerchantShop wxMerchantShop) { + logger.debug("[" + getIpAddr() + "] WxMerchantShopController::add"); //Assert.notNull(wxMerchantShop.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMerchantShopService.saveOrUpdate(wxMerchantShop); @@ -57,6 +60,7 @@ public class WxMerchantShopController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxMerchantShop wxMerchantShop) { + logger.debug("[" + getIpAddr() + "] WxMerchantShopController::update"); wxMerchantShopService.saveOrUpdate(wxMerchantShop); return new ResultData(); } @@ -65,6 +69,7 @@ public class WxMerchantShopController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantShopController::delete"); wxMerchantShopService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -73,6 +78,7 @@ public class WxMerchantShopController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantShopController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxMerchantShopService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 829a31633..a04ba44ac 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -33,6 +33,7 @@ public class WxMerchantTradeDailyController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData listYesterday(@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday"); if (wxMerchantTradeDaily == null) wxMerchantTradeDaily = new WxMerchantTradeDailyVo(); wxMerchantTradeDaily.setTenantId(getTenantId()); Calendar cal = Calendar.getInstance(); @@ -48,12 +49,14 @@ public class WxMerchantTradeDailyController extends BaseController { @ApiOperation("获得近30日解单") @GetMapping("/detail") public ResultData detail(Long merchantId) { + logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::detail"); return wxMerchantTradeDailyService.getVolumeOfMonth(merchantId); } @ApiOperation("获得昨日解单列表") @GetMapping("/listMonth") public ResultData listMonth() { + logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listMonth"); return wxMerchantTradeDailyService.getVolumeTotalOfMonth(getTenantId()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgCallbackController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgCallbackController.java index ba900e678..a71781d5a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgCallbackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgCallbackController.java @@ -29,6 +29,7 @@ public class WxMsgCallbackController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxMsgCallback wxMsgCallback, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::list"); if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); wxMsgCallback.setTenantId(getTenantId()); wxMsgCallback.setSortColumns(WxMsgCallback.Field.Createtime_DESC); @@ -39,6 +40,7 @@ public class WxMsgCallbackController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsgCallback wxMsgCallback) { + logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::add"); //Assert.notNull(wxMsgCallback.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMsgCallback.setTenantId(getTenantId()); @@ -49,6 +51,7 @@ public class WxMsgCallbackController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxMsgCallback wxMsgCallback) { + logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::update"); wxMsgCallbackService.saveOrUpdate(wxMsgCallback); return new ResultData(); } @@ -57,6 +60,7 @@ public class WxMsgCallbackController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::delete"); wxMsgCallbackService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -65,12 +69,14 @@ public class WxMsgCallbackController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxMsgCallbackService.getById(id)); } @PostMapping(value = "/receivemsg/{tenantId}") public void receivemsg(@PathVariable String tenantId, @RequestParam Map param) { + logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::receivemsg"); logger.info(param.toString()); //解析param数据插入数据库中 wxMsgCallbackService.saveOrUpdate(tenantId,param); @@ -79,6 +85,7 @@ public class WxMsgCallbackController extends BaseController { @RequestMapping(value = "/receivemodel/{tenantId}") public void receivemodel(@PathVariable String tenantId, @RequestParam Map param) { + logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::receivemodel"); logger.info(param.toString()); //解析param数据插入数据库中 wxMsgCallbackService.receivemodel(tenantId, param); @@ -87,6 +94,7 @@ public class WxMsgCallbackController extends BaseController { @RequestMapping(value = "/receiveverifymodel/{tenantId}") public void receiveverifymodel(@PathVariable String tenantId, @RequestParam Map param) { + logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::receiveverifymodel"); logger.info(param.toString()); //解析param数据插入数据库中 wxMsgCallbackService.receiveverifymodel(tenantId, param); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgConfigController.java index 463daf8d5..9802e3ee3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgConfigController.java @@ -27,6 +27,7 @@ public class WxMsgConfigController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxMsgConfig wxMsgConfig, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMsgConfigController::list"); if (null == wxMsgConfig) wxMsgConfig = new WxMsgConfig(); final PageInfo page = wxMsgConfigService.listAsPage(wxMsgConfig, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxMsgConfigController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsgConfig wxMsgConfig) { + logger.debug("[" + getIpAddr() + "] WxMsgConfigController::add"); //Assert.notNull(wxMsgConfig.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMsgConfigService.saveOrUpdate(wxMsgConfig); @@ -44,6 +46,7 @@ public class WxMsgConfigController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxMsgConfig wxMsgConfig) { + logger.debug("[" + getIpAddr() + "] WxMsgConfigController::update"); wxMsgConfigService.saveOrUpdate(wxMsgConfig); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxMsgConfigController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxMsgConfigController::delete"); wxMsgConfigService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,6 +64,7 @@ public class WxMsgConfigController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMsgConfigController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxMsgConfigService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java index 5a0745dc4..d35b48e3e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java @@ -45,6 +45,7 @@ public class WxMsgController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxMsg wxMsg, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMsgController::list"); if (null == wxMsg) wxMsg = new WxMsg(); wxMsg.setTenantId(getTenantId()); //wxMsg.setWay(EnumSendWay.TAG.getCode()); @@ -56,6 +57,7 @@ public class WxMsgController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsg wxMsg) { + logger.debug("[" + getIpAddr() + "] WxMsgController::add"); wxMsg.setTenantId(getTenantId()); //1、手机多条以逗号分隔,直接通过实体得到wxmsg.getphones //2、通过标签 @@ -127,6 +129,7 @@ public class WxMsgController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxMsg wxMsg) { + logger.debug("[" + getIpAddr() + "] WxMsgController::update"); //1、手机多条以逗号分隔,直接通过实体得到wxmsg.getphones //2、通过标签 String phones=wxMsg.getPhones(); @@ -179,6 +182,7 @@ public class WxMsgController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxMsgController::delete"); wxMsgService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -187,6 +191,7 @@ public class WxMsgController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMsgController::findById"); WxMsg wxMsg = wxMsgService.getById(id); String label = wxMsg.getLabel(); if (label != null && !label.isEmpty()) { @@ -203,6 +208,7 @@ public class WxMsgController extends BaseController { @RequestMapping("/excleupload") public ResultData excleupload(@RequestParam("file") MultipartFile file) { + logger.debug("[" + getIpAddr() + "] WxMsgController::excleupload"); if (file.isEmpty()) { return new ResultData(Result.SUCCESS, "上传文件不能为空"); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgModelController.java index 8d083e3f1..40c50845c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgModelController.java @@ -27,6 +27,7 @@ public class WxMsgModelController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxMsgModel wxMsgModel, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMsgModelController::list"); if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); wxMsgModel.setTenantId(getTenantId()); wxMsgModel.setSortColumns(WxMsgModel.Field.Createtime_DESC); @@ -37,6 +38,7 @@ public class WxMsgModelController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsgModel wxMsgModel) { + logger.debug("[" + getIpAddr() + "] WxMsgModelController::add"); //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMsgModel.setTenantId(getTenantId()); @@ -47,6 +49,7 @@ public class WxMsgModelController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxMsgModel wxMsgModel) { + logger.debug("[" + getIpAddr() + "] WxMsgModelController::update"); return wxMsgModelService.saveOrUpdate(wxMsgModel); } @@ -54,6 +57,7 @@ public class WxMsgModelController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxMsgModelController::delete"); wxMsgModelService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -62,12 +66,14 @@ public class WxMsgModelController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMsgModelController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxMsgModelService.getById(id)); } @ApiOperation("获取所有数据") @GetMapping("getmodellist") public ResultData getmodellist() { + logger.debug("[" + getIpAddr() + "] WxMsgModelController::getmodellist"); return wxMsgModelService.getmodellist(getTenantId()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java index 61c96cea5..e8799a632 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java @@ -27,6 +27,7 @@ public class WxMsgSignatureController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxMsgSignature wxMsgSignature, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::list"); if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); wxMsgSignature.setTenantId(getTenantId()); wxMsgSignature.setSortColumns(WxMsgSignature.Field.Createtime_DESC); @@ -37,6 +38,7 @@ public class WxMsgSignatureController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsgSignature wxMsgSignature) { + logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::add"); //Assert.notNull(wxMsgSignature.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMsgSignature.setTenantId(getTenantId()); @@ -47,6 +49,7 @@ public class WxMsgSignatureController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxMsgSignature wxMsgSignature) { + logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::update"); wxMsgSignatureService.saveOrUpdate(wxMsgSignature); return new ResultData(); } @@ -55,6 +58,7 @@ public class WxMsgSignatureController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::delete"); wxMsgSignatureService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -63,12 +67,14 @@ public class WxMsgSignatureController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxMsgSignatureService.getById(id)); } @ApiOperation("获取所有数据") @GetMapping("getsignaturelist") public ResultData getmodellist() { + logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::getmodellist"); return wxMsgSignatureService.getsignaturelist(getTenantId()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index a2b501467..4447f2589 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -25,6 +25,7 @@ public class WxMsgValidationcodeController extends BaseController { @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxMsgValidationcode wxMsgValidationcode,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::list"); if (null == wxMsgValidationcode) wxMsgValidationcode = new WxMsgValidationcode(); final PageInfo page = wxMsgValidationcodeService.listAsPage(wxMsgValidationcode, pageNum, pageSize); return new ResultData(page); @@ -32,6 +33,7 @@ public class WxMsgValidationcodeController extends BaseController { @PostMapping("add") public ResultData add(@RequestBody WxMsgValidationcode wxMsgValidationcode) { + logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::add"); //Assert.notNull(wxMsgValidationcode.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMsgValidationcodeService.saveOrUpdate(wxMsgValidationcode); @@ -40,6 +42,7 @@ public class WxMsgValidationcodeController extends BaseController { @PostMapping("update") public ResultData update(@RequestBody WxMsgValidationcode wxMsgValidationcode) { + logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::update"); wxMsgValidationcodeService.saveOrUpdate(wxMsgValidationcode); return new ResultData(); } @@ -47,13 +50,15 @@ public class WxMsgValidationcodeController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::update"); wxMsgValidationcodeService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::findById"); return new ResultData(Result.SUCCESS,"查询成功",wxMsgValidationcodeService.getById(id)); } @@ -66,6 +71,7 @@ public class WxMsgValidationcodeController extends BaseController { @ApiImplicitParam(name="type",value="场景",dataType="Integer", paramType = "query",required=true), @ApiImplicitParam(name="appid",value="appid",dataType="String", paramType = "query",required=true)}) public ResultData sendvalidationcode(String tenantId,String phone,Integer type,String appid) { + logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::sendvalidationcode"); WxMsgValidationcode wxMsgValidationcode =new WxMsgValidationcode(); wxMsgValidationcode.setTenantId(tenantId); wxMsgValidationcode.setPhone(phone); @@ -82,6 +88,7 @@ public class WxMsgValidationcodeController extends BaseController { @ApiImplicitParam(name="code",value="验证码",dataType="String", paramType = "query",required=true), @ApiImplicitParam(name="appid",value="appid",dataType="String", paramType = "query",required=true)}) public ResultData hasvalidationcode(String tenantId,String phone,Integer type,String code,String appid) { + logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::hasvalidationcode"); WxMsgValidationcode wxMsgValidationcode =new WxMsgValidationcode(); wxMsgValidationcode.setTenantId(tenantId); wxMsgValidationcode.setPhone(phone); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeModelController.java index 08a3ccea8..ff28aa2f7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeModelController.java @@ -25,6 +25,7 @@ public class WxMsgValidationcodeModelController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxMsgValidationcodeModel wxMsgValidationcodeModel, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::list"); if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); wxMsgValidationcodeModel.setTenantId(getTenantId()); final PageInfo page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); @@ -33,6 +34,7 @@ public class WxMsgValidationcodeModelController extends BaseController { @PostMapping("add") public ResultData add(@RequestBody WxMsgValidationcodeModel wxMsgValidationcodeModel) { + logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::add"); //Assert.notNull(wxMsgValidationcodeModel.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMsgValidationcodeModel.setTenantId(getTenantId()); @@ -41,6 +43,7 @@ public class WxMsgValidationcodeModelController extends BaseController { @PostMapping("update") public ResultData update(@RequestBody WxMsgValidationcodeModel wxMsgValidationcodeModel) { + logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::update"); wxMsgValidationcodeModelService.saveOrUpdate(wxMsgValidationcodeModel); return new ResultData(); } @@ -48,6 +51,7 @@ public class WxMsgValidationcodeModelController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData delete(String id) { + logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::delete"); wxMsgValidationcodeModelService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -55,6 +59,7 @@ public class WxMsgValidationcodeModelController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData findById(String id) { + logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxMsgValidationcodeModelService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxOrderController.java index ff221912a..ddee7b7df 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxOrderController.java @@ -31,6 +31,7 @@ public class WxOrderController extends BaseController { @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", defaultValue = "0", required = false, dataType = "int") }) public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxOrderController::list"); if (null == wxOrder) wxOrder = new WxOrder(); wxOrder.setTenantId(getTenantId()); wxOrder.setSortColumns(WxOrder.Field.Id_DESC); @@ -41,6 +42,7 @@ public class WxOrderController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxOrder wxOrder) { + logger.debug("[" + getIpAddr() + "] WxOrderController::add"); //Assert.notNull(wxOrder.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxOrderService.saveOrUpdate(wxOrder); @@ -50,6 +52,7 @@ public class WxOrderController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxOrder wxOrder) { + logger.debug("[" + getIpAddr() + "] WxOrderController::update"); wxOrderService.saveOrUpdate(wxOrder); return new ResultData(); } @@ -58,6 +61,7 @@ public class WxOrderController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxOrderController::delete"); wxOrderService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -66,7 +70,8 @@ public class WxOrderController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxOrderService.getById(id)); + logger.debug("[" + getIpAddr() + "] WxOrderController::findById"); + return new ResultData(Result.SUCCESS,"查询成功",wxOrderService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxParkController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxParkController.java index e73b77e3b..8721b8990 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxParkController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxParkController.java @@ -27,6 +27,7 @@ public class WxParkController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxPark wxPark, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxParkController::list"); if (null == wxPark) wxPark = new WxPark(); final PageInfo page = wxParkService.listAsPage(wxPark, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxParkController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxPark wxPark) { + logger.debug("[" + getIpAddr() + "] WxParkController::add"); //Assert.notNull(wxPark.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxParkService.saveOrUpdate(wxPark); @@ -44,6 +46,7 @@ public class WxParkController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxPark wxPark) { + logger.debug("[" + getIpAddr() + "] WxParkController::update"); wxParkService.saveOrUpdate(wxPark); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxParkController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxParkController::delete"); wxParkService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,6 +64,7 @@ public class WxParkController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxParkController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxParkService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayAccountController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxPayAccountController.java index 36d2fca4e..f3974b829 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayAccountController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxPayAccountController.java @@ -29,6 +29,7 @@ public class WxPayAccountController extends BaseController { @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxPayAccount wxPayAccount,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxPayAccountController::list"); if (null == wxPayAccount) wxPayAccount = new WxPayAccount(); final PageInfo page = wxPayAccountService.listAsPage(wxPayAccount, pageNum, pageSize); return new ResultData(page); @@ -37,6 +38,7 @@ public class WxPayAccountController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxPayAccount wxPayAccount) { + logger.debug("[" + getIpAddr() + "] WxPayAccountController::add"); //Assert.notNull(wxPayAccount.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxPayAccountService.saveOrUpdate(wxPayAccount); @@ -46,6 +48,7 @@ public class WxPayAccountController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxPayAccount wxPayAccount) { + logger.debug("[" + getIpAddr() + "] WxPayAccountController::update"); wxPayAccountService.saveOrUpdate(wxPayAccount); return new ResultData(); } @@ -54,14 +57,16 @@ public class WxPayAccountController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxPayAccountController::delete"); wxPayAccountService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxPayAccountController::findById"); return new ResultData(Result.SUCCESS,"查询成功",wxPayAccountService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxPayBillController.java index be2632faa..4e74ec196 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxPayBillController.java @@ -48,7 +48,7 @@ public class WxPayBillController extends BaseController { @RequestMapping(value = "/pay", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @ResponseBody public String _payNotify(HttpServletRequest request) throws IOException, JDOMException { - logger.info("微信支付回调"); + logger.info("[" +getIpAddr() + "]微信支付回调Bill"); InputStream inStream = request.getInputStream(); ByteArrayOutputStream outSteam = new ByteArrayOutputStream(); byte[] buffer = new byte[1024]; @@ -111,6 +111,7 @@ public class WxPayBillController extends BaseController { */ @RequestMapping(value = "/refund") public String __refundNotify(HttpServletRequest request) throws Exception { + logger.info("[" +getIpAddr() + "]微信退款回调Bill"); Map paramMap = null; String response = ""; String xml = ""; @@ -149,6 +150,7 @@ public class WxPayBillController extends BaseController { */ @RequestMapping(value = "/sharing") public String __shareNotify(HttpServletRequest request) throws Exception { + logger.info("[" +getIpAddr() + "]微信分账回调Bill"); Map paramMap = null; String response = ""; String xml = ""; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java index e0d431e49..123709f73 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java @@ -44,7 +44,7 @@ public class WxPayController extends BaseController { @RequestMapping(value = "/pay", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @ResponseBody public String _payNotify(HttpServletRequest request) throws IOException, JDOMException { - logger.info("微信支付回调"); + logger.info("[" +getIpAddr() + "]微信支付回调"); InputStream inStream = request.getInputStream(); ByteArrayOutputStream outSteam = new ByteArrayOutputStream(); byte[] buffer = new byte[1024]; @@ -107,6 +107,7 @@ public class WxPayController extends BaseController { */ @RequestMapping(value = "/refund") public String __refundNotify(HttpServletRequest request) throws Exception { + logger.info("[" +getIpAddr() + "]微信退款回调"); Map paramMap = null; String response = ""; String xml = ""; @@ -145,6 +146,7 @@ public class WxPayController extends BaseController { */ @RequestMapping(value = "/sharing") public String __shareNotify(HttpServletRequest request) throws Exception { + logger.info("[" +getIpAddr() + "]微信分账回调"); Map paramMap = null; String response = ""; String xml = ""; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxPayOrderController.java index 7abf7f08e..a5630c2af 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -25,6 +25,12 @@ public class WxPayOrderController extends BaseController { @Autowired private WxPayOrderService wxPayOrderService; + @Autowired + private WxProfitSharingOrderService xProfitSharingOrderService; + + @Autowired + private WxAppinfoService wxAppinfoService; + @ApiOperation("分页列表接口") @GetMapping("list") @@ -32,6 +38,7 @@ public class WxPayOrderController extends BaseController { @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxPayOrder wxPayOrder,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxPayOrderController::list"); if (null == wxPayOrder) wxPayOrder = new WxPayOrder(); final PageInfo page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); return new ResultData(page); @@ -40,6 +47,7 @@ public class WxPayOrderController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxPayOrder wxPayOrder) { + logger.debug("[" + getIpAddr() + "] WxPayOrderController::add"); //Assert.notNull(wxPayOrder.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxPayOrderService.saveOrUpdate(wxPayOrder); @@ -49,30 +57,25 @@ public class WxPayOrderController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxPayOrder wxPayOrder) { + logger.debug("[" + getIpAddr() + "] WxPayOrderController::update"); wxPayOrderService.saveOrUpdate(wxPayOrder); return new ResultData(); } @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxPayOrderController::delete"); wxPayOrderService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxPayOrderService.getById(id)); + logger.debug("[" + getIpAddr() + "] WxPayOrderController::findById"); + return new ResultData(Result.SUCCESS,"查询成功",wxPayOrderService.getById(id)); } - - - - @Autowired - private WxProfitSharingOrderService xProfitSharingOrderService; - - @Autowired - private WxAppinfoService wxAppinfoService; } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingReceiverController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingReceiverController.java index f2e87c1d4..02935404b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingReceiverController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingReceiverController.java @@ -31,6 +31,7 @@ public class WxProfitSharingReceiverController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxProfitSharingReceiver receiver, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxProfitSharingReceiverController::list"); if (null == receiver) receiver = new WxProfitSharingReceiver(); final PageInfo page = wxProfitSharingReceiverService.listAsPage(receiver, pageNum, pageSize); return new ResultData(page); @@ -40,6 +41,7 @@ public class WxProfitSharingReceiverController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@ModelAttribute WxProfitSharingReceiver receiver) { + logger.debug("[" + getIpAddr() + "] WxProfitSharingReceiverController::add"); if (receiver == null) return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); @@ -65,6 +67,7 @@ public class WxProfitSharingReceiverController extends BaseController { @ApiOperation("根据id删除接口") @GetMapping("del") public ResultData delete(@ModelAttribute WxProfitSharingReceiver receiver) { + logger.debug("[" + getIpAddr() + "] WxProfitSharingReceiverController::delete"); if (receiver == null) return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); if (receiver.getMerchantId() == null) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java index 3176b7e14..22c9b66e3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java @@ -32,6 +32,7 @@ public class WxPropertyContractController extends BaseController @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxPropertyContract wxPropertyContract,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::list"); if (null == wxPropertyContract){ wxPropertyContract = new WxPropertyContract(); } @@ -42,12 +43,14 @@ public class WxPropertyContractController extends BaseController @PostMapping("add") public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) { + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::add"); wxPropertyContract.setTenantId(getTenantId()); return wxPropertyContractService.saveOrUpdate(wxPropertyContract); } @PostMapping("update") public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update"); wxPropertyContract.setTenantId(getTenantId()); return wxPropertyContractService.saveOrUpdate(wxPropertyContract); } @@ -55,6 +58,7 @@ public class WxPropertyContractController extends BaseController @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::delete"); wxPropertyContractService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -62,39 +66,46 @@ public class WxPropertyContractController extends BaseController @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::findById"); return wxPropertyContractService.getById(id); } @RequestMapping("/download") public void download(HttpServletRequest request, HttpServletResponse response){ + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::download"); wxPropertyContractService.download(request,response,getTenantId()); } @GetMapping("/getPropertyContractStatusInfo") public ResultData getPropertyContractStatusInfo() { + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getPropertyContractStatusInfo"); return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getRentContractStatusInfo(getTenantId())); } @GetMapping("/endPropertyContract") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData endRentContract(Long id) { + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::endRentContract"); return wxPropertyContractService.endRentContract(id); } @GetMapping("/getRentContractList") public ResultData getRentContractList() { + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getRentContractList"); return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getRentContractList(getTenantId())); } @GetMapping("/endPropertyContractByRentContractId") @ApiImplicitParam(name = "rentContractId", value = "rentContractId", dataType = "Long", paramType = "query", required = true) public ResultData endPropertyContractByRentContractId(Long rentContractId) { + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::endPropertyContractByRentContractId"); return wxPropertyContractService.endPropertyContractByRentContractId(rentContractId); } @GetMapping("/hasRentContract") @ApiImplicitParam(name = "rentContractId", value = "rentContractId", dataType = "Long", paramType = "query", required = true) public ResultData hasRentContract(Long rentContractId) { + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::hasRentContract"); return wxPropertyContractService.hasRentContract(rentContractId); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxQuestionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxQuestionController.java index 74c67171a..b21ff7046 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxQuestionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxQuestionController.java @@ -31,6 +31,7 @@ public class WxQuestionController extends BaseController { @ApiOperation("查寻问券配置") @GetMapping("getConfig") public Result getQuestionConfig() { + logger.debug("[" + getIpAddr() + "] WxQuestionController::getQuestionConfig"); WxQuestionConfig wxQuestionConfig = new WxQuestionConfig(); WxQuestion wxQuestion = new WxQuestion(); wxQuestionConfig.setTenantId(getTenantId()); @@ -52,6 +53,7 @@ public class WxQuestionController extends BaseController { @ApiOperation("设置问券配置") @PostMapping("setConfig") public Result setQuestionConfig(@RequestBody WxQuestionConfig wxQuestionConfig) { + logger.debug("[" + getIpAddr() + "] WxQuestionController::setQuestionConfig"); if (wxQuestionConfig == null) return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); if (wxQuestionConfig.getQuestionList() == null) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRefundOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRefundOrderController.java index f354dac62..3e193e2d3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRefundOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRefundOrderController.java @@ -30,6 +30,7 @@ public class WxRefundOrderController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxRefundOrder wxRefundOrder, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxRefundOrderController::list"); if (null == wxRefundOrder) wxRefundOrder = new WxRefundOrder(); final PageInfo page = wxRefundOrderService.listAsPage(wxRefundOrder, pageNum, pageSize); return new ResultData(page); @@ -38,6 +39,7 @@ public class WxRefundOrderController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxRefundOrder wxRefundOrder) { + logger.debug("[" + getIpAddr() + "] WxRefundOrderController::add"); //Assert.notNull(wxRefundOrder.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxRefundOrderService.saveOrUpdate(wxRefundOrder); @@ -47,6 +49,7 @@ public class WxRefundOrderController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxRefundOrder wxRefundOrder) { + logger.debug("[" + getIpAddr() + "] WxRefundOrderController::update"); wxRefundOrderService.saveOrUpdate(wxRefundOrder); return new ResultData(); } @@ -55,6 +58,7 @@ public class WxRefundOrderController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxRefundOrderController::delete"); wxRefundOrderService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -63,6 +67,7 @@ public class WxRefundOrderController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxRefundOrderController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxRefundOrderService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index d3f94932a..354f80c47 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -31,6 +31,7 @@ public class WxRentContractController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::list"); if (null == wxRentContract) { wxRentContract = new WxRentContract(); } @@ -41,12 +42,14 @@ public class WxRentContractController extends BaseController { @PostMapping("add") public ResultData add(@RequestBody WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::add"); wxRentContract.setTenantId(getTenantId()); return wxRentContractService.saveOrUpdate(wxRentContract); } @PostMapping("update") public ResultData update(@RequestBody WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::update"); wxRentContract.setTenantId(getTenantId()); return wxRentContractService.saveOrUpdate(wxRentContract); } @@ -54,22 +57,26 @@ public class WxRentContractController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData delete(String id) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::delete"); return wxRentContractService.deleteById(id); } @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::findById"); return wxRentContractService.getById(id); } @RequestMapping("/download") public void download(HttpServletRequest request, HttpServletResponse response){ + logger.debug("[" + getIpAddr() + "] WxRentContractController::download"); wxRentContractService.download(request,response,getTenantId()); } @GetMapping("/getRentContractStatusInfo") public ResultData getRentContractStatusInfo() { + logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractStatusInfo"); return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getRentContractStatusInfo(getTenantId())); } @@ -78,11 +85,13 @@ public class WxRentContractController extends BaseController { @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true), @ApiImplicitParam(name = "status", value = "status", dataType = "int", paramType = "query", required = true)}) public ResultData endRentContract(Long id,Integer status) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::endRentContract"); return wxRentContractService.endRentContract(id,status); } @PostMapping("updateMerchant") public ResultData updateMerchant(@RequestBody WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::updateMerchant"); return wxRentContractService.updateMerchant(wxRentContract); } @@ -91,6 +100,7 @@ public class WxRentContractController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData getRentContractList(Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); return new ResultData(wxRentContractService.getRentContractList(getTenantId(),pageNum, pageSize)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreHistoryController.java index bd8afad52..5a64c5442 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreHistoryController.java @@ -27,6 +27,7 @@ public class WxScoreHistoryController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxScoreHistory wxScoreHistory, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxScoreHistoryController::list"); if (null == wxScoreHistory) wxScoreHistory = new WxScoreHistory(); final PageInfo page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxScoreHistoryController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxScoreHistory wxScoreHistory) { + logger.debug("[" + getIpAddr() + "] WxScoreHistoryController::add"); //Assert.notNull(wxScoreHistory.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxScoreHistoryService.saveOrUpdate(wxScoreHistory); @@ -44,6 +46,7 @@ public class WxScoreHistoryController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxScoreHistory wxScoreHistory) { + logger.debug("[" + getIpAddr() + "] WxScoreHistoryController::update"); wxScoreHistoryService.saveOrUpdate(wxScoreHistory); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxScoreHistoryController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxScoreHistoryController::delete"); wxScoreHistoryService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,6 +64,7 @@ public class WxScoreHistoryController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxScoreHistoryController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxScoreHistoryService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreRulesController.java index 1ac7d64ed..504d8b6d5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreRulesController.java @@ -26,6 +26,7 @@ public class WxScoreRulesController extends BaseController { @ApiOperation("成长值配置") @GetMapping("setting") public ResultData list() { + logger.debug("[" + getIpAddr() + "] WxScoreRulesController::list"); WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getTenantId()); return new ResultData(scoreRules); } @@ -33,6 +34,7 @@ public class WxScoreRulesController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxScoreRules wxScoreRules) { + logger.debug("[" + getIpAddr() + "] WxScoreRulesController::add"); wxScoreRules.setTenantId(getTenantId()); wxScoreRulesService.saveOrUpdate(wxScoreRules); return new ResultData(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreValidityPeriodController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreValidityPeriodController.java index a4b31e910..8ecab0cf8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreValidityPeriodController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreValidityPeriodController.java @@ -27,6 +27,7 @@ public class WxScoreValidityPeriodController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxScoreValidityPeriod wxScoreValidityPeriod, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxScoreValidityPeriodController::list"); if (null == wxScoreValidityPeriod) wxScoreValidityPeriod = new WxScoreValidityPeriod(); final PageInfo page = wxScoreValidityPeriodService.listAsPage(wxScoreValidityPeriod, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxScoreValidityPeriodController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxScoreValidityPeriod wxScoreValidityPeriod) { + logger.debug("[" + getIpAddr() + "] WxScoreValidityPeriodController::add"); //Assert.notNull(wxScoreValidityPeriod.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxScoreValidityPeriodService.saveOrUpdate(wxScoreValidityPeriod); @@ -44,6 +46,7 @@ public class WxScoreValidityPeriodController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxScoreValidityPeriod wxScoreValidityPeriod) { + logger.debug("[" + getIpAddr() + "] WxScoreValidityPeriodController::update"); wxScoreValidityPeriodService.saveOrUpdate(wxScoreValidityPeriod); return new ResultData(); } @@ -52,6 +55,7 @@ public class WxScoreValidityPeriodController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxScoreValidityPeriodController::delete"); wxScoreValidityPeriodService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,6 +64,7 @@ public class WxScoreValidityPeriodController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxScoreValidityPeriodController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxScoreValidityPeriodService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java index 9033cad9a..c9c05c7e9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java @@ -32,6 +32,7 @@ public class WxShopController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxShop wxShop, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxShopController::list"); if (null == wxShop){ wxShop = new WxShop(); } @@ -45,6 +46,7 @@ public class WxShopController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxShop wxShop) { + logger.debug("[" + getIpAddr() + "] WxShopController::add"); wxShop.setTenantId(getTenantId()); return wxShopService.saveOrUpdate(wxShop); } @@ -52,6 +54,7 @@ public class WxShopController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxShop wxShop) { + logger.debug("[" + getIpAddr() + "] WxShopController::update"); return wxShopService.saveOrUpdate(wxShop); } @@ -59,6 +62,7 @@ public class WxShopController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxShopController::delete"); wxShopService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -67,6 +71,7 @@ public class WxShopController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxShopController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxShopService.getById(id)); } @@ -74,6 +79,7 @@ public class WxShopController extends BaseController { @GetMapping("getShopListByShopNumber") @ApiImplicitParam(name = "shopNumber", value = "shopNumber", dataType = "String", paramType = "query", required = true) public ResultData getbshoplist(String shopNumber) { + logger.debug("[" + getIpAddr() + "] WxShopController::getbshoplist"); return wxShopService.getbshoplist(getTenantId(), shopNumber); } @@ -81,6 +87,7 @@ public class WxShopController extends BaseController { @GetMapping("getMerchantShopByShopId") @ApiImplicitParam(name = "shopId", value = "shopId", dataType = "String", paramType = "query", required = true) public ResultData getMerchantShopByShopId(String shopId) { + logger.debug("[" + getIpAddr() + "] WxShopController::getMerchantShopByShopId"); return wxShopService.getMerchantShopByShopId(getTenantId(), shopId); } @@ -90,6 +97,7 @@ public class WxShopController extends BaseController { @ApiImplicitParam(name = "shopNumber", value = "shopNumber", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query")}) public ResultData hasShopNumber(String shopNumber,Long id) { + logger.debug("[" + getIpAddr() + "] WxShopController::hasShopNumber"); return wxShopService.hasShopNumber(getTenantId(), shopNumber,id); } @@ -100,6 +108,7 @@ public class WxShopController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData listShopFromContract(@ModelAttribute WxShop wxShop, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxShopController::listShopFromContract"); if (null == wxShop){ wxShop = new WxShop(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTagsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxTagsController.java index 25974a675..bad796eeb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTagsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxTagsController.java @@ -48,6 +48,7 @@ public class WxTagsController extends BaseController { @GetMapping("getAllList") @ApiOperation("标签弹窗接口") public ResultData getAllList() { + logger.debug("[" + getIpAddr() + "] WxTagsController::getAllList"); List groupVos = new ArrayList<>(); List groups = wxTagsGroupService.findList(null); for(WxTagsGroup tg:groups) { @@ -81,12 +82,14 @@ public class WxTagsController extends BaseController { @ApiOperation("查询微信用户人群") @GetMapping("findCUserCountByTag") public Result findCUserCountByTag(Long[] tagIds) { + logger.debug("[" + getIpAddr() + "] WxTagsController::findCUserCountByTag"); return new ResultData(wxCUserTagsService.findTagListFromCUser(getTenantId(), Arrays.asList(tagIds))); } @ApiOperation("查询会员用户人群") @GetMapping("findCountByTag") public Result findCountByTag(Long[] tagIds) { + logger.debug("[" + getIpAddr() + "] WxTagsController::findCountByTag"); return new ResultData(wxCUserTagsService.findTagList(getTenantId(), Arrays.asList(tagIds))); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxUserChannelController.java index 8a5fe946e..5b3745ebf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxUserChannelController.java @@ -26,6 +26,7 @@ public class WxUserChannelController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxUserChannel wxUserChannel, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxUserChannelController::list"); if (null == wxUserChannel) wxUserChannel = new WxUserChannel(); final PageInfo page = wxUserChannelService.listAsPage(wxUserChannel, pageNum, pageSize); return new ResultData(page); @@ -34,6 +35,7 @@ public class WxUserChannelController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxUserChannel wxUserChannel) { + logger.debug("[" + getIpAddr() + "] WxUserChannelController::add"); //Assert.notNull(wxUserChannel.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxUserChannelService.saveOrUpdate(wxUserChannel); @@ -43,6 +45,7 @@ public class WxUserChannelController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxUserChannel wxUserChannel) { + logger.debug("[" + getIpAddr() + "] WxUserChannelController::update"); wxUserChannelService.saveOrUpdate(wxUserChannel); return new ResultData(); } @@ -51,6 +54,7 @@ public class WxUserChannelController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxUserChannelController::delete"); wxUserChannelService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -59,6 +63,7 @@ public class WxUserChannelController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxUserChannelController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxUserChannelService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxUserCouponController.java index da960ce43..b95ea15cb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxUserCouponController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("wxUserCoupon") -public class WxUserCouponController { +public class WxUserCouponController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -29,6 +29,7 @@ public class WxUserCouponController { @ApiOperation("查询用户卡券接口") @PostMapping("findByStatus") public ResultData findByStatus(@RequestBody WxUserCouponDto wxUserCoupon) { + logger.debug("[" + getIpAddr() + "] WxUserCouponController::findByStatus"); //根据用户id,用户卡券状态查找 if(wxUserCoupon==null||wxUserCoupon.getcUserId()==null||wxUserCoupon.getCouponStatus()==null){ return new ResultData(Result.ERROR,"查询失败"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java index 06f056b03..652b75c73 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java @@ -56,6 +56,7 @@ public class WxUserStructureController extends BaseController { @ApiOperation("查询会员性别结构") @GetMapping("/findUserSexStructure") public ResultData findUserSexStructure(Date startTime, Date endTime) { + logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserSexStructure"); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); dto.setTenantId(getTenantId()); dto.setStartTime(startTime); @@ -78,6 +79,7 @@ public class WxUserStructureController extends BaseController { @ApiOperation("查询会员年龄结构") @GetMapping("/findUserAgeStructure") public ResultData findUserAgeStructure(Date startTime, Date endTime) { + logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); dto.setTenantId(getTenantId()); dto.setStartTime(startTime); @@ -100,7 +102,7 @@ public class WxUserStructureController extends BaseController { @ApiOperation("查询会员积分结构") @GetMapping("/findUserLevelStructure") public ResultData findUserLevelStructure(Date startTime, Date endTime) { - + logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); WxLevelConfig wxLevelConfig = new WxLevelConfig(); wxLevelConfig.setTenantId(getTenantId()); wxLevelConfig.setSortColumns(WxLevelConfig.Field.Points_ASC); @@ -138,7 +140,7 @@ public class WxUserStructureController extends BaseController { @ApiOperation("查询会员绑车牌结构") @GetMapping("/findUserCarStructure") public ResultData findCarLevelStructure(Date startTime, Date endTime) { - + logger.debug("[" + getIpAddr() + "] WxUserStructureController::findCarLevelStructure"); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); dto.setTenantId(getTenantId()); dto.setStartTime(startTime); @@ -179,7 +181,7 @@ public class WxUserStructureController extends BaseController { @ApiOperation("查询会员手机品牌结构") @GetMapping("/findUserPhoneBandStructure") public ResultData findUserPhoneBandStructure(Date startTime, Date endTime) { - + logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserPhoneBandStructure"); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); dto.setTenantId(getTenantId()); dto.setStartTime(startTime); @@ -215,7 +217,7 @@ public class WxUserStructureController extends BaseController { @ApiOperation("查询会员活跃结构") @GetMapping("/findUserActivityStructure") public ResultData findUserActivityStructure(Date startTime, Date endTime) { - + logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserActivityStructure"); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); dto.setTenantId(getTenantId()); dto.setStartTime(startTime); @@ -250,6 +252,7 @@ public class WxUserStructureController extends BaseController { @ApiOperation("查询会员数量") @GetMapping("/findUserDataCount") public ResultData findUserCount(Date startTime, Date endTime) { + logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserCount"); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); dto.setTenantId(getTenantId()); dto.setStartTime(startTime); @@ -418,6 +421,7 @@ public class WxUserStructureController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData findUserByChannel(@ModelAttribute WxCUser wxCUser, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserByChannel"); List sceneList = null; if (StringUtils.isNotBlank(wxCUser.getChannelName())) { WxUserChannel c = new WxUserChannel(); @@ -451,7 +455,7 @@ public class WxUserStructureController extends BaseController { @ApiOperation("获取用户所有渠道") @GetMapping("/findUserStructureByChannel") public ResultData findUserStructureByChannel(@ModelAttribute WxCUser wxCUser) { - + logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserStructureByChannel"); List channelStructureList = new ArrayList<>(); List senceStructureList = new ArrayList<>(); @@ -494,6 +498,7 @@ public class WxUserStructureController extends BaseController { @ApiOperation("获取用户所有渠道") @GetMapping("/findAllUserChannel") public ResultData findAllUserChannel() { + logger.debug("[" + getIpAddr() + "] WxUserStructureController::findAllUserChannel"); List channels = wxUserChannelService.findDistinctChannel(); List vos = new ArrayList<>(); for (WxUserChannel w : channels) {