xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-08 21:26:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update domain suffix

Browse Source
This commit is contained in:
Turbolisten 2021-10-08 20:36:06 +08:00
parent 8ead192c44
commit 7a28835f1e
51 changed files with 209 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/PageParamDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/PageParamForm.java
View File

@ -3,10 +3,12 @@ package net.lab1024.smartadmin.service.common.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import org.hibernate.validator.constraints.Range;
import javax.validation.Valid;
import javax.validation.constraints.*;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.util.List;
/**
@ -16,7 +18,7 @@ import java.util.List;
* @Date Created in 2017/10/28 16:19
*/
@Data
public class PageParamDTO {
public class PageParamForm {
@ApiModelProperty(value = "页码(不能为空)", required = true, example = "1")
@NotNull(message = "分页参数不能为空")

6
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartPageUtil.java
View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.common.util;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
import net.lab1024.smartadmin.service.common.domain.PageParamForm;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import org.apache.commons.collections4.CollectionUtils;
@ -23,10 +23,10 @@ public class SmartPageUtil {
* @param baseDTO
* @return
*/
public static Page<?> convert2PageQuery(PageParamDTO baseDTO) {
public static Page<?> convert2PageQuery(PageParamForm baseDTO) {
Page<?> page = new Page<>(baseDTO.getPageNum(), baseDTO.getPageSize());
// 设置排序字段
List<PageParamDTO.SortItemDTO> sortItemList = baseDTO.getSortItemList();
List<PageParamForm.SortItemDTO> sortItemList = baseDTO.getSortItemList();
if (CollectionUtils.isNotEmpty(sortItemList)) {
List<OrderItem> orderItemList = sortItemList.stream().map(e -> new OrderItem(e.getColumn(), e.getIsAsc())).collect(Collectors.toList());
page.setOrders(orderItemList);

12
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryController.java
View File

@ -27,14 +27,14 @@ public class CategoryController extends SystemBaseController {
@ApiOperation("添加类目 by listen")
@PostMapping("/category/add")
public ResponseDTO<String> add(@RequestBody @Valid CategoryAddDTO addDTO) {
return categoryService.add(addDTO);
public ResponseDTO<String> add(@RequestBody @Valid CategoryAddForm addForm) {
return categoryService.add(addForm);
}
@ApiOperation("更新类目 by listen")
@PostMapping("/category/update")
public ResponseDTO<String> update(@RequestBody @Valid CategoryUpdateDTO updateDTO) {
return categoryService.update(updateDTO);
public ResponseDTO<String> update(@RequestBody @Valid CategoryUpdateForm updateForm) {
return categoryService.update(updateForm);
}
@ApiOperation("查询类目详情 by listen")
@ -45,8 +45,8 @@ public class CategoryController extends SystemBaseController {
@ApiOperation("查询类目层级树 by listen")
@PostMapping("/category/tree")
public ResponseDTO<List<CategoryTreeVO>> queryTree(@RequestBody @Valid CategoryTreeQueryDTO queryDTO) {
return categoryService.queryTree(queryDTO);
public ResponseDTO<List<CategoryTreeVO>> queryTree(@RequestBody @Valid CategoryTreeQueryForm queryForm) {
return categoryService.queryTree(queryForm);
}
@ApiOperation("删除类目 by listen")

8
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryQueryService.java
View File

@ -7,7 +7,7 @@ import net.lab1024.smartadmin.service.common.constant.StringConst;
import net.lab1024.smartadmin.service.module.business.category.constant.CategoryConst;
import net.lab1024.smartadmin.service.module.business.category.domain.CategoryEntity;
import net.lab1024.smartadmin.service.module.business.category.domain.CategorySimpleDTO;
import net.lab1024.smartadmin.service.module.business.category.domain.CategoryTreeQueryDTO;
import net.lab1024.smartadmin.service.module.business.category.domain.CategoryTreeQueryForm;
import net.lab1024.smartadmin.service.module.business.category.domain.CategoryTreeVO;
import net.lab1024.smartadmin.service.module.support.beancache.cache.IBeanCache;
import net.lab1024.smartadmin.service.module.support.beancache.key.CacheKey;
@ -195,10 +195,10 @@ public class CategoryQueryService {
*
* @return
*/
public List<CategoryTreeVO> queryCategoryTree(CategoryTreeQueryDTO queryDTO) {
public List<CategoryTreeVO> queryCategoryTree(CategoryTreeQueryForm queryForm) {
// 查询缓存
Long parentId = queryDTO.getParentId();
Integer categoryType = queryDTO.getCategoryType();
Long parentId = queryForm.getParentId();
Integer categoryType = queryForm.getCategoryType();
String cacheKey = CacheKey.cacheKey(CacheModuleConst.Category.CATEGORY_TREE, getCacheId(parentId, categoryType));
List<CategoryTreeVO> treeList = cache.get(cacheKey);
if (null != treeList) {

27
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryService.java
View File

@ -2,7 +2,6 @@ package net.lab1024.smartadmin.service.module.business.category;
import com.google.common.collect.Lists;
import net.lab1024.smartadmin.service.common.code.UserErrorCode;
import net.lab1024.smartadmin.service.common.constant.StringConst;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.business.category.constant.CategoryConst;
import net.lab1024.smartadmin.service.module.business.category.domain.*;
@ -36,17 +35,17 @@ public class CategoryService {
* @author 胡克
* @date 2021/1/20 17:17
*/
public ResponseDTO<String> add(CategoryAddDTO addDTO) {
public ResponseDTO<String> add(CategoryAddForm addForm) {
// 校验类目
CategoryEntity categoryEntity = SmartBeanUtil.copy(addDTO, CategoryEntity.class);
CategoryEntity categoryEntity = SmartBeanUtil.copy(addForm, CategoryEntity.class);
ResponseDTO<String> res = this.checkCategory(categoryEntity, false);
if (!res.getOk()) {
return res;
}
// 没有父类则使用默认父类
Long parentId = null == addDTO.getParentId() ? CategoryConst.DEFAULT_PARENT_ID : addDTO.getParentId();
Long parentId = null == addForm.getParentId() ? CategoryConst.DEFAULT_PARENT_ID : addForm.getParentId();
categoryEntity.setParentId(parentId);
categoryEntity.setSort(null == addDTO.getSort() ? 0 : addDTO.getSort());
categoryEntity.setSort(null == addForm.getSort() ? 0 : addForm.getSort());
categoryEntity.setDeletedFlag(false);
// 保存数据
@ -64,14 +63,14 @@ public class CategoryService {
* @author 胡克
* @date 2021/1/20 17:17
*/
public ResponseDTO<String> update(CategoryUpdateDTO updateDTO) {
public ResponseDTO<String> update(CategoryUpdateForm updateForm) {
// 校验类目
Long categoryId = updateDTO.getCategoryId();
Long categoryId = updateForm.getCategoryId();
Optional<CategoryEntity> optional = categoryQueryService.queryCategory(categoryId);
if (!optional.isPresent()) {
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
}
CategoryEntity categoryEntity = SmartBeanUtil.copy(updateDTO, CategoryEntity.class);
CategoryEntity categoryEntity = SmartBeanUtil.copy(updateForm, CategoryEntity.class);
/**
* 不更新类目类型
@ -162,17 +161,17 @@ public class CategoryService {
* 根据父级id 查询所有子类 返回层级树
* 如果父类id 为空 返回所有类目层级
*
* @param queryDTO
* @param queryForm
* @return
*/
public ResponseDTO<List<CategoryTreeVO>> queryTree(CategoryTreeQueryDTO queryDTO) {
if (null == queryDTO.getParentId()) {
if (null == queryDTO.getCategoryType()) {
public ResponseDTO<List<CategoryTreeVO>> queryTree(CategoryTreeQueryForm queryForm) {
if (null == queryForm.getParentId()) {
if (null == queryForm.getCategoryType()) {
return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "类目类型不能为空");
}
queryDTO.setParentId(CategoryConst.DEFAULT_PARENT_ID);
queryForm.setParentId(CategoryConst.DEFAULT_PARENT_ID);
}
List<CategoryTreeVO> treeList = categoryQueryService.queryCategoryTree(queryDTO);
List<CategoryTreeVO> treeList = categoryQueryService.queryCategoryTree(queryForm);
return ResponseDTO.ok(treeList);
}

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/domain/CategoryAddDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/domain/CategoryAddForm.java
View File

@ -9,6 +9,6 @@ import lombok.Data;
* @date 2021/1/20 16:24
*/
@Data
public class CategoryAddDTO extends CategoryBaseDTO {
public class CategoryAddForm extends CategoryBaseDTO {
}

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/domain/CategoryTreeQueryDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/domain/CategoryTreeQueryForm.java
View File

@ -12,7 +12,7 @@ import net.lab1024.smartadmin.service.module.business.category.constant.Category
* @date 2021/1/20 16:17
*/
@Data
public class CategoryTreeQueryDTO {
public class CategoryTreeQueryForm {
@ApiModelPropertyEnum(desc = "分类类型|可选", value = CategoryTypeEnum.class)
private Integer categoryType;

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/domain/CategoryUpdateDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/domain/CategoryUpdateForm.java
View File

@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull;
* @date 2021/1/20 16:24
*/
@Data
public class CategoryUpdateDTO extends CategoryBaseDTO {
public class CategoryUpdateForm extends CategoryBaseDTO {
@ApiModelProperty("类目id")
@NotNull(message = "类目id不能为空")

28
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java
View File

@ -31,34 +31,34 @@ public class GoodsController extends SystemBaseController {
@ApiOperation("添加商品 by listen")
@PostMapping("/goods/add")
public ResponseDTO<String> add(@RequestBody @Valid GoodsAddDTO addDTO) {
public ResponseDTO<String> add(@RequestBody @Valid GoodsAddForm addForm) {
EmployeeLoginInfoDTO employee = SmartEmployeeTokenUtil.getRequestEmployee();
addDTO.setUpdateId(employee.getEmployeeId());
addDTO.setUpdateName(employee.getActualName());
return goodsService.add(addDTO);
addForm.setUpdateId(employee.getEmployeeId());
addForm.setUpdateName(employee.getActualName());
return goodsService.add(addForm);
}
@ApiOperation("更新商品 by listen")
@PostMapping("/goods/update")
public ResponseDTO<String> update(@RequestBody @Valid GoodsUpdateDTO updateDTO) {
public ResponseDTO<String> update(@RequestBody @Valid GoodsUpdateForm updateForm) {
EmployeeLoginInfoDTO employee = SmartEmployeeTokenUtil.getRequestEmployee();
updateDTO.setUpdateId(employee.getEmployeeId());
updateDTO.setUpdateName(employee.getActualName());
return goodsService.update(updateDTO);
updateForm.setUpdateId(employee.getEmployeeId());
updateForm.setUpdateName(employee.getActualName());
return goodsService.update(updateForm);
}
@ApiOperation("删除 by listen")
@PostMapping("/goods/del")
public ResponseDTO<String> del(@RequestBody @Valid GoodsDelDTO delDTO) {
public ResponseDTO<String> del(@RequestBody @Valid GoodsDelForm delForm) {
EmployeeLoginInfoDTO employee = SmartEmployeeTokenUtil.getRequestEmployee();
delDTO.setUpdateId(employee.getEmployeeId());
delDTO.setUpdateName(employee.getActualName());
return goodsService.del(delDTO);
delForm.setUpdateId(employee.getEmployeeId());
delForm.setUpdateName(employee.getActualName());
return goodsService.del(delForm);
}
@ApiOperation("分页查询 by listen")
@PostMapping("/goods/query")
public ResponseDTO<PageResultDTO<GoodsAdminVO>> query(@RequestBody @Valid GoodsQueryDTO queryDTO) {
return goodsService.query(queryDTO);
public ResponseDTO<PageResultDTO<GoodsAdminVO>> query(@RequestBody @Valid GoodsQueryForm queryForm) {
return goodsService.query(queryForm);
}
}

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsDao.java
View File

@ -29,8 +29,8 @@ public interface GoodsDao extends BaseMapper<GoodsEntity> {
* 分页 查询商品
*
* @param page
* @param queryDTO
* @param query
* @return
*/
List<GoodsAdminVO> query(Page page, @Param("query") GoodsQueryDTO queryDTO);
List<GoodsAdminVO> query(Page page, @Param("query") GoodsQueryForm query);
}

42
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsService.java
View File

@ -40,17 +40,17 @@ public class GoodsService {
/**
* 添加商品
*
* @param addDTO
* @param addForm
* @return
*/
public ResponseDTO<String> add(GoodsAddDTO addDTO) {
public ResponseDTO<String> add(GoodsAddForm addForm) {
// 商品校验
ResponseDTO<String> res = this.checkGoods(addDTO, null);
ResponseDTO<String> res = this.checkGoods(addForm, null);
if (!res.getOk()) {
return res;
}
GoodsEntity goodsEntity = SmartBeanUtil.copy(addDTO, GoodsEntity.class);
GoodsEntity goodsEntity = SmartBeanUtil.copy(addForm, GoodsEntity.class);
goodsDao.insert(goodsEntity);
return ResponseDTO.ok();
}
@ -58,17 +58,17 @@ public class GoodsService {
/**
* 更新商品
*
* @param updateDTO
* @param updateForm
* @return
*/
public ResponseDTO<String> update(GoodsUpdateDTO updateDTO) {
public ResponseDTO<String> update(GoodsUpdateForm updateForm) {
// 商品校验
ResponseDTO<String> res = this.checkGoods(updateDTO, updateDTO.getGoodsId());
ResponseDTO<String> res = this.checkGoods(updateForm, updateForm.getGoodsId());
if (!res.getOk()) {
return res;
}
GoodsEntity goodsEntity = SmartBeanUtil.copy(updateDTO, GoodsEntity.class);
GoodsEntity goodsEntity = SmartBeanUtil.copy(updateForm, GoodsEntity.class);
goodsDao.updateById(goodsEntity);
return ResponseDTO.ok();
}
@ -76,17 +76,17 @@ public class GoodsService {
/**
* 添加/更新 商品校验
*
* @param addDTO
* @param addForm
* @param goodsId 不为空 代表更新商品
* @return
*/
private ResponseDTO<String> checkGoods(GoodsAddDTO addDTO, Long goodsId) {
private ResponseDTO<String> checkGoods(GoodsAddForm addForm, Long goodsId) {
// 校验商品名称重复
Long categoryId = addDTO.getCategoryId();
Long categoryId = addForm.getCategoryId();
GoodsBO goodsBO = new GoodsBO();
goodsBO.setGoodsName(addDTO.getGoodsName());
goodsBO.setGoodsType(addDTO.getGoodsType());
goodsBO.setGoodsName(addForm.getGoodsName());
goodsBO.setGoodsType(addForm.getGoodsType());
goodsBO.setCategoryId(categoryId);
goodsBO.setDeletedFlag(false);
GoodsEntity goodsEntity = goodsDao.selectOne(goodsBO);
@ -108,12 +108,12 @@ public class GoodsService {
/**
* 批量删除
*
* @param delDTO
* @param delForm
* @return
*/
public ResponseDTO<String> del(GoodsDelDTO delDTO) {
public ResponseDTO<String> del(GoodsDelForm delForm) {
// 批量更新删除状态
List<GoodsEntity> goodsList = delDTO.getGoodsIdList().stream().map(id -> {
List<GoodsEntity> goodsList = delForm.getGoodsIdList().stream().map(id -> {
GoodsEntity goodsEntity = new GoodsEntity();
goodsEntity.setGoodsId(id);
goodsEntity.setDeletedFlag(true);
@ -126,13 +126,13 @@ public class GoodsService {
/**
* 分页查询
*
* @param queryDTO
* @param queryForm
* @return
*/
public ResponseDTO<PageResultDTO<GoodsAdminVO>> query(GoodsQueryDTO queryDTO) {
queryDTO.setDeletedFlag(false);
Page<?> page = SmartPageUtil.convert2PageQuery(queryDTO);
List<GoodsAdminVO> list = goodsDao.query(page, queryDTO);
public ResponseDTO<PageResultDTO<GoodsAdminVO>> query(GoodsQueryForm queryForm) {
queryForm.setDeletedFlag(false);
Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
List<GoodsAdminVO> list = goodsDao.query(page, queryForm);
PageResultDTO<GoodsAdminVO> pageResult = SmartPageUtil.convert2PageResult(page, list);
if (pageResult.getEmptyFlag()) {
return ResponseDTO.ok(pageResult);

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsAddDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsAddForm.java
View File

@ -10,7 +10,7 @@ import lombok.Data;
* @date 2021/8/5 14:42
*/
@Data
public class GoodsAddDTO extends GoodsBaseDTO {
public class GoodsAddForm extends GoodsBaseDTO {
@ApiModelProperty(hidden = true)
private Long updateId;

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsDelDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsDelForm.java
View File

@ -14,7 +14,7 @@ import java.util.List;
* @date 2021/8/5 14:42
*/
@Data
public class GoodsDelDTO {
public class GoodsDelForm {
@ApiModelProperty("商品id集合")
@NotEmpty(message = "商品id不能为空")

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsQueryDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsQueryForm.java
View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.business.goods.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
import net.lab1024.smartadmin.service.common.domain.PageParamForm;
import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum;
import net.lab1024.smartadmin.service.module.business.goods.constant.GoodsTypeEnum;
import org.hibernate.validator.constraints.Length;
@ -14,7 +14,7 @@ import org.hibernate.validator.constraints.Length;
* @date 2021/8/5 14:42
*/
@Data
public class GoodsQueryDTO extends PageParamDTO {
public class GoodsQueryForm extends PageParamForm {
@ApiModelPropertyEnum(desc = "商品类型|可选", value = GoodsTypeEnum.class)
private Integer goodsType;

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsUpdateDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsUpdateForm.java
View File

@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull;
* @date 2021/8/5 14:42
*/
@Data
public class GoodsUpdateDTO extends GoodsAddDTO {
public class GoodsUpdateForm extends GoodsAddForm {
@ApiModelProperty("商品id")
@NotNull(message = "商品id不能为空")

26
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeController.java
View File

@ -4,7 +4,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.SystemBaseController;
import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
import net.lab1024.smartadmin.service.common.domain.PageParamForm;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.business.notice.domain.dto.*;
@ -31,34 +31,34 @@ public class NoticeController extends SystemBaseController {
@ApiOperation(value = "分页查询全部消息", notes = "@author 罗伊")
@PostMapping("/notice/page/query")
public ResponseDTO<PageResultDTO<NoticeVO>> queryByPage(@RequestBody NoticeQueryDTO queryDTO) {
return noticeService.queryByPage(queryDTO);
public ResponseDTO<PageResultDTO<NoticeVO>> queryByPage(@RequestBody NoticeQueryForm queryForm) {
return noticeService.queryByPage(queryForm);
}
@ApiOperation(value = "获取已收取的所有消息", notes = "@author 罗伊")
@PostMapping("/notice/receive/page/query")
public ResponseDTO<PageResultDTO<NoticeReceiveDTO>> queryReceiveByPage(@RequestBody NoticeReceiveQueryDTO queryDTO) {
queryDTO.setEmployeeId(SmartEmployeeTokenUtil.getRequestEmployeeId());
return noticeService.queryReceiveByPage(queryDTO);
public ResponseDTO<PageResultDTO<NoticeReceiveForm>> queryReceiveByPage(@RequestBody NoticeReceiveQueryForm queryForm) {
queryForm.setEmployeeId(SmartEmployeeTokenUtil.getRequestEmployeeId());
return noticeService.queryReceiveByPage(queryForm);
}
@ApiOperation(value = "分页查询未读消息", notes = "@author 罗伊")
@PostMapping("/notice/unread/page/query")
public ResponseDTO<PageResultDTO<NoticeVO>> queryUnreadByPage(@RequestBody PageParamDTO queryDTO) {
return noticeService.queryUnreadByPage(queryDTO, SmartEmployeeTokenUtil.getRequestEmployeeId());
public ResponseDTO<PageResultDTO<NoticeVO>> queryUnreadByPage(@RequestBody PageParamForm queryForm) {
return noticeService.queryUnreadByPage(queryForm, SmartEmployeeTokenUtil.getRequestEmployeeId());
}
@ApiOperation(value = "添加", notes = "@author 罗伊")
@PostMapping("/notice/add")
public ResponseDTO<String> add(@RequestBody @Valid NoticeAddDTO addDTO) {
addDTO.setCreateId(SmartEmployeeTokenUtil.getRequestEmployeeId());
return noticeService.add(addDTO);
public ResponseDTO<String> add(@RequestBody @Valid NoticeAddForm addForm) {
addForm.setCreateId(SmartEmployeeTokenUtil.getRequestEmployeeId());
return noticeService.add(addForm);
}
@ApiOperation(value = "修改", notes = "@author 罗伊")
@PostMapping("/notice/update")
public ResponseDTO<String> update(@RequestBody @Valid NoticeUpdateDTO updateDTO) {
return noticeService.update(updateDTO);
public ResponseDTO<String> update(@RequestBody @Valid NoticeUpdateForm updateForm) {
return noticeService.update(updateForm);
}
@ApiOperation(value = "删除", notes = "@author 罗伊")

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeManage.java
View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.business.notice;
import net.lab1024.smartadmin.service.module.business.notice.dao.NoticeDao;
import net.lab1024.smartadmin.service.module.business.notice.dao.NoticeReceiveRecordDao;
import net.lab1024.smartadmin.service.module.business.notice.domain.dto.NoticeUpdateDTO;
import net.lab1024.smartadmin.service.module.business.notice.domain.dto.NoticeUpdateForm;
import net.lab1024.smartadmin.service.module.business.notice.domain.entity.NoticeEntity;
import net.lab1024.smartadmin.service.module.business.notice.domain.entity.NoticeReceiveRecordEntity;
import org.springframework.beans.factory.annotation.Autowired;
@ -76,7 +76,7 @@ public class NoticeManage {
*
* @param updateDTO
*/
public void update(NoticeUpdateDTO updateDTO) {
public void update(NoticeUpdateForm updateDTO) {
NoticeEntity updateEntity = new NoticeEntity();
updateEntity.setId(updateDTO.getId());
updateEntity.setTitle(updateDTO.getTitle());

40
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeService.java
View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.business.notice;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import net.lab1024.smartadmin.service.common.code.UserErrorCode;
import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
import net.lab1024.smartadmin.service.common.domain.PageParamForm;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.business.notice.dao.NoticeDao;
@ -42,10 +42,10 @@ public class NoticeService {
* @description 分页查询
* @date 2019-07-11 16:19:48
*/
public ResponseDTO<PageResultDTO<NoticeVO>> queryByPage(NoticeQueryDTO queryDTO) {
queryDTO.setDeletedFlag(false);
Page page = SmartPageUtil.convert2PageQuery(queryDTO);
List<NoticeVO> dtoList = noticeDao.queryByPage(page, queryDTO);
public ResponseDTO<PageResultDTO<NoticeVO>> queryByPage(NoticeQueryForm queryForm) {
queryForm.setDeletedFlag(false);
Page page = SmartPageUtil.convert2PageQuery(queryForm);
List<NoticeVO> dtoList = noticeDao.queryByPage(page, queryForm);
PageResultDTO<NoticeVO> pageResultDTO = SmartPageUtil.convert2PageResult(page, dtoList);
return ResponseDTO.ok(pageResultDTO);
}
@ -53,29 +53,29 @@ public class NoticeService {
/**
* 获取当前登录人的消息列表
*
* @param queryDTO
* @param queryForm
* @return
*/
public ResponseDTO<PageResultDTO<NoticeReceiveDTO>> queryReceiveByPage(NoticeReceiveQueryDTO queryDTO) {
queryDTO.setSendStatus(true);
Page page = SmartPageUtil.convert2PageQuery(queryDTO);
List<NoticeReceiveDTO> dtoList = noticeDao.queryReceiveByPage(page, queryDTO);
public ResponseDTO<PageResultDTO<NoticeReceiveForm>> queryReceiveByPage(NoticeReceiveQueryForm queryForm) {
queryForm.setSendStatus(true);
Page page = SmartPageUtil.convert2PageQuery(queryForm);
List<NoticeReceiveForm> dtoList = noticeDao.queryReceiveByPage(page, queryForm);
//根据用户的接收时间设置读取状态，以便前端对其设置
dtoList.forEach(e -> {
e.setReadStatus(e.getReceiveTime() != null);
});
PageResultDTO<NoticeReceiveDTO> pageResultDTO = SmartPageUtil.convert2PageResult(page, dtoList);
PageResultDTO<NoticeReceiveForm> pageResultDTO = SmartPageUtil.convert2PageResult(page, dtoList);
return ResponseDTO.ok(pageResultDTO);
}
/**
* 获取我的未读消息
*
* @param queryDTO
* @param queryForm
* @return
*/
public ResponseDTO<PageResultDTO<NoticeVO>> queryUnreadByPage(PageParamDTO queryDTO, Long employeeId) {
Page page = SmartPageUtil.convert2PageQuery(queryDTO);
public ResponseDTO<PageResultDTO<NoticeVO>> queryUnreadByPage(PageParamForm queryForm, Long employeeId) {
Page page = SmartPageUtil.convert2PageQuery(queryForm);
List<NoticeVO> dtoList = noticeDao.queryUnreadByPage(page, employeeId, true);
PageResultDTO<NoticeVO> pageResultDTO = SmartPageUtil.convert2PageResult(page, dtoList);
return ResponseDTO.ok(pageResultDTO);
@ -86,9 +86,9 @@ public class NoticeService {
* @description 添加
* @date 2019-07-11 16:19:48
*/
public ResponseDTO<String> add(NoticeAddDTO addDTO) {
NoticeEntity entity = SmartBeanUtil.copy(addDTO, NoticeEntity.class);
entity.setCreateUser(addDTO.getCreateId());
public ResponseDTO<String> add(NoticeAddForm addForm) {
NoticeEntity entity = SmartBeanUtil.copy(addForm, NoticeEntity.class);
entity.setCreateUser(addForm.getCreateId());
entity.setSendStatus(false);
entity.setDeletedFlag(true);
noticeDao.insert(entity);
@ -101,8 +101,8 @@ public class NoticeService {
* @date 2019-07-11 16:19:48
*/
@Transactional(rollbackFor = Exception.class)
public ResponseDTO<String> update(NoticeUpdateDTO updateDTO) {
NoticeEntity entity = noticeDao.selectById(updateDTO.getId());
public ResponseDTO<String> update(NoticeUpdateForm updateForm) {
NoticeEntity entity = noticeDao.selectById(updateForm.getId());
if (entity == null) {
return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "此系统通知不存在");
}
@ -112,7 +112,7 @@ public class NoticeService {
if (entity.getSendStatus()) {
return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "此系统通知已发送无法修改");
}
noticeManage.update(updateDTO);
noticeManage.update(updateForm);
return ResponseDTO.ok();
}

14
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/dao/NoticeDao.java
View File

@ -2,10 +2,10 @@ package net.lab1024.smartadmin.service.module.business.notice.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import net.lab1024.smartadmin.service.module.business.notice.domain.dto.NoticeQueryDTO;
import net.lab1024.smartadmin.service.module.business.notice.domain.dto.NoticeQueryForm;
import net.lab1024.smartadmin.service.module.business.notice.domain.dto.NoticeReadCountDTO;
import net.lab1024.smartadmin.service.module.business.notice.domain.dto.NoticeReceiveDTO;
import net.lab1024.smartadmin.service.module.business.notice.domain.dto.NoticeReceiveQueryDTO;
import net.lab1024.smartadmin.service.module.business.notice.domain.dto.NoticeReceiveForm;
import net.lab1024.smartadmin.service.module.business.notice.domain.dto.NoticeReceiveQueryForm;
import net.lab1024.smartadmin.service.module.business.notice.domain.entity.NoticeEntity;
import net.lab1024.smartadmin.service.module.business.notice.domain.vo.NoticeDetailVO;
import net.lab1024.smartadmin.service.module.business.notice.domain.vo.NoticeVO;
@ -30,11 +30,11 @@ public interface NoticeDao extends BaseMapper<NoticeEntity> {
/**
* 分页查询
*
* @param queryDTO
* @param query
* @return NoticeEntity
*/
@DataScope(dataScopeType = DataScopeTypeEnum.NOTICE, joinSql = "n.create_user in (#employeeIds)", whereInType = DataScopeWhereInTypeEnum.EMPLOYEE)
List<NoticeVO> queryByPage(Page page, @Param("queryDTO") NoticeQueryDTO queryDTO);
List<NoticeVO> queryByPage(Page page, @Param("query") NoticeQueryForm query);
/**
@ -52,10 +52,10 @@ public interface NoticeDao extends BaseMapper<NoticeEntity> {
* 获取
*
* @param page
* @param queryDTO
* @param query
* @return
*/
List<NoticeReceiveDTO> queryReceiveByPage(Page page, @Param("queryDTO") NoticeReceiveQueryDTO queryDTO);
List<NoticeReceiveForm> queryReceiveByPage(Page page, @Param("query") NoticeReceiveQueryForm query);
/**
* 详情

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeAddDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeAddForm.java
View File

@ -10,7 +10,7 @@ import org.hibernate.validator.constraints.Length;
* @author 罗伊
*/
@Data
public class NoticeAddDTO {
public class NoticeAddForm {
@ApiModelProperty("消息标题")
@Length(max = 200)

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeQueryDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeQueryForm.java
View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.business.notice.domain.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
import net.lab1024.smartadmin.service.common.domain.PageParamForm;
/**
* [ ]
@ -10,7 +10,7 @@ import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
* @author 罗伊
*/
@Data
public class NoticeQueryDTO extends PageParamDTO {
public class NoticeQueryForm extends PageParamForm {
@ApiModelProperty("开始日期")

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeReceiveDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeReceiveForm.java
View File

@ -11,7 +11,7 @@ import java.time.LocalDateTime;
* @author 罗伊
*/
@Data
public class NoticeReceiveDTO{
public class NoticeReceiveForm {
@ApiModelProperty("id")
private Long id;

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeReceiveQueryDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeReceiveQueryForm.java
View File

@ -9,7 +9,7 @@ import lombok.Data;
* @author 罗伊
*/
@Data
public class NoticeReceiveQueryDTO extends NoticeQueryDTO {
public class NoticeReceiveQueryForm extends NoticeQueryForm {
@ApiModelProperty(hidden = true)
private Long employeeId;

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeUpdateDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeUpdateForm.java
View File

@ -9,7 +9,7 @@ import lombok.Data;
* @author 罗伊
*/
@Data
public class NoticeUpdateDTO extends NoticeAddDTO {
public class NoticeUpdateForm extends NoticeAddForm {
@ApiModelProperty("id")
private Long id;

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/domain/DataTracerQueryForm.java
View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.support.datatracer.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
import net.lab1024.smartadmin.service.common.domain.PageParamForm;
import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum;
import net.lab1024.smartadmin.service.module.support.datatracer.constant.DataTracerBusinessTypeEnum;
@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
* @date 2021/8/17 8:47
*/
@Data
public class DataTracerQueryForm extends PageParamDTO {
public class DataTracerQueryForm extends PageParamForm {
@ApiModelPropertyEnum(DataTracerBusinessTypeEnum.class)
private Integer businessType;

12
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/FileController.java
View File

@ -40,8 +40,8 @@ public class FileController extends SupportBaseController {
@ApiOperation(value = "文件上传，通过url上传 by listen", notes = FileFolderTypeEnum.INFO)
@PostMapping("/file/upload/url")
public ResponseDTO<FileUploadVO> uploadByUrl(@RequestBody @Valid FileUrlUploadDTO urlUploadDTO) {
return fileService.fileUpload(urlUploadDTO);
public ResponseDTO<FileUploadVO> uploadByUrl(@RequestBody @Valid FileUrlUploadForm uploadForm) {
return fileService.fileUpload(uploadForm);
}
@ApiOperation("获取文件URL：根据fileKey by listen")
@ -52,14 +52,14 @@ public class FileController extends SupportBaseController {
@ApiOperation("批量获取文件url：根据fileKey by listen")
@PostMapping("/file/url/query")
public ResponseDTO<List<FileUrlResultDTO>> getBatchFileUrl(@RequestBody @Valid FileUrlQueryDTO queryDTO) {
return fileService.getBatchFileUrl(queryDTO);
public ResponseDTO<List<FileUrlResultDTO>> getBatchFileUrl(@RequestBody @Valid FileUrlQueryForm queryForm) {
return fileService.getBatchFileUrl(queryForm);
}
@ApiOperation(value = "系统文件查询 by listen")
@PostMapping("/file/query")
public ResponseDTO<PageResultDTO<FileVO>> queryListByPage(@RequestBody @Valid FileQueryDTO queryDTO) {
return fileService.queryListByPage(queryDTO);
public ResponseDTO<PageResultDTO<FileVO>> queryListByPage(@RequestBody @Valid FileQueryForm queryForm) {
return fileService.queryListByPage(queryForm);
}
@ApiOperation(value = "下载文件流（根据fileId） by listen")

6
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/FileDao.java
View File

@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.support.file;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import net.lab1024.smartadmin.service.module.support.file.domain.FileEntity;
import net.lab1024.smartadmin.service.module.support.file.domain.dto.FileQueryDTO;
import net.lab1024.smartadmin.service.module.support.file.domain.dto.FileQueryForm;
import net.lab1024.smartadmin.service.module.support.file.domain.vo.FileVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -36,9 +36,9 @@ public interface FileDao extends BaseMapper<FileEntity> {
/**
* 分页查询
* @param page
* @param queryDTO
* @param query
* @return
*/
List<FileVO> queryListByPage(Page page, @Param("query") FileQueryDTO queryDTO);
List<FileVO> queryListByPage(Page page, @Param("query") FileQueryForm query);
}

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/dto/FileQueryDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/dto/FileQueryForm.java
View File

@ -1,6 +1,6 @@
package net.lab1024.smartadmin.service.module.support.file.domain.dto;
import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
import net.lab1024.smartadmin.service.common.domain.PageParamForm;
import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum;
import net.lab1024.smartadmin.service.module.support.file.domain.FileFolderTypeEnum;
import io.swagger.annotations.ApiModelProperty;
@ -13,7 +13,7 @@ import lombok.Data;
* @Version: 1.0
*/
@Data
public class FileQueryDTO extends PageParamDTO {
public class FileQueryForm extends PageParamForm {
@ApiModelProperty(value = "文件名称")
private String fileName;

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/dto/FileUrlQueryDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/dto/FileUrlQueryForm.java
View File

@ -17,7 +17,7 @@ import java.util.List;
@AllArgsConstructor
@NoArgsConstructor
@Data
public class FileUrlQueryDTO {
public class FileUrlQueryForm {
@ApiModelProperty("file key")
@NotEmpty(message = "file key not empty")

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/dto/FileUrlUploadDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/dto/FileUrlUploadForm.java
View File

@ -19,7 +19,7 @@ import javax.validation.constraints.NotNull;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class FileUrlUploadDTO {
public class FileUrlUploadForm {
@ApiModelPropertyEnum(FileFolderTypeEnum.class)
private Integer folder;

6
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/FileService.java
View File

@ -70,7 +70,7 @@ public class FileService {
* @param urlUploadDTO
* @return
*/
public ResponseDTO<FileUploadVO> fileUpload(FileUrlUploadDTO urlUploadDTO) {
public ResponseDTO<FileUploadVO> fileUpload(FileUrlUploadForm urlUploadDTO) {
try {
URL url = new URL(urlUploadDTO.getFileUrl());
URLConnection urlConnection = url.openConnection();
@ -211,7 +211,7 @@ public class FileService {
* @param queryDTO
* @return
*/
public ResponseDTO<List<FileUrlResultDTO>> getBatchFileUrl(FileUrlQueryDTO queryDTO) {
public ResponseDTO<List<FileUrlResultDTO>> getBatchFileUrl(FileUrlQueryForm queryDTO) {
// 获取文件服务
List<String> fileKeyList = queryDTO.getFileKeyList();
List<FileUrlResultDTO> resultDTOList = fileKeyList.stream().map(fileKey -> {
@ -231,7 +231,7 @@ public class FileService {
* @param queryDTO
* @return
*/
public ResponseDTO<PageResultDTO<FileVO>> queryListByPage(FileQueryDTO queryDTO) {
public ResponseDTO<PageResultDTO<FileVO>> queryListByPage(FileQueryForm queryDTO) {
Page page = SmartPageUtil.convert2PageQuery(queryDTO);
List<FileVO> fileList = fileDao.queryListByPage(page, queryDTO);
if (CollectionUtils.isNotEmpty(fileList)) {

6
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatController.java
View File

@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.support.heartbeat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
import net.lab1024.smartadmin.service.common.domain.PageParamForm;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.common.controller.SupportBaseController;
@ -24,8 +24,8 @@ public class HeartBeatController extends SupportBaseController {
@PostMapping("/heartBeat/query")
@ApiOperation("查询心跳记录 @author 卓大")
public ResponseDTO<PageResultDTO<HeartBeatRecordVO>> query(@RequestBody @Valid PageParamDTO pageParamDTO) {
return heartBeatService.pageQuery(pageParamDTO);
public ResponseDTO<PageResultDTO<HeartBeatRecordVO>> query(@RequestBody @Valid PageParamForm pageParamForm) {
return heartBeatService.pageQuery(pageParamForm);
}
}

6
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatService.java
View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.support.heartbeat;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
import net.lab1024.smartadmin.service.common.domain.PageParamForm;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.common.util.SmartPageUtil;
@ -24,8 +24,8 @@ public class HeartBeatService {
private HeartBeatRecordDao heartBeatRecordDao;
public ResponseDTO<PageResultDTO<HeartBeatRecordVO>> pageQuery(PageParamDTO pageParamDTO) {
Page pageQueryInfo = SmartPageUtil.convert2PageQuery(pageParamDTO);
public ResponseDTO<PageResultDTO<HeartBeatRecordVO>> pageQuery(PageParamForm pageParamForm) {
Page pageQueryInfo = SmartPageUtil.convert2PageQuery(pageParamForm);
List<HeartBeatRecordVO> recordVOList = heartBeatRecordDao.pageQuery(pageQueryInfo);
PageResultDTO<HeartBeatRecordVO> pageResultDTO = SmartPageUtil.convert2PageResult(pageQueryInfo, recordVOList);
return ResponseDTO.ok(pageResultDTO);

6
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogController.java
View File

@ -7,7 +7,7 @@ import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogDTO;
import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogQueryDTO;
import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogQueryForm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -27,8 +27,8 @@ public class OperateLogController extends SupportBaseController {
@ApiOperation(value = "分页查询 @author 罗伊")
@PostMapping("/userOperateLog/page/query")
public ResponseDTO<PageResultDTO<OperateLogDTO>> queryByPage(@RequestBody OperateLogQueryDTO queryDTO) {
return operateLogService.queryByPage(queryDTO);
public ResponseDTO<PageResultDTO<OperateLogDTO>> queryByPage(@RequestBody OperateLogQueryForm queryForm) {
return operateLogService.queryByPage(queryForm);
}
}

6
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogDao.java
View File

@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.support.operatelog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import net.lab1024.smartadmin.service.module.support.operatelog.domain.OperateLogEntity;
import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogQueryDTO;
import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogQueryForm;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
@ -22,10 +22,10 @@ public interface OperateLogDao extends BaseMapper<OperateLogEntity> {
/**
* 分页查询
*
* @param queryDTO
* @param queryForm
* @return UserOperateLogEntity
*/
List<OperateLogEntity> queryByPage(Page page, @Param("queryDTO") OperateLogQueryDTO queryDTO);
List<OperateLogEntity> queryByPage(Page page, @Param("query") OperateLogQueryForm queryForm);
/**
* 根据id删除

9
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogService.java
View File

@ -5,12 +5,11 @@ import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.support.operatelog.domain.OperateLogEntity;
import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogDTO;
import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogQueryDTO;
import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogQueryForm;
import net.lab1024.smartadmin.service.common.util.SmartBeanUtil;
import net.lab1024.smartadmin.service.common.util.SmartPageUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@ -30,9 +29,9 @@ public class OperateLogService {
* @description 分页查询
* @date 2019-05-15 11:32:14
*/
public ResponseDTO<PageResultDTO<OperateLogDTO>> queryByPage(OperateLogQueryDTO queryDTO) {
Page page = SmartPageUtil.convert2PageQuery(queryDTO);
List<OperateLogEntity> logEntityList = operateLogDao.queryByPage(page, queryDTO);
public ResponseDTO<PageResultDTO<OperateLogDTO>> queryByPage(OperateLogQueryForm queryForm) {
Page page = SmartPageUtil.convert2PageQuery(queryForm);
List<OperateLogEntity> logEntityList = operateLogDao.queryByPage(page, queryForm);
PageResultDTO<OperateLogDTO> pageResultDTO = SmartPageUtil.convert2PageResult(page, logEntityList, OperateLogDTO.class);
return ResponseDTO.ok(pageResultDTO);
}

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/OperateLogQueryDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/OperateLogQueryForm.java
View File

@ -1,6 +1,6 @@
package net.lab1024.smartadmin.service.module.support.operatelog.domain.dto;
import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
import net.lab1024.smartadmin.service.common.domain.PageParamForm;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -10,7 +10,7 @@ import lombok.Data;
* @author 罗伊
*/
@Data
public class OperateLogQueryDTO extends PageParamDTO {
public class OperateLogQueryForm extends PageParamForm {
@ApiModelProperty("开始日期")

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java
View File

@ -30,7 +30,7 @@ public class EmployeeController extends SystemBaseController {
@PostMapping("/employee/query")
@ApiOperation(value = "员工管理查询", notes = "员工管理查询 @author 开云")
public ResponseDTO<PageResultDTO<EmployeeVO>> query(@Valid @RequestBody EmployeeQueryDTO query) {
public ResponseDTO<PageResultDTO<EmployeeVO>> query(@Valid @RequestBody EmployeeQueryForm query) {
return employeeService.queryEmployeeList(query);
}

6
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeDao.java
View File

@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
import net.lab1024.smartadmin.service.module.system.employee.domain.dto.EmployeeDTO;
import net.lab1024.smartadmin.service.module.system.employee.domain.dto.EmployeeQueryDTO;
import net.lab1024.smartadmin.service.module.system.employee.domain.dto.EmployeeQueryForm;
import net.lab1024.smartadmin.service.module.system.employee.domain.entity.EmployeeEntity;
import net.lab1024.smartadmin.service.module.system.employee.domain.vo.EmployeeVO;
@ -29,7 +29,7 @@ public interface EmployeeDao extends BaseMapper<EmployeeEntity> {
* @param queryDTO
* @return
*/
List<EmployeeVO> queryEmployee(Page page, @Param("queryDTO") EmployeeQueryDTO queryDTO);
List<EmployeeVO> queryEmployee(Page page, @Param("queryDTO") EmployeeQueryForm queryDTO);
/**
* 查询员工列表
@ -37,7 +37,7 @@ public interface EmployeeDao extends BaseMapper<EmployeeEntity> {
* @param queryDTO
* @return
*/
List<EmployeeVO> queryEmployee(@Param("queryDTO") EmployeeQueryDTO queryDTO);
List<EmployeeVO> queryEmployee(@Param("queryDTO") EmployeeQueryForm queryDTO);
/**
* 批量更新禁用状态

5
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java
View File

@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import net.lab1024.smartadmin.service.common.code.UserErrorCode;
import net.lab1024.smartadmin.service.common.constant.CacheModuleConst;
import net.lab1024.smartadmin.service.common.constant.StringConst;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.support.beancache.cache.IBeanCache;
@ -113,7 +112,7 @@ public class EmployeeService {
* @param queryDTO
* @return
*/
public ResponseDTO<PageResultDTO<EmployeeVO>> queryEmployeeList(EmployeeQueryDTO queryDTO) {
public ResponseDTO<PageResultDTO<EmployeeVO>> queryEmployeeList(EmployeeQueryForm queryDTO) {
queryDTO.setDeletedFlag(false);
Page pageParam = SmartPageUtil.convert2PageQuery(queryDTO);
List<EmployeeVO> employeeList = employeeDao.queryEmployee(pageParam, queryDTO);
@ -504,7 +503,7 @@ public class EmployeeService {
* @return
*/
public ResponseDTO<List<EmployeeVO>> queryAllEmploy(Boolean disabledFlag) {
EmployeeQueryDTO queryDTO = new EmployeeQueryDTO();
EmployeeQueryForm queryDTO = new EmployeeQueryForm();
queryDTO.setDeletedFlag(Boolean.FALSE);
if (disabledFlag != null) {
queryDTO.setDisabledFlag(disabledFlag);

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeQueryDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeQueryForm.java
View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.employee.domain.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
import net.lab1024.smartadmin.service.common.domain.PageParamForm;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.Size;
@ -15,7 +15,7 @@ import java.util.List;
* @date 2017年12月21日上午09:09:31
*/
@Data
public class EmployeeQueryDTO extends PageParamDTO {
public class EmployeeQueryForm extends PageParamForm {
@ApiModelProperty("搜索词")
@Length(max = 20, message = "搜索词最多20字符")

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/domain/dto/RoleQueryDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/domain/dto/RoleQueryForm.java
View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.role.basic.domain.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
import net.lab1024.smartadmin.service.common.domain.PageParamForm;
/**
* [ ]
@ -10,7 +10,7 @@ import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
* @author 罗伊
*/
@Data
public class RoleQueryDTO extends PageParamDTO {
public class RoleQueryForm extends PageParamForm {
@ApiModelProperty("角色名称")
private String roleName;

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeController.java
View File

@ -9,7 +9,7 @@ import net.lab1024.smartadmin.service.common.controller.SystemBaseController;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.system.employee.domain.vo.EmployeeVO;
import net.lab1024.smartadmin.service.module.system.role.basic.domain.dto.RoleQueryDTO;
import net.lab1024.smartadmin.service.module.system.role.basic.domain.dto.RoleQueryForm;
import net.lab1024.smartadmin.service.module.system.role.basic.domain.vo.RoleSelectedVO;
import net.lab1024.smartadmin.service.module.system.role.roleemployee.domain.RoleEmployeeBatchDTO;
import org.springframework.beans.factory.annotation.Autowired;
@ -33,7 +33,7 @@ public class RoleEmployeeController extends SystemBaseController {
@ApiOperation(value = "获取角色成员-员工列表", notes = "获取角色成员-员工列表（分页）")
@PostMapping("/role/listEmployee")
public ResponseDTO<PageResultDTO<EmployeeVO>> listEmployeeByName(@Valid @RequestBody RoleQueryDTO queryDTO) {
public ResponseDTO<PageResultDTO<EmployeeVO>> listEmployeeByName(@Valid @RequestBody RoleQueryForm queryDTO) {
return roleEmployeeService.listEmployeeByName(queryDTO);
}

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeDao.java
View File

@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
import net.lab1024.smartadmin.service.module.system.employee.domain.dto.EmployeeDTO;
import net.lab1024.smartadmin.service.module.system.role.basic.domain.dto.RoleQueryDTO;
import net.lab1024.smartadmin.service.module.system.role.basic.domain.dto.RoleQueryForm;
import net.lab1024.smartadmin.service.module.system.role.roleemployee.domain.RoleEmployeeEntity;
import java.util.List;
@ -46,7 +46,7 @@ public interface RoleEmployeeDao extends BaseMapper<RoleEmployeeEntity> {
* @param queryDTO
* @return
*/
List<EmployeeDTO> selectEmployeeByNamePage(Page page, @Param("queryDTO") RoleQueryDTO queryDTO);
List<EmployeeDTO> selectEmployeeByNamePage(Page page, @Param("queryDTO") RoleQueryForm queryDTO);
/**
*

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeService.java
View File

@ -12,7 +12,7 @@ import net.lab1024.smartadmin.service.module.system.department.domain.entity.Dep
import net.lab1024.smartadmin.service.module.system.employee.domain.dto.EmployeeDTO;
import net.lab1024.smartadmin.service.module.system.employee.domain.vo.EmployeeVO;
import net.lab1024.smartadmin.service.module.system.role.basic.RoleDao;
import net.lab1024.smartadmin.service.module.system.role.basic.domain.dto.RoleQueryDTO;
import net.lab1024.smartadmin.service.module.system.role.basic.domain.dto.RoleQueryForm;
import net.lab1024.smartadmin.service.module.system.role.basic.domain.entity.RoleEntity;
import net.lab1024.smartadmin.service.module.system.role.basic.domain.vo.RoleSelectedVO;
import net.lab1024.smartadmin.service.module.system.role.roleemployee.domain.RoleEmployeeBatchDTO;
@ -57,7 +57,7 @@ public class RoleEmployeeService {
* @param queryDTO
* @return
*/
public ResponseDTO<PageResultDTO<EmployeeVO>> listEmployeeByName(RoleQueryDTO queryDTO) {
public ResponseDTO<PageResultDTO<EmployeeVO>> listEmployeeByName(RoleQueryForm queryDTO) {
Page page = SmartPageUtil.convert2PageQuery(queryDTO);
List<EmployeeDTO> employeeDTOS = roleEmployeeDao.selectEmployeeByNamePage(page, queryDTO);
employeeDTOS.stream().filter(e -> e.getDepartmentId() != null).forEach(employeeDTO -> {

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigController.java
View File

@ -30,7 +30,7 @@ public class SystemConfigController extends SupportBaseController {
@ApiOperation("分页查询系统配置")
@PostMapping("/system/config/query")
public ResponseDTO<PageResultDTO<SystemConfigVO>> querySystemConfigPage(@RequestBody @Valid SystemConfigQueryDTO queryDTO) {
public ResponseDTO<PageResultDTO<SystemConfigVO>> querySystemConfigPage(@RequestBody @Valid SystemConfigQueryForm queryDTO) {
return systemConfigService.queryConfigPage(queryDTO);
}

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigDao.java
View File

@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.system.systemconfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import net.lab1024.smartadmin.service.module.system.systemconfig.domain.SystemConfigEntity;
import net.lab1024.smartadmin.service.module.system.systemconfig.domain.SystemConfigQueryDTO;
import net.lab1024.smartadmin.service.module.system.systemconfig.domain.SystemConfigQueryForm;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
@ -26,7 +26,7 @@ public interface SystemConfigDao extends BaseMapper<SystemConfigEntity> {
* @param page
* @return
*/
List<SystemConfigEntity> queryByPage(Page page, @Param("query") SystemConfigQueryDTO queryDTO);
List<SystemConfigEntity> queryByPage(Page page, @Param("query") SystemConfigQueryForm queryDTO);
/**
* 根据key查询获取数据

2
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigService.java
View File

@ -81,7 +81,7 @@ public class SystemConfigService {
* @param queryDTO
* @return
*/
public ResponseDTO<PageResultDTO<SystemConfigVO>> queryConfigPage(SystemConfigQueryDTO queryDTO) {
public ResponseDTO<PageResultDTO<SystemConfigVO>> queryConfigPage(SystemConfigQueryForm queryDTO) {
Page page = SmartPageUtil.convert2PageQuery(queryDTO);
List<SystemConfigEntity> entityList = systemConfigDao.queryByPage(page, queryDTO);
PageResultDTO<SystemConfigVO> pageResultDTO = SmartPageUtil.convert2PageResult(page, entityList, SystemConfigVO.class);

4
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/domain/SystemConfigQueryDTO.java → admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/domain/SystemConfigQueryForm.java
View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.systemconfig.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import net.lab1024.smartadmin.service.common.domain.PageParamDTO;
import net.lab1024.smartadmin.service.common.domain.PageParamForm;
import org.hibernate.validator.constraints.Length;
/**
@ -14,7 +14,7 @@ import org.hibernate.validator.constraints.Length;
* @since JDK1.8
*/
@Data
public class SystemConfigQueryDTO extends PageParamDTO {
public class SystemConfigQueryForm extends PageParamForm {
@ApiModelProperty("参数KEY")
@Length(max = 50, message = "参数Key最多50字符")

36
admin-api/java-api/src/main/resources/mapper/business/notice/NoticeMapper.xml
View File

@ -13,17 +13,17 @@
from t_notice n
left join t_employee e on e.id = n.create_user
<where>
<if test="queryDTO.startDate != null and queryDTO.startDate != ''">
AND DATE_FORMAT(n.create_time, '%Y-%m-%d') &gt;= #{queryDTO.startDate}
<if test="query.startDate != null and query.startDate != ''">
AND DATE_FORMAT(n.create_time, '%Y-%m-%d') &gt;= #{query.startDate}
</if>
<if test="queryDTO.endDate != null and queryDTO.endDate != ''">
AND DATE_FORMAT(n.create_time, '%Y-%m-%d') &lt;= #{queryDTO.endDate}
<if test="query.endDate != null and query.endDate != ''">
AND DATE_FORMAT(n.create_time, '%Y-%m-%d') &lt;= #{query.endDate}
</if>
<if test="queryDTO.title != null and queryDTO.title != ''">
AND INSTR(n.title,#{queryDTO.title})
<if test="query.title != null and query.title != ''">
AND INSTR(n.title,#{query.title})
</if>
<if test="queryDTO.deletedFlag != null">
AND n.deleted_flag = #{queryDTO.deletedFlag}
<if test="query.deletedFlag != null">
AND n.deleted_flag = #{query.deletedFlag}
</if>
</where>
ORDER by n.create_time desc
@ -47,7 +47,7 @@
</select>
<select id="queryReceiveByPage" resultType="net.lab1024.smartadmin.service.module.business.notice.domain.dto.NoticeReceiveDTO">
<select id="queryReceiveByPage" resultType="net.lab1024.smartadmin.service.module.business.notice.domain.dto.NoticeReceiveForm">
select
n.id,
n.title,
@ -58,19 +58,19 @@
nrr.create_time as receiveTime
from t_notice n
left join t_employee e on e.id = n.create_user
left join t_notice_receive_record nrr on nrr.notice_id=n.id and nrr.employee_id=#{queryDTO.employeeId}
left join t_notice_receive_record nrr on nrr.notice_id=n.id and nrr.employee_id=#{query.employeeId}
<where>
<if test="queryDTO.startDate != null and queryDTO.startDate != ''">
AND DATE_FORMAT(n.create_time, '%Y-%m-%d') &gt;= #{queryDTO.startDate}
<if test="query.startDate != null and query.startDate != ''">
AND DATE_FORMAT(n.create_time, '%Y-%m-%d') &gt;= #{query.startDate}
</if>
<if test="queryDTO.endDate != null and queryDTO.endDate != ''">
AND DATE_FORMAT(n.create_time, '%Y-%m-%d') &lt;= #{queryDTO.endDate}
<if test="query.endDate != null and query.endDate != ''">
AND DATE_FORMAT(n.create_time, '%Y-%m-%d') &lt;= #{query.endDate}
</if>
<if test="queryDTO.title != null and queryDTO.title != ''">
AND INSTR(n.title,#{queryDTO.title})
<if test="query.title != null and query.title != ''">
AND INSTR(n.title,#{query.title})
</if>
<if test="queryDTO.sendStatus != null">
AND n.send_status = #{queryDTO.sendStatus}
<if test="query.sendStatus != null">
AND n.send_status = #{query.sendStatus}
</if>
</where>
ORDER by n.create_time desc

30
admin-api/java-api/src/main/resources/mapper/support/OperateLogMapper.xml
View File

@ -3,32 +3,20 @@
<mapper namespace="net.lab1024.smartadmin.service.module.support.operatelog.OperateLogDao">
<select id="queryByPage" resultType="net.lab1024.smartadmin.service.module.support.operatelog.domain.OperateLogEntity">
select
id,
user_id,
user_name,
module,
content,
url,
method,
param,
success_flag,
fail_reason,
update_time,
create_time
select *
from t_user_operate_log
<where>
<if test="queryDTO.startDate != null and queryDTO.startDate != ''">
AND DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= #{queryDTO.startDate}
<if test="query.startDate != null and query.startDate != ''">
AND DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= #{query.startDate}
</if>
<if test="queryDTO.endDate != null and queryDTO.endDate != ''">
AND DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{queryDTO.endDate}
<if test="query.endDate != null and query.endDate != ''">
AND DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{query.endDate}
</if>
<if test="queryDTO.userName != null and queryDTO.userName != ''">
AND INSTR(user_name,#{queryDTO.userName})
<if test="query.userName != null and query.userName != ''">
AND INSTR(user_name,#{query.userName})
</if>
<if test="queryDTO.resultFlag != null">
AND result = #{queryDTO.resultFlag}
<if test="query.resultFlag != null">
AND result = #{query.resultFlag}
</if>
</where>
order by create_time desc