From 727a69f859060093e685582fa10e5de82dcc138a Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期四, 29 十二月 2022 15:37:49 +0800
Subject: [PATCH] 放假备份。完成集中控制器对接。

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java |   63 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 4 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 8f8f570..f1b9713 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
@@ -14,6 +14,7 @@
 import com.sandu.ximon.dao.domain.WxConfigEntity;
 import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -40,6 +41,9 @@
      */
     @PostMapping("/addAliPayConfig")
     public ResponseVO<Object> addAliPayConfig(@RequestBody AlipayConfigParam configParam) {
+        if (!permissionConfig.check(MenuEnum.ALIPAY_CONFIG_ADD.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(alipayConfigService.addAliPayConfig(configParam));
     }
 
@@ -52,6 +56,9 @@
      */
     @PostMapping("/updateAliPayConfig/{configId}")
     public ResponseVO<Object> updateAliPayConfig(@PathVariable Integer configId, @RequestBody AlipayConfigParam configParam) {
+        if (!permissionConfig.check(MenuEnum.ALIPAY_CONFIG_UPDATE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(alipayConfigService.updateAliPayConfig(configId, configParam));
     }
 
@@ -63,6 +70,9 @@
      */
     @PostMapping("/deleteAliPayConfig/{configId}")
     public ResponseVO<Object> deleteAliPayConfig(@PathVariable Integer configId) {
+        if (!permissionConfig.check(MenuEnum.ALIPAY_CONFIG_DELETE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(alipayConfigService.deleteAliPayConfig(configId));
     }
 
@@ -83,6 +93,9 @@
      */
     @GetMapping("/getAliPayConfigById/{configId}")
     public ResponseVO<Object> getAliPayConfigById(@PathVariable Integer configId) {
+        if (!permissionConfig.check(MenuEnum.ALIPAY_CONFIG_DETAIL.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         if (configId == null) {
             throw new BusinessException("id鑳戒负绌�");
         }
@@ -97,6 +110,9 @@
     @GetMapping("/aliConfigList")
     public ResponseVO<Object> aliConfigList(BaseConditionVO baseConditionVO
             , @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.ALIPAY_CONFIG_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(alipayConfigService.configList(baseConditionVO, keyword));
     }
 
@@ -108,7 +124,10 @@
      * @return
      */
     @PostMapping("/addWxPayConfig")
-    public ResponseVO<Object> addAliPayConfig(@RequestBody WxpayConfigParam configParam) {
+    public ResponseVO<Object> addWxPayConfig(@Validated  @RequestBody WxpayConfigParam configParam) {
+        if (!permissionConfig.check(MenuEnum.WECHAT_CONFIG_ADD.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(wxPayConfigService.addWxPayConfig(configParam));
     }
 
@@ -120,7 +139,13 @@
      * @return
      */
     @PostMapping("/updateWxPayConfig/{configId}")
-    public ResponseVO<Object> updateAliPayConfig(@PathVariable Long configId, @RequestBody WxpayConfigParam configParam) {
+    public ResponseVO<Object> updateWxPayConfig(@PathVariable Long configId, @Validated  @RequestBody WxpayConfigParam configParam) {
+        if (!permissionConfig.check(MenuEnum.WECHAT_CONFIG_UPDATE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        if(configId==null){
+            throw new BusinessException("id涓嶈兘涓虹┖");
+        }
         return ResponseUtil.success(wxPayConfigService.updateWxPayConfig(configId, configParam));
     }
 
@@ -132,15 +157,24 @@
      */
     @PostMapping("/deleteWxPayConfig/{configId}")
     public ResponseVO<Object> deleteWxPayConfig(@PathVariable Long configId) {
+        if (!permissionConfig.check(MenuEnum.WECHAT_CONFIG_DELETE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        if(configId==null){
+            throw new BusinessException("id涓嶈兘涓虹┖");
+        }
         return ResponseUtil.success(wxPayConfigService.deleteWxPayConfig(configId));
     }
 
     /**
      * @param poleId
-     * @return
+     * @return 閫氳繃鐏潌id鑾峰彇閰嶇疆
      */
     @GetMapping("/getWxPayConfigByPoleId/{poleId}")
     public ResponseVO<Object> getWxPayConfigByPoleId(@PathVariable Long poleId) {
+        if(poleId==null){
+            throw new BusinessException("poleId涓嶈兘涓虹┖");
+        }
         return ResponseUtil.success(wxPayConfigService.getConfigByPoleId(poleId));
     }
 
@@ -152,6 +186,9 @@
      */
     @GetMapping("/getWxPayConfigById/{configId}")
     public ResponseVO<Object> getWxPayConfigById(@PathVariable Integer configId) {
+        if (!permissionConfig.check(MenuEnum.WECHAT_CONFIG_DETAIL.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         if (configId == null) {
             throw new BusinessException("id鑳戒负绌�");
         }
@@ -163,15 +200,33 @@
     }
 
 
+    /**
+     * wx閰嶇疆鍒楄〃
+     *
+     * @param baseConditionVO
+     * @param keyword
+     * @return
+     */
     @GetMapping("/WxConfigList")
     public ResponseVO<Object> WxConfigList(BaseConditionVO baseConditionVO
             , @RequestParam(value = "keyword", required = false) String keyword) {
-        if (!permissionConfig.check(MenuEnum.PAY_CONFIG.getCode())) {
+        if (!permissionConfig.check(MenuEnum.WECHAT_CONFIG_LIST.getCode())) {
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         return ResponseUtil.success(wxPayConfigService.configList(baseConditionVO, keyword));
     }
 
+    /**
+     * wx閰嶇疆鐨勫仠鐢�/鍚敤
+     */
+    @PostMapping("/updateWxPayConfigStatus")
+    public ResponseVO<Object> updateWxPayConfigStatus(@RequestBody WxpayConfigParam wxConfigParam) {
+        if (!permissionConfig.check(MenuEnum.WECHAT_CONFIG_UPDATE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        return ResponseUtil.success(wxPayConfigService.updateState(wxConfigParam.getConfigId(), wxConfigParam.getStatus()));
+    }
+
 
 }

--
Gitblit v1.9.3