소스 검색

信息牌接口对接调整 2023-03-31

donggaosheng 2 년 전
부모
커밋
8fc7fc580b
1개의 변경된 파일4개의 추가작업 그리고 1개의 파일을 삭제
  1. 4 1
      zd-modules/zd-base/src/main/java/com/zd/base/app/controller/LabBoardApi.java

+ 4 - 1
zd-modules/zd-base/src/main/java/com/zd/base/app/controller/LabBoardApi.java

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