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

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpDutyController.java

@@ -185,6 +185,12 @@ public class LabXxpDutyController extends BaseController
     public ResultData<List<Map<String,Object>>> list(Long labId,String dateTime)
     {
         List<Map<String,Object>> list = xxpDutyService.selectDutyUser(labId,dateTime);
+        for(Map<String,Object> map:list){
+            if(StringUtils.isNotNull(map.get("avatar"))){
+                String avatar=fileConfigUtils.getFileDomainApp() + map.get("avatar");
+                map.put("avatar",avatar);
+            }
+        }
         return ResultData.success(list);
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/XxpClassifyDetailedServiceImpl.java

@@ -2,6 +2,7 @@ package com.zd.laboratory.service.impl;
 
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.security.TokenService;
+import com.zd.common.core.utils.FileConfigUtils;
 import com.zd.laboratory.api.vo.LabXxpClassifyVo;
 import com.zd.laboratory.domain.XxpClassify;
 import com.zd.common.core.utils.StringUtils;
@@ -36,6 +37,9 @@ public class XxpClassifyDetailedServiceImpl implements IXxpClassifyDetailedServi
     @Autowired
     private TokenService tokenService;
 
+    @Autowired
+    private FileConfigUtils fileConfigUtils;
+
 
     /**
      * 查询安全信息类目详情
@@ -130,19 +134,24 @@ public class XxpClassifyDetailedServiceImpl implements IXxpClassifyDetailedServi
         List<XxpClassifyDetail> classifyDetailList=classifyDetailedMapper.selectXxpClassifyBySubjectId(id);
         for(XxpClassify xxpClassify:xxpClassifyList){
             LabXxpClassifyVo labXxpClassifyVo=new LabXxpClassifyVo();
+            labXxpClassifyVo.setClassifyType(xxpClassify.getClassifyType());
             labXxpClassifyVo.setShowColour(xxpClassify.getShowColour());
             labXxpClassifyVo.setIsShow(xxpClassify.getIsShow());
             labXxpClassifyVo.setClassifyName(xxpClassify.getClassifyName());
             labXxpClassifyVo.setIsSpecial(xxpClassify.getIsSpecial());
             labXxpClassifyVo.setSort(xxpClassify.getSort());
             labXxpClassifyVo.setIsSpecial(xxpClassify.getIsSpecial());
-            List<String> StrList=new ArrayList<>();
+            List<String> strList=new ArrayList<>();
             for(XxpClassifyDetail classifyDetail:classifyDetailList){
                 if(xxpClassify.getId().intValue()==classifyDetail.getInfoClassifyId().intValue()){
-                    StrList.add(classifyDetail.getInfoContent());
+                    if(xxpClassify.getClassifyType()==2){
+                        strList.add(fileConfigUtils.getFileDomainApp()+classifyDetail.getInfoContent());
+                    }else{
+                        strList.add(classifyDetail.getInfoContent());
+                    }
                 }
             }
-            labXxpClassifyVo.setClassifyList(StrList);
+            labXxpClassifyVo.setClassifyList(strList);
             xxpClassifyVoList.add(labXxpClassifyVo);
         }
         return xxpClassifyVoList;

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpDutyMapper.xml

@@ -76,7 +76,7 @@
     </select>
 
     <select id="selectDutyUser" resultType="java.util.Map">
-        select user_name userName,user_phone userPhone,user_img userImg from  xxp_duty xxp
+        select user_name userName,user_phone userPhone,user_img avatar from  xxp_duty xxp
         <where>
             xxp.subject_id=#{labId}
             <if test="dateTime!=null">