zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zt
2025-05-23 14:27:40 +08:00
parent 8651495124
commit 1612bbaf5c
7 changed files with 83 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SseController.java
View File

@ -25,28 +25,5 @@ public class SseController {
return SseUtil.subscribe(userId,prefix);
}
// /**
// * 触发消息数量推送（适配2.4.7）
// */
// @GetMapping("/push")
// public void pushMessageCount(String userId) {
// SseEmitter emitter = emitterMap.get(userId);
// if (emitter != null) {
// BgtMessageCountVO bgtMessageCountVO = new BgtMessageCountVO();
// bgtMessageCountVO.setTaskMessageCount(1);
// bgtMessageCountVO.setSettlementMessageCount(0);
// try {
// // 发送自定义事件（客户端通过事件名监听）
// emitter.send(SseEmitter.event()
// .id(String.valueOf(System.currentTimeMillis()))
// .name("messageCount")
// .data(JSONUtil.toJsonStr(bgtMessageCountVO))
// );
// } catch (IOException e) {
// emitter.completeWithError(e);
// emitterMap.remove(userId); // 异常时清理无效连接
// }
// }
// }
}

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectSubcontractingController.java
View File

@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.fbs.domain.vo.FbsProjectSubcontractingDetailVO;
import com.ruoyi.zbf.domain.ZbfProject;
import com.ruoyi.zbf.domain.ZbfProjectSubcontracting;
import com.ruoyi.zbf.domain.ZbfProjectSubcontractingApply;
import com.ruoyi.zbf.service.IZbfProjectSectionService;
@ -62,7 +63,14 @@ public class AppFbsProjectSubcontractingController extends BaseController {
ZbfProjectSubcontracting zbfProjectSubcontracting = iZbfProjectSubcontractingService.queryById(apply.getSubId());
FbsProjectSubcontractingDetailVO vo = BeanUtil.copyProperties(zbfProjectSubcontracting, FbsProjectSubcontractingDetailVO.class);
vo.setSectionName(zbfProjectSectionService.getById(vo.getSectionId()).getSectionName());
vo.setProjectImg(zbfProjectService.getById(vo.getProjectId()).getProjectImg());
ZbfProject project = zbfProjectService.getById(vo.getProjectId());
vo.setProjectImg(project.getProjectImg());
vo.setProjectName(project.getProjectName());
vo.setProjectAddress(project.getProjectAddress());
vo.setContactPerson(project.getContactPerson());
vo.setContactPhone(project.getContactPhone());
vo.setUnitName(project.getUnitName());
vo.setCreditCode(project.getCreditCode());
vo.setApplyStatus(apply.getApplyStatus());
return AjaxResult.success(vo);
}