From 4b8c13f72a1cfef0c8475d9c6051f962b8766ba2 Mon Sep 17 00:00:00 2001 From: mx <1289317512@qq.com> Date: Wed, 20 Nov 2024 11:18:16 +0800 Subject: [PATCH] bug --- .../pusong/web/controller/AuthController.java | 19 +++++++++++-------- .../handler/PlusWebSocketHandler.java | 14 +++++++------- .../websocket/utils/WebSocketUtils.java | 8 ++++---- .../impl/PayContractApproverServiceImpl.java | 4 +++- .../service/impl/HomeServiceImpl.java | 5 +++-- .../mapper/business/PsContractInfoMapper.xml | 2 -- 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/pusong-admin/src/main/java/com/pusong/web/controller/AuthController.java b/pusong-admin/src/main/java/com/pusong/web/controller/AuthController.java index 9a45d59..c3a8f64 100644 --- a/pusong-admin/src/main/java/com/pusong/web/controller/AuthController.java +++ b/pusong-admin/src/main/java/com/pusong/web/controller/AuthController.java @@ -121,15 +121,18 @@ public class AuthController { QueryWrapper queryWrapper = new QueryWrapper() .in( "rec_uid", userId); List sysNotices = sysNoticeMapper.selectList(queryWrapper); - for (SysNotice sysNotice : sysNotices) { - dto = new WebSocketMessageDto(); +// for (int i = 0; i < 100; i++) { + for (SysNotice sysNotice : sysNotices) { + dto = new WebSocketMessageDto(); // dto.setMessage(sysNotice.getNoticeContent()); - SysNoticeVo vo = MapstructUtils.convert(sysNotice, SysNoticeVo.class); - vo.setLogin(true); - dto.setMessage(JsonUtils.toJsonString(vo)); - dto.setSessionKeys(List.of(userId)); - WebSocketUtils.publishMessage(dto); - } + SysNoticeVo vo = MapstructUtils.convert(sysNotice, SysNoticeVo.class); + vo.setLogin(true); + dto.setMessage(JsonUtils.toJsonString(vo)); + dto.setSessionKeys(List.of(userId)); + WebSocketUtils.publishMessage(dto); + } +// } + }, 3, TimeUnit.SECONDS); return R.ok(loginVo); diff --git a/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/handler/PlusWebSocketHandler.java b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/handler/PlusWebSocketHandler.java index 935a845..5dd7a5a 100644 --- a/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/handler/PlusWebSocketHandler.java +++ b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/handler/PlusWebSocketHandler.java @@ -46,14 +46,14 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler { @Override protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception { // 从WebSocket会话中获取登录用户信息 - LoginUser loginUser = (LoginUser) session.getAttributes().get(WebSocketConstants.LOGIN_USER_KEY); +// LoginUser loginUser = (LoginUser) session.getAttributes().get(WebSocketConstants.LOGIN_USER_KEY); - // 创建WebSocket消息DTO对象 - WebSocketMessageDto webSocketMessageDto = new WebSocketMessageDto(); - webSocketMessageDto.setSessionKeys(List.of(loginUser.getUserId())); - webSocketMessageDto.setMessage(message.getPayload()); - WebSocketUtils.publishMessage(webSocketMessageDto); + // 创建WebSocket消息DTO对象?????收到什么回什么？？？ +// WebSocketMessageDto webSocketMessageDto = new WebSocketMessageDto(); +// webSocketMessageDto.setSessionKeys(List.of(loginUser.getUserId())); +// webSocketMessageDto.setMessage(message.getPayload()); +// WebSocketUtils.publishMessage(webSocketMessageDto); } /** @@ -77,7 +77,7 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler { */ @Override protected void handlePongMessage(WebSocketSession session, PongMessage message) throws Exception { - WebSocketUtils.sendPongMessage(session); +// WebSocketUtils.sendPongMessage(session); } /** diff --git a/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/utils/WebSocketUtils.java b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/utils/WebSocketUtils.java index f3a7739..f2d2e43 100644 --- a/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/utils/WebSocketUtils.java +++ b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/utils/WebSocketUtils.java @@ -67,10 +67,10 @@ public class WebSocketUtils { WebSocketMessageDto broadcastMessage = new WebSocketMessageDto(); broadcastMessage.setMessage(webSocketMessage.getMessage()); broadcastMessage.setSessionKeys(unsentSessionKeys); - RedisUtils.publish(WebSocketConstants.WEB_SOCKET_TOPIC, broadcastMessage, consumer -> { - log.info(" WebSocket发送主题订阅消息topic:{} session keys:{} message:{}", - WebSocketConstants.WEB_SOCKET_TOPIC, unsentSessionKeys, webSocketMessage.getMessage()); - }); +// RedisUtils.publish(WebSocketConstants.WEB_SOCKET_TOPIC, broadcastMessage, consumer -> { +// log.info(" WebSocket发送主题订阅消息topic:{} session keys:{} message:{}", +// WebSocketConstants.WEB_SOCKET_TOPIC, unsentSessionKeys, webSocketMessage.getMessage()); +// }); } } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java index 88efbcf..d865989 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java @@ -100,7 +100,9 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl } - if (ContractStatusEnum.CREATE.getCode().equals(info.getContractStatus())){ + PsContractPayVo psContractPayVo = payService.queryById(Long.valueOf(psApproverRecord.getBusinessId())); + + if (psContractPayVo.getMoney().equals(info.getResidualMoney())){ noticeService.sendNotice(SysNoticeBo.getFirstPayInstance(info.getCustomManager(), info.getPsCustomInfoVo().getCustomName())); }else{ if (info.getResidualMoney().doubleValue() > 0){ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java index 2a9184a..5146278 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java @@ -312,7 +312,7 @@ public class HomeServiceImpl implements HomeService { * @param isCaiwu * @return */ - @Cacheable(cacheNames = CacheNames.HOME_E, key = "#type+'_' + #tabType") +// @Cacheable(cacheNames = CacheNames.HOME_E, key = "#type+'_' + #tabType") public UserAmountVo getUserContractSourceAmountsByDeptId(Integer type, int tabType){ Map mapParam = this.getDate(type); LocalDate startDate = (LocalDate)mapParam.get("startDate"); @@ -403,7 +403,8 @@ public class HomeServiceImpl implements HomeService { daPan.setJieShaoPer(daPan.getJieShaoAmount().multiply(new BigDecimal("100.0")).divide(daPan.getSumAmount(), 2, RoundingMode.HALF_UP).toPlainString() + "%"); daPan.setOtherPer(daPan.getOtherAmount().multiply(new BigDecimal("100.0")).divide(daPan.getSumAmount(), 2, RoundingMode.HALF_UP).toPlainString() + "%"); } - + daPan.setJsUnPaySumAmount(daPan.getJieShaoAmount().subtract(daPan.getJsPayedSumAmount())); + daPan.setOtherUnPaySumAmount(daPan.getOtherAmount().subtract(daPan.getOtherPayedSumAmount())); UserAmountVo userAmountVo = new UserAmountVo(); userAmountVo.setZjsList(listData); diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml index 01447a9..9bcc134 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml @@ -146,8 +146,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and info.contract_status != #{queryParam.contractStatus} and info.is_cancel != #{queryParam.isCancel} --- inner join sys_user_role ur on ur.user_id = u.user_id --- inner join sys_role role on role.role_id = ur.role_id LEFT JOIN ps_contract_business bus on bus.contract_code=info.contract_code LEFT JOIN ps_contract_pay pay on info.contract_code=pay.contract_code and pay.pay_status=#{queryParam.payStatus} and pay.del_flag=0 ${ew.getCustomSqlSegment}