|
@@ -219,18 +219,20 @@ public class OperatorTrajectoryAspect {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
com.jzg.commons.entity.po.OperatorTrajectory trajectory = new com.jzg.commons.entity.po.OperatorTrajectory();
|
|
com.jzg.commons.entity.po.OperatorTrajectory trajectory = new com.jzg.commons.entity.po.OperatorTrajectory();
|
|
|
|
|
+ String userTokenString = baseController.getUserTokenString();
|
|
|
|
|
+ JSONObject userInfo = JSONObject.parseObject(userTokenString);
|
|
|
|
|
+ String systemCode = userInfo.getString("system");
|
|
|
String trajectoryId = IdGenerate.nextId();
|
|
String trajectoryId = IdGenerate.nextId();
|
|
|
trajectory.setId(trajectoryId);
|
|
trajectory.setId(trajectoryId);
|
|
|
trajectory.setOperatorType(operatorTrajectory.type());
|
|
trajectory.setOperatorType(operatorTrajectory.type());
|
|
|
- trajectory.setSystemCode(baseController.getUserSystemCode());
|
|
|
|
|
|
|
+ trajectory.setSystemCode(systemCode);
|
|
|
String className = point.getTarget().getClass().getName();
|
|
String className = point.getTarget().getClass().getName();
|
|
|
String methodName = point.getSignature().getName();
|
|
String methodName = point.getSignature().getName();
|
|
|
trajectory.setServiceTag(className + "." + methodName + "()");
|
|
trajectory.setServiceTag(className + "." + methodName + "()");
|
|
|
trajectory.setModuleName(operatorTrajectory.moduleName());
|
|
trajectory.setModuleName(operatorTrajectory.moduleName());
|
|
|
trajectory.setCreateTime(LocalDateTime.now());
|
|
trajectory.setCreateTime(LocalDateTime.now());
|
|
|
- String userName = baseController.getUserName();
|
|
|
|
|
- trajectory.setCreateBy(userName);
|
|
|
|
|
- trajectory.setCreateByName(userName);
|
|
|
|
|
|
|
+ trajectory.setCreateBy(userInfo.getString("username"));
|
|
|
|
|
+ trajectory.setCreateByName(userInfo.getString("name"));
|
|
|
trajectory.setEntityName(Arrays.stream(operatorTrajectory.entityClass())
|
|
trajectory.setEntityName(Arrays.stream(operatorTrajectory.entityClass())
|
|
|
.map(Class::getName).collect(Collectors.joining(",")));
|
|
.map(Class::getName).collect(Collectors.joining(",")));
|
|
|
if(!Objects.isNull(obj)) {
|
|
if(!Objects.isNull(obj)) {
|