Helius
2022-07-02 97641c088c44dd60f63e697466c73613a1c63262
Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
4 files modified
23 ■■■■■ changed files
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddMessageDto.java 4 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MessageBoardServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminMessageBoardVo.java 11 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/MessageBoardMapper.xml 3 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddMessageDto.java
@@ -19,11 +19,11 @@
    private String contactValue;
    @ApiModelProperty(value = "留言标题")
    @NotNull(message = "请输入留言标题")
//    @NotNull(message = "请输入留言标题")
    private String title;
    @ApiModelProperty(value = "留言描述")
    @NotNull(message = "请输入留言描述")
//    @NotNull(message = "请输入留言描述")
    private String remark;
    @ApiModelProperty(value = "备注1")
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MessageBoardServiceImpl.java
@@ -81,6 +81,11 @@
                }
            }
        }
        String title = adminAddMessageDto.getTitle();
        String remark = adminAddMessageDto.getRemark();
        if(StrUtil.isEmpty(title) && StrUtil.isEmpty(remark)){
            return Result.fail("请输入留言");
        }
        MessageBoardEntity messageBoardEntity = new MessageBoardEntity();
        messageBoardEntity.setName(adminAddMessageDto.getName());
        messageBoardEntity.setContactValue(adminAddMessageDto.getContactValue());
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminMessageBoardVo.java
@@ -1,8 +1,5 @@
package com.xcong.farmer.cms.modules.system.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.google.type.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,6 +24,12 @@
    private String remark;
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    private String createTime;
    @ApiModelProperty(value = "邮箱")
    private String paramOne;
    @ApiModelProperty(value = "预留")
    private String paramTwo;
}
src/main/resources/mapper/MessageBoardMapper.xml
@@ -4,7 +4,8 @@
    <select id="selectAdminMessageBoardInPage" resultType="com.xcong.farmer.cms.modules.system.vo.AdminMessageBoardVo">
        SELECT
        a.*
        a.*,
        DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%i:%S') createTime
        FROM
        t_message_board a
        <where>