From dca4ddc639b978f06f106bde6f31c2df2f8738d4 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Tue, 18 Jan 2022 16:30:10 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9Auth=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=BC=80=E5=8F=91?= =?UTF-8?q?=EF=BC=8C=20=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BD=BD=E4=B8=8B?= =?UTF-8?q?=E6=9D=A5=E7=9A=84pdf=E5=AD=98=E6=94=BE=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=B8=BA=E6=9C=8D=E5=8A=A1=E5=99=A8=E8=B7=AF=E5=BE=84=EF=BC=8C?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=BB=99=E7=94=A8=E6=88=B7=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=96=B9=E6=B3=95=EF=BC=8C=E4=B8=BA=E5=85=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E9=80=81=E5=8F=91=E7=A5=A8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/gateway/filter/AuthFilter.java | 2 +- .../xhpc/invoice/controller/XhpcInvoiceController.java | 7 ++++++- .../xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java | 8 ++++++++ .../xhpc-invoice/src/main/resources/bootstrap.yml | 4 ++-- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ruoyi-gateway/src/main/java/com/xhpc/gateway/filter/AuthFilter.java b/ruoyi-gateway/src/main/java/com/xhpc/gateway/filter/AuthFilter.java index 8f9d1a46..3db86bf3 100644 --- a/ruoyi-gateway/src/main/java/com/xhpc/gateway/filter/AuthFilter.java +++ b/ruoyi-gateway/src/main/java/com/xhpc/gateway/filter/AuthFilter.java @@ -37,7 +37,7 @@ public class AuthFilter implements GlobalFilter, Ordered { private static final Logger log = LoggerFactory.getLogger(AuthFilter.class); - private final static long EXPIRE_TIME = Constants.TOKEN_EXPIRE * 600; + private final static long EXPIRE_TIME = Constants.TOKEN_EXPIRE * 600000; // 排除过滤的 uri 地址，nacos自行添加 @Autowired diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java index ed1b7f29..f9fd80b2 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java @@ -66,7 +66,6 @@ public class XhpcInvoiceController extends BaseController { * @date 2021/12/29 16:40 * @since version-1.0 */ - @Log(title = "电子发票上传", businessType = BusinessType.INSERT) @PostMapping("/pdf") public AjaxResult uploadPdf(MultipartFile invoicePdf) throws IOException { @@ -93,6 +92,9 @@ public class XhpcInvoiceController extends BaseController { @Log(title = "用户提交发票状态", businessType = BusinessType.UPDATE) @PatchMapping() public AjaxResult invoiceToUser(@RequestBody InvoiceToUserRequest requestData) { + + System.out.println("进入方法"); + long start = System.currentTimeMillis(); //前置条件 if (requestData.getInvoiceId() == null) { return AjaxResult.error("必须上传发票id"); @@ -120,6 +122,9 @@ public class XhpcInvoiceController extends BaseController { return AjaxResult.error(e.getMessage()); } } + long end = System.currentTimeMillis(); + System.out.println("方法执行时间"); + System.out.println(end - start); return AjaxResult.success(); } diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java index b27b1735..f6ddb1c5 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java @@ -143,12 +143,20 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { //参数1 文件下载路径 //参数2 文件存放位置 //服务器响应404 表示服务器找不到客户端所请求的资源 + System.out.println("下载文件"); + long start = System.currentTimeMillis(); HttpUtil.downloadFile(fileUrl, electricInvoiceFile); + long end = System.currentTimeMillis(); + System.out.println(end - start); } catch (Exception e) { throw new RuntimeException("在阿里云上无法找到该文件，请检查上传的图片路径是否完整或有误"); } try { + System.out.println("发送邮件"); + long start = System.currentTimeMillis(); MailUtil.send(receiveEmail, "【小华充电】电子发票", "邮件来自小华充电", false, electricInvoiceFile); + long end = System.currentTimeMillis(); + System.out.println(end - start); } catch (Exception e) { System.out.println(e.getMessage()); return Boolean.FALSE; diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml index adcb25c9..fdb63184 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml @@ -37,5 +37,5 @@ oss: #文件路径 file: aliyunPath: invoicePdf/ - # serverStoreDisposableFileLocation: /www/wwwroot/xhpc.scxhua.com/disposableFiles/ - serverStoreDisposableFileLocation: C:\\www\\wwwroot\\xhpc.scxhua.com\\disposableFiles\\ \ No newline at end of file + serverStoreDisposableFileLocation: /www/wwwroot/xhpc.scxhua.com/disposableFiles/ +# serverStoreDisposableFileLocation: C:\\www\\wwwroot\\xhpc.scxhua.com\\disposableFiles\\ \ No newline at end of file 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 02/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=95=99=E8=A8=80?= =?UTF-8?q?=E6=9D=BF=E5=88=97=E8=A1=A8=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8E=A5=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); + + } + } From b6a6fd3d85b9360be46961ceaca914f04a3a264d Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Wed, 19 Jan 2022 15:06:58 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=99=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=BC=80=E5=8F=91=E7=A5=A8=E6=8E=A5=E5=8F=A3=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=EF=BC=8C=E6=97=A0=E8=AE=BA=E5=89=8D=E7=AB=AF=E4=BC=A0?= =?UTF-8?q?=E4=BB=80=E4=B9=88=E5=80=BC=EF=BC=8C=E9=83=BD=E4=BB=8E=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8new=E4=B8=80=E4=B8=AA=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BD=9C=E4=B8=BA=E5=BC=80=E7=A5=A8=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/invoice/api/XhpcInvoiceApiController.java | 4 +--- .../com/xhpc/board/controller/XhpcMessageBoardController.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/api/XhpcInvoiceApiController.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/api/XhpcInvoiceApiController.java index 1e86a935..ce7d452e 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/api/XhpcInvoiceApiController.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/api/XhpcInvoiceApiController.java @@ -50,9 +50,7 @@ public class XhpcInvoiceApiController extends BaseController { @PostMapping("/user/commit") public AjaxResult saveInvoiceInfo(@RequestBody SaveInvoiceInfoRequest saveInvoiceInfoRequest) throws Exception { - if (saveInvoiceInfoRequest.getCreateTime() == null) { - saveInvoiceInfoRequest.setCreateTime(DateUtil.getYyyyMmDdHhMmSs()); - } + saveInvoiceInfoRequest.setCreateTime(DateUtil.getYyyyMmDdHhMmSs()); xhpcInvoiceService.saveInvoiceInfo(saveInvoiceInfoRequest); return AjaxResult.success(); } 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 1a8530e1..4df113e2 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 @@ -31,7 +31,7 @@ public class XhpcMessageBoardController { * @date 2022/1/13 18:43 * @since version-1.0 */ - @DeleteMapping("/platform/list/user") + @PatchMapping("/platform/list/user") public AjaxResult deleteListUser(@Validated @RequestBody UserInfo userInfo) { xhpcMessageBoardService.deleteListUser(userInfo); From 3ff14d7135424f67dc7924f56fbbd39dac524255 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Wed, 19 Jan 2022 16:46:07 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=95=99=E8=A8=80?= =?UTF-8?q?=E6=9D=BFBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/board/domain/QueryUserListRequest.java | 4 ---- .../xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java index 0a54adb1..fe110b3a 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; /** @@ -47,14 +46,11 @@ public class QueryUserListRequest { * tenantId */ @JsonProperty("tenantId") - @NotNull(message = "tenantId的参数名不正确或者tenantId的值为空，请检查传入参数") - @NotBlank(message = "tenantId的参数为''字符串，请检查传入参数") private String tenantId; /** * tenantType */ @JsonProperty("tenantType") - @NotNull(message = "tenantType的参数名不正确或者tenantType的值为空，请检查传入参数") private Integer tenantType; } 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 aa92f9b4..d0b6298d 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 @@ -268,9 +268,8 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { param.setCurrentPage(startIndex); //查询用户列表 SysUser receiverInfo = tokenService.getLoginUser().getSysUser(); - if (receiverInfo == null) { - throw new Exception("查询不到指定的租户，receiverInfo为null，请检查传递的参数"); - } + param.setTenantId(receiverInfo.getTenantId()); + param.setTenantType(0); QueryUserListResponse queryUserListResponse = new QueryUserListResponse(); //查询出该租户拥有的所有用户列表 List userList = xhpcMessageBoardReceiveUserMapper.findAllBy(param); From e106f2ee3fc970542367d705b01e9ef25105810d Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Thu, 20 Jan 2022 22:52:42 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=95=99=E8=A8=80?= =?UTF-8?q?=E6=9D=BFBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/board/controller/XhpcMessageBoardController.java | 5 ++++- .../board/service/impl/XhpcMessageBoardServiceImpl.java | 4 +++- .../mapper/XhpcMessageBoardReceiveUserMapper.xml | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-) 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 4df113e2..239b14d7 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 @@ -49,6 +49,9 @@ public class XhpcMessageBoardController { @PostMapping("/platform/message") public AjaxResult platformSendMessageToUser(@RequestBody PlatformSendMessageToUserRequest platformRequest) { + if (platformRequest.getMessageContent() == null || "".equals(platformRequest.getMessageContent())) { + return AjaxResult.error("必须传入有效的信息内容"); + } xhpcMessageBoardService.platformSendMessageToUser(platformRequest); return AjaxResult.success(); @@ -77,7 +80,7 @@ public class XhpcMessageBoardController { * @date 2022/1/15 18:47 * @since version-1.0 */ - @PatchMapping("/user/message") + @GetMapping("/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/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java index d0b6298d..cb900446 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 @@ -16,6 +16,8 @@ import com.xhpc.common.util.DateUtil; import com.xhpc.common.util.MyPagingUtil; import com.xhpc.system.api.domain.SysUser; import com.xhpc.system.api.model.LoginUser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,7 +43,7 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { @Resource UserTypeService userTypeService; - + private static final Logger logger = LoggerFactory.getLogger(XhpcMessageBoardServiceImpl.class); /** * 将用户发送的信息保存到数据库中 * diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml b/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml index dc5b5ff2..838a91ba 100644 --- a/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml +++ b/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml @@ -118,10 +118,10 @@ AND tenant_type = #{tenantType} AND del_flag IS NULL AND have_new_info = 0 - + AND sender_type = #{userType} - + AND sender_account = #{senderAccount} LIMIT #{currentPage},#{items} @@ -133,10 +133,10 @@ AND tenant_type = #{tenantType} AND del_flag IS NULL AND have_new_info = 0 - + AND sender_type = #{userType} - + AND sender_account = #{senderAccount} From 5cfeaf015e0d6038079ab6d7a70acfd8322d32ec Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Fri, 21 Jan 2022 15:36:29 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F=E7=9A=84Bug=EF=BC=8C?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=89=8D=E7=AB=AF=E6=89=80=E4=BC=A0=E9=80=92?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/XhpcInvoiceServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java index f6ddb1c5..5a401ff1 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java @@ -128,8 +128,11 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { @Override @Transactional(rollbackFor = Exception.class) public Boolean invoiceToUser(InvoiceToUserRequest requestData) { - //获取当前时间 - requestData.setInvoicingTime(DateUtil.getYyyyMmDdHhMmSs()); + + if (requestData.getInvoicingTime() == null || "".equals(requestData.getInvoicingTime())) { + //获取当前时间 + requestData.setInvoicingTime(DateUtil.getYyyyMmDdHhMmSs()); + } //根据操作人的id，查询操作人的名字 SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(requestData.getDrawer())); requestData.setDrawer(sysUser.getNickName()); @@ -178,8 +181,11 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { @Override @Transactional(rollbackFor = Exception.class) public void failInvoiceToUser(InvoiceToUserRequest requestData) { - //获取当前时间 - requestData.setInvoicingTime(DateUtil.getYyyyMmDdHhMmSs()); + + if (requestData.getInvoicingTime() == null || "".equals(requestData.getInvoicingTime())) { + //获取当前时间 + requestData.setInvoicingTime(DateUtil.getYyyyMmDdHhMmSs()); + } //根据操作人的id，查询操作人的名字 SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(requestData.getDrawer())); requestData.setDrawer(sysUser.getNickName()); From edc81cbad4d7ee27ab2c64f5f52c7b546e8eed91 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Mon, 24 Jan 2022 11:13:34 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=95=99=E8=A8=80?= =?UTF-8?q?=E6=9D=BF=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XhpcMessageBoardReceiveUserMapper.java | 20 ++++++++++++ .../impl/XhpcMessageBoardServiceImpl.java | 31 ++++++++++++------- .../XhpcMessageBoardReceiveUserMapper.xml | 20 +++++++++--- 3 files changed, 55 insertions(+), 16 deletions(-) diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java index 5ea339f4..f77476c2 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java @@ -73,4 +73,24 @@ public interface XhpcMessageBoardReceiveUserMapper { */ void updateHaveNewInfoIsNull(UserQueryCondition userQueryCondition); + /** + * 删除指定租户列表中的指定用户 + * + * @param userQueryCondition 用户信息 + * @author WH + * @date 2022/1/24 10:32 + * @since version-1.0 + */ + void updateDelFlag(UserQueryCondition userQueryCondition); + + /** + * 设置指定用户从租户列表中恢复 + * + * @param userMessage 用户信息 + * @author WH + * @date 2022/1/24 10:37 + * @since version-1.0 + */ + void setDelFlag(SendMessageToPlatformRequest userMessage); + } \ No newline at end of file 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 cb900446..900af764 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 @@ -9,15 +9,13 @@ import com.xhpc.board.service.XhpcMessageBoardService; import com.xhpc.common.api.UserTypeService; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.DateUtils; -import com.xhpc.common.core.utils.bean.BeanUtils; import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.DateUtil; import com.xhpc.common.util.MyPagingUtil; import com.xhpc.system.api.domain.SysUser; import com.xhpc.system.api.model.LoginUser; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,7 +41,7 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { @Resource UserTypeService userTypeService; - private static final Logger logger = LoggerFactory.getLogger(XhpcMessageBoardServiceImpl.class); + /** * 将用户发送的信息保存到数据库中 * @@ -88,6 +86,7 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { xhpcMessageBoardReceiveUserMapper.insertSelective(xhpcMessageBoardReceiveUser); } else { xhpcMessageBoardReceiveUserMapper.updateHaveNewInfoFiledByUserCondition(userMessage); + xhpcMessageBoardReceiveUserMapper.setDelFlag(userMessage); } } else { //reset redis key valid time @@ -113,6 +112,7 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { xhpcMessageBoardReceiveUserMapper.insertSelective(xhpcMessageBoardReceiveUser); } else { xhpcMessageBoardReceiveUserMapper.updateHaveNewInfoFiledByUserCondition(userMessage); + xhpcMessageBoardReceiveUserMapper.setDelFlag(userMessage); } } } @@ -213,7 +213,7 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { List aMonthRecords = messageBoardMapper.selectBy(userQueryCondition, nextTimeStr); //如果没有数据，则返回空实体类对象 QueryUserMassageResponse response = new QueryUserMassageResponse(); - if (aMonthRecords.size() == 0) { + if (aMonthRecords.isEmpty()) { return response; } List messageIdList = new ArrayList<>(); @@ -250,8 +250,14 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { */ @Override public String returnPlatformAvatar(String tenantId, Integer tenantType) { - //todo 查询数据库 - return "https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png"; + + SysUser sysUser = tokenService.getLoginUser().getSysUser(); + String avatar = sysUser.getAvatar(); + if (avatar == null) { + return "https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png"; + } else { + return avatar; + } } /** @@ -275,7 +281,7 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { QueryUserListResponse queryUserListResponse = new QueryUserListResponse(); //查询出该租户拥有的所有用户列表 List userList = xhpcMessageBoardReceiveUserMapper.findAllBy(param); - if (userList.size() == 0) { + if (userList.isEmpty()) { return queryUserListResponse; } List dataDtoList = new ArrayList<>(); @@ -315,7 +321,7 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { //查询用户是否有数据，即查询该用户的所有时间记录（有时间记录表示该用户发送过信息） List allTimeRecords = messageBoardMapper.selectTimeRecords(userQueryCondition); QueryUserMassageResponse queryUserMassageResponse = new QueryUserMassageResponse(); - if (allTimeRecords.size() == 0) { + if (allTimeRecords.isEmpty()) { return queryUserMassageResponse; } //获取最后一个时间记录，将其减去一个月，放入查询条件中 @@ -339,7 +345,7 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { List aMonthRecords = messageBoardMapper.selectBy(userQueryCondition, nextTimeStr); //如果没有数据，则返回空实体类对象 QueryUserMassageResponse response = new QueryUserMassageResponse(); - if (aMonthRecords.size() == 0) { + if (aMonthRecords.isEmpty()) { return response; } List messageIdList = new ArrayList<>(); @@ -361,7 +367,6 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { dataDTOS.add(dataDTO); } //处理下次查询时间 - //todo 截取时间 response.setNextQueryTime(nextTimeStr); response.setData(dataDTOS); return response; @@ -376,7 +381,9 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { userInfo.setTenantType(0); UserQueryCondition userQueryCondition = new UserQueryCondition(); BeanUtils.copyProperties(userInfo, userQueryCondition); - xhpcMessageBoardReceiveUserMapper.updateHaveNewInfoIsNull(userQueryCondition); + userQueryCondition.setSenderType(userInfo.getUserType()); + userQueryCondition.setSenderAccount(userInfo.getUserAccount()); + xhpcMessageBoardReceiveUserMapper.updateDelFlag(userQueryCondition); } diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml b/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml index 838a91ba..ba98eaec 100644 --- a/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml +++ b/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml @@ -85,7 +85,6 @@ AND tenant_id = #{tenantId} AND sender_account = #{senderAccount} AND sender_type = #{senderType} - AND del_flag IS NULL; UPDATE xhpc_message_board_receive_user @@ -96,6 +95,22 @@ AND sender_type = #{senderType} AND del_flag IS NULL; + + UPDATE xhpc_message_board_receive_user + SET del_flag = 0 + WHERE tenant_type = #{tenantType} + AND tenant_id = #{tenantId} + AND sender_account = #{senderAccount} + AND sender_type = #{senderType} + + + UPDATE xhpc_message_board_receive_user + SET del_flag = null + WHERE tenant_type = #{tenantType} + AND tenant_id = #{tenantId} + AND sender_account = #{senderAccount} + AND sender_type = #{senderType} +