fix 广告

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/ActivityAdvertisingController.java

@@ -0,0 +1,66 @@
+package com.zhongzheng.controller.cmmon;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingAddBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingEditBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingQueryBo;
+import com.zhongzheng.modules.base.service.IActivityAdvertisingLocationService;
+import com.zhongzheng.modules.base.service.IActivityAdvertisingService;
+import com.zhongzheng.modules.base.vo.ActivityAdvertisingLocationVo;
+import com.zhongzheng.modules.base.vo.ActivityAdvertisingVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 广告发布储存Controller
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+@Api(value = "广告发布储存控制器", tags = {"广告发布储存管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/app/common/base/advertising")
+public class ActivityAdvertisingController extends BaseController {
+
+    private final IActivityAdvertisingService iActivityAdvertisingService;
+
+    private final IActivityAdvertisingLocationService iActivityAdvertisingLocationService;
+
+    /**
+     * 查询广告发布储存列表
+     */
+    @ApiOperation("查询广告发布储存列表")
+    @PreAuthorize("@ss.hasPermi('system:advertising:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ActivityAdvertisingVo> list(ActivityAdvertisingQueryBo bo) {
+        bo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
+        startPage();
+        List<ActivityAdvertisingVo> list = iActivityAdvertisingService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取广告位详细信息
+     */
+    @ApiOperation("获取首页广告位详细信息")
+    @PreAuthorize("@ss.hasPermi('system:location:query')")
+    @GetMapping("/homeLocation")
+    public AjaxResult<ActivityAdvertisingLocationVo> homeLocation() {
+        return AjaxResult.success(iActivityAdvertisingLocationService.queryByKey("home-banner"));
+    }
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/IActivityAdvertisingLocationService.java

@@ -23,6 +23,8 @@ public interface IActivityAdvertisingLocationService extends IService<ActivityAd
 	 */
 	ActivityAdvertisingLocationVo queryById(Long locationId);
 
+	ActivityAdvertisingLocationVo queryByKey(String key);
+
 	/**
 	 * 查询列表
 	 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ActivityAdvertisingLocationServiceImpl.java

@@ -36,6 +36,14 @@ public class ActivityAdvertisingLocationServiceImpl extends ServiceImpl<Activity
         return BeanUtil.toBean(db, ActivityAdvertisingLocationVo.class);
     }
 
+    @Override
+    public ActivityAdvertisingLocationVo queryByKey(String key) {
+        LambdaQueryWrapper<ActivityAdvertisingLocation> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ActivityAdvertisingLocation::getLocationKey, key);
+        ActivityAdvertisingLocation db = this.baseMapper.selectOne(lqw.last("limit 1"));
+        return BeanUtil.toBean(db, ActivityAdvertisingLocationVo.class);
+    }
+
     @Override
     public List<ActivityAdvertisingLocationVo> queryList(ActivityAdvertisingLocationQueryBo bo) {
         LambdaQueryWrapper<ActivityAdvertisingLocation> lqw = Wrappers.lambdaQuery();

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ActivityAdvertisingServiceImpl.java

@@ -45,7 +45,7 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
         lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ActivityAdvertising::getRemarks, bo.getRemarks());
         lqw.in(bo.getStatus() != null, ActivityAdvertising::getStatus, bo.getStatus());
         lqw.eq(bo.getJumpType() != null, ActivityAdvertising::getJumpType, bo.getJumpType());
-        lqw.eq(bo.getSort() != null, ActivityAdvertising::getSort, bo.getSort());
+        lqw.orderByDesc(bo.getSort() != null, ActivityAdvertising::getSort);
         lqw.like(StrUtil.isNotBlank(bo.getAdvName()), ActivityAdvertising::getAdvName, bo.getAdvName());
         return entity2Vo(this.list(lqw));
     }