|
|
|
|
@ -28,12 +28,19 @@ package org.springblade.desk.dashboard.service.impl; |
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
import jodd.util.StringPool; |
|
|
|
|
import jodd.util.StringUtil; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.springblade.core.mp.base.BaseServiceImpl; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
|
import org.springblade.desk.dashboard.mapper.DsMoldChangeMapper; |
|
|
|
|
import org.springblade.desk.dashboard.pojo.entity.DsMoldChangeEntity; |
|
|
|
|
import org.springblade.desk.dashboard.pojo.enums.DsMoldChangeEnum; |
|
|
|
|
import org.springblade.desk.dashboard.pojo.vo.DsMoldChangeVO; |
|
|
|
|
import org.springblade.desk.dashboard.service.IDsMoldChangeService; |
|
|
|
|
import org.springblade.system.feign.IUserClient; |
|
|
|
|
import org.springblade.system.pojo.entity.User; |
|
|
|
|
import org.springblade.system.pojo.entity.UserInfo; |
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
import java.util.Arrays; |
|
|
|
|
@ -47,8 +54,11 @@ import java.util.stream.Collectors; |
|
|
|
|
* @author BladeX |
|
|
|
|
* @since 2025-11-12 |
|
|
|
|
*/ |
|
|
|
|
@Slf4j |
|
|
|
|
@Service |
|
|
|
|
public class DsMoldChangeServiceImpl extends BaseServiceImpl<DsMoldChangeMapper, DsMoldChangeEntity> implements IDsMoldChangeService { |
|
|
|
|
@Autowired |
|
|
|
|
IUserClient userClient; |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public IPage<DsMoldChangeVO> selectDsMoldChangePage(IPage<DsMoldChangeVO> page, DsMoldChangeVO moldChange) { |
|
|
|
|
@ -70,6 +80,22 @@ public class DsMoldChangeServiceImpl extends BaseServiceImpl<DsMoldChangeMapper, |
|
|
|
|
.collect(Collectors.joining("、")); |
|
|
|
|
dsMoldChangeVO.setProcessModeStr(processModeStr); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(null != dsMoldChangeVO.getCreateUser()){ |
|
|
|
|
// 安全获取用户名称
|
|
|
|
|
try { |
|
|
|
|
R<UserInfo> userInfoR = userClient.userInfo(Func.toLong(dsMoldChangeVO.getCreateUser())); |
|
|
|
|
if (userInfoR != null && userInfoR.getData() != null) { |
|
|
|
|
User user = userInfoR.getData().getUser(); |
|
|
|
|
if (user != null) { |
|
|
|
|
dsMoldChangeVO.setCreateUserStr(user.getName()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error("获取用户信息失败, userId: {}", dsMoldChangeVO.getCreateUser(), e); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return page.setRecords(moldChangeList); |
|
|
|
|
} |
|
|
|
|
|