From 56eded01813a06ea1048b42919af021900e5f813 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Jun 2022 15:58:30 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateWebSetDto.java | 4 +
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminNavigationBarController.java | 6 -
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java | 7 -
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddRoleDto.java | 4 +
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminDeleteDto.java | 4 +
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java | 14 --
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminActiveUserDto.java | 17 ++++
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminResetPasswordDto.java | 16 ++++
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminRoleController.java | 6 -
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateStatusOnDto.java | 16 ++++
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java | 10 --
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminMenuController.java | 6 -
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddUserDto.java | 4 +
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminLoginDto.java | 4 +
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java | 5 +
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminForbiddenUserDto.java | 15 +++
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java | 5 +
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminArticleController.java | 16 +--
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUserDto.java | 2
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java | 6 -
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 20 +----
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java | 21 ++---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java | 7 -
23 files changed, 118 insertions(+), 97 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminArticleController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminArticleController.java
index a1b255e..8ca5653 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminArticleController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminArticleController.java
@@ -36,12 +36,6 @@
return iArticleService.addArticle(adminAddArticleDto);
}
- @ApiOperation(value = "删除文章", notes = "删除文章")
- @GetMapping(value = "/deleteArticle/{id}")
- public Result deleteArticle(@PathVariable(value = "id") Long id) {
- return iArticleService.deleteArticle(id);
- }
-
@ApiOperation(value = "查看文章", notes = "查看文章")
@GetMapping(value = "/seeArticleInfo/{id}")
public Result seeArticleInfo(@PathVariable(value = "id") Long id) {
@@ -55,14 +49,16 @@
}
@ApiOperation(value = "发布文章", notes = "发布文章")
- @GetMapping(value = "/updateStatusOn/{id}")
- public Result updateStatusOn(@PathVariable(value = "id") Long id) {
+ @PostMapping(value = "/updateStatusOn")
+ public Result updateStatusOn(@RequestBody @Valid AdminUpdateStatusOnDto adminUpdateStatusOnDto) {
+ Long id = adminUpdateStatusOnDto.getId();
return iArticleService.updateStatusOn(id);
}
@ApiOperation(value = "取消发布文章", notes = "取消发布文章")
- @GetMapping(value = "/updateStatusOff/{id}")
- public Result updateStatusOff(@PathVariable(value = "id") Long id) {
+ @PostMapping(value = "/updateStatusOff")
+ public Result updateStatusOff(@RequestBody @Valid AdminUpdateStatusOnDto adminUpdateStatusOnDto) {
+ Long id = adminUpdateStatusOnDto.getId();
return iArticleService.updateStatusOff(id);
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
index 2e35522..87e5534 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
@@ -27,7 +27,6 @@
@ApiResponses({@ApiResponse(code = 200, message = "ok", response = AdminColumnVo.class)})
@PostMapping(value = "/columnInPage")
public Result getColumnInPage(@RequestBody @Valid AdminColumnDto adminColumnDto) {
-// log.info("--->{}", SecurityContextHolder.getContext().getAuthentication());
return iColumnService.getColumnInPage(adminColumnDto);
}
@@ -42,12 +41,6 @@
@PostMapping(value = "/addColumn")
public Result addColumn(@RequestBody @Valid AdminAddColumnDto adminAddColumnDto) {
return iColumnService.addColumn(adminAddColumnDto);
- }
-
- @ApiOperation(value = "删除栏目", notes = "删除栏目")
- @GetMapping(value = "/deleteColumn/{id}")
- public Result deleteColumn(@PathVariable(value = "id") Long id) {
- return iColumnService.deleteColumn(id);
}
@ApiOperation(value = "查看栏目", notes = "查看栏目")
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java
index 8af07a6..9b7517a 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java
@@ -14,6 +14,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.validation.Valid;
import java.io.File;
import java.io.IOException;
@@ -29,16 +30,7 @@
@ApiOperation(value = "登陆接口", notes = "登陆接口")
@PostMapping("/login")
- public Result login(@RequestBody AdminLoginDto adminLoginDto) {
-
- String username = adminLoginDto.getUsername();
- if(StrUtil.isEmpty(username)){
- return Result.fail("请输入用户名");
- }
- String password = adminLoginDto.getPassword();
- if(StrUtil.isEmpty(password)){
- return Result.fail("请输入密码");
- }
+ public Result login(@RequestBody @Valid AdminLoginDto adminLoginDto) {
return iCommonService.login(adminLoginDto);
}
@@ -47,7 +39,7 @@
* @return
*/
@ApiOperation(value="用户退出登录", notes="用户退出登录")
- @GetMapping(value = "/Logout")
+ @PostMapping(value = "/Logout")
public Result memberLogout() {
return iCommonService.memberLogout();
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminMenuController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminMenuController.java
index b4282ac..97633b7 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminMenuController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminMenuController.java
@@ -43,12 +43,6 @@
return iMenuService.addMenu(adminAddMenuDto);
}
- @ApiOperation(value = "删除系统菜单", notes = "删除系统菜单")
- @GetMapping(value = "/deleteMenu/{id}")
- public Result deleteMenu(@PathVariable(value = "id") Long id) {
- return iMenuService.deleteMenu(id);
- }
-
@ApiOperation(value = "查看系统菜单详情", notes = "查看系统菜单详情")
@GetMapping(value = "/seeMenuInfo/{id}")
public Result seeMenuInfo(@PathVariable(value = "id") Long id) {
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminNavigationBarController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminNavigationBarController.java
index 5cb8cd1..e0e595f 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminNavigationBarController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminNavigationBarController.java
@@ -43,12 +43,6 @@
return iNavigationBarService.addBar(adminAddBarDto);
}
- @ApiOperation(value = "删除导航栏", notes = "删除导航栏")
- @GetMapping(value = "/deleteBar/{id}")
- public Result deleteBar(@PathVariable(value = "id") Long id) {
- return iNavigationBarService.deleteBar(id);
- }
-
@ApiOperation(value = "查看导航栏", notes = "查看导航栏")
@GetMapping(value = "/seeBarInfo/{id}")
public Result seeBarInfo(@PathVariable(value = "id") Long id) {
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminRoleController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminRoleController.java
index 0d26e6f..6834a5d 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminRoleController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminRoleController.java
@@ -36,12 +36,6 @@
return iRoleService.addRole(adminAddRoleDto);
}
- @ApiOperation(value = "删除系统角色", notes = "删除系统角色")
- @GetMapping(value = "/deleteRole/{id}")
- public Result deleteRole(@PathVariable(value = "id") Long id) {
- return iRoleService.deleteRole(id);
- }
-
@ApiOperation(value = "查看系统角色详情", notes = "查看系统角色详情")
@GetMapping(value = "/seeRoleInfo/{id}")
public Result seeRoleInfo(@PathVariable(value = "id") Long id) {
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java
index 5de7e88..1358a63 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java
@@ -37,21 +37,17 @@
}
@ApiOperation(value = "激活用户", notes = "激活用户")
- @GetMapping(value = "/activeUser/{id}")
- public Result activeUser(@PathVariable(value = "id") Long id) {
+ @PostMapping(value = "/activeUser")
+ public Result activeUser(@RequestBody @Valid AdminActiveUserDto adminActiveUserDto) {
+ Long id = adminActiveUserDto.getId();
return iUserService.activeUser(id);
}
@ApiOperation(value = "禁用用户", notes = "禁用用户")
- @GetMapping(value = "/forbiddenUser/{id}")
- public Result forbiddenUser(@PathVariable(value = "id") Long id) {
+ @PostMapping(value = "/forbiddenUser")
+ public Result forbiddenUser(@RequestBody @Valid AdminForbiddenUserDto adminForbiddenUserDto) {
+ Long id = adminForbiddenUserDto.getId();
return iUserService.forbiddenUser(id);
- }
-
- @ApiOperation(value = "删除用户", notes = "删除用户")
- @GetMapping(value = "/deleteUser/{id}")
- public Result deleteUser(@PathVariable(value = "id") Long id) {
- return iUserService.deleteUser(id);
}
@ApiOperation(value = "查看用户详情", notes = "查看用户详情")
@@ -79,8 +75,9 @@
}
@ApiOperation(value = "重置密码", notes = "重置密码")
- @GetMapping(value = "/resetPassword/{id}")
- public Result resetPassword(@PathVariable(value = "id") Long id) {
+ @PostMapping(value = "/resetPassword")
+ public Result resetPassword(@RequestBody @Valid AdminResetPasswordDto adminResetPasswordDto) {
+ Long id = adminResetPasswordDto.getId();
return iUserService.resetPassword(id);
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminActiveUserDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminActiveUserDto.java
new file mode 100644
index 0000000..a36168e
--- /dev/null
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminActiveUserDto.java
@@ -0,0 +1,17 @@
+package com.xcong.farmer.cms.modules.system.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel(value = "AdminActiveUserDto", description = "参数接收类")
+public class AdminActiveUserDto {
+
+ @ApiModelProperty(value = "用户ID")
+ @NotNull(message = "参数不能为空")
+ private Long id;
+
+}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java
index 3448f79..9f54cd4 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java
@@ -4,6 +4,9 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
@@ -11,6 +14,7 @@
public class AdminAddArticleDto {
@ApiModelProperty(value = "标题")
+ @NotBlank(message = "请输入文章标题")
private String title;
@ApiModelProperty(value = "标题")
@@ -26,6 +30,7 @@
private String remark;
@ApiModelProperty(value = "所属栏目ID")
+ @NotNull(message = "所属栏目不能为空")
private Long columnId;
@ApiModelProperty(value = "访问量")
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddRoleDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddRoleDto.java
index 4b2c9cf..6120fc0 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddRoleDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddRoleDto.java
@@ -4,17 +4,21 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
+
@Data
@ApiModel(value = "AdminAddRoleDto", description = "参数接收类")
public class AdminAddRoleDto {
@ApiModelProperty(value = "角色名称")
+ @NotBlank(message = "请输入角色名称")
private String roleName;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "菜单按钮IDS")
+ @NotBlank(message = "请选择角色权限")
private String menuIds;
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddUserDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddUserDto.java
index eb49617..65be1d5 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddUserDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddUserDto.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Data
@@ -11,6 +12,7 @@
public class AdminAddUserDto {
@ApiModelProperty(value = "用户名")
+ @NotBlank(message = "请输入用户名")
private String username;
@ApiModelProperty(value = "昵称")
@@ -20,9 +22,11 @@
private Long belongId;
@ApiModelProperty(value = "角色IDS")
+ @NotBlank(message = "请选择用户角色")
private String roleIds;
@ApiModelProperty(value = "联系电话")
+ @NotBlank(message = "请输入联系电话")
private String phone;
@ApiModelProperty(value = "邮箱")
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminDeleteDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminDeleteDto.java
index 19bbb41..b6ee9ca 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminDeleteDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminDeleteDto.java
@@ -4,10 +4,14 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
@Data
@ApiModel(value = "AdminDeleteDto", description = "参数接收类")
public class AdminDeleteDto {
@ApiModelProperty(value = "IDS", example = "1,2,3")
+ @NotBlank(message = "参数不能为空")
private String ids;
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminForbiddenUserDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminForbiddenUserDto.java
new file mode 100644
index 0000000..577e773
--- /dev/null
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminForbiddenUserDto.java
@@ -0,0 +1,15 @@
+package com.xcong.farmer.cms.modules.system.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+@Data
+@ApiModel(value = "AdminForbiddenUserDto", description = "参数接收类")
+public class AdminForbiddenUserDto {
+
+ @ApiModelProperty(value = "用户ID")
+ @NotNull(message = "参数不能为空")
+ private Long id;
+}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminLoginDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminLoginDto.java
index 901359f..b6871be 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminLoginDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminLoginDto.java
@@ -3,12 +3,16 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
+
@Data
@ApiModel(value = "AdminLoginDto", description = "参数接收类")
public class AdminLoginDto {
+ @NotBlank(message = "请输入用户名")
private String username;
+ @NotBlank(message = "请输入密码")
private String password;
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminResetPasswordDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminResetPasswordDto.java
new file mode 100644
index 0000000..b3ae47f
--- /dev/null
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminResetPasswordDto.java
@@ -0,0 +1,16 @@
+package com.xcong.farmer.cms.modules.system.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel(value = "AdminResetPasswordDto", description = "参数接收类")
+public class AdminResetPasswordDto {
+
+ @ApiModelProperty(value = "用户ID")
+ @NotNull(message = "参数不能为空")
+ private Long id;
+}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java
index 03277d2..8f82420 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java
@@ -4,6 +4,9 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.util.Date;
@@ -15,6 +18,7 @@
private Long id;
@ApiModelProperty(value = "标题")
+ @NotBlank(message = "请输入文章标题")
private String title;
@ApiModelProperty(value = "标题")
@@ -30,6 +34,7 @@
private String remark;
@ApiModelProperty(value = "所属栏目ID")
+ @NotNull(message = "所属栏目不能为空")
private Long columnId;
@ApiModelProperty(value = "访问量")
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateStatusOnDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateStatusOnDto.java
new file mode 100644
index 0000000..d9fec67
--- /dev/null
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateStatusOnDto.java
@@ -0,0 +1,16 @@
+package com.xcong.farmer.cms.modules.system.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel(value = "AdminUpdateStatusOnDto", description = "参数接收类")
+public class AdminUpdateStatusOnDto {
+
+ @ApiModelProperty(value = "文章ID")
+ @NotNull(message = "参数不能为空")
+ private Long id;
+}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateWebSetDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateWebSetDto.java
index 9eb825d..d22e9a0 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateWebSetDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateWebSetDto.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
+
@Data
@ApiModel(value = "AdminUpdateWebSetDto", description = "参数接收类")
public class AdminUpdateWebSetDto {
@@ -12,9 +14,11 @@
private Long id;
@ApiModelProperty(value = "网页标题")
+ @NotBlank(message = "请输入网页标题")
private String webTitle;
@ApiModelProperty(value = "网页关键字")
+ @NotBlank(message = "请输入网页关键字")
private String webKeyword;
@ApiModelProperty(value = "网页描述")
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUserDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUserDto.java
index 1eea18a..7be030a 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUserDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUserDto.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotNull;
+
@Data
@ApiModel(value = "AdminUserDto", description = "参数接收类")
public class AdminUserDto {
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
index d910537..60e4ea5 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
@@ -69,9 +69,6 @@
ArticleEntity articleEntity = new ArticleEntity();
articleEntity.setBelongId(belongId);
String title = adminAddArticleDto.getTitle();
- if(StrUtil.isEmpty(title)){
- return Result.fail("请输入文章标题");
- }
articleEntity.setTitle(title);
String childTitle = adminAddArticleDto.getChildTitle();
if(StrUtil.isNotEmpty(childTitle)){
@@ -90,9 +87,6 @@
articleEntity.setRemark(remark);
}
long columnId = adminAddArticleDto.getColumnId() == null ? 0L : adminAddArticleDto.getColumnId();
- if(columnId == 0L){
- return Result.fail("请选择文章栏目");
- }
ColumnEntity columnEntity = columnMapper.selectById(columnId);
if(ObjectUtil.isEmpty(columnEntity)){
return Result.fail("请选择文章栏目");
@@ -153,11 +147,12 @@
if(ObjectUtil.isEmpty(articleEntity)){
return Result.fail("文章不存在");
}
+ Integer releaseStatus = adminUpdateArticleDto.getReleaseStatus();
+ if(!ArticleEntity.RELEASE_STATUS_YES.equals(releaseStatus)){
+ return Result.fail("请先取消文章的发布状态");
+ }
articleEntity.getReleaseStatus();
String title = adminUpdateArticleDto.getTitle();
- if(StrUtil.isEmpty(title)){
- return Result.fail("请输入文章标题");
- }
articleEntity.setTitle(title);
String childTitle = adminUpdateArticleDto.getChildTitle();
articleEntity.setChildTitle(childTitle);
@@ -167,9 +162,6 @@
String remark = adminUpdateArticleDto.getRemark();
articleEntity.setRemark(remark);
long columnId = adminUpdateArticleDto.getColumnId() == null ? 0L : adminUpdateArticleDto.getColumnId();
- if(columnId == 0L){
- return Result.fail("请选择文章栏目");
- }
ColumnEntity columnEntity = columnMapper.selectById(columnId);
if(ObjectUtil.isEmpty(columnEntity)){
return Result.fail("请选择文章栏目");
@@ -184,10 +176,6 @@
Date releaseTime = adminUpdateArticleDto.getReleaseTime();
if(ObjectUtil.isNotEmpty(releaseTime)){
articleEntity.setReleaseTime(releaseTime);
- }
- Integer releaseStatus = adminUpdateArticleDto.getReleaseStatus();
- if(!ArticleEntity.RELEASE_STATUS_YES.equals(releaseStatus)){
- return Result.fail("请先取消文章的发布状态");
}
articleEntity.setReleaseStatus(releaseStatus);
String articleDetails = adminUpdateArticleDto.getArticleDetails();
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java
index 54ac970..6c8a2ad 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java
@@ -66,13 +66,7 @@
public Result addRole(AdminAddRoleDto adminAddRoleDto) {
UserEntity userlogin = LoginUserUtil.getLoginUser();
String roleName = adminAddRoleDto.getRoleName();
- if(StrUtil.isEmpty(roleName)){
- return Result.fail("请输入角色名称");
- }
String menuIds = adminAddRoleDto.getMenuIds();
- if(StrUtil.isEmpty(menuIds)){
- return Result.fail("请选择角色权限");
- }
RoleEntity roleEntity = new RoleEntity();
String remark = adminAddRoleDto.getRemark();
if(StrUtil.isNotEmpty(remark)){
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
index 2341744..af97f37 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
@@ -82,24 +82,14 @@
public Result addUser(AdminAddUserDto adminAddUserDto) {
UserEntity userlogin = LoginUserUtil.getLoginUser();
String username = adminAddUserDto.getUsername();
- if(StrUtil.isEmpty(username)){
- return Result.fail("请输入用户名");
- }
QueryWrapper<UserEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("username",username);
-// objectQueryWrapper.eq("belong_id",userlogin.getBelongId());
List<UserEntity> userEntities = this.baseMapper.selectList(objectQueryWrapper);
if(CollUtil.isNotEmpty(userEntities)){
return Result.fail("用户名重复");
}
String roleIds = adminAddUserDto.getRoleIds();
- if(StrUtil.isEmpty(roleIds)){
- return Result.fail("请选择用户角色");
- }
String phone = adminAddUserDto.getPhone();
- if(StrUtil.isEmpty(phone)){
- return Result.fail("请输入联系电话");
- }
Long belongId = adminAddUserDto.getBelongId() == null ? UserEntity.USER_BELONG_TOP:adminAddUserDto.getBelongId();
if(belongId == UserEntity.USER_BELONG_TOP){
return Result.fail("请选择所属公司");
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java
index 8904e67..b01fafc 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java
@@ -46,18 +46,11 @@
UserEntity userlogin = LoginUserUtil.getLoginUser();
long belongId = userlogin.getBelongId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getBelongId();
String webTitle = adminUpdateWebSetDto.getWebTitle();
- if(StrUtil.isEmpty(webTitle)){
- return Result.fail("请输入网页标题");
- }
String webKeyword = adminUpdateWebSetDto.getWebKeyword();
- if(StrUtil.isEmpty(webKeyword)){
- return Result.fail("请输入网页关键字");
- }
Long id = adminUpdateWebSetDto.getId() == null ? 0L : adminUpdateWebSetDto.getId();
QueryWrapper<WebSetEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("belong_id",belongId);
WebSetEntity webSetEntity = this.baseMapper.selectOne(objectQueryWrapper);
-// WebSetEntity webSetEntity = this.baseMapper.selectById(id);
if(ObjectUtil.isEmpty(webSetEntity)){
WebSetEntity webSetEntityAdd = new WebSetEntity();
webSetEntityAdd.setWebTitle(webTitle);
--
Gitblit v1.9.1