From 981055073317b3b07534d5ac504a4e470e87f3d8 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 30 三月 2022 11:04:22 +0800
Subject: [PATCH] 摄像头

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java |   48 +++++++++++++++++++++++++-----------------------
 1 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java
index 8aac5fd..1943139 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java
@@ -1,5 +1,6 @@
 package com.sandu.ximon.admin.controller;
 
+import com.github.pagehelper.PageHelper;
 import com.sandu.common.domain.ResponseVO;
 import com.sandu.common.execption.BusinessException;
 import com.sandu.common.object.BaseConditionVO;
@@ -7,7 +8,7 @@
 import com.sandu.ximon.admin.param.AlipayConfigParam;
 import com.sandu.ximon.admin.param.WxpayConfigParam;
 import com.sandu.ximon.admin.pay.alipay.UsrAlipayConfigService;
-import com.sandu.ximon.admin.pay.alipay.UsrWxPayConfigService;
+import com.sandu.ximon.admin.pay.wxpay.UsrWxPayConfigService;
 import com.sandu.ximon.dao.domain.AliConfigEntity;
 import com.sandu.ximon.dao.domain.WxConfigEntity;
 import lombok.AllArgsConstructor;
@@ -30,6 +31,7 @@
 
     /**
      * 鏀粯瀹濋厤缃坊鍔�
+     *
      * @param configParam
      * @return
      */
@@ -40,17 +42,19 @@
 
     /**
      * 鏀粯瀹濋厤缃洿鏀�
+     *
      * @param configId
      * @param configParam
      * @return
      */
     @PostMapping("/updateAliPayConfig/{configId}")
     public ResponseVO<Object> updateAliPayConfig(@PathVariable Integer configId, @RequestBody AlipayConfigParam configParam) {
-        return ResponseUtil.success(alipayConfigService.updateAliPayConfig(configId,configParam));
+        return ResponseUtil.success(alipayConfigService.updateAliPayConfig(configId, configParam));
     }
 
     /**
      * 鏀粯瀹濋厤缃垹闄�
+     *
      * @param configId
      * @return
      */
@@ -60,7 +64,6 @@
     }
 
     /**
-     *
      * @param poleId
      * @return
      */
@@ -70,17 +73,18 @@
     }
 
     /**
-     *閰嶇疆璇︽儏
+     * 閰嶇疆璇︽儏
+     *
      * @param configId
      * @return
      */
     @GetMapping("/getAliPayConfigById/{configId}")
     public ResponseVO<Object> getAliPayConfigById(@PathVariable Integer configId) {
-        if(configId==null){
+        if (configId == null) {
             throw new BusinessException("id鑳戒负绌�");
         }
         AliConfigEntity byId = alipayConfigService.getById(configId);
-        if(byId==null){
+        if (byId == null) {
             throw new BusinessException("閰嶇疆id閿欒鎴栭厤缃笉瀛樺湪");
         }
         return ResponseUtil.success(byId);
@@ -88,16 +92,15 @@
 
 
     @GetMapping("/aliConfigList")
-    public ResponseVO<Object> aliConfigList(BaseConditionVO baseConditionVO) {
-        return ResponseUtil.success(alipayConfigService.configList(baseConditionVO));
+    public ResponseVO<Object> aliConfigList(BaseConditionVO baseConditionVO
+            , @RequestParam(value = "keyword", required = false) String keyword) {
+        return ResponseUtil.success(alipayConfigService.configList(baseConditionVO, keyword));
     }
-
-
-
 
 
     /**
      * wx閰嶇疆娣诲姞
+     *
      * @param configParam
      * @return
      */
@@ -108,17 +111,19 @@
 
     /**
      * wx閰嶇疆鏇存敼
+     *
      * @param configId
      * @param configParam
      * @return
      */
     @PostMapping("/updateWxPayConfig/{configId}")
     public ResponseVO<Object> updateAliPayConfig(@PathVariable Long configId, @RequestBody WxpayConfigParam configParam) {
-        return ResponseUtil.success(wxPayConfigService.updateWxPayConfig(configId,configParam));
+        return ResponseUtil.success(wxPayConfigService.updateWxPayConfig(configId, configParam));
     }
 
     /**
      * wx閰嶇疆鍒犻櫎
+     *
      * @param configId
      * @return
      */
@@ -128,7 +133,6 @@
     }
 
     /**
-     *
      * @param poleId
      * @return
      */
@@ -138,17 +142,18 @@
     }
 
     /**
-     *閰嶇疆璇︽儏
+     * 閰嶇疆璇︽儏
+     *
      * @param configId
      * @return
      */
     @GetMapping("/getWxPayConfigById/{configId}")
     public ResponseVO<Object> getWxPayConfigById(@PathVariable Integer configId) {
-        if(configId==null){
+        if (configId == null) {
             throw new BusinessException("id鑳戒负绌�");
         }
         WxConfigEntity byId = wxPayConfigService.getById(configId);
-        if(byId==null){
+        if (byId == null) {
             throw new BusinessException("閰嶇疆id閿欒鎴栭厤缃笉瀛樺湪");
         }
         return ResponseUtil.success(byId);
@@ -156,14 +161,11 @@
 
 
     @GetMapping("/WxConfigList")
-    public ResponseVO<Object> WxConfigList(BaseConditionVO baseConditionVO) {
-        return ResponseUtil.success(wxPayConfigService.configList(baseConditionVO));
+    public ResponseVO<Object> WxConfigList(BaseConditionVO baseConditionVO
+            , @RequestParam(value = "keyword", required = false) String keyword) {
+        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+        return ResponseUtil.success(wxPayConfigService.configList(baseConditionVO, keyword));
     }
-
-
-
-
-
 
 
 }

--
Gitblit v1.9.3