From 7ea3a05f4298ddd675de1a18fff147be8b0b4950 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期一, 10 十月 2022 17:09:49 +0800
Subject: [PATCH] 新增全部栏目获取接口
---
ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java | 22 +++++++++--
ycl-platform/src/main/java/com/ycl/entity/message/Message.java | 2
ycl-platform/src/main/java/com/ycl/dto/message/MessageColumnParam.java | 14 +++----
ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java | 12 ++---
ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java | 7 +++
ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java | 5 +-
ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 6 +-
ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnServiceImpl.java | 7 +++
8 files changed, 48 insertions(+), 27 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
index 966c6e6..4a1d274 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
+import com.ycl.common.util.UtilNumber;
import com.ycl.dto.message.MessageColumnParam;
import com.ycl.entity.message.MessageColumn;
import com.ycl.service.message.IMessageColumnService;
@@ -14,6 +15,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.Date;
import java.util.List;
/**
@@ -26,7 +28,7 @@
*/
@RestController
@RequestMapping("/message_column")
-@Api(tags = "娑堟伅绠＄悊")
+@Api(tags = "鏍忕洰绠＄悊")
public class MessageColumnController {
@@ -43,8 +45,20 @@
//璁剧疆鍒涘缓浜�
messageColumnParam.setCreateUser(user.getUserId());
BeanUtils.copyProperties(messageColumnParam, messageColumn);
+ messageColumn.setColumnNumber(UtilNumber.getNumber("LM",0));
+ messageColumn.setCreateTime(new Date());
+ messageColumn.setUpdateTime(new Date());
+ messageColumn.setUpdateUser(user.getUserId());
iMessageColumnService.save(messageColumn);
return CommonResult.success(messageColumn);
+ }
+
+
+ @ApiOperation(value = "鑾峰彇鍏ㄩ儴鏍忕洰")
+ @RequestMapping(value = "/getAllColumn", method = RequestMethod.GET)
+ @ResponseBody
+ public CommonResult<List<MessageColumn>> getAllColumn() {
+ return CommonResult.success(iMessageColumnService.list());
}
@ApiOperation(value = "鑾峰彇鏍忕洰鍒嗛〉鏌ヨ")
@@ -55,15 +69,15 @@
}
- @ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛淇℃伅")
+ @ApiOperation("鑾峰彇鎸囧畾鏍忕洰")
@RequestMapping(value = "/getColumn/{id}", method = RequestMethod.GET)
@ResponseBody
- public CommonResult<MessageColumn> getItem(@PathVariable Long id) {
+ public CommonResult<MessageColumn> getColumn(@PathVariable Long id) {
MessageColumn messageColumn = iMessageColumnService.getById(id);
return CommonResult.success(messageColumn);
}
- @ApiOperation("淇敼鎸囧畾鐢ㄦ埛淇℃伅")
+ @ApiOperation("淇敼鎸囧畾鏍忕洰")
@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
@ResponseBody
public CommonResult update(@PathVariable Long id, @RequestBody MessageColumnParam messageColumnParam) {
diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
index bc57c79..4bb2698 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
@@ -50,10 +50,10 @@
}
- @ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛淇℃伅")
- @RequestMapping(value = "/getColumn/{id}", method = RequestMethod.GET)
+ @ApiOperation("鑾峰彇鎸囧畾娑堟伅")
+ @RequestMapping(value = "/getMessage/{id}", method = RequestMethod.GET)
@ResponseBody
- public CommonResult<Message> getItem(@PathVariable Long id) {
+ public CommonResult<Message> getMessage(@PathVariable Long id) {
Message message = iMessageService.getById(id);
return CommonResult.success(message);
}
diff --git a/ycl-platform/src/main/java/com/ycl/dto/message/MessageColumnParam.java b/ycl-platform/src/main/java/com/ycl/dto/message/MessageColumnParam.java
index 0ee5c76..ae104a9 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/message/MessageColumnParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/message/MessageColumnParam.java
@@ -1,11 +1,11 @@
package com.ycl.dto.message;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.ycl.api.BasePageVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
/**
* <p>
@@ -17,29 +17,27 @@
*/
@Data
@ApiModel("娑堟伅鏍忕洰鍙傛暟浣�")
-public class MessageColumnParam {
+public class MessageColumnParam extends BasePageVO {
private static final long serialVersionUID = 1L;
/**
* 鏍忕洰鍚嶇О
*/
@ApiModelProperty(value = "鏍忕洰鍚嶇О")
- @NotNull(message = "鏍忕洰鍚嶇О涓虹┖")
+ @NotEmpty(message = "鏍忕洰鍚嶇О涓虹┖")
private String columnName;
/**
* 鎻忚堪
*/
- @TableField("desc")
@ApiModelProperty(value = "鎻忚堪")
- private String desc;
+ private String description;
/**
* 鏄惁鏄剧ず
*/
- @TableField("is_show")
@ApiModelProperty(value = "鏄惁鏄剧ず")
- private String isShow;
+ private Integer isShow;
/**
* 鍒涘缓浜�
diff --git a/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java b/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
index 7d06d37..806cc20 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
@@ -1,6 +1,7 @@
package com.ycl.dto.message;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.ycl.api.BasePageVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,7 +18,7 @@
*/
@Data
@ApiModel("娑堟伅鍙傛暟浣�")
-public class MessageParam {
+public class MessageParam extends BasePageVO {
/**
* 鏍囬
*/
@@ -34,7 +35,7 @@
/**
* 娑堟伅绫诲瀷
*/
- @ApiModelProperty(value = "娑堟伅绫诲瀷0-绔欏唴淇�1-閭欢2-鐭俊", required = true)
+ @ApiModelProperty(value = "濉厖鏍忕洰缂栫爜", required = true)
@NotNull(message = "娑堟伅绫诲瀷涓虹┖")
private Integer messageType;
/**
diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/Message.java b/ycl-platform/src/main/java/com/ycl/entity/message/Message.java
index 032f38b..dcd5edc 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/message/Message.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/Message.java
@@ -58,7 +58,7 @@
* 娑堟伅绫诲瀷
*/
@TableField("message_type")
- @ApiModelProperty(value = "娑堟伅绫诲瀷0-绔欏唴淇�1-閭欢2-鐭俊")
+ @ApiModelProperty(value = "濉厖鏍忕洰缂栫爜")
@NotBlank(message = "娑堟伅绫诲瀷涓虹┖")
private Integer messageType;
diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java b/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java
index 4ba2973..f08e4dc 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java
@@ -10,7 +10,6 @@
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
import java.util.Date;
/**
@@ -48,7 +47,7 @@
*/
@TableField("column_number")
@ApiModelProperty(value = "鏍忕洰缂栫爜")
- @NotBlank(message = "娓犻亾鐮佷负绌�")
+ @NotBlank(message = "鏍忕洰缂栫爜涓虹┖")
private String columnNumber;
/**
@@ -56,22 +55,21 @@
*/
@TableField("notice_amount")
@ApiModelProperty(value = "鍏憡鏁�")
- private Integer notice_amount;
+ private Integer noticeAmount;
/**
* 鏄惁鏄剧ず
*/
@TableField("is_show")
@ApiModelProperty(value = "鏄惁鏄剧ず")
- @NotNull(message = "鏄惁鏄剧ず涓虹┖")
- private String isShow;
+ private Integer isShow;
/**
* 鎻忚堪
*/
- @TableField("desc")
+ @TableField("description")
@ApiModelProperty(value = "鎻忚堪")
- private String desc;
+ private String description;
/**
* 鍒涘缓浜�
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnServiceImpl.java
index 18c464d..5d8cadb 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnServiceImpl.java
@@ -1,6 +1,8 @@
package com.ycl.service.message.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.message.MessageColumnParam;
import com.ycl.entity.message.MessageColumn;
@@ -20,6 +22,9 @@
public class IMessageColumnServiceImpl extends ServiceImpl<MessageColumnMapper, MessageColumn> implements IMessageColumnService {
@Override
public IPage<MessageColumn> list(MessageColumnParam messageColumnParam) {
- return null;
+ Page<MessageColumn> page = new Page<>(messageColumnParam.getCurrent(), messageColumnParam.getPageSize());
+ LambdaQueryWrapper<MessageColumn> queryWrapper = new LambdaQueryWrapper<>();
+ Page<MessageColumn> result = baseMapper.selectPage(page, queryWrapper);
+ return result;
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java
index 22fde87..79fb6e3 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java
@@ -1,6 +1,8 @@
package com.ycl.service.message.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
@@ -51,6 +53,9 @@
@Override
public IPage<Message> list(MessageParam messageParam) {
- return null;
+ Page<Message> page = new Page<>(messageParam.getCurrent(), messageParam.getPageSize());
+ LambdaQueryWrapper<Message> queryWrapper = new LambdaQueryWrapper<>();
+ Page<Message> result = baseMapper.selectPage(page, queryWrapper);
+ return result;
}
}
--
Gitblit v1.8.0