From 44f3b599a875529619e8204ad53a506e2813ccab Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Mon, 22 Dec 2025 16:58:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=B7=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/service/impl/RemoteServiceImpl.java | 5 +- .../spdm/controller/SpdmLogController.java | 9 ++- .../src/main/resources/logback-spring.xml | 80 +++++++++++++++++++ .../honeycom/user/dto/SysUserDTO.java | 6 ++ .../honeycom/user/entity/SysUserEntity.java | 6 ++ .../honeycom/user/vo/SysUserVO.java | 7 ++ 6 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 honeycom-spdm/src/main/resources/logback-spring.xml diff --git a/honeycom-flow/honeycom-flow-task/honeycom-flow-task-biz/src/main/java/com/honeycombis/honeycom/flow/task/service/impl/RemoteServiceImpl.java b/honeycom-flow/honeycom-flow-task/honeycom-flow-task-biz/src/main/java/com/honeycombis/honeycom/flow/task/service/impl/RemoteServiceImpl.java index 4f5981c..c9c38e5 100644 --- a/honeycom-flow/honeycom-flow-task/honeycom-flow-task-biz/src/main/java/com/honeycombis/honeycom/flow/task/service/impl/RemoteServiceImpl.java +++ b/honeycom-flow/honeycom-flow-task/honeycom-flow-task-biz/src/main/java/com/honeycombis/honeycom/flow/task/service/impl/RemoteServiceImpl.java @@ -403,8 +403,11 @@ public class RemoteServiceImpl implements IRemoteService { messageOpenApiDTO.setTenantCode(String.valueOf(TenantContextHolder.getTenantId())); JSONObject jsonObject = new JSONObject(); - jsonObject.put("flowId", processNodeRecordAssignUserParamDto.getProcessInstanceId()); + jsonObject.put("flowId", processNodeRecordAssignUserParamDto.getFlowId()); + jsonObject.put("processInstanceId", processNodeRecordAssignUserParamDto.getProcessInstanceId()); + jsonObject.put("nodeId", processNodeRecordAssignUserParamDto.getNodeId()); jsonObject.put("taskId", processNodeRecordAssignUserParamDto.getTaskId()); + jsonObject.put("title", process.getName()); messageOpenApiDTO.setBusinessId(JSON.toJSONString(jsonObject)); log.info("审批节点发送通知消息:{}", JSON.toJSONString(messageOpenApiDTO)); remoteMessageService.pushMessage(messageOpenApiDTO); diff --git a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmLogController.java b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmLogController.java index f2edbe2..6abca83 100644 --- a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmLogController.java +++ b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmLogController.java @@ -19,6 +19,7 @@ package com.honeycombis.honeycom.spdm.controller; +import cn.hutool.json.JSONUtil; import com.honeycombis.honeycom.common.core.util.R; import com.honeycombis.honeycom.spdm.dto.SysLogDto; import com.honeycombis.honeycom.spdm.feign.SpdmServiceFeignClient; @@ -45,8 +46,14 @@ public class SpdmLogController { @Operation(summary = "记录日志") @PostMapping(value = "/saveLog") - public R saveLog(@RequestBody SysLogDto sysLog) { + public R saveLog(@RequestBody SysLogDto sysLogDto) { // R r = remoteLogServiceFeign.saveLog(messageDto, SecurityConstants.FROM_IN); + SysLogDto sysLog = new SysLogDto(); + sysLog.setTitle("登录成功"); + sysLog.setServiceId("simulation-system"); + sysLog.setTenantId(sysLogDto.getTenantId()); + sysLog.setCreateBy(sysLogDto.getCreateBy()); + log.info("[SpdmLogController] sysLog param:{}", JSONUtil.toJsonStr(sysLog)); spdmServiceFeignClient.saveLog(sysLog); return R.ok(); } diff --git a/honeycom-spdm/src/main/resources/logback-spring.xml b/honeycom-spdm/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..6ac18e2 --- /dev/null +++ b/honeycom-spdm/src/main/resources/logback-spring.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + 192.168.3.4:4567 + + + + + + + + + + + + + + + + + + + + diff --git a/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/dto/SysUserDTO.java b/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/dto/SysUserDTO.java index 3a12779..e4bc289 100644 --- a/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/dto/SysUserDTO.java +++ b/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/dto/SysUserDTO.java @@ -65,4 +65,10 @@ public class SysUserDTO { * 岗位ID */ private List post; + + /** + * 工号 + */ + @Schema(description = "工号") + private String jobNumber; } diff --git a/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/entity/SysUserEntity.java b/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/entity/SysUserEntity.java index 0af4433..51a41eb 100644 --- a/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/entity/SysUserEntity.java +++ b/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/entity/SysUserEntity.java @@ -125,4 +125,10 @@ public class SysUserEntity extends Model { */ @Schema(description = "hr主键id") private Integer hrEmpId; + + /** + * 工号 + */ + @Schema(description = "工号") + private String jobNumber; } \ No newline at end of file diff --git a/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/vo/SysUserVO.java b/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/vo/SysUserVO.java index ac7d599..fdabfa1 100644 --- a/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/vo/SysUserVO.java +++ b/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/vo/SysUserVO.java @@ -40,6 +40,12 @@ public class SysUserVO { @Schema(description = "昵称") private String nickname; + /** + * 工号 + */ + @Schema(description = "工号") + private String jobNumber; + /** * 头像 */ @@ -139,6 +145,7 @@ public class SysUserVO { this.username = sysUser.getUsername(); this.phone = sysUser.getPhone(); this.nickname = sysUser.getNickname(); + this.jobNumber = sysUser.getJobNumber(); this.avatar = sysUser.getAvatar(); this.password = sysUser.getPassword(); this.salt = sysUser.getSalt();