|
|
@@ -5,6 +5,7 @@ import com.zd.base.app.domain.board.DutyPersonVo;
|
|
|
import com.zd.base.app.domain.board.LabXxpSubjectVo;
|
|
|
import com.zd.common.core.security.TokenService;
|
|
|
import com.zd.common.core.utils.DateUtils;
|
|
|
+import com.zd.common.core.utils.FileConfigUtils;
|
|
|
import com.zd.common.core.utils.StringUtils;
|
|
|
import com.zd.laboratory.api.feign.RemoteDutyService;
|
|
|
import com.zd.model.constant.HttpStatus;
|
|
|
@@ -39,6 +40,8 @@ public class LabBoardApi {
|
|
|
private RemoteXxpService remoteXxpService;
|
|
|
@Autowired
|
|
|
private TokenService tokenService;
|
|
|
+ @Autowired
|
|
|
+ private FileConfigUtils fileConfigUtils;
|
|
|
|
|
|
/**
|
|
|
* 查询电子信息牌头部信息
|
|
|
@@ -56,7 +59,7 @@ public class LabBoardApi {
|
|
|
return ResultData.fail(500, "获取logo失败!");
|
|
|
}
|
|
|
map.put("schoolName", logoConfigVo.getSchoolName());
|
|
|
- map.put("circularLogo", logoConfigVo.getCircularLogo());
|
|
|
+ map.put("circularLogo", fileConfigUtils.getFileDomainApp()+logoConfigVo.getCircularLogo());
|
|
|
ResultData resultData=remoteDutyService.getSubjectName(labId);
|
|
|
if (resultData == null || resultData.getCode() != 200) {
|
|
|
return ResultData.fail(500, "获取实验室名称失败!");
|