优化代码

java110-bean/src/main/java/com/java110/dto/communityLocation/CommunityLocationDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.communityLocation;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,9 +16,10 @@ import java.util.Date;
 public class CommunityLocationDto extends PageDto implements Serializable {
 
     private String locationName;
-private String locationId;
-private String locationType;
-private String communityId;
+    private String locationId;
+    private String locationType;
+    private String communityId;
+    private String locationTypeName;
 
 
     private Date createTime;
@@ -28,25 +30,32 @@ private String communityId;
     public String getLocationName() {
         return locationName;
     }
-public void setLocationName(String locationName) {
+
+    public void setLocationName(String locationName) {
         this.locationName = locationName;
     }
-public String getLocationId() {
+
+    public String getLocationId() {
         return locationId;
     }
-public void setLocationId(String locationId) {
+
+    public void setLocationId(String locationId) {
         this.locationId = locationId;
     }
-public String getLocationType() {
+
+    public String getLocationType() {
         return locationType;
     }
-public void setLocationType(String locationType) {
+
+    public void setLocationType(String locationType) {
         this.locationType = locationType;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
@@ -66,4 +75,12 @@ public void setCommunityId(String communityId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getLocationTypeName() {
+        return locationTypeName;
+    }
+
+    public void setLocationTypeName(String locationTypeName) {
+        this.locationTypeName = locationTypeName;
+    }
 }

java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java

@@ -1,9 +1,11 @@
 package com.java110.dto.repair;
 
 import com.java110.dto.PageDto;
+import com.java110.vo.api.junkRequirement.PhotoVo;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -73,6 +75,7 @@ public class RepairDto extends PageDto implements Serializable {
     private String repairObjType;
     private String repairObjId;
     private String repairObjName;
+    private List<PhotoVo> photos;
 
 
     public String getRepairName() {
@@ -268,4 +271,12 @@ public class RepairDto extends PageDto implements Serializable {
     public void setRepairObjName(String repairObjName) {
         this.repairObjName = repairObjName;
     }
+
+    public List<PhotoVo> getPhotos() {
+        return photos;
+    }
+
+    public void setPhotos(List<PhotoVo> photos) {
+        this.photos = photos;
+    }
 }

java110-db/src/main/resources/mapper/community/CommunityLocationServiceDaoImplMapper.xml

@@ -73,8 +73,9 @@
     <select id="getCommunityLocationInfo" parameterType="Map" resultType="Map">
         select t.location_name,t.location_name locationName,t.location_id,t.location_id
         locationId,t.location_type,t.location_type locationType,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id
-        bId,t.community_id,t.community_id communityId
+        bId,t.community_id,t.community_id communityId,d.name locationTypeName
         from community_location t
+        left join t_dict d on t.flow_type = d.status_cd and d.table_name = 'community_location' and d.table_columns = 'location_type'
         where 1 =1
         <if test="locationName !=null and locationName != ''">
             and t.location_name= #{locationName}

service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java

@@ -5,14 +5,18 @@ import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.core.smo.common.IFileRelInnerServiceSMO;
 import com.java110.core.smo.community.IRepairInnerServiceSMO;
 import com.java110.core.smo.community.IRepairUserInnerServiceSMO;
+import com.java110.dto.file.FileRelDto;
 import com.java110.dto.repair.RepairDto;
 import com.java110.dto.repair.RepairUserDto;
 import com.java110.utils.constant.ServiceCodeOwnerRepairConstant;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
+import com.java110.vo.api.junkRequirement.ApiJunkRequirementDataVo;
+import com.java110.vo.api.junkRequirement.PhotoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
@@ -34,6 +38,9 @@ public class ListOwnerRepairsListener extends AbstractServiceApiListener {
     @Autowired
     private IRepairUserInnerServiceSMO repairUserInnerServiceSMOImpl;
 
+    @Autowired
+    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
     @Override
     public String getServiceCode() {
         return ServiceCodeOwnerRepairConstant.LIST_OWNERREPAIRS;
@@ -82,7 +89,7 @@ public class ListOwnerRepairsListener extends AbstractServiceApiListener {
         if (count > 0) {
             ownerRepairs = repairInnerServiceSMOImpl.queryRepairs(ownerRepairDto);
 
-            refreshStaffName(ownerRepairs);
+            refreshRepair(ownerRepairs);
         } else {
             ownerRepairs = new ArrayList<>();
         }
@@ -94,7 +101,7 @@ public class ListOwnerRepairsListener extends AbstractServiceApiListener {
 
     }
 
-    private void refreshStaffName(List<RepairDto> ownerRepairs) {
+    private void refreshRepair(List<RepairDto> ownerRepairs) {
 
         List<String> repairIds = new ArrayList<>();
         for (RepairDto apiOwnerRepairDataVo : ownerRepairs) {
@@ -117,5 +124,22 @@ public class ListOwnerRepairsListener extends AbstractServiceApiListener {
             }
         }
 
+        //刷入图片信息
+        List<PhotoVo> photoVos = null;
+        PhotoVo photoVo = null;
+        for (RepairDto repairDto : ownerRepairs) {
+            FileRelDto fileRelDto = new FileRelDto();
+            fileRelDto.setObjId(repairDto.getRepairId());
+            List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+            photoVos = new ArrayList<>();
+            for (FileRelDto tmpFileRelDto : fileRelDtos) {
+                photoVo = new PhotoVo();
+                photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
+                photoVos.add(photoVo);
+            }
+
+            repairDto.setPhotos(photoVos);
+        }
+
     }
 }