From b3dc7f2557983a5bc7b386809ed8b500107fb36c Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期一, 10 十月 2022 15:34:29 +0800
Subject: [PATCH] 新增消息栏目和获取部门用户
---
ycl-platform/src/main/java/com/ycl/service/message/IMessageColumnService.java | 19 ++
ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java | 3
ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java | 2
ycl-platform/src/main/java/com/ycl/dto/message/MessageColumnParam.java | 49 +++++++
ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java | 100 ++++++++++++++
ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java | 8 +
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 23 ++-
ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java | 93 +++++++++++++
ycl-platform/src/main/java/com/ycl/mapper/message/MessageColumnMapper.java | 15 ++
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java | 9 +
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java | 2
ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 52 +++++++
ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnServiceImpl.java | 25 +++
13 files changed, 390 insertions(+), 10 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index 251a7df..67706d1 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -237,4 +237,13 @@
}
return CommonResult.failed();
}
+
+
+ @ApiOperation("鑾峰彇閮ㄩ棬浜哄憳")
+ @RequestMapping(value = "/getDepartUser/{departId}", method = RequestMethod.GET)
+ @ResponseBody
+ public CommonResult<List<UmsAdmin>> getDepartUser(@PathVariable Long departId) {
+ return CommonResult.success(adminService.getDepartUser(departId));
+ }
+
}
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
index 19d8da5..9386a8c 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
@@ -108,4 +108,7 @@
* @param status
*/
boolean updateStatusBatch(List<Long> ids, Integer status);
+
+
+ List<UmsAdmin> getDepartUser(Long departId);
}
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index a88c754..ca8979a 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -13,12 +13,8 @@
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.user.*;
import com.ycl.exception.Asserts;
-import com.ycl.mapper.user.UmsAdminLoginLogMapper;
-import com.ycl.mapper.user.UmsAdminMapper;
-import com.ycl.mapper.user.UmsResourceMapper;
-import com.ycl.mapper.user.UmsRoleMapper;
+import com.ycl.mapper.user.*;
import com.ycl.service.depart.UmsDepartService;
-import com.ycl.service.user.UmsDepartManageService;
import com.ycl.service.redis.RedisService;
import com.ycl.service.user.UmsAdminCacheService;
import com.ycl.service.user.UmsAdminRoleRelationService;
@@ -53,6 +49,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 鍚庡彴绠＄悊鍛樼鐞哠ervice瀹炵幇绫�
@@ -76,9 +73,9 @@
@Resource
private UmsDepartService departService;
@Resource
- private UmsDepartManageService umsAdminDepartService;
- @Resource
private RedisService redisService;
+ @Resource
+ private UmsDepartManageMapper umsDepartManageMapper;
@Override
public UmsAdmin getAdminByUsername(String username) {
@@ -369,4 +366,16 @@
getCacheService().delBatchAdmin(ids);
return true;
}
+
+ @Override
+ public List<UmsAdmin> getDepartUser(Long departId) {
+ QueryWrapper<UmsDepartManage> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(UmsDepartManage::getDepartId, departId);
+ List<UmsDepartManage> list = umsDepartManageMapper.selectList(wrapper);
+ List<Long> userIds = list.stream().map(UmsDepartManage::getUserId).collect(Collectors.toList());
+ QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
+ wrapperUser.in("id", userIds);
+ List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
+ return adminList;
+ }
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
index bf8a133..d3ffe96 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -29,7 +29,7 @@
*/
@RestController
@RequestMapping("/dispatch_handle")
-@Api(tags = "璋冨害澶勭悊")
+@Api(tags = "璋冨害")
public class DispatchHandleController {
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
new file mode 100644
index 0000000..966c6e6
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
@@ -0,0 +1,93 @@
+package com.ycl.controller.message;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.api.CommonResult;
+import com.ycl.bo.AdminUserDetails;
+import com.ycl.dto.message.MessageColumnParam;
+import com.ycl.entity.message.MessageColumn;
+import com.ycl.service.message.IMessageColumnService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 娑堟伅鏍忕洰绠＄悊 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-10
+ */
+@RestController
+@RequestMapping("/message_column")
+@Api(tags = "娑堟伅绠＄悊")
+public class MessageColumnController {
+
+
+ @Autowired
+ private IMessageColumnService iMessageColumnService;
+
+
+ @ApiOperation(value = "鏂板鏍忕洰")
+ @RequestMapping(value = "/addColumn", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult addColumn(@Validated @RequestBody MessageColumnParam messageColumnParam) {
+ MessageColumn messageColumn = new MessageColumn();
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ //璁剧疆鍒涘缓浜�
+ messageColumnParam.setCreateUser(user.getUserId());
+ BeanUtils.copyProperties(messageColumnParam, messageColumn);
+ iMessageColumnService.save(messageColumn);
+ return CommonResult.success(messageColumn);
+ }
+
+ @ApiOperation(value = "鑾峰彇鏍忕洰鍒嗛〉鏌ヨ")
+ @RequestMapping(value = "/list", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult<IPage<MessageColumn>> list(@Validated @RequestBody MessageColumnParam messageColumnParam) {
+ return CommonResult.success(iMessageColumnService.list(messageColumnParam));
+ }
+
+
+ @ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛淇℃伅")
+ @RequestMapping(value = "/getColumn/{id}", method = RequestMethod.GET)
+ @ResponseBody
+ public CommonResult<MessageColumn> getItem(@PathVariable Long id) {
+ MessageColumn messageColumn = iMessageColumnService.getById(id);
+ return CommonResult.success(messageColumn);
+ }
+
+ @ApiOperation("淇敼鎸囧畾鐢ㄦ埛淇℃伅")
+ @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult update(@PathVariable Long id, @RequestBody MessageColumnParam messageColumnParam) {
+ MessageColumn messageColumn = new MessageColumn();
+ messageColumn.setId(id);
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ //璁剧疆鍒涘缓浜�
+ messageColumnParam.setCreateUser(user.getUserId());
+ BeanUtils.copyProperties(messageColumnParam, messageColumn);
+ boolean success = iMessageColumnService.updateById(messageColumn);
+ if (success) {
+ return CommonResult.success(null);
+ }
+ return CommonResult.failed();
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎娑堟伅鏍忕洰")
+ @RequestMapping(value = "/delete", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult delete(@RequestParam("ids") List<Long> ids) {
+ boolean success = iMessageColumnService.removeBatchByIds(ids);
+ if (success) {
+ return CommonResult.success(null);
+ }
+ return CommonResult.failed();
+ }
+}
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 a929dd4..bc57c79 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
@@ -1,16 +1,21 @@
package com.ycl.controller.message;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.message.MessageParam;
+import com.ycl.entity.message.Message;
import com.ycl.service.message.IMessageService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -26,7 +31,7 @@
public class MessageController {
@Autowired
- IMessageService iMessageService;
+ private IMessageService iMessageService;
@ApiOperation(value = "鍙戦�佹秷鎭�")
@RequestMapping(value = "/sendMessage", method = RequestMethod.POST)
@@ -37,4 +42,49 @@
messageParam.setCreateUser(user.getUserId());
return CommonResult.success(iMessageService.sendMessage(messageParam));
}
+ @ApiOperation(value = "鑾峰彇娑堟伅鍒嗛〉鏌ヨ")
+ @RequestMapping(value = "/list", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult<IPage<Message>> list(@Validated @RequestBody MessageParam messageParam) {
+ return CommonResult.success(iMessageService.list(messageParam));
+ }
+
+
+ @ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛淇℃伅")
+ @RequestMapping(value = "/getColumn/{id}", method = RequestMethod.GET)
+ @ResponseBody
+ public CommonResult<Message> getItem(@PathVariable Long id) {
+ Message message = iMessageService.getById(id);
+ return CommonResult.success(message);
+ }
+
+ @ApiOperation("淇敼鎸囧畾娑堟伅")
+ @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult update(@PathVariable Long id, @RequestBody MessageParam messageParam) {
+ Message message = new Message();
+ message.setId(id);
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ //璁剧疆鍒涘缓浜�
+ message.setCreateUser(user.getUserId());
+ BeanUtils.copyProperties(messageParam, message);
+ boolean success = iMessageService.updateById(message);
+ if (success) {
+ return CommonResult.success(null);
+ }
+ return CommonResult.failed();
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎娑堟伅")
+ @RequestMapping(value = "/delete", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult delete(@RequestParam("ids") List<Long> ids) {
+ boolean success = iMessageService.removeBatchByIds(ids);
+ if (success) {
+ return CommonResult.success(null);
+ }
+ return CommonResult.failed();
+ }
+
+
}
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
new file mode 100644
index 0000000..0ee5c76
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/dto/message/MessageColumnParam.java
@@ -0,0 +1,49 @@
+package com.ycl.dto.message;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 娑堟伅鏍忕洰 瀹炰綋绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-10
+ */
+@Data
+@ApiModel("娑堟伅鏍忕洰鍙傛暟浣�")
+public class MessageColumnParam {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鏍忕洰鍚嶇О
+ */
+ @ApiModelProperty(value = "鏍忕洰鍚嶇О")
+ @NotNull(message = "鏍忕洰鍚嶇О涓虹┖")
+ private String columnName;
+
+ /**
+ * 鎻忚堪
+ */
+ @TableField("desc")
+ @ApiModelProperty(value = "鎻忚堪")
+ private String desc;
+
+ /**
+ * 鏄惁鏄剧ず
+ */
+ @TableField("is_show")
+ @ApiModelProperty(value = "鏄惁鏄剧ず")
+ private String isShow;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Long createUser;
+}
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
new file mode 100644
index 0000000..4ba2973
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java
@@ -0,0 +1,100 @@
+package com.ycl.entity.message;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * <p>
+ * 娑堟伅鏍忕洰 瀹炰綋绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ums_message_column")
+@ApiModel(value = "娑堟伅鏍忕洰琛�")
+public class MessageColumn {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 涓婚敭
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "涓婚敭")
+ private Long id;
+
+ /**
+ * 鏍忕洰鍚嶇О
+ */
+ @TableField("column_name")
+ @ApiModelProperty(value = "鏍忕洰鍚嶇О")
+ @NotBlank(message = "鏍忕洰鍚嶇О涓虹┖")
+ private String columnName;
+
+
+ /**
+ * 鏍忕洰缂栫爜
+ */
+ @TableField("column_number")
+ @ApiModelProperty(value = "鏍忕洰缂栫爜")
+ @NotBlank(message = "娓犻亾鐮佷负绌�")
+ private String columnNumber;
+
+ /**
+ * 鍏憡鏁�
+ */
+ @TableField("notice_amount")
+ @ApiModelProperty(value = "鍏憡鏁�")
+ private Integer notice_amount;
+
+ /**
+ * 鏄惁鏄剧ず
+ */
+ @TableField("is_show")
+ @ApiModelProperty(value = "鏄惁鏄剧ず")
+ @NotNull(message = "鏄惁鏄剧ず涓虹┖")
+ private String isShow;
+
+ /**
+ * 鎻忚堪
+ */
+ @TableField("desc")
+ @ApiModelProperty(value = "鎻忚堪")
+ private String desc;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @TableField("create_user")
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Long createUser;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField("create_time")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
+ @TableField("update_user")
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Long updateUser;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @TableField("update_time")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date 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
new file mode 100644
index 0000000..7a18efa
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/mapper/message/MessageColumnMapper.java
@@ -0,0 +1,15 @@
+package com.ycl.mapper.message;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.message.MessageColumn;
+
+/**
+ * <p>
+ * 娑堟伅鏍忕洰 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-10
+ */
+public interface MessageColumnMapper extends BaseMapper<MessageColumn> {
+}
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
new file mode 100644
index 0000000..77a0ff8
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/message/IMessageColumnService.java
@@ -0,0 +1,19 @@
+package com.ycl.service.message;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.dto.message.MessageColumnParam;
+import com.ycl.entity.message.MessageColumn;
+
+/**
+ * <p>
+ * 娑堟伅鏍忕洰鏈嶅姟绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-10
+ */
+public interface IMessageColumnService extends IService<MessageColumn> {
+
+ IPage<MessageColumn> list(MessageColumnParam messageColumnParam);
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java b/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java
index 24ae67d..692e6ef 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java
@@ -1,5 +1,6 @@
package com.ycl.service.message;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
@@ -15,4 +16,5 @@
public interface IMessageService extends IService<Message> {
Message sendMessage(MessageParam messageParam);
+ IPage<Message> list(MessageParam messageParam);
}
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
new file mode 100644
index 0000000..18c464d
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnServiceImpl.java
@@ -0,0 +1,25 @@
+package com.ycl.service.message.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.dto.message.MessageColumnParam;
+import com.ycl.entity.message.MessageColumn;
+import com.ycl.mapper.message.MessageColumnMapper;
+import com.ycl.service.message.IMessageColumnService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 娑堟伅鏍忕洰 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-10
+ */
+@Service
+public class IMessageColumnServiceImpl extends ServiceImpl<MessageColumnMapper, MessageColumn> implements IMessageColumnService {
+ @Override
+ public IPage<MessageColumn> list(MessageColumnParam messageColumnParam) {
+ return null;
+ }
+}
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 011eeb2..22fde87 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,5 +1,6 @@
package com.ycl.service.message.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
@@ -14,7 +15,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 娑堟伅 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author mg
@@ -47,4 +48,9 @@
sender.sendMessage(messageParam);
return message;
}
+
+ @Override
+ public IPage<Message> list(MessageParam messageParam) {
+ return null;
+ }
}
--
Gitblit v1.8.0