From 41112d2f3201d0acb542a6053d9768fd8973617d Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Tue, 18 Jan 2022 21:50:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=95=99=E8=A8=80=E6=9D=BF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/common/util/MyDateUtil.java | 4 +- .../XhpcMessageBoardController.java | 19 +++++++- .../java/com/xhpc/board/domain/UserInfo.java | 48 +++++++++++++++++++ .../service/XhpcMessageBoardService.java | 10 ++++ .../impl/XhpcMessageBoardServiceImpl.java | 13 +++++ 5 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserInfo.java diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/MyDateUtil.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/MyDateUtil.java index a910ddb0..cc7b0c67 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/MyDateUtil.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/MyDateUtil.java @@ -15,6 +15,8 @@ import java.util.Date; @SuppressWarnings("all") public class MyDateUtil { + public static final String DATE_FORMAT_DATE_TIME = "yyyy-MM-dd HH:mm:ss"; + public static void main(String[] args) { System.out.println(getCurrentDateStr()); @@ -43,8 +45,6 @@ public class MyDateUtil { } - public static final String DATE_FORMAT_DATE_TIME = "yyyy-MM-dd HH:mm:ss"; - /** * 获取表示所传入的Date对象的Calendar对象 * diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java index ab141e6d..1a8530e1 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java @@ -24,6 +24,21 @@ public class XhpcMessageBoardController { @Resource XhpcMessageBoardService xhpcMessageBoardService; + /** + * 平台删除所查看的用户列表中的指定用户 + * + * @author WH + * @date 2022/1/13 18:43 + * @since version-1.0 + */ + @DeleteMapping("/platform/list/user") + public AjaxResult deleteListUser(@Validated @RequestBody UserInfo userInfo) { + + xhpcMessageBoardService.deleteListUser(userInfo); + + return AjaxResult.success(); + } + /** * 平台给用户发送消息 * @@ -62,8 +77,8 @@ public class XhpcMessageBoardController { * @date 2022/1/15 18:47 * @since version-1.0 */ - @GetMapping("/user/message") - public AjaxResult platformQueryMessage(UserQueryCondition userQueryCondition) throws Exception { + @PatchMapping("/user/message") + public AjaxResult platformQueryMessage(UserQueryCondition userQueryCondition) { QueryUserMassageResponse queryUserMassageResponse = xhpcMessageBoardService.platformQueryMessage(userQueryCondition); diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserInfo.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserInfo.java new file mode 100644 index 00000000..6f54c8a3 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserInfo.java @@ -0,0 +1,48 @@ +package com.xhpc.board.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 用户信息 + * + * @author WH + * @date 2022/1/18 17:34 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class UserInfo { + + + /** + * userAccount + */ + @JsonProperty("userAccount") + @NotNull(message = "userAccount的参数名不正确或者userAccount的值为空，请检查传入参数") + @NotBlank(message = "userAccount的参数不能为''字符串，请检查传入参数") + private String userAccount; + /** + * userType + */ + @JsonProperty("userType") + @NotNull(message = "userType的参数名不正确或者userType的值为空，请检查传入参数") + @Min(value = 0, message = "userType的参数不能小于0，请检查传入参数") + private Integer userType; + /** + * tenantId + */ + @JsonProperty("tenantId") + private String tenantId; + /** + * tenantType + */ + @JsonProperty("tenantType") + private Integer tenantType; + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java index 089173e7..44cceb0f 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java @@ -78,4 +78,14 @@ public interface XhpcMessageBoardService { */ QueryUserMassageResponse platformQueryMessage(UserQueryCondition userQueryCondition); + /** + * 删除指定租户用户列表中的用户 + * + * @param userInfo 指定用户信息 + * @author WH + * @date 2022/1/18 17:39 + * @since version-1.0 + */ + void deleteListUser(UserInfo userInfo); + } diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java index 73047a9e..aa92f9b4 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java @@ -366,4 +366,17 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { return response; } + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteListUser(UserInfo userInfo) { + + SysUser sysUser = tokenService.getLoginUser().getSysUser(); + userInfo.setTenantId(sysUser.getTenantId()); + userInfo.setTenantType(0); + UserQueryCondition userQueryCondition = new UserQueryCondition(); + BeanUtils.copyProperties(userInfo, userQueryCondition); + xhpcMessageBoardReceiveUserMapper.updateHaveNewInfoIsNull(userQueryCondition); + + } + }