From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java |   53 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java
index 09d0e10..b4c3535 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java
@@ -1,14 +1,16 @@
 package com.panzhihua.service_community.api;
 
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
 import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
 import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
 import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.service_community.service.ComOpsAdvService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -25,97 +27,112 @@
 
     /**
      * 获取广告跳转内容配置
+     * 
      * @return 跳转内容集合
      */
     @PostMapping("getjumpcontent")
-    public R getJumpContent(){
+    public R getJumpContent() {
         return comOpsAdvService.getJumpContent();
     }
 
     /**
      * 编辑运营后台系统配置
-     * @param appletesBackstageConfigDTO 编辑内容
+     * 
+     * @param appletesBackstageConfigDTO
+     *            编辑内容
      * @return 编辑结果
      */
     @PostMapping("putjumpcontent")
-    public R putJumpContent(@RequestBody AppletesBackstageConfigDTO appletesBackstageConfigDTO){
+    public R putJumpContent(@RequestBody AppletesBackstageConfigDTO appletesBackstageConfigDTO) {
         return comOpsAdvService.putJumpContent(appletesBackstageConfigDTO);
     }
 
     /**
      * 首页广告banner
+     * 
      * @return 广告列表
      */
     @PostMapping("listadvertisement")
-    public R listAdvertisement(){
+    public R listAdvertisement() {
         return comOpsAdvService.listAdvertisement();
     }
 
     /**
      * 新增广告
+     * 
      * @param comOpsAdvDTO
      * @return 新增结果
      */
     @PostMapping("addadvertisement")
-    public R addAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO){
+    public R addAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO) {
         return comOpsAdvService.addAdvertisement(comOpsAdvDTO);
     }
 
     /**
      * 编辑广告
-     * @param comOpsAdvDTO 编辑内容
+     * 
+     * @param comOpsAdvDTO
+     *            编辑内容
      * @return 编辑结果
      */
     @PostMapping("putadvertisement")
-    public R putAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO){
+    public R putAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO) {
         return comOpsAdvService.putAdvertisement(comOpsAdvDTO);
     }
 
     /**
      * 广告位置下拉列表
+     * 
      * @return 位置集合
      */
     @PostMapping("listadvpos")
-    public R listadvpos(){
+    public R listadvpos() {
         return comOpsAdvService.listadvpos();
     }
 
     /**
      * 跳转内容下拉集合
+     * 
      * @return 跳转集合
      */
     @PostMapping("listadvjump")
-    public R listAdvjump(){
+    public R listAdvjump() {
         return comOpsAdvService.listAdvjump();
     }
 
     /**
      * 分页查询广告
-     * @param pageComOpsAdvDTO 查询内容
+     * 
+     * @param pageComOpsAdvDTO
+     *            查询内容
      * @return 查询结果 ComOpsAdvVO
      */
     @PostMapping("pageadvertisement")
-    R pageAdvertisement(@RequestBody PageComOpsAdvDTO pageComOpsAdvDTO){
+    R pageAdvertisement(@RequestBody PageComOpsAdvDTO pageComOpsAdvDTO) {
         return comOpsAdvService.pageAdvertisement(pageComOpsAdvDTO);
     }
 
     /**
      * 广告详情
-     * @param id 主键
+     * 
+     * @param id
+     *            主键
      * @return 广告内容
      */
     @PostMapping("detailadvertisement")
-    public R detailAdvertisement(@RequestParam("id") Long id){
+    public R detailAdvertisement(@RequestParam("id") Long id) {
         return comOpsAdvService.detailAdvertisement(id);
     }
 
     /**
      * 删除广告
-     * @param id 主键
+     * 
+     * @param id
+     *            主键
      * @return 删除结果
      */
     @PostMapping("deleteadvertisement")
-    public R deleteAdvertisement(@RequestParam("id")Long id){
+    public R deleteAdvertisement(@RequestParam("id") Long id) {
         return comOpsAdvService.deleteAdvertisement(id);
     }
 }

--
Gitblit v1.7.1