From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java b/service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java
index 0cb24e1..0058b3f 100755
--- a/service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java
@@ -5,12 +5,13 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.intf.common.IFileRelInnerServiceSMO;
-import com.java110.intf.community.IRepairInnerServiceSMO;
-import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.community.IRepairInnerServiceSMO;
+import com.java110.intf.community.IRepairUserInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.ServiceCodeOwnerRepairConstant;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
@@ -86,7 +87,7 @@
}
//pc鐢佃瘽鎶ヤ慨妯″潡 鍙繑鍥濸C鍛樺伐鐧昏鍜屾墜鏈虹鍛樺伐鐧昏鐨勬暟鎹�
if (!StringUtil.isEmpty(ownerRepairDto.getReqSource()) && ownerRepairDto.getReqSource().equals("pc_mobile")) {
- String[] repair_channel={RepairDto.REPAIR_CHANNEL_STAFF, RepairDto.REPAIR_CHANNEL_TEL};
+ String[] repair_channel = {RepairDto.REPAIR_CHANNEL_STAFF, RepairDto.REPAIR_CHANNEL_TEL};
ownerRepairDto.setRepairChannels(Arrays.asList(repair_channel));
}
@@ -95,7 +96,7 @@
List<RepairDto> ownerRepairs = new ArrayList<>();
if (count > 0) {
List<RepairDto> repairDtos = repairInnerServiceSMOImpl.queryRepairs(ownerRepairDto);
- for(RepairDto repairDto : repairDtos){
+ for (RepairDto repairDto : repairDtos) {
//鑾峰彇缁煎悎璇勪环寰楀垎
String appraiseScoreNumber = repairDto.getAppraiseScore();
Double appraiseScoreNum = 0.0;
@@ -164,6 +165,8 @@
List<PhotoVo> beforePhotos = null; //缁翠慨鍓嶅浘鐗�
List<PhotoVo> afterPhotos = null; //缁翠慨鍚庡浘鐗�
PhotoVo photoVo = null;
+ String imgUrl = MappingCache.getValue("IMG_PATH");
+ imgUrl += (!StringUtil.isEmpty(imgUrl) && imgUrl.endsWith("/") ? "" : "/");
for (RepairDto repairDto : ownerRepairs) {
FileRelDto fileRelDto = new FileRelDto();
fileRelDto.setObjId(repairDto.getRepairId());
@@ -174,22 +177,26 @@
afterPhotos = new ArrayList<>();
for (FileRelDto tmpFileRelDto : fileRelDtos) {
photoVo = new PhotoVo();
- photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
+ //photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
+ photoVo.setUrl(imgUrl + tmpFileRelDto.getFileRealName());
photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
photoVos.add(photoVo);
if (tmpFileRelDto.getRelTypeCd().equals(FileRelDto.REL_TYPE_CD_REPAIR)) { //缁翠慨鍥剧墖
photoVo = new PhotoVo();
- photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
+ // photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
+ photoVo.setUrl(imgUrl + tmpFileRelDto.getFileRealName());
photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
repairPhotos.add(photoVo); //缁翠慨鍥剧墖
} else if (tmpFileRelDto.getRelTypeCd().equals(FileRelDto.BEFORE_REPAIR_PHOTOS)) { //缁翠慨鍓嶅浘鐗�
photoVo = new PhotoVo();
- photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
+ //photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
+ photoVo.setUrl(imgUrl + tmpFileRelDto.getFileRealName());
photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
beforePhotos.add(photoVo); //缁翠慨鍓嶅浘鐗�
} else if (tmpFileRelDto.getRelTypeCd().equals(FileRelDto.AFTER_REPAIR_PHOTOS)) { //缁翠慨鍚庡浘鐗�
photoVo = new PhotoVo();
- photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
+ //photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
+ photoVo.setUrl(imgUrl + tmpFileRelDto.getFileRealName());
photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
afterPhotos.add(photoVo);
}
--
Gitblit v1.8.0