feat(garden): 添加GIS道路管理和坐标转换功能

- 新增GIS道路管理相关控制器、服务和数据对象 - 实现WGS84到GCJ02坐标转换算法和工具类 - 添加GIS道路关联和取消关联功能 - 实现GIS道路坐标批量转换功能 - 添加GIS道路数据导入导出功能 - 新增问题类型级联查询接口优化前端展示 - 配置本地调试Mock认证支持 - 更新部署脚本和数据库表结构变更SQL

feat(garden): 添加GIS道路管理和坐标转换功能
- 新增GIS道路管理相关控制器、服务和数据对象 - 实现WGS84到GCJ02坐标转换算法和工具类 - 添加GIS道路关联和取消关联功能 - 实现GIS道路坐标批量转换功能 - 添加GIS道路数据导入导出功能 - 新增问题类型级联查询接口优化前端展示 - 配置本地调试Mock认证支持 - 更新部署脚本和数据库表结构变更SQL
王彪总
1 parent a8d4e5e8
Showing 4 changed files with 65 additions and 27 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/gis/GisRoadController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/gis/vo/GisRoadExportVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/gis/GisRoadServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/problemtype/GardenProblemTypeServiceImpl.java
@@ -70,7 +70,6 @@ public class GisRoadController {
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<GisRoadRespVO> list = gisRoadService.getGisRoadPage(pageReqVO).getList();
-        // 只导出表格展示的 6 列数据
         List<GisRoadExportVO> exportList = new ArrayList<>();
         for (GisRoadRespVO vo : list) {
             GisRoadExportVO exportVO = new GisRoadExportVO();
@@ -80,9 +79,23 @@ public class GisRoadController {
             exportVO.setTotalArea(vo.getTotalArea());
             exportVO.setGisIsRelatedStr(vo.getGisIsRelated() != null && vo.getGisIsRelated() == 1 ? "已关联" : "未关联");
             exportVO.setGisDiffArea(vo.getGisDiffArea());
+            exportVO.setCompanyName(vo.getCompanyName());
+            exportVO.setDeptName(vo.getDeptName());
+            // 位置信息：起点描述 ~ 终点描述
+            String positionInfo = "";
+            if (vo.getStartingRemark() != null) {
+                positionInfo += vo.getStartingRemark();
+            }
+            if (vo.getEndRemark() != null) {
+                if (!positionInfo.isEmpty()) {
+                    positionInfo += " ~ ";
+                }
+                positionInfo += vo.getEndRemark();
+            }
+            exportVO.setPositionInfo(positionInfo.isEmpty() ? null : positionInfo);
             exportList.add(exportVO);
         }
-        String filename = "GIS核对" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xls";
+        String filename = "十谱绿地核对" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xls";
         ExcelUtils.write(response, filename, "数据", GisRoadExportVO.class, exportList);
     }
@@ -7,21 +7,21 @@ import lombok.Data;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-@Schema(description = "GIS 道路核对导出 VO")
+@Schema(description = "十谱绿地核对导出 VO")
 @Data
 @ExcelIgnoreUnannotated
 public class GisRoadExportVO {
-    @Schema(description = "图斑名称")
-    @ExcelProperty("图斑名称")
+    @Schema(description = "十谱绿地名称")
+    @ExcelProperty("十谱绿地名称")
     private String gisPlotName;
     @Schema(description = "道路名称")
     @ExcelProperty("道路名称")
     private String roadName;
-    @Schema(description = "图斑面积")
-    @ExcelProperty("图斑面积(㎡)")
+    @Schema(description = "十谱绿地面积")
+    @ExcelProperty("十谱绿地面积(㎡)")
     @JsonSerialize(using = TwoDecimalFloatSerializer.class)
     private Float gisPlotArea;
@@ -39,4 +39,16 @@ public class GisRoadExportVO {
     @JsonSerialize(using = TwoDecimalFloatSerializer.class)
     private Float gisDiffArea;
+    @Schema(description = "归属单位")
+    @ExcelProperty("归属单位")
+    private String companyName;
+
+    @Schema(description = "归属班组")
+    @ExcelProperty("归属班组")
+    private String deptName;
+
+    @Schema(description = "位置信息")
+    @ExcelProperty("位置信息")
+    private String positionInfo;
+
 }
@@ -124,19 +124,11 @@ public class GisRoadServiceImpl implements GisRoadService {
                     .set(RoadDO::getGisIsRelated, 0));
         }
-        // 清空 garden_gis_road 的道路关联信息
+        // 取消关联：仅将关联状态置为 0，其他字段因数据库 NOT NULL 约束保留原值
         gisRoadMapper.update(null,
             new LambdaUpdateWrapper<GisRoadDO>()
                 .eq(GisRoadDO::getId, gisRoad.getId())
-                .set(GisRoadDO::getGisRoadId, null)
-                .set(GisRoadDO::getRoadName, null)
-                .set(GisRoadDO::getTotalArea, null)
-                .set(GisRoadDO::getCompanyId, null)
-                .set(GisRoadDO::getDeptId, null)
-                .set(GisRoadDO::getGisDiffArea, null)
-                .set(GisRoadDO::getGisIsRelated, 0)
-                .set(GisRoadDO::getGisRelatedUser, null)
-                .set(GisRoadDO::getGisRelatedTime, null));
+                .set(GisRoadDO::getGisIsRelated, 0));
     }
     @Override
@@ -98,12 +98,33 @@ public class GardenProblemTypeServiceImpl implements GardenProblemTypeService {
     @Override
     public List<ProblemTypeCascadeRespVO> getProblemTypeTree(String parentCode) {
-        List<GardenProblemTypeDO> allList = gardenProblemTypeMapper.selectList(
-                new com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX<GardenProblemTypeDO>()
-                        .eq(GardenProblemTypeDO::getStatus, 1)
-                        .eq(GardenProblemTypeDO::getParentCode, parentCode)
-                        .orderByAsc(GardenProblemTypeDO::getSort)
-                        .orderByAsc(GardenProblemTypeDO::getId));
+        List<GardenProblemTypeDO> allList;
+        
+        if (parentCode == null) {
+            allList = gardenProblemTypeMapper.selectList(
+                    new com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX<GardenProblemTypeDO>()
+                            .eq(GardenProblemTypeDO::getStatus, 1)
+                            .orderByAsc(GardenProblemTypeDO::getSort)
+                            .orderByAsc(GardenProblemTypeDO::getId));
+        } else {
+            List<GardenProblemTypeDO> level2List = gardenProblemTypeMapper.selectByParentCodeAndLevel(parentCode, 2);
+            
+            List<String> level2Codes = level2List.stream()
+                    .map(GardenProblemTypeDO::getTypeCode)
+                    .collect(Collectors.toList());
+            
+            List<GardenProblemTypeDO> level3List = new ArrayList<>();
+            if (!level2Codes.isEmpty()) {
+                level3List = gardenProblemTypeMapper.selectList(
+                        new com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX<GardenProblemTypeDO>()
+                                .eq(GardenProblemTypeDO::getStatus, 1)
+                                .in(GardenProblemTypeDO::getParentCode, level2Codes));
+            }
+            
+            allList = new ArrayList<>();
+            allList.addAll(level2List);
+            allList.addAll(level3List);
+        }
         Map<String, List<GardenProblemTypeDO>> childrenMap = allList.stream()
                 .filter(item -> item.getParentCode() != null && !item.getParentCode().equals(item.getTypeCode()))
@@ -119,11 +140,11 @@ public class GardenProblemTypeServiceImpl implements GardenProblemTypeService {
                 result.add(vo);
             }
         } else {
-            List<GardenProblemTypeDO> parentList = allList.stream()
-                    .filter(item -> parentCode.equals(item.getTypeCode()))
+            List<GardenProblemTypeDO> childrenList = allList.stream()
+                    .filter(item -> parentCode.equals(item.getParentCode()))
                     .collect(Collectors.toList());
-            for (GardenProblemTypeDO parent : parentList) {
-                ProblemTypeCascadeRespVO vo = buildTreeNode(parent, childrenMap);
+            for (GardenProblemTypeDO child : childrenList) {
+                ProblemTypeCascadeRespVO vo = buildTreeNode(child, childrenMap);
                 result.add(vo);
             }
         }