获取网格基础信息接口

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@@ -104,6 +104,7 @@ public class CustomerGridController {
     public Result<CustomerGridDTO> getCustomerGridByGridId(@RequestBody CustomerGridFormDTO customerGridFormDTO) {
         return customerGridService.getCustomerGridByGridId(customerGridFormDTO);
     }
+
     /**
      * @Description 陌生人导览模块调用 根据陌生揽客传入的地区码进行分页查询显示
      * @Param ListCustomerGridFormDTO

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java

@@ -5,8 +5,9 @@ import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.*;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.CustomerGridService;
 import com.epmet.service.CustomerStaffAgencyService;
@@ -165,4 +166,15 @@ public class GridController {
     public Result<List<OrgInfoResultDTO>> selectOrgInfo(@RequestBody OrgInfoFormDTO orgInfoFormDTO){
         return new Result<List<OrgInfoResultDTO>>().ok(customerGridService.selectOrgInfo(orgInfoFormDTO));
     }
+    /**
+     * 供epmet-user服务调用 查询客户网格表数据
+     * @author  sun
+     * @param customerGridFormDTO
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("getbaseinfo")
+    public Result<CustomerGridDTO> getBaseInfo(@RequestBody CustomerGridFormDTO customerGridFormDTO) {
+        return customerGridService.getBaseInfo(customerGridFormDTO);
+    }
 }

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

@@ -18,7 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.UserIdAndPidDTO;
 import com.epmet.dto.UserIdDTO;
@@ -60,11 +60,11 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
     List<CustomerGridForStrangerResultDTO> selectRestGridWithoutGivenAreaCode(Map<String, Object> paramsMap);
 
     /**
-     * @Description 通过gridId查询网格信息，网格名称格式： 上级组织名称-网格名称
      * @param customerGridFormDTO
+     * @Description 通过gridId查询网格信息，网格名称格式： 上级组织名称-网格名称
      * @author wangc
      * @date 2020.04.30 13:57
-    **/
+     **/
     CustomerGridDTO getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO);
 
     /**
@@ -156,8 +156,8 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
     List<AllGridsByUserIdResultDTO> selectGridByIds(@Param("gridIdList") List<String> gridIdList);
 
     /**
-     * @Description  获取所属网格
      * @param formDTO
+     * @Description 获取所属网格
      * @author zxc
      * @date 2020/5/11 18:50
      */
@@ -178,12 +178,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
     List<CustomerGridDTO> selectGridListByIds(@Param("gridIdList") List<String> gridIdList);
 
     /**
-     * @Description 通过网格Id获取网格所需要的数据权限信息
      * @param gridId
+     * @Description 通过网格Id获取网格所需要的数据权限信息
      * @author wangc
      * @date 2020.05.13 11:01
      **/
-    CommonDataFilterResultDTO getGridDataFilterMsg(@Param("gridId")String gridId);
+    CommonDataFilterResultDTO getGridDataFilterMsg(@Param("gridId") String gridId);
 
     /**
      * @param agencyId
@@ -218,41 +218,55 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
     List<PublicCustomerGridForStrangerResultDTO> selectThirdRestGridWithoutGivenAreaCode(Map<String, Object> map);
 
     /**
-     * @Description  查询当前客户已有网格数量
      * @param customerId
+     * @Description 查询当前客户已有网格数量
      * @author zxc
      * @date 2020/8/12 5:10 下午
      */
-    Integer selectGridCount(@Param("customerId")String customerId);
+    Integer selectGridCount(@Param("customerId") String customerId);
 
     /**
      * 删除工作人员与网格关联
-     * @author zhaoqifeng
-     * @date 2020/8/28 15:32
+     *
      * @param staffId
      * @return void
+     * @author zhaoqifeng
+     * @date 2020/8/28 15:32
      */
     void deleteGridStaff(@Param("staffId") String staffId);
 
     /**
      * 查询工作人员所在网格
-     * @author zhaoqifeng
-     * @date 2020/8/28 15:41
+     *
      * @param staffId
      * @return java.util.List<com.epmet.entity.CustomerGridEntity>
+     * @author zhaoqifeng
+     * @date 2020/8/28 15:41
      */
     List<CustomerGridEntity> selectGridByStaff(@Param("staffId") String staffId);
 
-    List<OrgInfoResultDTO> selectOrgInfoByAgency(@Param("orgIds")List<String> orgIds);
-    List<OrgInfoResultDTO> selectOrgInfoByGrid(@Param("orgIds")List<String> orgIds);
-    List<OrgInfoResultDTO> selectOrgInfoByDept(@Param("orgIds")List<String> orgIds);
+    List<OrgInfoResultDTO> selectOrgInfoByAgency(@Param("orgIds") List<String> orgIds);
+
+    List<OrgInfoResultDTO> selectOrgInfoByGrid(@Param("orgIds") List<String> orgIds);
+
+    List<OrgInfoResultDTO> selectOrgInfoByDept(@Param("orgIds") List<String> orgIds);
 
     /**
      * @param gridId
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<java.lang.String>>
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < java.lang.String>>
      * @Author zy
      * @Description 根据 网格id，查询同属于一个社区下的所有网格id
      * @Date 2020/12/28 23:16
      **/
     List<String> selectListGridIdsInCommunity(@Param("gridId") String gridId);
+
+    /**
+     * desc: 根据网格Id获取网格基础信息 单表查询
+     *
+     * @param gridId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerGridDTO>
+     * @author LiuJanJun
+     * @date 2021/4/19 11:56 上午
+     */
+    Result<CustomerGridDTO> getGridBaseInfoById(@Param("gridId") String gridId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@@ -23,17 +23,8 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.AddGridResultDTO;
-import com.epmet.dto.form.CommonAgencyIdFormDTO;
-import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.ListCustomerGridFormDTO;
-import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
-import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
-import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
-import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerGridEntity;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -286,4 +277,14 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @Date 2020/12/28 23:16
      **/
     List<String> listGridIdsInCommunity(String gridId);
+
+    /**
+     * desc: 获取网格基础数据单表查询
+     *
+     * @param customerGridFormDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerGridDTO>
+     * @author LiuJanJun
+     * @date 2021/4/19 11:53 上午
+     */
+    Result<CustomerGridDTO> getBaseInfo(CustomerGridFormDTO customerGridFormDTO);
 }

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

@@ -696,4 +696,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     public List<String> listGridIdsInCommunity(String gridId) {
         return baseDao.selectListGridIdsInCommunity(gridId);
     }
+
+    @Override
+    public Result<CustomerGridDTO> getBaseInfo(CustomerGridFormDTO customerGridFormDTO) {
+        return baseDao.getGridBaseInfoById(customerGridFormDTO.getGridId());
+    }
 }

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

@@ -600,4 +600,17 @@
             </if>
         ) AND DEL_FLAG = 0
     </select>
+    <select id="getGridBaseInfoById" resultType="com.epmet.dto.CustomerGridDTO">
+        SELECT
+            cg.ID AS orgId,
+            cg.GRID_NAME AS orgName,
+            cg.PID AS agencyId,
+            ca.PID,
+            ca.PIDS,
+            ca.ORGANIZATION_NAME
+        FROM customer_grid cg
+        WHERE
+            cg.ID = #{gridId}
+            AND cg.DEL_FLAG = '0'
+    </select>
 </mapper>