diff --git a/ruoyi-ui/src/views/business/english/word/index.vue b/ruoyi-ui/src/views/business/english/word/index.vue
index ee4391b7..eab91948 100644
--- a/ruoyi-ui/src/views/business/english/word/index.vue
+++ b/ruoyi-ui/src/views/business/english/word/index.vue
@@ -130,9 +130,9 @@
@pagination="getList"
/>
-
+
-
+
@@ -140,7 +140,49 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -197,6 +239,7 @@ export default {
title: "",
// 是否显示弹出层
open: false,
+ openAdd: false,
// 查看次数时间范围
daterangeCreateTime: [],
// 查询参数
@@ -210,10 +253,27 @@ export default {
// 表单参数
form: {},
// 表单校验
- rules: {
+ rulesEdit: {
englishWord: [
{required: true, message: "英语单词不能为空", trigger: "blur"}
],
+ chineseWord: [
+ {required: true, message: "中文不能为空", trigger: "blur"}
+ ],
+ isCollect: [
+ {required: true, message: "是否收藏 1收藏 2不收藏不能为空", trigger: "change"}
+ ],
+ top: [
+ {required: true, message: "置顶 1置顶 2不置顶不能为空", trigger: "change"}
+ ],
+ createTime: [
+ {required: true, message: "创建时间不能为空", trigger: "blur"}
+ ]
+ },
+ rulesAdd: {
+ content: [
+ {required: true, message: "中英文不能为空", trigger: "blur"}
+ ],
isCollect: [
{required: true, message: "是否收藏 1收藏 2不收藏不能为空", trigger: "change"}
],
@@ -247,6 +307,7 @@ export default {
// 取消按钮
cancel() {
this.open = false;
+ this.openAdd = false
this.reset();
},
// 表单重置
@@ -283,7 +344,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
- this.open = true;
+ this.openAdd = true;
this.title = "添加英语单词";
},
/** 修改按钮操作 */
@@ -299,6 +360,7 @@ export default {
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
+ console.log(valid)
if (valid) {
if (this.form.id != null) {
updateWord(this.form).then(response => {
@@ -309,7 +371,7 @@ export default {
} else {
addWord(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
- this.open = false;
+ this.openAdd = false;
this.getList();
});
}
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java
index 2c6e23a2..8f445968 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java
@@ -10,6 +10,7 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.xjs.word.domain.EnglishWord;
import com.xjs.word.service.IEnglishWordService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -68,7 +69,7 @@ public class EnglishWordController extends BaseController {
@RequiresPermissions("english:word:add")
@Log(title = "英语单词", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody EnglishWord englishWord) {
+ public AjaxResult add(@Validated @RequestBody EnglishWord englishWord) {
return toAjax(englishWordService.insertEnglishWord(englishWord));
}
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java
index e8e16ae6..860c60a8 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.annotation.Excel;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
@@ -39,6 +40,7 @@ public class EnglishWord {
* 前端传递的内容（可能是中、英文）
*/
@TableField(exist = false)
+ @NotBlank(message = "内容不能为空")
private String content;
/**
@@ -63,7 +65,7 @@ public class EnglishWord {
* 查看次数
*/
@Excel(name = "查看次数")
- private Long lookCount = 0L;
+ private Long lookCount ;
@Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT)
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java
index b68d17b6..6c5fd303 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java
@@ -88,6 +88,7 @@ public class EnglishWordServiceImpl implements IEnglishWordService {
englishWord.setChineseWord(dst);
}
}
+ englishWord.setLookCount(0L);
return englishWordMapper.insert(englishWord);
}
diff --git a/xjs-business/xjs-business-english/src/main/resources/mapper.english/EnglishWordMapper.xml b/xjs-business/xjs-business-english/src/main/resources/mapper.english/EnglishWordMapper.xml
index 55e62116..242e1cb9 100644
--- a/xjs-business/xjs-business-english/src/main/resources/mapper.english/EnglishWordMapper.xml
+++ b/xjs-business/xjs-business-english/src/main/resources/mapper.english/EnglishWordMapper.xml
@@ -40,6 +40,7 @@
and create_time between #{createTime} and #{endCreateTime}
+ order by top asc, sort desc , create_time desc