From 97641c088c44dd60f63e697466c73613a1c63262 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 02 Jul 2022 21:37:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MessageBoardServiceImpl.java | 5 +++++
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminMessageBoardVo.java | 11 +++++++----
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddMessageDto.java | 4 ++--
src/main/resources/mapper/MessageBoardMapper.xml | 3 ++-
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddMessageDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddMessageDto.java
index 1ca8fd7..9c9dd69 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddMessageDto.java
+++ b/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")
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MessageBoardServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MessageBoardServiceImpl.java
index 79cd77e..7ce5500 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MessageBoardServiceImpl.java
+++ b/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());
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminMessageBoardVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminMessageBoardVo.java
index 57adb85..3a513ba 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminMessageBoardVo.java
+++ b/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;
}
diff --git a/src/main/resources/mapper/MessageBoardMapper.xml b/src/main/resources/mapper/MessageBoardMapper.xml
index 5fd7925..1fac69f 100644
--- a/src/main/resources/mapper/MessageBoardMapper.xml
+++ b/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>
--
Gitblit v1.9.1