Browse Source

改了个名

master
zxc 3 years ago
parent
commit
d35d033a48
  1. 3
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java
  2. 2
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoIdAndNameResultDTO.java
  3. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java

3
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java

@ -1,5 +1,6 @@
package com.epmet.dto.form;
import com.epmet.dto.result.OrgInfoIdAndNameResultDTO;
import com.epmet.dto.result.OrgInfoResultDTO;
import lombok.Data;
@ -77,5 +78,5 @@ public class CollectDetailResultDTO implements Serializable {
private String orgIdPath;
private List<OrgInfoResultDTO> orgIdPathList;
private List<OrgInfoIdAndNameResultDTO> orgIdPathList;
}

2
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java → epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoIdAndNameResultDTO.java

@ -14,7 +14,7 @@ import java.io.Serializable;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class OrgInfoResultDTO implements Serializable {
public class OrgInfoIdAndNameResultDTO implements Serializable {
private static final long serialVersionUID = 7478605833438304330L;

4
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java

@ -226,13 +226,13 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
CollectDetailResultDTO result = ConvertUtils.sourceToTarget(entity, CollectDetailResultDTO.class);
result.setOrgIdPath(StringUtils.isBlank(entity.getPids()) ? entity.getAgencyId() : entity.getPids()+":"+entity.getAgencyId());
String[] split = result.getOrgIdPath().split(":");
List<OrgInfoResultDTO> orgInfoList = new ArrayList<>();
List<OrgInfoIdAndNameResultDTO> orgInfoList = new ArrayList<>();
for (String orgId : split) {
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId);
if (null == agencyInfo){
throw new EpmetException("查询组织信息失败:"+orgId);
}
OrgInfoResultDTO orgInfoResultDTO = new OrgInfoResultDTO(orgId,agencyInfo.getOrganizationName());
OrgInfoIdAndNameResultDTO orgInfoResultDTO = new OrgInfoIdAndNameResultDTO(orgId,agencyInfo.getOrganizationName());
orgInfoList.add(orgInfoResultDTO);
}
result.setOrgIdPathList(orgInfoList);

Loading…
Cancel
Save