From c0328edb2de39f27e47b7ad1eedf8f80b883335e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 24 一月 2023 17:41:49 +0800
Subject: [PATCH] 优化 供应链 类型的bug
---
service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/ListInspectionTaskDetailsCmd.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/ListInspectionTaskDetailsCmd.java b/service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/ListInspectionTaskDetailsCmd.java
index 649e973..f5153b1 100644
--- a/service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/ListInspectionTaskDetailsCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/ListInspectionTaskDetailsCmd.java
@@ -9,6 +9,7 @@
import com.java110.dto.inspectionPlan.InspectionTaskDetailDto;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.api.inspectionTaskDetail.ApiInspectionTaskDetailDataVo;
@@ -38,33 +39,26 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
InspectionTaskDetailDto inspectionTaskDetailDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDetailDto.class);
-
int count = inspectionTaskDetailInnerServiceSMOImpl.queryInspectionTaskDetailsCount(inspectionTaskDetailDto);
-
List<ApiInspectionTaskDetailDataVo> inspectionTaskDetails = null;
-
if (count > 0) {
inspectionTaskDetails = BeanConvertUtil.covertBeanList(inspectionTaskDetailInnerServiceSMOImpl.queryInspectionTaskDetails(inspectionTaskDetailDto), ApiInspectionTaskDetailDataVo.class);
refreshPhotos(inspectionTaskDetails);
} else {
inspectionTaskDetails = new ArrayList<>();
}
-
ApiInspectionTaskDetailVo apiInspectionTaskDetailVo = new ApiInspectionTaskDetailVo();
-
apiInspectionTaskDetailVo.setTotal(count);
apiInspectionTaskDetailVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
apiInspectionTaskDetailVo.setInspectionTaskDetails(inspectionTaskDetails);
-
ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionTaskDetailVo), HttpStatus.OK);
-
context.setResponseEntity(responseEntity);
-
}
private void refreshPhotos(List<ApiInspectionTaskDetailDataVo> inspectionTaskDetails) {
List<PhotoVo> photoVos = null;
PhotoVo photoVo = null;
+ String imgUrl = MappingCache.getValue("IMG_PATH");
for (ApiInspectionTaskDetailDataVo inspectionTaskDetail : inspectionTaskDetails) {
if(!"20200407".equals(inspectionTaskDetail.getState())){
continue;
@@ -75,12 +69,10 @@
photoVos = new ArrayList<>();
for (FileRelDto tmpFileRelDto : fileRelDtos) {
photoVo = new PhotoVo();
- photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + inspectionTaskDetail.getCommunityId());
+ photoVo.setUrl(tmpFileRelDto.getFileRealName().startsWith("http")?tmpFileRelDto.getFileRealName():imgUrl+tmpFileRelDto.getFileRealName());
photoVos.add(photoVo);
}
-
inspectionTaskDetail.setPhotos(photoVos);
-
}
}
}
--
Gitblit v1.8.0