From c094aa1a63e711a632f24a17f21462778829ecc7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Nov 2021 15:08:01 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-sys/src/main/java/com/xzx/gc/system/service/BannerService.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/gc-sys/src/main/java/com/xzx/gc/system/service/BannerService.java b/gc-sys/src/main/java/com/xzx/gc/system/service/BannerService.java
index 4ada7e8..5254e7e 100644
--- a/gc-sys/src/main/java/com/xzx/gc/system/service/BannerService.java
+++ b/gc-sys/src/main/java/com/xzx/gc/system/service/BannerService.java
@@ -7,13 +7,13 @@
import com.xzx.gc.entity.BannerInfo;
import com.xzx.gc.entity.CityPartner;
import com.xzx.gc.entity.CoreUser;
+import com.xzx.gc.entity.SysPopup;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.model.admin.BannerModel;
import com.xzx.gc.system.dto.*;
import com.xzx.gc.system.mapper.BannerMapper;
-import com.xzx.gc.system.vo.SysBannerListVo;
-import com.xzx.gc.system.vo.SysNewsListVo;
-import com.xzx.gc.system.vo.ViewSysBannerVo;
+import com.xzx.gc.system.mapper.SysPopupMapper;
+import com.xzx.gc.system.vo.*;
import com.xzx.gc.util.SessionUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +32,9 @@
@Autowired
private BannerMapper bannerMapper;
+
+ @Autowired
+ private SysPopupMapper sysPopupMapper;
@Autowired
private SessionUtil sessionUtil;
@@ -124,6 +127,7 @@
bannerInfo.setDelFlag(0);
bannerInfo.setPicName(model.getPicName());
bannerInfo.setPicUrl(model.getPicUrl());
+ bannerInfo.setPicPath(model.getPicPath());
bannerInfo.setSort(model.getSort());
bannerMapper.insertSelective(bannerInfo);
}
@@ -137,12 +141,13 @@
viewSysBannerVo.setId(bannerInfo.getId());
viewSysBannerVo.setPicName(bannerInfo.getPicName());
viewSysBannerVo.setPicUrl(bannerInfo.getPicUrl());
+ viewSysBannerVo.setPicPath(bannerInfo.getPicPath());
return viewSysBannerVo;
}
public void updateSysBanner(UpdateSysBannerDto model) {
- bannerMapper.updateBannerById(model.getSort(),model.getPicUrl(),model.getPicName(),model.getId());
+ bannerMapper.updateBannerById(model.getSort(),model.getPicPath(),model.getPicUrl(),model.getPicName(),model.getId());
}
public void delSysBanner(DelSysBannerDto model) {
@@ -152,4 +157,64 @@
public void onOffSysBanner(OnSysBannerDto model) {
bannerMapper.updateStatusById(model.getId(),model.getStatus());
}
+
+ public List<ApiBannerListVo> bannerList(ApiBannerListDto apiBannerListDto) {
+ return bannerMapper.selectBannerList();
+ }
+
+ public Map<String, Object> sysPopupList(SysPopupListDto sysPopupListDto) {
+ PageHelper.startPage(sysPopupListDto.getPage(), sysPopupListDto.getLimit());
+ List<SysPopupListVo> sysPopupListVos = bannerMapper.selectSysPopup(sysPopupListDto);
+ PageInfo<SysPopupListVo> pageInfo = new PageInfo<>(sysPopupListVos);
+
+ Map<String, Object> data = new HashMap<>();
+ int count = Convert.toInt(pageInfo.getTotal());
+ data.put("data", sysPopupListVos);
+ data.put("count", count);
+ data.put("code", 0);
+ return data;
+ }
+
+
+ public void addSysPopup(AddSysPopupDto model) {
+ SysPopup sysPopup = new SysPopup();
+ sysPopup.setArea(model.getArea());
+ sysPopup.setName(model.getName());
+ sysPopup.setAims(model.getAims());
+ sysPopup.setRules(model.getRules());
+ sysPopup.setIsOut(model.getIsOut());
+ sysPopup.setOutText(model.getOutText());
+ sysPopup.setStartTime(model.getStartTime());
+ sysPopup.setEndTime(model.getEndTime());
+ sysPopup.setImg(model.getImg());
+ sysPopup.setState(2);
+ sysPopupMapper.insertSelective(sysPopup);
+ }
+
+ public SysPopupListVo viewSysPopup(Long id) {
+ return bannerMapper.selectSysPopupById(id);
+ }
+
+ public void updateSysPopup(UpdateSysPopupDto model) {
+ bannerMapper.updateSysPopupById(
+ model.getId(),
+ model.getArea(),
+ model.getName(),
+ model.getAims(),
+ model.getRules(),
+ model.getIsOut(),
+ model.getOutText(),
+ model.getStartTime(),
+ model.getEndTime(),
+ model.getImg()
+ );
+ }
+
+ public void delSysPopup(DelSysPopupDto model) {
+ sysPopupMapper.deleteByPrimaryKey(model.getId());
+ }
+
+ public void onOffSysPopup(OnSysPopupDto model) {
+ bannerMapper.updateSysPopupStatusById(model.getId(),model.getStatus());
+ }
}
--
Gitblit v1.9.1