轮播功能

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/dao/WebsiteAdvDao.java → roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/dao/WebsiteCarouselDao.java

 package com.roncoo.education.system.dao;
 
 import com.roncoo.education.common.core.base.Page;
-import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteAdv;
-import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteAdvExample;
+import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarousel;
+import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarouselExample;
 
 import java.util.List;
 
@@ -10,9 +10,9 @@ import java.util.List;
  * 广告信息 服务类
  *
  * @author wujing
- * @date 2022-08-25
+ * @date 2022-09-16
  */
-public interface WebsiteAdvDao {
+public interface WebsiteCarouselDao {
 
     /**
      * 保存广告信息
@@ -20,7 +20,7 @@ public interface WebsiteAdvDao {
      * @param record 广告信息
      * @return 影响记录数
      */
-    int save(WebsiteAdv record);
+    int save(WebsiteCarousel record);
 
     /**
      * 根据ID删除广告信息
@@ -36,7 +36,7 @@ public interface WebsiteAdvDao {
      * @param record 广告信息
      * @return 影响记录数
      */
-    int updateById(WebsiteAdv record);
+    int updateById(WebsiteCarousel record);
 
     /**
      * 根据ID获取广告信息
@@ -44,7 +44,7 @@ public interface WebsiteAdvDao {
      * @param id 主键ID
      * @return 广告信息
      */
-    WebsiteAdv getById(Long id);
+    WebsiteCarousel getById(Long id);
 
     /**
      * 广告信息--分页查询
@@ -54,21 +54,21 @@ public interface WebsiteAdvDao {
      * @param example     查询条件
      * @return 分页结果
      */
-    Page<WebsiteAdv> page(int pageCurrent, int pageSize, WebsiteAdvExample example);
+    Page<WebsiteCarousel> page(int pageCurrent, int pageSize, WebsiteCarouselExample example);
 
     /**
      * 广告信息--条件列出
      *
-     * @param example 查询条件
+     * @param example     查询条件
      * @return 广告信息列表
      */
-    List<WebsiteAdv> listByExample(WebsiteAdvExample example);
+    List<WebsiteCarousel> listByExample(WebsiteCarouselExample example);
 
     /**
      * 广告信息--条件统计
      *
-     * @param example 统计条件
+     * @param example     统计条件
      * @return 广告信息数量
      */
-    int countByExample(WebsiteAdvExample example);
+    int countByExample(WebsiteCarouselExample example);
 }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/dao/impl/WebsiteAdvDaoImpl.java → roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/dao/impl/WebsiteCarouselDaoImpl.java

@@ -3,10 +3,10 @@ package com.roncoo.education.system.dao.impl;
 import com.roncoo.education.common.core.base.Page;
 import com.roncoo.education.common.core.base.PageUtil;
 import com.roncoo.education.common.core.tools.IdWorker;
-import com.roncoo.education.system.dao.WebsiteAdvDao;
-import com.roncoo.education.system.dao.impl.mapper.WebsiteAdvMapper;
-import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteAdv;
-import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteAdvExample;
+import com.roncoo.education.system.dao.WebsiteCarouselDao;
+import com.roncoo.education.system.dao.impl.mapper.WebsiteCarouselMapper;
+import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarousel;
+import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarouselExample;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
@@ -17,17 +17,17 @@ import java.util.List;
  * 广告信息 服务实现类
  *
  * @author wujing
- * @date 2022-08-25
+ * @date 2022-09-16
  */
 @Repository
 @RequiredArgsConstructor
-public class WebsiteAdvDaoImpl implements WebsiteAdvDao {
+public class WebsiteCarouselDaoImpl implements WebsiteCarouselDao {
 
     @NotNull
-    private final WebsiteAdvMapper mapper;
+    private final WebsiteCarouselMapper mapper;
 
     @Override
-    public int save(WebsiteAdv record) {
+    public int save(WebsiteCarousel record) {
         if (record.getId() == null) {
             record.setId(IdWorker.getId());
         }
@@ -40,19 +40,19 @@ public class WebsiteAdvDaoImpl implements WebsiteAdvDao {
     }
 
     @Override
-    public int updateById(WebsiteAdv record) {
+    public int updateById(WebsiteCarousel record) {
         record.setGmtCreate(null);
         record.setGmtModified(null);
         return this.mapper.updateByPrimaryKeySelective(record);
     }
 
     @Override
-    public WebsiteAdv getById(Long id) {
+    public WebsiteCarousel getById(Long id) {
         return this.mapper.selectByPrimaryKey(id);
     }
 
     @Override
-    public Page<WebsiteAdv> page(int pageCurrent, int pageSize, WebsiteAdvExample example) {
+    public Page<WebsiteCarousel> page(int pageCurrent, int pageSize, WebsiteCarouselExample example) {
         int count = this.mapper.countByExample(example);
         pageSize = PageUtil.checkPageSize(pageSize);
         pageCurrent = PageUtil.checkPageCurrent(count, pageSize, pageCurrent);
@@ -63,12 +63,12 @@ public class WebsiteAdvDaoImpl implements WebsiteAdvDao {
     }
 
     @Override
-    public List<WebsiteAdv> listByExample(WebsiteAdvExample example) {
+    public List<WebsiteCarousel> listByExample(WebsiteCarouselExample example) {
         return this.mapper.selectByExample(example);
     }
 
     @Override
-    public int countByExample(WebsiteAdvExample example) {
+    public int countByExample(WebsiteCarouselExample example){
         return this.mapper.countByExample(example);
     }
 }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/dao/impl/mapper/WebsiteAdvMapper.java → roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/dao/impl/mapper/WebsiteCarouselMapper.java

 package com.roncoo.education.system.dao.impl.mapper;
 
-import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteAdv;
-import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteAdvExample;
+import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarousel;
+import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarouselExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
-public interface WebsiteAdvMapper {
-    int countByExample(WebsiteAdvExample example);
+public interface WebsiteCarouselMapper {
+    int countByExample(WebsiteCarouselExample example);
 
-    int deleteByExample(WebsiteAdvExample example);
+    int deleteByExample(WebsiteCarouselExample example);
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(WebsiteAdv record);
+    int insert(WebsiteCarousel record);
 
-    int insertSelective(WebsiteAdv record);
+    int insertSelective(WebsiteCarousel record);
 
-    List<WebsiteAdv> selectByExample(WebsiteAdvExample example);
+    List<WebsiteCarousel> selectByExample(WebsiteCarouselExample example);
 
-    WebsiteAdv selectByPrimaryKey(Long id);
+    WebsiteCarousel selectByPrimaryKey(Long id);
 
-    int updateByExampleSelective(@Param("record") WebsiteAdv record, @Param("example") WebsiteAdvExample example);
+    int updateByExampleSelective(@Param("record") WebsiteCarousel record, @Param("example") WebsiteCarouselExample example);
 
-    int updateByExample(@Param("record") WebsiteAdv record, @Param("example") WebsiteAdvExample example);
+    int updateByExample(@Param("record") WebsiteCarousel record, @Param("example") WebsiteCarouselExample example);
 
-    int updateByPrimaryKeySelective(WebsiteAdv record);
+    int updateByPrimaryKeySelective(WebsiteCarousel record);
 
-    int updateByPrimaryKey(WebsiteAdv record);
+    int updateByPrimaryKey(WebsiteCarousel record);
 }
\ No newline at end of file

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/dao/impl/mapper/entity/WebsiteAdv.java → roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/dao/impl/mapper/entity/WebsiteCarousel.java

@@ -3,7 +3,7 @@ package com.roncoo.education.system.dao.impl.mapper.entity;
 import java.io.Serializable;
 import java.util.Date;
 
-public class WebsiteAdv implements Serializable {
+public class WebsiteCarousel implements Serializable {
     private Long id;
 
     private Date gmtCreate;
@@ -14,22 +14,18 @@ public class WebsiteAdv implements Serializable {
 
     private Integer sort;
 
-    private String advTitle;
+    private String carouselTitle;
 
-    private String advImg;
+    private String carouselImg;
 
-    private String advUrl;
+    private String carouselUrl;
 
-    private String advTarget;
-
-    private Integer advLocation;
+    private String carouselTarget;
 
     private Date beginTime;
 
     private Date endTime;
 
-    private Integer platShow;
-
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -72,44 +68,36 @@ public class WebsiteAdv implements Serializable {
         this.sort = sort;
     }
 
-    public String getAdvTitle() {
-        return advTitle;
-    }
-
-    public void setAdvTitle(String advTitle) {
-        this.advTitle = advTitle == null ? null : advTitle.trim();
-    }
-
-    public String getAdvImg() {
-        return advImg;
+    public String getCarouselTitle() {
+        return carouselTitle;
     }
 
-    public void setAdvImg(String advImg) {
-        this.advImg = advImg == null ? null : advImg.trim();
+    public void setCarouselTitle(String carouselTitle) {
+        this.carouselTitle = carouselTitle == null ? null : carouselTitle.trim();
     }
 
-    public String getAdvUrl() {
-        return advUrl;
+    public String getCarouselImg() {
+        return carouselImg;
     }
 
-    public void setAdvUrl(String advUrl) {
-        this.advUrl = advUrl == null ? null : advUrl.trim();
+    public void setCarouselImg(String carouselImg) {
+        this.carouselImg = carouselImg == null ? null : carouselImg.trim();
     }
 
-    public String getAdvTarget() {
-        return advTarget;
+    public String getCarouselUrl() {
+        return carouselUrl;
     }
 
-    public void setAdvTarget(String advTarget) {
-        this.advTarget = advTarget == null ? null : advTarget.trim();
+    public void setCarouselUrl(String carouselUrl) {
+        this.carouselUrl = carouselUrl == null ? null : carouselUrl.trim();
     }
 
-    public Integer getAdvLocation() {
-        return advLocation;
+    public String getCarouselTarget() {
+        return carouselTarget;
     }
 
-    public void setAdvLocation(Integer advLocation) {
-        this.advLocation = advLocation;
+    public void setCarouselTarget(String carouselTarget) {
+        this.carouselTarget = carouselTarget == null ? null : carouselTarget.trim();
     }
 
     public Date getBeginTime() {
@@ -128,14 +116,6 @@ public class WebsiteAdv implements Serializable {
         this.endTime = endTime;
     }
 
-    public Integer getPlatShow() {
-        return platShow;
-    }
-
-    public void setPlatShow(Integer platShow) {
-        this.platShow = platShow;
-    }
-
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -147,14 +127,12 @@ public class WebsiteAdv implements Serializable {
         sb.append(", gmtModified=").append(gmtModified);
         sb.append(", statusId=").append(statusId);
         sb.append(", sort=").append(sort);
-        sb.append(", advTitle=").append(advTitle);
-        sb.append(", advImg=").append(advImg);
-        sb.append(", advUrl=").append(advUrl);
-        sb.append(", advTarget=").append(advTarget);
-        sb.append(", advLocation=").append(advLocation);
+        sb.append(", carouselTitle=").append(carouselTitle);
+        sb.append(", carouselImg=").append(carouselImg);
+        sb.append(", carouselUrl=").append(carouselUrl);
+        sb.append(", carouselTarget=").append(carouselTarget);
         sb.append(", beginTime=").append(beginTime);
         sb.append(", endTime=").append(endTime);
-        sb.append(", platShow=").append(platShow);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/AdminWebsiteAdvController.java → roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/AdminWebsiteCarouselController.java

@@ -2,12 +2,12 @@ package com.roncoo.education.system.service.admin;
 
 import com.roncoo.education.common.core.base.Page;
 import com.roncoo.education.common.core.base.Result;
-import com.roncoo.education.system.service.admin.biz.AdminWebsiteAdvBiz;
-import com.roncoo.education.system.service.admin.req.AdminWebsiteAdvEditReq;
-import com.roncoo.education.system.service.admin.req.AdminWebsiteAdvPageReq;
-import com.roncoo.education.system.service.admin.req.AdminWebsiteAdvSaveReq;
-import com.roncoo.education.system.service.admin.resp.AdminWebsiteAdvPageResp;
-import com.roncoo.education.system.service.admin.resp.AdminWebsiteAdvViewResp;
+import com.roncoo.education.system.service.admin.biz.AdminWebsiteCarouselBiz;
+import com.roncoo.education.system.service.admin.req.AdminWebsiteCarouselEditReq;
+import com.roncoo.education.system.service.admin.req.AdminWebsiteCarouselPageReq;
+import com.roncoo.education.system.service.admin.req.AdminWebsiteCarouselSaveReq;
+import com.roncoo.education.system.service.admin.resp.AdminWebsiteCarouselPageResp;
+import com.roncoo.education.system.service.admin.resp.AdminWebsiteCarouselViewResp;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -25,34 +25,34 @@ import javax.validation.constraints.NotNull;
 @Api(tags = "ADMIN-广告信息")
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/system/admin/website/adv")
-public class AdminWebsiteAdvController {
+@RequestMapping("/system/admin/website/carousel")
+public class AdminWebsiteCarouselController {
 
     @NotNull
-    private final AdminWebsiteAdvBiz biz;
+    private final AdminWebsiteCarouselBiz biz;
 
     @ApiOperation(value = "广告信息分页", notes = "广告信息分页")
     @PostMapping(value = "/page")
-    public Result<Page<AdminWebsiteAdvPageResp>> page(@RequestBody AdminWebsiteAdvPageReq req) {
+    public Result<Page<AdminWebsiteCarouselPageResp>> page(@RequestBody AdminWebsiteCarouselPageReq req) {
         return biz.page(req);
     }
 
     @ApiOperation(value = "广告信息添加", notes = "广告信息添加")
     @PostMapping(value = "/save")
-    public Result<String> save(@RequestBody @Valid AdminWebsiteAdvSaveReq req) {
+    public Result<String> save(@RequestBody @Valid AdminWebsiteCarouselSaveReq req) {
         return biz.save(req);
     }
 
     @ApiOperation(value = "广告信息查看", notes = "广告信息查看")
     @ApiImplicitParam(name = "id", value = "主键ID", dataTypeClass = Long.class, paramType = "query", required = true)
     @GetMapping(value = "/view")
-    public Result<AdminWebsiteAdvViewResp> view(@RequestParam Long id) {
+    public Result<AdminWebsiteCarouselViewResp> view(@RequestParam Long id) {
         return biz.view(id);
     }
 
     @ApiOperation(value = "广告信息修改", notes = "广告信息修改")
     @PutMapping(value = "/edit")
-    public Result<String> edit(@RequestBody @Valid AdminWebsiteAdvEditReq req) {
+    public Result<String> edit(@RequestBody @Valid AdminWebsiteCarouselEditReq req) {
         return biz.edit(req);
     }
 

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminWebsiteAdvBiz.java → roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminWebsiteCarouselBiz.java

 package com.roncoo.education.system.service.admin.biz;
 
+import com.roncoo.education.common.service.BaseBiz;
 import com.roncoo.education.common.core.base.Page;
 import com.roncoo.education.common.core.base.PageUtil;
 import com.roncoo.education.common.core.base.Result;
 import com.roncoo.education.common.core.tools.BeanUtil;
-import com.roncoo.education.common.service.BaseBiz;
-import com.roncoo.education.system.dao.WebsiteAdvDao;
-import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteAdv;
-import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteAdvExample;
-import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteAdvExample.Criteria;
-import com.roncoo.education.system.service.admin.req.AdminWebsiteAdvEditReq;
-import com.roncoo.education.system.service.admin.req.AdminWebsiteAdvPageReq;
-import com.roncoo.education.system.service.admin.req.AdminWebsiteAdvSaveReq;
-import com.roncoo.education.system.service.admin.resp.AdminWebsiteAdvPageResp;
-import com.roncoo.education.system.service.admin.resp.AdminWebsiteAdvViewResp;
+import com.roncoo.education.system.service.admin.req.AdminWebsiteCarouselEditReq;
+import com.roncoo.education.system.service.admin.req.AdminWebsiteCarouselPageReq;
+import com.roncoo.education.system.service.admin.req.AdminWebsiteCarouselSaveReq;
+import com.roncoo.education.system.service.admin.resp.AdminWebsiteCarouselPageResp;
+import com.roncoo.education.system.service.admin.resp.AdminWebsiteCarouselViewResp;
+import com.roncoo.education.system.dao.WebsiteCarouselDao;
+import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarousel;
+import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarouselExample;
+import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarouselExample.Criteria;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
@@ -26,10 +26,10 @@ import javax.validation.constraints.NotNull;
  */
 @Component
 @RequiredArgsConstructor
-public class AdminWebsiteAdvBiz extends BaseBiz {
+public class AdminWebsiteCarouselBiz extends BaseBiz {
 
     @NotNull
-    private final WebsiteAdvDao dao;
+    private final WebsiteCarouselDao dao;
 
     /**
      * 广告信息分页
@@ -37,12 +37,12 @@ public class AdminWebsiteAdvBiz extends BaseBiz {
      * @param req 广告信息分页查询参数
      * @return 广告信息分页查询结果
      */
-    public Result<Page<AdminWebsiteAdvPageResp>> page(AdminWebsiteAdvPageReq req) {
-        WebsiteAdvExample example = new WebsiteAdvExample();
+    public Result<Page<AdminWebsiteCarouselPageResp>> page(AdminWebsiteCarouselPageReq req) {
+        WebsiteCarouselExample example = new WebsiteCarouselExample();
         Criteria c = example.createCriteria();
         example.setOrderByClause("sort asc, id desc");
-        Page<WebsiteAdv> page = dao.page(req.getPageCurrent(), req.getPageSize(), example);
-        Page<AdminWebsiteAdvPageResp> respPage = PageUtil.transform(page, AdminWebsiteAdvPageResp.class);
+        Page<WebsiteCarousel> page = dao.page(req.getPageCurrent(), req.getPageSize(), example);
+        Page<AdminWebsiteCarouselPageResp> respPage = PageUtil.transform(page, AdminWebsiteCarouselPageResp.class);
         return Result.success(respPage);
     }
 
@@ -52,8 +52,8 @@ public class AdminWebsiteAdvBiz extends BaseBiz {
      * @param req 广告信息
      * @return 添加结果
      */
-    public Result<String> save(AdminWebsiteAdvSaveReq req) {
-        WebsiteAdv record = BeanUtil.copyProperties(req, WebsiteAdv.class);
+    public Result<String> save(AdminWebsiteCarouselSaveReq req) {
+        WebsiteCarousel record = BeanUtil.copyProperties(req, WebsiteCarousel.class);
         if (dao.save(record) > 0) {
             return Result.success("操作成功");
         }
@@ -66,8 +66,8 @@ public class AdminWebsiteAdvBiz extends BaseBiz {
      * @param id 主键ID
      * @return 广告信息
      */
-    public Result<AdminWebsiteAdvViewResp> view(Long id) {
-        return Result.success(BeanUtil.copyProperties(dao.getById(id), AdminWebsiteAdvViewResp.class));
+    public Result<AdminWebsiteCarouselViewResp> view(Long id) {
+        return Result.success(BeanUtil.copyProperties(dao.getById(id), AdminWebsiteCarouselViewResp.class));
     }
 
     /**
@@ -76,8 +76,8 @@ public class AdminWebsiteAdvBiz extends BaseBiz {
      * @param req 广告信息修改对象
      * @return 修改结果
      */
-    public Result<String> edit(AdminWebsiteAdvEditReq req) {
-        WebsiteAdv record = BeanUtil.copyProperties(req, WebsiteAdv.class);
+    public Result<String> edit(AdminWebsiteCarouselEditReq req) {
+        WebsiteCarousel record = BeanUtil.copyProperties(req, WebsiteCarousel.class);
         if (dao.updateById(record) > 0) {
             return Result.success("操作成功");
         }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/req/AdminWebsiteAdvEditReq.java → roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/req/AdminWebsiteCarouselEditReq.java

 package com.roncoo.education.system.service.admin.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDateTime;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * <p>
  * ADMIN-广告信息
@@ -18,8 +17,8 @@ import java.time.LocalDateTime;
  */
 @Data
 @Accessors(chain = true)
-@ApiModel(value = "AdminWebsiteAdvEditReq", description = "ADMIN-广告信息修改")
-public class AdminWebsiteAdvEditReq implements Serializable {
+@ApiModel(value = "AdminWebsiteCarouselEditReq", description = "ADMIN-广告信息修改")
+public class AdminWebsiteCarouselEditReq implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -41,19 +40,16 @@ public class AdminWebsiteAdvEditReq implements Serializable {
     private Integer sort;
 
     @ApiModelProperty(value = "广告标题")
-    private String advTitle;
+    private String carouselTitle;
 
     @ApiModelProperty(value = "广告图片")
-    private String advImg;
+    private String carouselImg;
 
     @ApiModelProperty(value = "广告链接")
-    private String advUrl;
+    private String carouselUrl;
 
     @ApiModelProperty(value = "广告跳转方式")
-    private String advTarget;
-
-    @ApiModelProperty(value = "广告位置(1首页轮播)")
-    private Integer advLocation;
+    private String carouselTarget;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
@@ -62,7 +58,4 @@ public class AdminWebsiteAdvEditReq implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "结束时间")
     private LocalDateTime endTime;
-
-    @ApiModelProperty(value = "位置(0电脑端，1微信端)")
-    private Integer platShow;
 }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/req/AdminWebsiteAdvPageReq.java → roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/req/AdminWebsiteCarouselPageReq.java

 package com.roncoo.education.system.service.admin.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDateTime;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * <p>
  * ADMIN-广告信息
@@ -18,8 +17,8 @@ import java.time.LocalDateTime;
  */
 @Data
 @Accessors(chain = true)
-@ApiModel(value = "AdminWebsiteAdvPageReq", description = "ADMIN-广告信息分页")
-public class AdminWebsiteAdvPageReq implements Serializable {
+@ApiModel(value = "AdminWebsiteCarouselPageReq", description = "ADMIN-广告信息分页")
+public class AdminWebsiteCarouselPageReq implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -41,19 +40,16 @@ public class AdminWebsiteAdvPageReq implements Serializable {
     private Integer sort;
 
     @ApiModelProperty(value = "广告标题")
-    private String advTitle;
+    private String carouselTitle;
 
     @ApiModelProperty(value = "广告图片")
-    private String advImg;
+    private String carouselImg;
 
     @ApiModelProperty(value = "广告链接")
-    private String advUrl;
+    private String carouselUrl;
 
     @ApiModelProperty(value = "广告跳转方式")
-    private String advTarget;
-
-    @ApiModelProperty(value = "广告位置(1首页轮播)")
-    private Integer advLocation;
+    private String carouselTarget;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
@@ -63,9 +59,6 @@ public class AdminWebsiteAdvPageReq implements Serializable {
     @ApiModelProperty(value = "结束时间")
     private LocalDateTime endTime;
 
-    @ApiModelProperty(value = "位置(0电脑端，1微信端)")
-    private Integer platShow;
-
     @ApiModelProperty(value = "当前页")
     private int pageCurrent = 1;
 

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/req/AdminWebsiteAdvSaveReq.java → roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/req/AdminWebsiteCarouselSaveReq.java

 package com.roncoo.education.system.service.admin.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDateTime;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * <p>
  * ADMIN-广告信息
@@ -18,8 +17,8 @@ import java.time.LocalDateTime;
  */
 @Data
 @Accessors(chain = true)
-@ApiModel(value = "AdminWebsiteAdvSaveReq", description = "ADMIN-广告信息添加")
-public class AdminWebsiteAdvSaveReq implements Serializable {
+@ApiModel(value = "AdminWebsiteCarouselSaveReq", description = "ADMIN-广告信息添加")
+public class AdminWebsiteCarouselSaveReq implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -41,19 +40,16 @@ public class AdminWebsiteAdvSaveReq implements Serializable {
     private Integer sort;
 
     @ApiModelProperty(value = "广告标题")
-    private String advTitle;
+    private String carouselTitle;
 
     @ApiModelProperty(value = "广告图片")
-    private String advImg;
+    private String carouselImg;
 
     @ApiModelProperty(value = "广告链接")
-    private String advUrl;
+    private String carouselUrl;
 
     @ApiModelProperty(value = "广告跳转方式")
-    private String advTarget;
-
-    @ApiModelProperty(value = "广告位置(1首页轮播)")
-    private Integer advLocation;
+    private String carouselTarget;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
@@ -62,7 +58,4 @@ public class AdminWebsiteAdvSaveReq implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "结束时间")
     private LocalDateTime endTime;
-
-    @ApiModelProperty(value = "位置(0电脑端，1微信端)")
-    private Integer platShow;
 }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/resp/AdminWebsiteAdvViewResp.java → roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/resp/AdminWebsiteCarouselPageResp.java

 package com.roncoo.education.system.service.admin.resp;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDateTime;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * <p>
  * ADMIN-广告信息
@@ -18,8 +17,8 @@ import java.time.LocalDateTime;
  */
 @Data
 @Accessors(chain = true)
-@ApiModel(value = "AdminWebsiteAdvViewResp", description = "ADMIN-广告信息查看")
-public class AdminWebsiteAdvViewResp implements Serializable {
+@ApiModel(value = "AdminWebsiteCarouselPageResp", description = "ADMIN-广告信息分页")
+public class AdminWebsiteCarouselPageResp implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -41,19 +40,16 @@ public class AdminWebsiteAdvViewResp implements Serializable {
     private Integer sort;
 
     @ApiModelProperty(value = "广告标题")
-    private String advTitle;
+    private String carouselTitle;
 
     @ApiModelProperty(value = "广告图片")
-    private String advImg;
+    private String carouselImg;
 
     @ApiModelProperty(value = "广告链接")
-    private String advUrl;
+    private String carouselUrl;
 
     @ApiModelProperty(value = "广告跳转方式")
-    private String advTarget;
-
-    @ApiModelProperty(value = "广告位置(1首页轮播)")
-    private Integer advLocation;
+    private String carouselTarget;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
@@ -62,7 +58,4 @@ public class AdminWebsiteAdvViewResp implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "结束时间")
     private LocalDateTime endTime;
-
-    @ApiModelProperty(value = "位置(0电脑端，1微信端)")
-    private Integer platShow;
 }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/resp/AdminWebsiteAdvPageResp.java → roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/resp/AdminWebsiteCarouselViewResp.java

 package com.roncoo.education.system.service.admin.resp;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDateTime;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * <p>
  * ADMIN-广告信息
@@ -18,8 +17,8 @@ import java.time.LocalDateTime;
  */
 @Data
 @Accessors(chain = true)
-@ApiModel(value = "AdminWebsiteAdvPageResp", description = "ADMIN-广告信息分页")
-public class AdminWebsiteAdvPageResp implements Serializable {
+@ApiModel(value = "AdminWebsiteCarouselViewResp", description = "ADMIN-广告信息查看")
+public class AdminWebsiteCarouselViewResp implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -41,19 +40,16 @@ public class AdminWebsiteAdvPageResp implements Serializable {
     private Integer sort;
 
     @ApiModelProperty(value = "广告标题")
-    private String advTitle;
+    private String carouselTitle;
 
     @ApiModelProperty(value = "广告图片")
-    private String advImg;
+    private String carouselImg;
 
     @ApiModelProperty(value = "广告链接")
-    private String advUrl;
+    private String carouselUrl;
 
     @ApiModelProperty(value = "广告跳转方式")
-    private String advTarget;
-
-    @ApiModelProperty(value = "广告位置(1首页轮播)")
-    private Integer advLocation;
+    private String carouselTarget;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
@@ -62,7 +58,4 @@ public class AdminWebsiteAdvPageResp implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "结束时间")
     private LocalDateTime endTime;
-
-    @ApiModelProperty(value = "位置(0电脑端，1微信端)")
-    private Integer platShow;
 }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/api/ApiWebsiteAdvController.java → roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/api/ApiWebsiteCarouselController.java

 package com.roncoo.education.system.service.api;
 
 import com.roncoo.education.common.core.base.Result;
-import com.roncoo.education.system.service.api.biz.ApiWebsiteAdvBiz;
+import com.roncoo.education.system.service.api.biz.ApiWebsiteCarouselBiz;
 import com.roncoo.education.system.service.api.resp.ApiWebsiteAdvResp;
+import com.roncoo.education.system.service.api.resp.ApiWebsiteCarouselResp;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -17,20 +18,21 @@ import java.util.List;
  * API-广告信息
  *
  * @author wujing
- * @date 2022-08-25
+ * @date 2022-09-16
  */
 @Api(tags = "API-广告信息")
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/system/api/website/adv")
-public class ApiWebsiteAdvController {
+@RequestMapping("/system/api/website/carousel")
+public class ApiWebsiteCarouselController {
 
     @NotNull
-    private final ApiWebsiteAdvBiz biz;
+    private final ApiWebsiteCarouselBiz biz;
 
     @ApiOperation(value = "广告列表接口", notes = "首页轮播广告列出")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public Result<List<ApiWebsiteAdvResp>> list() {
+    public Result<List<ApiWebsiteCarouselResp>> list() {
         return biz.list();
     }
+
 }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/api/biz/ApiWebsiteAdvBiz.java → roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/api/biz/ApiWebsiteCarouselBiz.java

@@ -4,12 +4,11 @@ import com.roncoo.education.common.core.base.PageUtil;
 import com.roncoo.education.common.core.base.Result;
 import com.roncoo.education.common.core.enums.StatusIdEnum;
 import com.roncoo.education.common.service.BaseBiz;
-import com.roncoo.education.system.dao.WebsiteAdvDao;
-import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteAdv;
-import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteAdvExample;
-import com.roncoo.education.system.service.api.resp.ApiWebsiteAdvResp;
+import com.roncoo.education.system.dao.WebsiteCarouselDao;
+import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarousel;
+import com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarouselExample;
+import com.roncoo.education.system.service.api.resp.ApiWebsiteCarouselResp;
 import lombok.RequiredArgsConstructor;
-import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 
@@ -22,18 +21,18 @@ import java.util.List;
  * @author wujing
  */
 @Component
-@CacheConfig(cacheNames = {"system"})
 @RequiredArgsConstructor
-public class ApiWebsiteAdvBiz extends BaseBiz {
+public class ApiWebsiteCarouselBiz extends BaseBiz {
 
     @NotNull
-    private final WebsiteAdvDao dao;
+    private final WebsiteCarouselDao dao;
 
     @Cacheable
-    public Result<List<ApiWebsiteAdvResp>> list() {
-        WebsiteAdvExample example = new WebsiteAdvExample();
+    public Result<List<ApiWebsiteCarouselResp>> list() {
+        WebsiteCarouselExample example = new WebsiteCarouselExample();
         example.createCriteria().andStatusIdEqualTo(StatusIdEnum.YES.getCode());
-        List<WebsiteAdv> advList = dao.listByExample(example);
-        return Result.success(PageUtil.copyList(advList, ApiWebsiteAdvResp.class));
+        example.setOrderByClause("sort asc, id desc");
+        List<WebsiteCarousel> CarouselList = dao.listByExample(example);
+        return Result.success(PageUtil.copyList(CarouselList, ApiWebsiteCarouselResp.class));
     }
 }

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/api/req/ApiWebsiteCarouselReq.java

+package com.roncoo.education.system.service.api.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * API-广告信息
+ * </p>
+ *
+ * @author wujing
+ * @date 2022-09-16
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "ApiWebsiteCarouselReq", description = "API-广告信息")
+public class ApiWebsiteCarouselReq implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime gmtCreate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private LocalDateTime gmtModified;
+
+    @ApiModelProperty(value = "状态(1:正常，0:禁用)")
+    private Integer statusId;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "广告标题")
+    private String carouselTitle;
+
+    @ApiModelProperty(value = "广告图片")
+    private String carouselImg;
+
+    @ApiModelProperty(value = "广告链接")
+    private String carouselUrl;
+
+    @ApiModelProperty(value = "广告跳转方式")
+    private String carouselTarget;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "开始时间")
+    private LocalDateTime beginTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "结束时间")
+    private LocalDateTime endTime;
+}

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/api/resp/ApiWebsiteCarouselResp.java

+package com.roncoo.education.system.service.api.resp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * API-广告信息
+ * </p>
+ *
+ * @author wujing
+ * @date 2022-09-16
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "ApiWebsiteCarouselResp", description = "API-广告信息")
+public class ApiWebsiteCarouselResp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime gmtCreate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private LocalDateTime gmtModified;
+
+    @ApiModelProperty(value = "状态(1:正常，0:禁用)")
+    private Integer statusId;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "广告标题")
+    private String carouselTitle;
+
+    @ApiModelProperty(value = "广告图片")
+    private String carouselImg;
+
+    @ApiModelProperty(value = "广告链接")
+    private String carouselUrl;
+
+    @ApiModelProperty(value = "广告跳转方式")
+    private String carouselTarget;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "开始时间")
+    private LocalDateTime beginTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "结束时间")
+    private LocalDateTime endTime;
+}

roncoo-education-system/roncoo-education-system-service/src/main/resources/mybatis/WebsiteCarouselMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.roncoo.education.system.dao.impl.mapper.WebsiteCarouselMapper">
+  <resultMap id="BaseResultMap" type="com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarousel">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
+    <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
+    <result column="status_id" jdbcType="TINYINT" property="statusId" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="carousel_title" jdbcType="VARCHAR" property="carouselTitle" />
+    <result column="carousel_img" jdbcType="VARCHAR" property="carouselImg" />
+    <result column="carousel_url" jdbcType="VARCHAR" property="carouselUrl" />
+    <result column="carousel_target" jdbcType="VARCHAR" property="carouselTarget" />
+    <result column="begin_time" jdbcType="TIMESTAMP" property="beginTime" />
+    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, gmt_create, gmt_modified, status_id, sort, carousel_title, carousel_img, carousel_url, 
+    carousel_target, begin_time, end_time
+  </sql>
+  <select id="selectByExample" parameterType="com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarouselExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from website_carousel
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+    <if test="limitStart >= 0">
+      limit ${limitStart} , ${pageSize}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from website_carousel
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from website_carousel
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarouselExample">
+    delete from website_carousel
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarousel">
+    insert into website_carousel (id, gmt_create, gmt_modified, 
+      status_id, sort, carousel_title, 
+      carousel_img, carousel_url, carousel_target, 
+      begin_time, end_time)
+    values (#{id,jdbcType=BIGINT}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, 
+      #{statusId,jdbcType=TINYINT}, #{sort,jdbcType=INTEGER}, #{carouselTitle,jdbcType=VARCHAR}, 
+      #{carouselImg,jdbcType=VARCHAR}, #{carouselUrl,jdbcType=VARCHAR}, #{carouselTarget,jdbcType=VARCHAR}, 
+      #{beginTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarousel">
+    insert into website_carousel
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="gmtCreate != null">
+        gmt_create,
+      </if>
+      <if test="gmtModified != null">
+        gmt_modified,
+      </if>
+      <if test="statusId != null">
+        status_id,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+      <if test="carouselTitle != null">
+        carousel_title,
+      </if>
+      <if test="carouselImg != null">
+        carousel_img,
+      </if>
+      <if test="carouselUrl != null">
+        carousel_url,
+      </if>
+      <if test="carouselTarget != null">
+        carousel_target,
+      </if>
+      <if test="beginTime != null">
+        begin_time,
+      </if>
+      <if test="endTime != null">
+        end_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="gmtCreate != null">
+        #{gmtCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="gmtModified != null">
+        #{gmtModified,jdbcType=TIMESTAMP},
+      </if>
+      <if test="statusId != null">
+        #{statusId,jdbcType=TINYINT},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="carouselTitle != null">
+        #{carouselTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="carouselImg != null">
+        #{carouselImg,jdbcType=VARCHAR},
+      </if>
+      <if test="carouselUrl != null">
+        #{carouselUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="carouselTarget != null">
+        #{carouselTarget,jdbcType=VARCHAR},
+      </if>
+      <if test="beginTime != null">
+        #{beginTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarouselExample" resultType="java.lang.Integer">
+    select count(*) from website_carousel
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update website_carousel
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.gmtCreate != null">
+        gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.gmtModified != null">
+        gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.statusId != null">
+        status_id = #{record.statusId,jdbcType=TINYINT},
+      </if>
+      <if test="record.sort != null">
+        sort = #{record.sort,jdbcType=INTEGER},
+      </if>
+      <if test="record.carouselTitle != null">
+        carousel_title = #{record.carouselTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.carouselImg != null">
+        carousel_img = #{record.carouselImg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.carouselUrl != null">
+        carousel_url = #{record.carouselUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.carouselTarget != null">
+        carousel_target = #{record.carouselTarget,jdbcType=VARCHAR},
+      </if>
+      <if test="record.beginTime != null">
+        begin_time = #{record.beginTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.endTime != null">
+        end_time = #{record.endTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update website_carousel
+    set id = #{record.id,jdbcType=BIGINT},
+      gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP},
+      gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP},
+      status_id = #{record.statusId,jdbcType=TINYINT},
+      sort = #{record.sort,jdbcType=INTEGER},
+      carousel_title = #{record.carouselTitle,jdbcType=VARCHAR},
+      carousel_img = #{record.carouselImg,jdbcType=VARCHAR},
+      carousel_url = #{record.carouselUrl,jdbcType=VARCHAR},
+      carousel_target = #{record.carouselTarget,jdbcType=VARCHAR},
+      begin_time = #{record.beginTime,jdbcType=TIMESTAMP},
+      end_time = #{record.endTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarousel">
+    update website_carousel
+    <set>
+      <if test="gmtCreate != null">
+        gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="gmtModified != null">
+        gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
+      </if>
+      <if test="statusId != null">
+        status_id = #{statusId,jdbcType=TINYINT},
+      </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="carouselTitle != null">
+        carousel_title = #{carouselTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="carouselImg != null">
+        carousel_img = #{carouselImg,jdbcType=VARCHAR},
+      </if>
+      <if test="carouselUrl != null">
+        carousel_url = #{carouselUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="carouselTarget != null">
+        carousel_target = #{carouselTarget,jdbcType=VARCHAR},
+      </if>
+      <if test="beginTime != null">
+        begin_time = #{beginTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.roncoo.education.system.dao.impl.mapper.entity.WebsiteCarousel">
+    update website_carousel
+    set gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
+      gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
+      status_id = #{statusId,jdbcType=TINYINT},
+      sort = #{sort,jdbcType=INTEGER},
+      carousel_title = #{carouselTitle,jdbcType=VARCHAR},
+      carousel_img = #{carouselImg,jdbcType=VARCHAR},
+      carousel_url = #{carouselUrl,jdbcType=VARCHAR},
+      carousel_target = #{carouselTarget,jdbcType=VARCHAR},
+      begin_time = #{beginTime,jdbcType=TIMESTAMP},
+      end_time = #{endTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file