Browse Source

工作人员缓存信息添加所属组织经纬度信息,没有则去客户根组织经纬度的值

dev_shibei_match
sunyuchao 4 years ago
parent
commit
a364a1fbb7
  1. 16
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java
  2. 20
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java
  3. 15
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java
  4. 3
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
  5. 18
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml
  6. 16
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java
  7. 3
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

16
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java

@ -93,4 +93,20 @@ public class CustomerStaffInfoCacheResult implements Serializable {
*/ */
private List<IdAndNameDTO> deptList; private List<IdAndNameDTO> deptList;
/**
* 组织级别
*/
private String level;
/**
* 中心位置经度
*/
private String longitude;
/**
* 中心位置纬度
*/
private String latitude;
} }

20
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java

@ -93,4 +93,24 @@ public class CustomerStaffResultDTO implements Serializable {
*/ */
private String twoOrgName; private String twoOrgName;
/**
* 社区名称0409
*/
private String community;
/**
* 组织级别
*/
private String level;
/**
* 中心位置经度
*/
private String longitude;
/**
* 中心位置纬度
*/
private String latitude;
} }

15
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java

@ -142,4 +142,19 @@ public class CustomerAgencyDTO implements Serializable {
* 社区 * 社区
*/ */
private String community; private String community;
/**
* 坐标
*/
private String coordinates;
/**
* 中心位置经度
*/
private String longitude;
/**
* 中心位置纬度
*/
private String latitude;
} }

3
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@ -602,6 +602,9 @@ public class EpmetUserServiceImpl implements EpmetUserService {
result.setAgencyId(agencyDTO.getId()); result.setAgencyId(agencyDTO.getId());
result.setAgencyName(agencyDTO.getOrganizationName()); result.setAgencyName(agencyDTO.getOrganizationName());
result.setAgencyPIds(agencyDTO.getPids()); result.setAgencyPIds(agencyDTO.getPids());
result.setLevel(agencyDTO.getLevel());
result.setLongitude(agencyDTO.getLongitude());
result.setLatitude(agencyDTO.getLatitude());
StaffOrgRelationResultDTO fromOrgTypeDto = govOrgService.getStaffFromOrgType(staffId); StaffOrgRelationResultDTO fromOrgTypeDto = govOrgService.getStaffFromOrgType(staffId);
String fromOrgType = OrgTypeEnum.AGENCY.getCode(); String fromOrgType = OrgTypeEnum.AGENCY.getCode();
if (fromOrgTypeDto != null){ if (fromOrgTypeDto != null){

18
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml

@ -26,7 +26,23 @@
ca.organization_name, ca.organization_name,
ca.level, ca.level,
ca.area_code, ca.area_code,
ca.parent_area_code ca.parent_area_code,
( CASE WHEN ca.longitude is THEN
( SELECT longitude FROM customer_agency
WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
ORDER BY pid ASC LIMIT 1
)
ELSE ca.longitude
END
) longitude,
( CASE WHEN ca.latitude is null THEN
( SELECT latitude FROM customer_agency
WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
ORDER BY pid ASC LIMIT 1
)
ELSE ca.latitude
END
) latitude
FROM FROM
customer_staff_agency csa customer_staff_agency csa
INNER JOIN customer_agency ca ON csa.agency_id = ca.id INNER JOIN customer_agency ca ON csa.agency_id = ca.id

16
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java

@ -77,4 +77,20 @@ public class StaffBasicInfoResultDTO implements Serializable {
*/ */
private String agencyName; private String agencyName;
/**
* 组织级别
*/
private String level;
/**
* 中心位置经度
*/
private String longitude;
/**
* 中心位置纬度
*/
private String latitude;
} }

3
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@ -717,6 +717,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
if (null != staffInfo){ if (null != staffInfo){
resultDTO.setAgencyId(staffInfo.getAgencyId()); resultDTO.setAgencyId(staffInfo.getAgencyId());
resultDTO.setAgencyName(staffInfo.getAgencyName()); resultDTO.setAgencyName(staffInfo.getAgencyName());
resultDTO.setLevel(staffInfo.getLevel());
resultDTO.setLongitude(staffInfo.getLongitude());
resultDTO.setLatitude(staffInfo.getLatitude());
} }
} }
return new Result<StaffBasicInfoResultDTO>().ok(resultDTO); return new Result<StaffBasicInfoResultDTO>().ok(resultDTO);

Loading…
Cancel
Save