用户工号

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);

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<Void> saveLog(@RequestBody SysLogDto sysLog) {
+	public R<Void> saveLog(@RequestBody SysLogDto sysLogDto) {
 //		R<Boolean> 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();
 	}

honeycom-spdm/src/main/resources/logback-spring.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    小技巧: 在根pom里面设置统一存放路径，统一管理方便维护
+    <properties>
+        <log-path>/Users/lengleng</log-path>
+    </properties>
+    1. 其他模块加日志输出，直接copy本文件放在resources 目录即可
+    2. 注意修改 <property name="${log-path}/log.path" value=""/> 的value模块
+-->
+<configuration debug="false" scan="false">
+	<property name="log.path" value="logs/${project.artifactId}"/>
+	<!-- 彩色日志格式 -->
+	<property name="CONSOLE_LOG_PATTERN"
+			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+	<!-- 彩色日志依赖的渲染类 -->
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+	<conversionRule conversionWord="wex"
+					converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+	<conversionRule conversionWord="wEx"
+					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+	<!-- Console log output -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<!-- Log file debug output -->
+	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/debug.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- Log file error output -->
+	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/error.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>ERROR</level>
+		</filter>
+	</appender>
+
+	<!--输出到logstash的appender-->
+	<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+		<!--可以访问的logstash日志收集端口-->
+		<destination>192.168.3.4:4567</destination>
+		<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
+	</appender>
+	<root level="INFO">
+		<appender-ref ref="LOGSTASH"/>
+	</root>
+
+	<logger name="org.activiti.engine.impl.db" level="DEBUG">
+		<appender-ref ref="debug"/>
+	</logger>
+
+	<!--nacos 心跳 INFO 屏蔽-->
+	<logger name="com.alibaba.nacos" level="OFF">
+		<appender-ref ref="error"/>
+	</logger>
+	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+	<root level="INFO">
+		<appender-ref ref="console"/>
+		<appender-ref ref="debug"/>
+	</root>
+</configuration>

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<Long> post;
+
+    /**
+     * 工号
+     */
+    @Schema(description = "工号")
+    private String jobNumber;
 }

honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/entity/SysUserEntity.java

@@ -125,4 +125,10 @@ public class SysUserEntity extends Model<SysUserEntity> {
      */
     @Schema(description = "hr主键id")
     private Integer hrEmpId;
+
+    /**
+     * 工号
+     */
+    @Schema(description = "工号")
+    private String jobNumber;
 }

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();