Merge branch 'develop' of gitadmin/tuoheng_lc into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/ReportServiceImpl.java

@@ -21,6 +21,7 @@ import com.tuoheng.admin.service.IThInspectionService;
 import com.tuoheng.admin.utils.ImgTypeConvert;
 import com.tuoheng.admin.utils.WordUtilsOld;
 import com.tuoheng.common.common.BaseServiceImpl;
+import com.tuoheng.common.config.CommonConfig;
 import com.tuoheng.common.config.UploadFileConfig;
 import com.tuoheng.common.exception.ServiceException;
 import com.tuoheng.common.utils.DateUtils;
@@ -212,6 +213,17 @@ public class ReportServiceImpl extends BaseServiceImpl<ReportMapper, Report> imp
             QuestionReportVO questionReportVO=new QuestionReportVO();
             BeanUtils.copyProperties(question,questionReportVO);
             List<QuestionHandleVO> questionHandleList = questionHandleMapper.getList(question.getId());
+            for (QuestionHandleVO questionHandleVO : questionHandleList) {
+                //拼接图片域名
+                if(null != questionHandleVO && StringUtils.isNotEmpty(questionHandleVO.getHandlerImage())){
+                    String[] imgHanders = questionHandleVO.getHandlerImage().split(",");
+                    for (int i = 0; i < imgHanders.length; i++) {
+                        imgHanders[i] = CommonConfig.imageURL + imgHanders[i];
+                    }
+                    String handerImg = StringUtils.join(imgHanders, ",");
+                    questionHandleVO.setHandlerImage(handerImg);
+                }
+            }
             questionReportVO.setQuestionHandleList(questionHandleList);
 
             questionReportVOList.add(questionReportVO);

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/ThInspectionServiceImpl.java

@@ -107,7 +107,8 @@ public class ThInspectionServiceImpl extends BaseServiceImpl<ThInspectionMapper,
         //这边需要配置到yml文件里面
         Tenant tenant = tenantMapper.selectById(ShiroUtils.getTenantId());
         String url = tenant.getAirportUrl() +"/api/airportInterface/airportList";
-        String param = "page=1&limit=1000&tenantName=" + URLEncoder.encode(tenant.getName(), "UTF-8");
+        String param = "page=1&limit=1000&tenantCode=" + URLEncoder.encode(tenant.getCode(), "UTF-8");
+        log.info("****** airportList param tenantCode:{}", tenant.getCode());
         String airPortStr = HttpUtils.sendGet(url, param);
         JsonResult jsonResult = JacksonUtil.json2pojo(airPortStr, JsonResult.class);
         if(ObjectUtil.isEmpty(jsonResult) || (!ObjectUtil.isEmpty(jsonResult.getData()) &&jsonResult.getCode() != 0)) {
@@ -141,7 +142,7 @@ public class ThInspectionServiceImpl extends BaseServiceImpl<ThInspectionMapper,
         String url = tenant.getAirportUrl() + "/api/airportInterface/executeTask";
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("code", "lc");
-        jsonObject.put("tenantName", tenant.getName());
+        jsonObject.put("tenantCode", tenant.getCode());
         jsonObject.put("taskId", taskId);
         jsonObject.put("requestId", String.valueOf(thMission.getId()));
         log.info("***** executeTask url:{};param:{}", url, jsonObject.toJSONString());