From 2d64a43b8224dedff37b8d3734416599f7a1276f Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 19 Apr 2021 13:17:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BD=91=E6=A0=BC=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/CustomerGridDao.java | 3 +-- .../java/com/epmet/service/impl/CustomerGridServiceImpl.java | 2 +- .../src/main/resources/mapper/CustomerGridDao.xml | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 125c7731ed..4277be98c6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -18,7 +18,6 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.UserIdAndPidDTO; import com.epmet.dto.UserIdDTO; @@ -268,5 +267,5 @@ public interface CustomerGridDao extends BaseDao { * @author LiuJanJun * @date 2021/4/19 11:56 上午 */ - Result getGridBaseInfoById(@Param("gridId") String gridId); + CustomerGridDTO getGridBaseInfoById(@Param("gridId") String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 3d30cd063a..c87958e926 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -699,6 +699,6 @@ public class CustomerGridServiceImpl extends BaseServiceImpl getBaseInfo(CustomerGridFormDTO customerGridFormDTO) { - return baseDao.getGridBaseInfoById(customerGridFormDTO.getGridId()); + return new Result().ok(baseDao.getGridBaseInfoById(customerGridFormDTO.getGridId())); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 938a0c3ffe..c6ad656854 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -604,7 +604,10 @@ SELECT cg.ID, cg.GRID_NAME, - cg.PID + cg.PID, + cg.LONGITUDE, + cg.LATITUDE, + cg.AREA_CODE FROM customer_grid cg WHERE cg.ID = #{gridId}