完善查询网格

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/GisGridDao.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.GisGridDTO;
 import com.elink.esua.epdc.entity.GisGridEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * gis地图网格与平台网格对应关系表
@@ -40,4 +41,14 @@ public interface GisGridDao extends BaseDao<GisGridEntity> {
      * @date 2022/9/5 10:54
      */
     void deleteByGridInfo(GisGridDTO dto);
+
+    /**
+     * 展示系统网格关联
+     *
+     * @param
+     * @return com.elink.esua.epdc.dto.GisGridDTO
+     * @author zhy
+     * @date 2022/9/5 19:55
+     */
+    GisGridDTO getGridInfo(@Param("gisGridId") String gisGridId);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/GisGridService.java

@@ -77,12 +77,12 @@ public interface GisGridService extends BaseService<GisGridEntity> {
     /**
      * 单条查询
      *
-     * @param gisGridName
+     * @param gisGridId
      * @return GisGridDTO
      * @author generator
      * @date 2022-09-05
      */
-    GisGridDTO getByGisGridName(String gisGridName);
+    GisGridDTO getByGisGridId(String gisGridId);
 
     /**
      * 默认保存

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/GisGridServiceImpl.java

@@ -99,11 +99,8 @@ public class GisGridServiceImpl extends BaseServiceImpl<GisGridDao, GisGridEntit
     }
 
     @Override
-    public GisGridDTO getByGisGridName(String gisGridName) {
+    public GisGridDTO getByGisGridId(String gisGridId) {
-        Map<String, Object> params = new HashMap<>(2);
+       return baseDao.getGridInfo(gisGridId);
-        params.put("gisGridName", gisGridName);
-        GisGridEntity entity = baseDao.selectOne(getWrapper(params));
-        return ConvertUtils.sourceToTarget(entity, GisGridDTO.class);
     }
 
     @Override

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -1436,7 +1436,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             String gridName = attributes.get("网格名称").toString();
             String gridId = attributes.get("网格编码").toString();
 
-            GisGridDTO gisGridDTO = gisGridService.getByGisGridName(gridName);
+            GisGridDTO gisGridDTO = gisGridService.getByGisGridId(gridId);
             if (gisGridDTO == null) {
                 throw new RenException(gridName + "尚未绑定系统网格，请联系管理员");
             } else {

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/GisGridDao.xml

@@ -28,4 +28,19 @@
             OR GIS_GRID_NAME = #{gisGridName}
         </if>
     </delete>
+
+    <select id="getGridInfo" resultType="com.elink.esua.epdc.dto.GisGridDTO">
+        SELECT
+            g.GRID_NAME AS GIS_GRID_NAME,
+            g.GRID_ID AS GIS_GRID_ID,
+            d.id AS GRID_ID,
+            d.`name` AS GRID_NAME
+        FROM
+            epdc_gis g
+                INNER JOIN sys_dept d ON d.area_code = g.GRID_ID
+        WHERE
+            d.del_flag = '0'
+          AND d.type_key = 'grid_party'
+          AND g.GRID_ID = #{gisGridId}
+    </select>
 </mapper>