From 6be7aa6909049712ff05ff0df877f1db5a5f5c23 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Thu, 24 Oct 2024 19:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/homeimg/vo/HomeimgPageReqVO.java | 23 ++++++---- .../admin/homeimg/vo/HomeimgRespVO.java | 25 ++++++---- .../admin/homeimg/vo/HomeimgSaveReqVO.java | 24 ++++++---- .../dal/dataobject/homeimg/HomeimgDO.java | 46 +++++++++++-------- .../home/dal/mysql/homeimg/HomeimgMapper.java | 18 ++++---- .../service/homeimg/HomeimgServiceImpl.java | 6 +-- 6 files changed, 88 insertions(+), 54 deletions(-) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgPageReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgPageReqVO.java index 9d190c7..7c5d3c1 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgPageReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgPageReqVO.java @@ -5,6 +5,8 @@ import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -16,30 +18,35 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ public class HomeimgPageReqVO extends PageParam { @Schema(description = "公告id", example = "17311") - private Long imgId; + private Long id; @Schema(description = "公告名称", example = "李四") - private String imgName; + private String newsName; @Schema(description = "发布时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] imgCreatetime; + private LocalDateTime[] newsCreatetime; @Schema(description = "轮换图片") -// private String[] imgImg; - private String imgImg; + private String newsImg; @Schema(description = "发布内容") - private String imgContent; + private String newsContent; @Schema(description = "公告分类", example = "2") private Integer contentType; @Schema(description = "公告图片状态", example = "1") - private Integer imgStatus; + private Integer newsStatus; @Schema(description = "公告状态", example = "1") - private Integer contentStatus; + private Integer status; + + @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31402") + private Long deptId; + + @Schema(description = "发布用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31402") + private Long userId; @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgRespVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgRespVO.java index cd76ed0..e07e887 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgRespVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgRespVO.java @@ -9,6 +9,8 @@ import com.alibaba.excel.annotation.*; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import javax.validation.constraints.NotNull; + @Schema(description = "管理后台 - 公告管理 Response VO") @Data @ExcelIgnoreUnannotated @@ -16,24 +18,23 @@ public class HomeimgRespVO { @Schema(description = "公告id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17311") @ExcelProperty("公告id") - private Long imgId; + private Long id; @Schema(description = "公告名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") @ExcelProperty("公告名称") - private String imgName; + private String newsName; @Schema(description = "发布时间") @ExcelProperty("发布时间") - private LocalDateTime imgCreatetime; + private LocalDateTime newsCreatetime; @Schema(description = "轮换图片", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("轮换图片") -// private String[] imgImg; - private String imgImg; + private String newsImg; @Schema(description = "发布内容") @ExcelProperty("发布内容") - private String imgContent; + private String newsContent; @Schema(description = "公告分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @ExcelProperty(value = "公告分类", converter = DictConvert.class) @@ -43,12 +44,20 @@ public class HomeimgRespVO { @Schema(description = "公告图片状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @ExcelProperty(value = "公告图片状态", converter = DictConvert.class) @DictFormat("home_img_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private Integer imgStatus; + private Integer newsStatus; @Schema(description = "公告状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @ExcelProperty(value = "公告状态", converter = DictConvert.class) @DictFormat("home_content") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private Integer contentStatus; + private Integer status; + + @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31402") + @NotNull(message = "部门id不能为空") + private Long deptId; + + @Schema(description = "发布用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31402") + @NotNull(message = "发布用户id不能为空") + private Long userId; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgSaveReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgSaveReqVO.java index 18aff41..a8c7404 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgSaveReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgSaveReqVO.java @@ -12,22 +12,21 @@ import java.time.LocalDateTime; public class HomeimgSaveReqVO { @Schema(description = "公告id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17311") - private Long imgId; + private Long id; @Schema(description = "公告名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") @NotEmpty(message = "公告名称不能为空") - private String imgName; + private String newsName; @Schema(description = "发布时间") - private LocalDateTime imgCreatetime; + private LocalDateTime newsCreatetime; @Schema(description = "轮换图片", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "轮换图片不能为空") -// private String[] imgImg; - private String imgImg; + private String newsImg; @Schema(description = "发布内容") - private String imgContent; + private String newsContent; @Schema(description = "公告分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @NotNull(message = "公告分类不能为空") @@ -35,10 +34,19 @@ public class HomeimgSaveReqVO { @Schema(description = "公告图片状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "公告图片状态不能为空") - private Integer imgStatus; + private Integer newsStatus; @Schema(description = "公告状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "公告状态不能为空") - private Integer contentStatus; + private Integer status; + + @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31402") + @NotNull(message = "部门id不能为空") + private Long deptId; + + @Schema(description = "发布用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31402") + @NotNull(message = "发布用户id不能为空") + private Long userId; + } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/homeimg/HomeimgDO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/homeimg/HomeimgDO.java index 2e9781b..c41b7a6 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/homeimg/HomeimgDO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/homeimg/HomeimgDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.home.dal.dataobject.homeimg; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -13,8 +14,8 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; * * @author xaol */ -@TableName("des_homeimg") -@KeySequence("des_homeimg_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("oa_news") +@KeySequence("oa_news_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -24,44 +25,51 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; public class HomeimgDO extends BaseDO { /** - * 公告id + * 新闻id */ @TableId - private Long imgId; + private Long id; /** - * 公告名称 + * 新闻名称 */ - private String imgName; + private String newsName; /** * 发布时间 */ - private LocalDateTime imgCreatetime; + private LocalDateTime newsCreatetime; /** * 轮换图片 */ -// private String[] imgImg; - private String imgImg; + private String newsImg; /** - * 发布内容 + * 发布内容修改为String类型不然会返回字节 */ - private String imgContent; + private String newsContent; /** - * 公告分类 + * 新闻分类 * - * 枚举 {@link TODO home_content_status 对应的类} + * 枚举 {@link TODO oa_news_type 对应的类} */ private Integer contentType; /** - * 公告图片状态 + * 新闻图片状态 * - * 枚举 {@link TODO home_img_status 对应的类} + * 枚举 {@link TODO oa_news_img_status 对应的类} */ - private Integer imgStatus; + private String newsStatus; /** - * 公告状态 + * 新闻状态 * - * 枚举 {@link TODO home_content 对应的类} + * 枚举 {@link TODO oa_news_status 对应的类} */ - private Integer contentStatus; + private String status; + /** + * 部门id + */ + private Long deptId; + /** + * 部门id + */ + private Long userId; } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homeimg/HomeimgMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homeimg/HomeimgMapper.java index 82714e6..47ff1a3 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homeimg/HomeimgMapper.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homeimg/HomeimgMapper.java @@ -19,16 +19,18 @@ public interface HomeimgMapper extends BaseMapperX { default PageResult selectPage(HomeimgPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(HomeimgDO::getImgId, reqVO.getImgId()) - .likeIfPresent(HomeimgDO::getImgName, reqVO.getImgName()) - .betweenIfPresent(HomeimgDO::getImgCreatetime, reqVO.getImgCreatetime()) - .eqIfPresent(HomeimgDO::getImgImg, reqVO.getImgImg()) - .eqIfPresent(HomeimgDO::getImgContent, reqVO.getImgContent()) + .eqIfPresent(HomeimgDO::getId, reqVO.getId()) + .likeIfPresent(HomeimgDO::getNewsName, reqVO.getNewsName()) + .betweenIfPresent(HomeimgDO::getNewsCreatetime, reqVO.getNewsCreatetime()) + .eqIfPresent(HomeimgDO::getNewsImg, reqVO.getNewsImg()) + .eqIfPresent(HomeimgDO::getNewsContent, reqVO.getNewsContent()) .eqIfPresent(HomeimgDO::getContentType, reqVO.getContentType()) - .eqIfPresent(HomeimgDO::getImgStatus, reqVO.getImgStatus()) - .eqIfPresent(HomeimgDO::getContentStatus, reqVO.getContentStatus()) + .eqIfPresent(HomeimgDO::getNewsStatus, reqVO.getNewsStatus()) + .eqIfPresent(HomeimgDO::getStatus, reqVO.getStatus()) + .eqIfPresent(HomeimgDO::getDeptId, reqVO.getDeptId()) + .eqIfPresent(HomeimgDO::getUserId, reqVO.getUserId()) .betweenIfPresent(HomeimgDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(HomeimgDO::getImgId)); + .orderByDesc(HomeimgDO::getId)); } } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImpl.java index a0170e0..3ed93c6 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImpl.java @@ -35,13 +35,13 @@ public class HomeimgServiceImpl implements HomeimgService { HomeimgDO img = BeanUtils.toBean(createReqVO, HomeimgDO.class); imgMapper.insert(img); // 返回 - return img.getImgId(); + return img.getId(); } @Override public void updateimg(HomeimgSaveReqVO updateReqVO) { // 校验存在 - validateimgExists(updateReqVO.getImgId()); + validateimgExists(updateReqVO.getId()); // 更新 HomeimgDO updateObj = BeanUtils.toBean(updateReqVO, HomeimgDO.class); imgMapper.updateById(updateObj); @@ -57,7 +57,7 @@ public class HomeimgServiceImpl implements HomeimgService { private void validateimgExists(Long id) { if (imgMapper.selectById(id) == null) { - throw exception(IMG_NOT_EXISTS); + throw exception(NEWS_NOT_EXISTS); } }