diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index dc505b1985..c70047b7c8 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -284,8 +284,8 @@ lb://epmet-job-server - - lb://epmet-user-server + http://localhost:8087 + lb://epmet-demo-server @@ -324,11 +324,11 @@ lb://resi-hall-server - - lb://gov-issue-server + http://localhost:8101 + - - lb://gov-project-server + http://localhost:8102 + lb://common-service-server diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java index cbc171d0a9..a4ffd4b25d 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java @@ -43,7 +43,7 @@ public class OrgProjectListFormDTO extends PageFormDTO implements Serializable { private List firstIdList; private List secondIdList; /** - * 事件状态 待处理 pending，结案closed + * 事件状态 处理中 pending，已结案 closed */ private String status; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java index aaece87f42..8209973888 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java @@ -91,10 +91,10 @@ public class OrgProjectListResultDTO implements Serializable { * 图片url集合 */ private List urlList; - private List imageList; + private String imageUrl; /** - * 状态 待处理 pending，结案closed + * 状态 处理中 pending，已结案 closed */ private String status; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 466eb3d57f..180b00767e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -409,7 +409,7 @@ public class ProjectController { @PostMapping("orgprojectexport") public void orgProjectExport(@LoginUser TokenDto tokenDto, @RequestBody OrgProjectListFormDTO formDTO, HttpServletResponse response) throws IOException { formDTO.setCustomerId(tokenDto.getCustomerId()); - formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setUserId(tokenDto.getUserId()); formDTO.setIsPage(false); ExcelWriter excelWriter = null; formDTO.setPageNo(NumConstant.ONE); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java index 4eb4cd5c71..0af3ccc4c9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java @@ -113,8 +113,7 @@ public class OrgProjectListExcel { */ @ExcelProperty(value = "图片") @ColumnWidth(30) - @ExcelCollection(name = "图片") - private List imageList; + private String imageUrl; /** * 状态 处理中 pending，已结案 closed diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 08f457f764..3843668354 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -3471,39 +3471,47 @@ public class ProjectServiceImpl extends BaseServiceImpl> categoryRes = govIssueOpenFeignClient.getCategoryList(dictFormDto); + Result> categoryRes = govIssueOpenFeignClient.coutomerCategoryList(dictFormDto); if (!categoryRes.success() || org.springframework.util.CollectionUtils.isEmpty(categoryRes.getData())) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常"); } Map categoryMap = categoryRes.getData().stream().collect(Collectors.toMap(IssueProjectCategoryDictDTO::getId, IssueProjectCategoryDictDTO::getCategoryName)); - *///3-2.封装数据 + //3-2.封装数据 for (OrgProjectListResultDTO dto : list) { //分类名称 - /*dto.setFirstName(categoryMap.get(dto.getFirstId())); - dto.setSecondName(categoryMap.get(dto.getSecondId()));*/ - //工作人员基础信息 - /*CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), dto.getStaffId()); - if (null != staffInfo) { - dto.setStaffName(staffInfo.getRealName()); - dto.setMobile(staffInfo.getMobile()); - }*/ - //拼接网格名 - /*if (StringUtils.isNoneBlank(dto.getGridId())) { - GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); - if (null != gridInfo) { - dto.setGridName((StringUtils.isEmpty(gridInfo.getAllParentName()) ? "" : gridInfo.getAllParentName() + "-") + gridInfo.getGridNamePath()); + dto.setFirstName(categoryMap.get(dto.getFirstId())); + dto.setSecondName(categoryMap.get(dto.getSecondId())); + try { + //工作人员基础信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), dto.getStaffId()); + if (null != staffInfo) { + dto.setStaffName(staffInfo.getRealName()); + dto.setMobile(staffInfo.getMobile()); } - } else { - AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId()); - if (null != agencyInfo) { - dto.setGridName((StringUtils.isEmpty(agencyInfo.getAllParentName()) ? "" : agencyInfo.getAllParentName() + "-") + agencyInfo.getOrganizationName()); + //拼接网格名 + if (StringUtils.isNoneBlank(dto.getGridId())) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + dto.setGridName((StringUtils.isEmpty(gridInfo.getAllParentName()) ? "" : gridInfo.getAllParentName() + "-") + gridInfo.getGridNamePath()); + } + } else { + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId()); + if (null != agencyInfo) { + dto.setGridName((StringUtils.isEmpty(agencyInfo.getAllParentName()) ? "" : agencyInfo.getAllParentName() + "-") + agencyInfo.getOrganizationName()); + } } - }*/ + } catch (Exception e) { + log.warn("获取组织/网格缓存失败"); + } + if (!org.springframework.util.CollectionUtils.isEmpty(dto.getUrlList())) { - List imageList = dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList()); - dto.setImageList(imageList); + //String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList()),String.valueOf((char)10)); + String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList()),"\n"); + System.out.println(imageUrl + ); + dto.setImageUrl(imageUrl); } }