Browse Source

进网格接口增加网格经纬度返参

dev_shibei_match
sunyuchao 4 years ago
parent
commit
4c245f3092
  1. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
  2. 7
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  3. 49
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
  4. 10
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
  5. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java

6
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@ -345,4 +345,10 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
List<CustomerGridEntity> selectByPid(@Param("pid") String pid); List<CustomerGridEntity> selectByPid(@Param("pid") String pid);
List<OptionResultDTO> getGridOptionForQuery(String gridPids); List<OptionResultDTO> getGridOptionForQuery(String gridPids);
/**
* @Author sun
* @Description 网格组织信息
**/
CustomerGridDTO gridAgencyByGrid(@Param("gridId") String gridId);
} }

7
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@ -770,15 +770,16 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
return gridInfo; return gridInfo;
} }
CustomerGridDTO gridInfo = ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class); CustomerGridDTO gridInfo = baseDao.gridAgencyByGrid(customerGridFormDTO.getGridId());
/*CustomerGridDTO gridInfo = ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class);
if (null != gridInfo) { if (null != gridInfo) {
CustomerAgencyEntity agency = customerAgencyService.selectById(gridInfo.getPid()); CustomerAgencyEntity agency = customerAgencyService.selectById(gridInfo.getPid());
gridInfo.setAgencyName(null != agency ? agency.getOrganizationName() : ""); gridInfo.setAgencyName(null != agency ? agency.getOrganizationName() : "");
gridInfo.setGridNamePath(null != agency ? agency.getOrganizationName().concat("-").concat(gridInfo.getGridName()) : gridInfo.getGridName()); gridInfo.setGridNamePath(null != agency ? agency.getOrganizationName().concat("-").concat(gridInfo.getGridName()) : gridInfo.getGridName());
redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo)); redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
} }*/
redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
return gridInfo; return gridInfo;
} }

49
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@ -734,4 +734,53 @@
and cg.PIDS like concat(#{gridPids},'%') and cg.PIDS like concat(#{gridPids},'%')
order by ca.CREATED_TIME asc,cg.CREATED_TIME asc order by ca.CREATED_TIME asc,cg.CREATED_TIME asc
</select> </select>
<select id="gridAgencyByGrid" resultType="com.epmet.dto.CustomerGridDTO">
SELECT
CONCAT(
ca.organization_name,
"-",
cg.grid_name
) gridNamePath,
ca.all_parent_name allParentName,
cg.id,
cg.customer_id,
cg.grid_name,
cg.coordinates,
cg.area_code,
cg.code,
cg.sync_flag,
cg.manage_district,
cg.total_user,
cg.pid,
cg.pids,
cg.grid_type,
cg.contacts,
cg.mobile,
<!-- 网格没有经纬度时获取客户根组织下的 -->
( CASE WHEN cg.longitude is null 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 cg.longitude
END
) longitude,
( CASE WHEN cg.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 cg.latitude
END
) latitude
FROM
customer_grid cg
INNER JOIN customer_agency ca ON cg.pid = ca.id
WHERE
cg.del_flag = '0'
AND ca.del_flag = '0'
AND cg.id = #{gridId}
</select>
</mapper> </mapper>

10
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java

@ -30,6 +30,16 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
* */ * */
private String currentGridId; private String currentGridId;
/**
* 网格经度没值则去客户跟组织的值
*/
private String longitude;
/**
* 网格纬度没值则去客户跟组织的值
*/
private String latitude;
/** /**
* 当前网格名称 * 当前网格名称
* */ * */

2
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java

@ -309,6 +309,8 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
resultObj.setOrgId(resultObj.getCurrentGridId()); resultObj.setOrgId(resultObj.getCurrentGridId());
resultObj.setOrgName(gridDTOResult.getData().getAgencyName()+"-"+gridDTOResult.getData().getGridName()); resultObj.setOrgName(gridDTOResult.getData().getAgencyName()+"-"+gridDTOResult.getData().getGridName());
resultObj.setOrgType("grid"); resultObj.setOrgType("grid");
resultObj.setLongitude(gridDTOResult.getData().getLongitude());
resultObj.setLatitude(gridDTOResult.getData().getLatitude());
}else{ }else{
//查询网格名称失败 //查询网格名称失败
log.warn(String.format("查找网格信息失败,网格Id:【%s】",gridId)); log.warn(String.format("查找网格信息失败,网格Id:【%s】",gridId));

Loading…
Cancel
Save