mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
mx 2024-11-20 11:18:16 +08:00
parent 87c95dc479
commit 4b8c13f72a
6 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pusong-admin/src/main/java/com/pusong/web/controller/AuthController.java
View File

@ -121,15 +121,18 @@ public class AuthController {
QueryWrapper<SysNotice> queryWrapper = new QueryWrapper<SysNotice>() QueryWrapper<SysNotice> queryWrapper = new QueryWrapper<SysNotice>()
.in( "rec_uid", userId); .in( "rec_uid", userId);
List<SysNotice> sysNotices = sysNoticeMapper.selectList(queryWrapper); List<SysNotice> sysNotices = sysNoticeMapper.selectList(queryWrapper);
for (SysNotice sysNotice : sysNotices) { // for (int i = 0; i < 100; i++) {
dto = new WebSocketMessageDto(); for (SysNotice sysNotice : sysNotices) {
dto = new WebSocketMessageDto();
// dto.setMessage(sysNotice.getNoticeContent()); // dto.setMessage(sysNotice.getNoticeContent());
SysNoticeVo vo = MapstructUtils.convert(sysNotice, SysNoticeVo.class); SysNoticeVo vo = MapstructUtils.convert(sysNotice, SysNoticeVo.class);
vo.setLogin(true); vo.setLogin(true);
dto.setMessage(JsonUtils.toJsonString(vo)); dto.setMessage(JsonUtils.toJsonString(vo));
dto.setSessionKeys(List.of(userId)); dto.setSessionKeys(List.of(userId));
WebSocketUtils.publishMessage(dto); WebSocketUtils.publishMessage(dto);
} }
// }
}, 3, TimeUnit.SECONDS); }, 3, TimeUnit.SECONDS);
return R.ok(loginVo); return R.ok(loginVo);

14
pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/handler/PlusWebSocketHandler.java
View File

@ -46,14 +46,14 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler {
@Override @Override
protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception { protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
// 从WebSocket会话中获取登录用户信息 // 从WebSocket会话中获取登录用户信息
LoginUser loginUser = (LoginUser) session.getAttributes().get(WebSocketConstants.LOGIN_USER_KEY); // LoginUser loginUser = (LoginUser) session.getAttributes().get(WebSocketConstants.LOGIN_USER_KEY);
// 创建WebSocket消息DTO对象 // 创建WebSocket消息DTO对象?????收到什么回什么？？？
WebSocketMessageDto webSocketMessageDto = new WebSocketMessageDto(); // WebSocketMessageDto webSocketMessageDto = new WebSocketMessageDto();
webSocketMessageDto.setSessionKeys(List.of(loginUser.getUserId())); // webSocketMessageDto.setSessionKeys(List.of(loginUser.getUserId()));
webSocketMessageDto.setMessage(message.getPayload()); // webSocketMessageDto.setMessage(message.getPayload());
WebSocketUtils.publishMessage(webSocketMessageDto); // WebSocketUtils.publishMessage(webSocketMessageDto);
} }
/** /**
@ -77,7 +77,7 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler {
*/ */
@Override @Override
protected void handlePongMessage(WebSocketSession session, PongMessage message) throws Exception { protected void handlePongMessage(WebSocketSession session, PongMessage message) throws Exception {
WebSocketUtils.sendPongMessage(session); // WebSocketUtils.sendPongMessage(session);
} }
/** /**

8
pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/utils/WebSocketUtils.java
View File

@ -67,10 +67,10 @@ public class WebSocketUtils {
WebSocketMessageDto broadcastMessage = new WebSocketMessageDto(); WebSocketMessageDto broadcastMessage = new WebSocketMessageDto();
broadcastMessage.setMessage(webSocketMessage.getMessage()); broadcastMessage.setMessage(webSocketMessage.getMessage());
broadcastMessage.setSessionKeys(unsentSessionKeys); broadcastMessage.setSessionKeys(unsentSessionKeys);
RedisUtils.publish(WebSocketConstants.WEB_SOCKET_TOPIC, broadcastMessage, consumer -> { // RedisUtils.publish(WebSocketConstants.WEB_SOCKET_TOPIC, broadcastMessage, consumer -> {
log.info(" WebSocket发送主题订阅消息topic:{} session keys:{} message:{}", // log.info(" WebSocket发送主题订阅消息topic:{} session keys:{} message:{}",
WebSocketConstants.WEB_SOCKET_TOPIC, unsentSessionKeys, webSocketMessage.getMessage()); // WebSocketConstants.WEB_SOCKET_TOPIC, unsentSessionKeys, webSocketMessage.getMessage());
}); // });
} }
} }

4
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java
View File

@ -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())); noticeService.sendNotice(SysNoticeBo.getFirstPayInstance(info.getCustomManager(), info.getPsCustomInfoVo().getCustomName()));
}else{ }else{
if (info.getResidualMoney().doubleValue() > 0){ if (info.getResidualMoney().doubleValue() > 0){

5
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java
View File

@ -312,7 +312,7 @@ public class HomeServiceImpl implements HomeService {
* @param isCaiwu * @param isCaiwu
* @return * @return
*/ */
@Cacheable(cacheNames = CacheNames.HOME_E, key = "#type+'_' + #tabType") // @Cacheable(cacheNames = CacheNames.HOME_E, key = "#type+'_' + #tabType")
public UserAmountVo getUserContractSourceAmountsByDeptId(Integer type, int tabType){ public UserAmountVo getUserContractSourceAmountsByDeptId(Integer type, int tabType){
Map<String, Object> mapParam = this.getDate(type); Map<String, Object> mapParam = this.getDate(type);
LocalDate startDate = (LocalDate)mapParam.get("startDate"); 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.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.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 userAmountVo = new UserAmountVo();
userAmountVo.setZjsList(listData); userAmountVo.setZjsList(listData);

2
pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml
View File

@ -146,8 +146,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and info.contract_status != #{queryParam.contractStatus} and info.contract_status != #{queryParam.contractStatus}
and info.is_cancel != #{queryParam.isCancel} 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_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 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} ${ew.getCustomSqlSegment}