From f7b78b3823b1000bf16fd9d324960ae0fc04fbfa Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 03 一月 2023 11:40:58 +0800
Subject: [PATCH] fix: 栏目公告数量
---
ycl-platform/src/main/java/com/ycl/service/message/IMessageColumnService.java | 3 +++
ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java | 8 +++++---
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java | 8 ++++++++
ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java | 3 ++-
ycl-platform/src/main/java/com/ycl/mapper/message/MessageColumnMapper.java | 4 ++++
ycl-platform/src/main/resources/mapper/message/MessageColumnMapper.xml | 19 +++++++++++++++++++
6 files changed, 41 insertions(+), 4 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 12d3218..f529be7 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
@@ -16,6 +16,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@@ -48,7 +49,7 @@
BeanUtils.copyProperties(messageColumnParam, messageColumn);
messageColumn.setColumnNumber(UtilNumber.getNumber("LM",0));
messageColumn.setCreateTime(new Date());
- messageColumn.setUpdateTime(new Date());
+ messageColumn.setUpdateTime(LocalDateTime.now());
messageColumn.setUpdateUser(user.getUserId());
iMessageColumnService.save(messageColumn);
return CommonResult.success(messageColumn);
@@ -58,8 +59,8 @@
@ApiOperation(value = "鑾峰彇鍏ㄩ儴鏍忕洰")
@RequestMapping(value = "/getAllColumn", method = RequestMethod.GET)
@ResponseBody
- public CommonResult<List<MessageColumn>> getAllColumn() {
- return CommonResult.success(iMessageColumnService.list());
+ public CommonResult getAllColumn() {
+ return CommonResult.success(iMessageColumnService.listAllColumn());
}
@ApiOperation(value = "鑾峰彇鐢ㄦ埛鐨勬爮鐩缃�")
@@ -95,6 +96,7 @@
//璁剧疆鍒涘缓浜�
messageColumnParam.setCreateUser(user.getUserId());
BeanUtils.copyProperties(messageColumnParam, messageColumn);
+ messageColumn.setUpdateTime(LocalDateTime.now());
boolean success = iMessageColumnService.updateById(messageColumn);
if (success) {
return CommonResult.success(null);
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 25557c3..a6fd990 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
@@ -11,6 +11,7 @@
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -95,5 +96,5 @@
*/
@TableField("update_time")
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
+ private LocalDateTime updateTime;
}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/message/MessageColumnMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/message/MessageColumnMapper.java
index 7a18efa..afffd96 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/message/MessageColumnMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/message/MessageColumnMapper.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.message.MessageColumn;
+import com.ycl.vo.message.MessageColumnVO;
+
+import java.util.List;
/**
* <p>
@@ -12,4 +15,5 @@
* @since 2022-10-10
*/
public interface MessageColumnMapper extends BaseMapper<MessageColumn> {
+ List<MessageColumnVO> selectAllColumn();
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/IMessageColumnService.java b/ycl-platform/src/main/java/com/ycl/service/message/IMessageColumnService.java
index 65c26d0..3eec194 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/IMessageColumnService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/IMessageColumnService.java
@@ -6,6 +6,7 @@
import com.ycl.entity.message.MessageColumn;
import com.ycl.vo.message.MessageColumnSetVO;
import com.ycl.vo.message.MessageColumnUserVO;
+import com.ycl.vo.message.MessageColumnVO;
import java.util.List;
@@ -22,4 +23,6 @@
IPage<MessageColumn> list(MessageColumnParam messageColumnParam);
List<MessageColumnUserVO> listColumnUser(Integer id);
+
+ List<MessageColumnVO> listAllColumn();
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java
index 4d34676..54b8e2d 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java
@@ -10,6 +10,7 @@
import com.ycl.mapper.message.MessageMapper;
import com.ycl.service.message.IMessageColumnService;
import com.ycl.vo.message.MessageColumnUserVO;
+import com.ycl.vo.message.MessageColumnVO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -30,6 +31,8 @@
@Resource
MessageMapper messageMapper;
+ @Resource
+ MessageColumnMapper messageColumnMapper;
@Override
public IPage<MessageColumn> list(MessageColumnParam messageColumnParam) {
@@ -56,4 +59,9 @@
});
return messageColumnUserVOS;
}
+
+ @Override
+ public List<MessageColumnVO> listAllColumn() {
+ return messageColumnMapper.selectAllColumn();
+ }
}
diff --git a/ycl-platform/src/main/resources/mapper/message/MessageColumnMapper.xml b/ycl-platform/src/main/resources/mapper/message/MessageColumnMapper.xml
new file mode 100644
index 0000000..a024c62
--- /dev/null
+++ b/ycl-platform/src/main/resources/mapper/message/MessageColumnMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.mapper.message.MessageColumnMapper">
+
+<select id="selectAllColumn" resultType="com.ycl.vo.message.MessageColumnVO">
+ SELECT
+ t1.id,
+ COUNT( t1.id ) AS notice_amount,
+ t1.column_name,
+ t1.update_time,
+ t1.is_show,
+ t1.description
+ FROM
+ ums_message_column t1
+ LEFT JOIN ums_message t2 ON t1.id = t2.message_type
+ GROUP BY
+ t1.id
+</select>
+</mapper>
--
Gitblit v1.8.0