内蒙山洪运维系统-应急系统功能开发,危险区群众注册、转移记录、巡查巡检上报

pom.xml

@@ -203,11 +203,13 @@
             <artifactId>javase</artifactId>
             <version>3.3.3</version>
         </dependency>
+
         <dependency>
             <groupId>org.rocksdb</groupId>
             <artifactId>rocksdbjni</artifactId>
             <version>5.5.1</version>
         </dependency>
+
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>

src/main/java/org/springblade/modules/map/controller/MapDangerAreaController.java → src/main/java/org/springblade/modules/yjxt/base/map/controller/MapDangerAreaController.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.controller;
+package org.springblade.modules.yjxt.base.map.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -22,17 +22,19 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.jobtask.TaskManager;
 import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
 import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
-import org.springblade.modules.map.dto.DangerAreaImportRecordDTO;
-import org.springblade.modules.map.dto.DangerAreaDTO;
-import org.springblade.modules.map.entity.DangerAreaImportRecordEntity;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.entity.DangerAreaPointEntity;
-import org.springblade.modules.map.service.*;
-import org.springblade.modules.map.task.DangerAreaImportTask;
-import org.springblade.modules.map.vo.DangerAreaImportRecordVO;
-import org.springblade.modules.map.vo.DangerAreaVO;
-import org.springblade.modules.map.wrapper.DangerAreaWrapper;
+import org.springblade.modules.yjxt.base.map.dto.DangerAreaImportRecordDTO;
+import org.springblade.modules.yjxt.base.map.dto.DangerAreaDTO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaPointEntity;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaImportServcie;
+import org.springblade.modules.yjxt.base.map.task.DangerAreaImportTask;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaImportRecordVO;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaVO;
+import org.springblade.modules.yjxt.base.map.wrapper.DangerAreaWrapper;
 import org.springblade.modules.resource.builder.oss.OssBuilder;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaPointService;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
@@ -83,6 +85,25 @@ public class MapDangerAreaController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 根据行政区查询危险区
+	 * @param dto
+	 * @return
+	 */
+	@GetMapping("/list")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "adcd", value = "行政区编码", paramType = "query", dataType = "string"),
+	})
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页")
+	public R<List<DangerAreaVO>> list(@ApiIgnore DangerAreaDTO dto) {
+		List<DangerAreaVO> voList = dangerAreaService.selectAdDangerArea(dto);
+		for (DangerAreaVO vo : voList) {
+			DangerAreaWrapper.build().entityVO(vo);
+		}
+		return R.data(voList);
+	}
+
 	@GetMapping("/import/page")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页")

src/main/java/org/springblade/modules/map/controller/MapDangerAreaLeaveLineController.java → src/main/java/org/springblade/modules/yjxt/base/map/controller/MapDangerAreaLeaveLineController.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.controller;
+package org.springblade.modules.yjxt.base.map.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -20,15 +20,20 @@ import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.jobtask.TaskManager;
-import org.springblade.modules.map.dto.DangerAreaLeaveLineDTO;
-import org.springblade.modules.map.dto.DangerAreaLeaveLineImportRecordDTO;
-import org.springblade.modules.map.entity.*;
-import org.springblade.modules.map.service.*;
-import org.springblade.modules.map.task.DangerAreaLeaveLineImportTask;
-import org.springblade.modules.map.vo.DangerAreaLeaveLineImportRecordVO;
-import org.springblade.modules.map.vo.DangerAreaLeaveLineVO;
-import org.springblade.modules.map.wrapper.DangerAreaLeaveLineWrapper;
+import org.springblade.modules.yjxt.base.map.dto.DangerAreaLeaveLineDTO;
+import org.springblade.modules.yjxt.base.map.dto.DangerAreaLeaveLineImportRecordDTO;
+
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLinePointEntity;
+import org.springblade.modules.yjxt.base.map.task.DangerAreaLeaveLineImportTask;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaLeaveLineImportRecordVO;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaLeaveLineVO;
+import org.springblade.modules.yjxt.base.map.wrapper.DangerAreaLeaveLineWrapper;
 import org.springblade.modules.resource.builder.oss.OssBuilder;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaLeaveLineImportServcie;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaLeaveLinePointService;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaLeaveLineService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
@@ -76,6 +81,21 @@ public class MapDangerAreaLeaveLineController extends BladeController {
 		return R.data(pages);
 	}
 
+	@GetMapping("/list")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "adcd", value = "行政区编码", paramType = "query", dataType = "string"),
+	})
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页")
+	public R<List<DangerAreaLeaveLineVO>> list(@ApiIgnore DangerAreaLeaveLineDTO dto) {
+		List<DangerAreaLeaveLineVO> voList = leaveLineService.selectAdDangerArea(dto);
+		for (DangerAreaLeaveLineVO vo : voList) {
+			DangerAreaLeaveLineWrapper.build().entityVO(vo);
+		}
+		return R.data(voList);
+	}
+
+
 	@GetMapping("/import/page")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页")

src/main/java/org/springblade/modules/map/controller/MapRegionController.java → src/main/java/org/springblade/modules/yjxt/base/map/controller/MapRegionController.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.controller;
+package org.springblade.modules.yjxt.base.map.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -21,13 +21,18 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.etl.service.IEtlAdCdService;
 import org.springblade.jobtask.TaskManager;
-import org.springblade.modules.map.dto.*;
-import org.springblade.modules.map.entity.*;
-import org.springblade.modules.map.service.*;
-import org.springblade.modules.map.task.MapRegionImportTask;
-import org.springblade.modules.map.vo.MapRegionImportRecordVO;
-import org.springblade.modules.map.vo.MapRegionVO;
-import org.springblade.modules.map.wrapper.MapRegionWrapper;
+import org.springblade.modules.yjxt.base.map.dto.MapRegionDTO;
+import org.springblade.modules.yjxt.base.map.dto.MapRegionImportRecordDTO;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionEntity;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionPointEntity;
+import org.springblade.modules.yjxt.base.map.service.IMapRegionImportService;
+import org.springblade.modules.yjxt.base.map.service.IMapRegionPointService;
+import org.springblade.modules.yjxt.base.map.service.IMapRegionService;
+import org.springblade.modules.yjxt.base.map.task.MapRegionImportTask;
+import org.springblade.modules.yjxt.base.map.vo.MapRegionImportRecordVO;
+import org.springblade.modules.yjxt.base.map.vo.MapRegionVO;
+import org.springblade.modules.yjxt.base.map.wrapper.MapRegionWrapper;
 import org.springblade.modules.resource.builder.oss.OssBuilder;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

src/main/java/org/springblade/modules/map/dto/DangerAreaDTO.java → src/main/java/org/springblade/modules/yjxt/base/map/dto/DangerAreaDTO.java

@@ -4,11 +4,11 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.dto;
+package org.springblade.modules.yjxt.base.map.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.map.entity.DangerAreaEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/dto/DangerAreaImportRecordDTO.java → src/main/java/org/springblade/modules/yjxt/base/map/dto/DangerAreaImportRecordDTO.java

@@ -4,11 +4,11 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.dto;
+package org.springblade.modules.yjxt.base.map.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.map.entity.DangerAreaImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaImportRecordEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/dto/DangerAreaLeaveLineDTO.java → src/main/java/org/springblade/modules/yjxt/base/map/dto/DangerAreaLeaveLineDTO.java

@@ -4,13 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.dto;
+package org.springblade.modules.yjxt.base.map.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.entity.DangerAreaLeaveLineEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/dto/DangerAreaLeaveLineImportRecordDTO.java → src/main/java/org/springblade/modules/yjxt/base/map/dto/DangerAreaLeaveLineImportRecordDTO.java

@@ -4,11 +4,11 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.dto;
+package org.springblade.modules.yjxt.base.map.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.map.entity.DangerAreaLeaveLineImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineImportRecordEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/dto/MapRegionDTO.java → src/main/java/org/springblade/modules/yjxt/base/map/dto/MapRegionDTO.java

@@ -4,11 +4,11 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.dto;
+package org.springblade.modules.yjxt.base.map.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.map.entity.MapRegionEntity;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/dto/MapRegionImportRecordDTO.java → src/main/java/org/springblade/modules/yjxt/base/map/dto/MapRegionImportRecordDTO.java

@@ -4,12 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.dto;
+package org.springblade.modules.yjxt.base.map.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.map.entity.MapRegionImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionImportRecordEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/entity/DangerAreaEntity.java → src/main/java/org/springblade/modules/yjxt/base/map/entity/DangerAreaEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.entity;
+package org.springblade.modules.yjxt.base.map.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/org/springblade/modules/map/entity/DangerAreaImportRecordEntity.java → src/main/java/org/springblade/modules/yjxt/base/map/entity/DangerAreaImportRecordEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.entity;
+package org.springblade.modules.yjxt.base.map.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/org/springblade/modules/map/entity/DangerAreaLeaveLineEntity.java → src/main/java/org/springblade/modules/yjxt/base/map/entity/DangerAreaLeaveLineEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.entity;
+package org.springblade.modules.yjxt.base.map.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/org/springblade/modules/map/entity/DangerAreaLeaveLineImportRecordEntity.java → src/main/java/org/springblade/modules/yjxt/base/map/entity/DangerAreaLeaveLineImportRecordEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.entity;
+package org.springblade.modules.yjxt.base.map.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/org/springblade/modules/map/entity/DangerAreaLeaveLinePointEntity.java → src/main/java/org/springblade/modules/yjxt/base/map/entity/DangerAreaLeaveLinePointEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.entity;
+package org.springblade.modules.yjxt.base.map.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/org/springblade/modules/map/entity/DangerAreaPointEntity.java → src/main/java/org/springblade/modules/yjxt/base/map/entity/DangerAreaPointEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.entity;
+package org.springblade.modules.yjxt.base.map.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/org/springblade/modules/map/entity/MapRegionEntity.java → src/main/java/org/springblade/modules/yjxt/base/map/entity/MapRegionEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.entity;
+package org.springblade.modules.yjxt.base.map.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/org/springblade/modules/map/entity/MapRegionImportRecordEntity.java → src/main/java/org/springblade/modules/yjxt/base/map/entity/MapRegionImportRecordEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.entity;
+package org.springblade.modules.yjxt.base.map.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/org/springblade/modules/map/entity/MapRegionPointEntity.java → src/main/java/org/springblade/modules/yjxt/base/map/entity/MapRegionPointEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.entity;
+package org.springblade.modules.yjxt.base.map.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/org/springblade/modules/map/mapper/DangerAreaImportMapper.java → src/main/java/org/springblade/modules/yjxt/base/map/mapper/DangerAreaImportMapper.java

@@ -4,12 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.mapper;
+package org.springblade.modules.yjxt.base.map.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.map.entity.DangerAreaImportRecordEntity;
-import org.springblade.modules.map.vo.DangerAreaImportRecordVO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaImportRecordVO;
 
 import java.util.List;
 

src/main/java/org/springblade/modules/map/mapper/DangerAreaImportMapper.xml → src/main/java/org/springblade/modules/yjxt/base/map/mapper/DangerAreaImportMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.map.mapper.DangerAreaImportMapper">
+<mapper namespace="org.springblade.modules.yjxt.base.map.mapper.DangerAreaImportMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="dangerAreaImportResultMap" type="org.springblade.modules.map.entity.DangerAreaImportRecordEntity">
+    <resultMap id="dangerAreaImportResultMap" type="org.springblade.modules.yjxt.base.map.entity.DangerAreaImportRecordEntity">
 
         <result column="import_time" property="importTime"/>
         <result column="import_status" property="importStatus"/>
@@ -12,7 +12,7 @@
         <result column="file_name" property="fileName"/>
     </resultMap>
 
-    <resultMap id="dangerAreaImportResultVOMap" type="org.springblade.modules.map.vo.DangerAreaImportRecordVO">
+    <resultMap id="dangerAreaImportResultVOMap" type="org.springblade.modules.yjxt.base.map.vo.DangerAreaImportRecordVO">
 
         <result column="import_time" property="importTime"/>
         <result column="import_status" property="importStatus"/>

src/main/java/org/springblade/modules/map/mapper/DangerAreaLeaveLineImportMapper.java → src/main/java/org/springblade/modules/yjxt/base/map/mapper/DangerAreaLeaveLineImportMapper.java

@@ -4,12 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.mapper;
+package org.springblade.modules.yjxt.base.map.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.map.entity.DangerAreaLeaveLineImportRecordEntity;
-import org.springblade.modules.map.vo.DangerAreaLeaveLineImportRecordVO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaLeaveLineImportRecordVO;
 
 import java.util.List;
 

src/main/java/org/springblade/modules/map/mapper/DangerAreaLeaveLineImportMapper.xml → src/main/java/org/springblade/modules/yjxt/base/map/mapper/DangerAreaLeaveLineImportMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.map.mapper.DangerAreaLeaveLineImportMapper">
+<mapper namespace="org.springblade.modules.yjxt.base.map.mapper.DangerAreaLeaveLineImportMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="dangerAreaLineImportResultMap" type="org.springblade.modules.map.entity.DangerAreaLeaveLineImportRecordEntity">
+    <resultMap id="dangerAreaLineImportResultMap" type="org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineImportRecordEntity">
 
         <result column="import_time" property="importTime"/>
         <result column="import_status" property="importStatus"/>
@@ -12,7 +12,7 @@
         <result column="file_name" property="fileName"/>
     </resultMap>
 
-    <resultMap id="dangerAreaLineImportResultVOMap" type="org.springblade.modules.map.vo.DangerAreaLeaveLineImportRecordVO">
+    <resultMap id="dangerAreaLineImportResultVOMap" type="org.springblade.modules.yjxt.base.map.vo.DangerAreaLeaveLineImportRecordVO">
 
         <result column="import_time" property="importTime"/>
         <result column="import_status" property="importStatus"/>

src/main/java/org/springblade/modules/map/mapper/DangerAreaLeaveLineMapper.java → src/main/java/org/springblade/modules/yjxt/base/map/mapper/DangerAreaLeaveLineMapper.java

@@ -4,17 +4,14 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.mapper;
+package org.springblade.modules.yjxt.base.map.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.map.dto.DangerAreaDTO;
-import org.springblade.modules.map.dto.DangerAreaLeaveLineDTO;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.entity.DangerAreaLeaveLineEntity;
-import org.springblade.modules.map.vo.DangerAreaLeaveLineVO;
-import org.springblade.modules.map.vo.DangerAreaVO;
+import org.springblade.modules.yjxt.base.map.dto.DangerAreaLeaveLineDTO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineEntity;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaLeaveLineVO;
 
 import java.util.List;
 
@@ -28,5 +25,7 @@ import java.util.List;
  */
 public interface DangerAreaLeaveLineMapper extends BaseMapper<DangerAreaLeaveLineEntity> {
 	List<DangerAreaLeaveLineVO> selectPage(IPage page, @Param("dto") DangerAreaLeaveLineDTO dto);
+
+	List<DangerAreaLeaveLineVO> selectAdDangerArea(@Param("dto") DangerAreaLeaveLineDTO dto);
 }
 

src/main/java/org/springblade/modules/map/mapper/DangerAreaLeaveLineMapper.xml → src/main/java/org/springblade/modules/yjxt/base/map/mapper/DangerAreaLeaveLineMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.map.mapper.DangerAreaLeaveLineMapper">
+<mapper namespace="org.springblade.modules.yjxt.base.map.mapper.DangerAreaLeaveLineMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="dangerAreaLineResultMap" type="org.springblade.modules.map.entity.DangerAreaLeaveLineEntity">
+    <resultMap id="dangerAreaLineResultMap" type="org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineEntity">
 
         <result column="leave_line_pid" property="leaveLinePid"/>
         <result column="leave_line_name" property="leaveLineName"/>
@@ -15,7 +15,7 @@
     </resultMap>
 
 
-    <resultMap id="dangerAreaLineResultVOMap" type="org.springblade.modules.map.vo.DangerAreaLeaveLineVO">
+    <resultMap id="dangerAreaLineResultVOMap" type="org.springblade.modules.yjxt.base.map.vo.DangerAreaLeaveLineVO">
 
         <result column="leave_line_pid" property="leaveLinePid"/>
         <result column="leave_line_name" property="leaveLineName"/>
@@ -41,4 +41,18 @@
         </if>
         order by d.adcd
     </select>
+
+    <select id="selectAdDangerArea" resultMap="dangerAreaLineResultVOMap">
+        SELECT
+        d.*,a.ADNM
+        FROM
+        map_danger_leave_line d
+        LEFT JOIN etl_ad_cd_b a ON a.ADCD = d.adcd
+        WHERE
+        d.is_deleted = 0
+        <if test="dto.adcd!=null">
+            and d.adcd = #{dto.adcd
+        </if>
+        order by d.adcd
+    </select>
 </mapper>

src/main/java/org/springblade/modules/map/mapper/DangerAreaLeaveLinePointMapper.java → src/main/java/org/springblade/modules/yjxt/base/map/mapper/DangerAreaLeaveLinePointMapper.java

@@ -4,11 +4,10 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.mapper;
+package org.springblade.modules.yjxt.base.map.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.map.entity.DangerAreaLeaveLinePointEntity;
-import org.springblade.modules.map.entity.DangerAreaPointEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLinePointEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/mapper/DangerAreaLeaveLinePointMapper.xml → src/main/java/org/springblade/modules/yjxt/base/map/mapper/DangerAreaLeaveLinePointMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.map.mapper.DangerAreaLeaveLinePointMapper">
+<mapper namespace="org.springblade.modules.yjxt.base.map.mapper.DangerAreaLeaveLinePointMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="dangerAreaPointResultMap" type="org.springblade.modules.map.entity.DangerAreaLeaveLinePointEntity">
+    <resultMap id="dangerAreaPointResultMap" type="org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLinePointEntity">
 
         <result column="leave_line_id" property="leaveLineId"/>
         <result column="point_lat" property="pointLat"/>

src/main/java/org/springblade/modules/map/mapper/DangerAreaMapper.java → src/main/java/org/springblade/modules/yjxt/base/map/mapper/DangerAreaMapper.java

@@ -4,15 +4,14 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.mapper;
+package org.springblade.modules.yjxt.base.map.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.baseinfo.rtu.dto.RtuInfoDTO;
-import org.springblade.modules.map.dto.DangerAreaDTO;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.vo.DangerAreaVO;
+import org.springblade.modules.yjxt.base.map.dto.DangerAreaDTO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaEntity;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaVO;
 
 import java.util.List;
 
@@ -26,5 +25,7 @@ import java.util.List;
  */
 public interface DangerAreaMapper extends BaseMapper<DangerAreaEntity> {
 	List<DangerAreaVO> selectPage(IPage page,@Param("dto") DangerAreaDTO dto);
+
+	List<DangerAreaVO> selectAdDangerArea(@Param("dto") DangerAreaDTO dto);
 }
 

src/main/java/org/springblade/modules/map/mapper/DangerAreaMapper.xml → src/main/java/org/springblade/modules/yjxt/base/map/mapper/DangerAreaMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.map.mapper.DangerAreaMapper">
+<mapper namespace="org.springblade.modules.yjxt.base.map.mapper.DangerAreaMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="dangerAreaResultMap" type="org.springblade.modules.map.entity.DangerAreaEntity">
+    <resultMap id="dangerAreaResultMap" type="org.springblade.modules.yjxt.base.map.entity.DangerAreaEntity">
 
         <result column="danger_area_pid" property="dangerAreaPid"/>
         <result column="danger_area_name" property="dangerAreaName"/>
@@ -15,7 +15,7 @@
     </resultMap>
 
 
-    <resultMap id="dangerAreaResultVOMap" type="org.springblade.modules.map.vo.DangerAreaVO">
+    <resultMap id="dangerAreaResultVOMap" type="org.springblade.modules.yjxt.base.map.vo.DangerAreaVO">
 
         <result column="danger_area_pid" property="dangerAreaPid"/>
         <result column="danger_area_name" property="dangerAreaName"/>
@@ -41,4 +41,18 @@
         </if>
         order by d.adcd
     </select>
+
+    <select id="selectAdDangerArea" resultMap="dangerAreaResultVOMap">
+        SELECT
+        d.*,a.ADNM
+        FROM
+        map_danger_area_info d
+        LEFT JOIN etl_ad_cd_b a ON a.ADCD = d.adcd
+        WHERE
+        d.is_deleted = 0
+        <if test="dto.adcd!=null">
+            and d.adcd = #{dto.adcd
+        </if>
+        order by d.adcd
+    </select>
 </mapper>

src/main/java/org/springblade/modules/map/mapper/DangerAreaPointMapper.java → src/main/java/org/springblade/modules/yjxt/base/map/mapper/DangerAreaPointMapper.java

@@ -4,17 +4,10 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.mapper;
+package org.springblade.modules.yjxt.base.map.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.map.dto.DangerAreaDTO;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.entity.DangerAreaPointEntity;
-import org.springblade.modules.map.vo.DangerAreaVO;
-
-import java.util.List;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaPointEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/mapper/DangerAreaPointMapper.xml → src/main/java/org/springblade/modules/yjxt/base/map/mapper/DangerAreaPointMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.map.mapper.DangerAreaPointMapper">
+<mapper namespace="org.springblade.modules.yjxt.base.map.mapper.DangerAreaPointMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="dangerAreaPointResultMap" type="org.springblade.modules.map.entity.DangerAreaPointEntity">
+    <resultMap id="dangerAreaPointResultMap" type="org.springblade.modules.yjxt.base.map.entity.DangerAreaPointEntity">
 
         <result column="danger_area_id" property="dangerAreaId"/>
         <result column="point_lat" property="pointLat"/>

src/main/java/org/springblade/modules/map/mapper/MapRegionImportMapper.java → src/main/java/org/springblade/modules/yjxt/base/map/mapper/MapRegionImportMapper.java

@@ -4,12 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.mapper;
+package org.springblade.modules.yjxt.base.map.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.map.entity.MapRegionImportRecordEntity;
-import org.springblade.modules.map.vo.MapRegionImportRecordVO;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.vo.MapRegionImportRecordVO;
 
 import java.util.List;
 

src/main/java/org/springblade/modules/map/mapper/MapRegionImportMapper.xml → src/main/java/org/springblade/modules/yjxt/base/map/mapper/MapRegionImportMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.map.mapper.MapRegionImportMapper">
+<mapper namespace="org.springblade.modules.yjxt.base.map.mapper.MapRegionImportMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="dangerAreaImportResultMap" type="org.springblade.modules.map.entity.MapRegionImportRecordEntity">
+    <resultMap id="dangerAreaImportResultMap" type="org.springblade.modules.yjxt.base.map.entity.MapRegionImportRecordEntity">
 
         <result column="import_time" property="importTime"/>
         <result column="import_status" property="importStatus"/>
@@ -12,7 +12,7 @@
         <result column="file_name" property="fileName"/>
     </resultMap>
 
-    <resultMap id="dangerAreaImportResultVOMap" type="org.springblade.modules.map.vo.MapRegionImportRecordVO">
+    <resultMap id="dangerAreaImportResultVOMap" type="org.springblade.modules.yjxt.base.map.vo.MapRegionImportRecordVO">
 
         <result column="import_time" property="importTime"/>
         <result column="import_status" property="importStatus"/>

src/main/java/org/springblade/modules/map/mapper/MapRegionMapper.java → src/main/java/org/springblade/modules/yjxt/base/map/mapper/MapRegionMapper.java

@@ -4,14 +4,14 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.mapper;
+package org.springblade.modules.yjxt.base.map.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.map.dto.MapRegionDTO;
-import org.springblade.modules.map.entity.MapRegionEntity;
-import org.springblade.modules.map.vo.MapRegionVO;
+import org.springblade.modules.yjxt.base.map.dto.MapRegionDTO;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionEntity;
+import org.springblade.modules.yjxt.base.map.vo.MapRegionVO;
 
 import java.util.List;
 

src/main/java/org/springblade/modules/map/mapper/MapRegionMapper.xml → src/main/java/org/springblade/modules/yjxt/base/map/mapper/MapRegionMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.map.mapper.MapRegionMapper">
+<mapper namespace="org.springblade.modules.yjxt.base.map.mapper.MapRegionMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="dangerAreaResultMap" type="org.springblade.modules.map.entity.MapRegionEntity">
+    <resultMap id="dangerAreaResultMap" type="org.springblade.modules.yjxt.base.map.entity.MapRegionEntity">
 
         <result column="adcd" property="adcd"/>
         <result column="adnm" property="adnm"/>
@@ -18,7 +18,7 @@
     </resultMap>
 
 
-    <resultMap id="dangerAreaResultVOMap" type="org.springblade.modules.map.vo.MapRegionVO">
+    <resultMap id="dangerAreaResultVOMap" type="org.springblade.modules.yjxt.base.map.vo.MapRegionVO">
 
         <result column="adcd" property="adcd"/>
         <result column="adnm" property="adnm"/>

src/main/java/org/springblade/modules/map/mapper/MapRegionPointMapper.java → src/main/java/org/springblade/modules/yjxt/base/map/mapper/MapRegionPointMapper.java

@@ -4,10 +4,10 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.mapper;
+package org.springblade.modules.yjxt.base.map.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.map.entity.MapRegionPointEntity;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionPointEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/mapper/MapRegionPointMapper.xml → src/main/java/org/springblade/modules/yjxt/base/map/mapper/MapRegionPointMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.map.mapper.MapRegionPointMapper">
+<mapper namespace="org.springblade.modules.yjxt.base.map.mapper.MapRegionPointMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="dangerAreaPointResultMap" type="org.springblade.modules.map.entity.MapRegionPointEntity">
+    <resultMap id="dangerAreaPointResultMap" type="org.springblade.modules.yjxt.base.map.entity.MapRegionPointEntity">
 
         <result column="region_id" property="regionId"/>
         <result column="point_lat" property="pointLat"/>

src/main/java/org/springblade/modules/map/service/IDangerAreaImportServcie.java → src/main/java/org/springblade/modules/yjxt/base/map/service/IDangerAreaImportServcie.java

@@ -4,12 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service;
+package org.springblade.modules.yjxt.base.map.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.map.entity.DangerAreaImportRecordEntity;
-import org.springblade.modules.map.vo.DangerAreaImportRecordVO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaImportRecordVO;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/service/IDangerAreaLeaveLineImportServcie.java → src/main/java/org/springblade/modules/yjxt/base/map/service/IDangerAreaLeaveLineImportServcie.java

@@ -4,12 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service;
+package org.springblade.modules.yjxt.base.map.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.map.entity.DangerAreaLeaveLineImportRecordEntity;
-import org.springblade.modules.map.vo.DangerAreaLeaveLineImportRecordVO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaLeaveLineImportRecordVO;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/service/IDangerAreaLeaveLinePointService.java → src/main/java/org/springblade/modules/yjxt/base/map/service/IDangerAreaLeaveLinePointService.java

@@ -4,11 +4,10 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service;
+package org.springblade.modules.yjxt.base.map.service;
 
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.map.entity.DangerAreaLeaveLinePointEntity;
-import org.springblade.modules.map.entity.DangerAreaPointEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLinePointEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/service/IDangerAreaLeaveLineService.java → src/main/java/org/springblade/modules/yjxt/base/map/service/IDangerAreaLeaveLineService.java

@@ -4,16 +4,18 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service;
+package org.springblade.modules.yjxt.base.map.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.map.dto.DangerAreaDTO;
-import org.springblade.modules.map.dto.DangerAreaLeaveLineDTO;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.entity.DangerAreaLeaveLineEntity;
-import org.springblade.modules.map.vo.DangerAreaLeaveLineVO;
-import org.springblade.modules.map.vo.DangerAreaVO;
+import org.springblade.modules.yjxt.base.map.dto.DangerAreaDTO;
+import org.springblade.modules.yjxt.base.map.dto.DangerAreaLeaveLineDTO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineEntity;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaLeaveLineVO;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaVO;
+
+import java.util.List;
 
 /***
  * Date:2023/9/13
@@ -25,4 +27,6 @@ import org.springblade.modules.map.vo.DangerAreaVO;
  */
 public interface IDangerAreaLeaveLineService extends BaseService<DangerAreaLeaveLineEntity> {
 	IPage<DangerAreaLeaveLineVO> selectPage(IPage<DangerAreaLeaveLineVO> page, DangerAreaLeaveLineDTO dto);
+
+	List<DangerAreaLeaveLineVO> selectAdDangerArea(DangerAreaLeaveLineDTO dto);
 }

src/main/java/org/springblade/modules/map/service/IDangerAreaPointService.java → src/main/java/org/springblade/modules/yjxt/base/map/service/IDangerAreaPointService.java

@@ -4,14 +4,10 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service;
+package org.springblade.modules.yjxt.base.map.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.map.dto.DangerAreaDTO;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.entity.DangerAreaPointEntity;
-import org.springblade.modules.map.vo.DangerAreaVO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaPointEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/service/IDangerAreaService.java → src/main/java/org/springblade/modules/yjxt/base/map/service/IDangerAreaService.java

@@ -4,13 +4,16 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service;
+package org.springblade.modules.yjxt.base.map.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.map.dto.DangerAreaDTO;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.vo.DangerAreaVO;
+import org.springblade.modules.yjxt.base.map.dto.DangerAreaDTO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaEntity;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaVO;
+
+import java.util.List;
 
 /***
  * Date:2023/9/13
@@ -22,4 +25,6 @@ import org.springblade.modules.map.vo.DangerAreaVO;
  */
 public interface IDangerAreaService extends BaseService<DangerAreaEntity> {
 	IPage<DangerAreaVO> selectPage(IPage<DangerAreaVO> page, DangerAreaDTO dto);
+
+	List<DangerAreaVO> selectAdDangerArea(@Param("dto") DangerAreaDTO dto);
 }

src/main/java/org/springblade/modules/map/service/IMapRegionImportService.java → src/main/java/org/springblade/modules/yjxt/base/map/service/IMapRegionImportService.java

@@ -4,13 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service;
+package org.springblade.modules.yjxt.base.map.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.map.dto.MapRegionImportRecordDTO;
-import org.springblade.modules.map.entity.MapRegionImportRecordEntity;
-import org.springblade.modules.map.vo.MapRegionImportRecordVO;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.vo.MapRegionImportRecordVO;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/service/IMapRegionPointService.java → src/main/java/org/springblade/modules/yjxt/base/map/service/IMapRegionPointService.java

@@ -4,10 +4,10 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service;
+package org.springblade.modules.yjxt.base.map.service;
 
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.map.entity.MapRegionPointEntity;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionPointEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/service/IMapRegionService.java → src/main/java/org/springblade/modules/yjxt/base/map/service/IMapRegionService.java

@@ -4,13 +4,13 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service;
+package org.springblade.modules.yjxt.base.map.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.map.dto.MapRegionDTO;
-import org.springblade.modules.map.entity.MapRegionEntity;
-import org.springblade.modules.map.vo.MapRegionVO;
+import org.springblade.modules.yjxt.base.map.dto.MapRegionDTO;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionEntity;
+import org.springblade.modules.yjxt.base.map.vo.MapRegionVO;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/service/impl/DangerAreaImportServcieImpl.java → src/main/java/org/springblade/modules/yjxt/base/map/service/impl/DangerAreaImportServcieImpl.java

@@ -4,14 +4,14 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service.impl;
+package org.springblade.modules.yjxt.base.map.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.map.entity.DangerAreaImportRecordEntity;
-import org.springblade.modules.map.mapper.DangerAreaImportMapper;
-import org.springblade.modules.map.service.IDangerAreaImportServcie;
-import org.springblade.modules.map.vo.DangerAreaImportRecordVO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.mapper.DangerAreaImportMapper;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaImportServcie;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaImportRecordVO;
 import org.springframework.stereotype.Service;
 
 /***

src/main/java/org/springblade/modules/map/service/impl/DangerAreaLeaveLineImportServcieImpl.java → src/main/java/org/springblade/modules/yjxt/base/map/service/impl/DangerAreaLeaveLineImportServcieImpl.java

@@ -4,14 +4,14 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service.impl;
+package org.springblade.modules.yjxt.base.map.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.map.entity.DangerAreaLeaveLineImportRecordEntity;
-import org.springblade.modules.map.mapper.DangerAreaLeaveLineImportMapper;
-import org.springblade.modules.map.service.IDangerAreaLeaveLineImportServcie;
-import org.springblade.modules.map.vo.DangerAreaLeaveLineImportRecordVO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.mapper.DangerAreaLeaveLineImportMapper;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaLeaveLineImportServcie;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaLeaveLineImportRecordVO;
 import org.springframework.stereotype.Service;
 
 /***

src/main/java/org/springblade/modules/map/service/impl/DangerAreaLeaveLinePointServiceImpl.java → src/main/java/org/springblade/modules/yjxt/base/map/service/impl/DangerAreaLeaveLinePointServiceImpl.java

@@ -4,15 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service.impl;
+package org.springblade.modules.yjxt.base.map.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.map.entity.DangerAreaLeaveLinePointEntity;
-import org.springblade.modules.map.entity.DangerAreaPointEntity;
-import org.springblade.modules.map.mapper.DangerAreaLeaveLinePointMapper;
-import org.springblade.modules.map.mapper.DangerAreaPointMapper;
-import org.springblade.modules.map.service.IDangerAreaLeaveLinePointService;
-import org.springblade.modules.map.service.IDangerAreaPointService;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLinePointEntity;
+import org.springblade.modules.yjxt.base.map.mapper.DangerAreaLeaveLinePointMapper;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaLeaveLinePointService;
 import org.springframework.stereotype.Service;
 
 /***

src/main/java/org/springblade/modules/map/service/impl/DangerAreaLeaveLineServiceImpl.java → src/main/java/org/springblade/modules/yjxt/base/map/service/impl/DangerAreaLeaveLineServiceImpl.java

@@ -4,22 +4,19 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service.impl;
+package org.springblade.modules.yjxt.base.map.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.map.dto.DangerAreaDTO;
-import org.springblade.modules.map.dto.DangerAreaLeaveLineDTO;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.entity.DangerAreaLeaveLineEntity;
-import org.springblade.modules.map.mapper.DangerAreaLeaveLineMapper;
-import org.springblade.modules.map.mapper.DangerAreaMapper;
-import org.springblade.modules.map.service.IDangerAreaLeaveLineService;
-import org.springblade.modules.map.service.IDangerAreaService;
-import org.springblade.modules.map.vo.DangerAreaLeaveLineVO;
-import org.springblade.modules.map.vo.DangerAreaVO;
+import org.springblade.modules.yjxt.base.map.dto.DangerAreaLeaveLineDTO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineEntity;
+import org.springblade.modules.yjxt.base.map.mapper.DangerAreaLeaveLineMapper;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaLeaveLineService;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaLeaveLineVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /***
  * Date:2023/9/13
  * Title:文件所属模块（必须填写）
@@ -34,4 +31,9 @@ public class DangerAreaLeaveLineServiceImpl extends BaseServiceImpl<DangerAreaLe
 	public IPage<DangerAreaLeaveLineVO> selectPage(IPage<DangerAreaLeaveLineVO> page, DangerAreaLeaveLineDTO dto) {
 		return page.setRecords(baseMapper.selectPage(page,dto));
 	}
+
+	@Override
+	public List<DangerAreaLeaveLineVO> selectAdDangerArea(DangerAreaLeaveLineDTO dto) {
+		return baseMapper.selectAdDangerArea(dto);
+	}
 }

src/main/java/org/springblade/modules/map/service/impl/DangerAreaPointServiceImpl.java → src/main/java/org/springblade/modules/yjxt/base/map/service/impl/DangerAreaPointServiceImpl.java

@@ -4,18 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service.impl;
+package org.springblade.modules.yjxt.base.map.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.map.dto.DangerAreaDTO;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.entity.DangerAreaPointEntity;
-import org.springblade.modules.map.mapper.DangerAreaMapper;
-import org.springblade.modules.map.mapper.DangerAreaPointMapper;
-import org.springblade.modules.map.service.IDangerAreaPointService;
-import org.springblade.modules.map.service.IDangerAreaService;
-import org.springblade.modules.map.vo.DangerAreaVO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaPointEntity;
+import org.springblade.modules.yjxt.base.map.mapper.DangerAreaPointMapper;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaPointService;
 import org.springframework.stereotype.Service;
 
 /***

src/main/java/org/springblade/modules/map/service/impl/DangerAreaServiceImpl.java → src/main/java/org/springblade/modules/yjxt/base/map/service/impl/DangerAreaServiceImpl.java

@@ -4,17 +4,19 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service.impl;
+package org.springblade.modules.yjxt.base.map.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.map.dto.DangerAreaDTO;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.mapper.DangerAreaMapper;
-import org.springblade.modules.map.service.IDangerAreaService;
-import org.springblade.modules.map.vo.DangerAreaVO;
+import org.springblade.modules.yjxt.base.map.dto.DangerAreaDTO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaEntity;
+import org.springblade.modules.yjxt.base.map.mapper.DangerAreaMapper;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaService;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /***
  * Date:2023/9/13
  * Title:文件所属模块（必须填写）
@@ -29,4 +31,9 @@ public class DangerAreaServiceImpl extends BaseServiceImpl<DangerAreaMapper, Dan
 	public IPage<DangerAreaVO> selectPage(IPage<DangerAreaVO> page, DangerAreaDTO dto) {
 		return page.setRecords(baseMapper.selectPage(page,dto));
 	}
+
+	@Override
+	public List<DangerAreaVO> selectAdDangerArea(DangerAreaDTO dto) {
+		return baseMapper.selectAdDangerArea(dto);
+	}
 }

src/main/java/org/springblade/modules/map/service/impl/MapRegionImportServcieImpl.java → src/main/java/org/springblade/modules/yjxt/base/map/service/impl/MapRegionImportServcieImpl.java

@@ -4,14 +4,14 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service.impl;
+package org.springblade.modules.yjxt.base.map.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.map.entity.MapRegionImportRecordEntity;
-import org.springblade.modules.map.mapper.MapRegionImportMapper;
-import org.springblade.modules.map.service.IMapRegionImportService;
-import org.springblade.modules.map.vo.MapRegionImportRecordVO;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.mapper.MapRegionImportMapper;
+import org.springblade.modules.yjxt.base.map.service.IMapRegionImportService;
+import org.springblade.modules.yjxt.base.map.vo.MapRegionImportRecordVO;
 import org.springframework.stereotype.Service;
 
 /***

src/main/java/org/springblade/modules/map/service/impl/MapRegionPointServiceImpl.java → src/main/java/org/springblade/modules/yjxt/base/map/service/impl/MapRegionPointServiceImpl.java

@@ -4,12 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service.impl;
+package org.springblade.modules.yjxt.base.map.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.map.entity.MapRegionPointEntity;
-import org.springblade.modules.map.mapper.MapRegionPointMapper;
-import org.springblade.modules.map.service.IMapRegionPointService;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionPointEntity;
+import org.springblade.modules.yjxt.base.map.mapper.MapRegionPointMapper;
+import org.springblade.modules.yjxt.base.map.service.IMapRegionPointService;
 import org.springframework.stereotype.Service;
 
 /***

src/main/java/org/springblade/modules/map/service/impl/MapRegionServiceImpl.java → src/main/java/org/springblade/modules/yjxt/base/map/service/impl/MapRegionServiceImpl.java

@@ -4,15 +4,15 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.service.impl;
+package org.springblade.modules.yjxt.base.map.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.map.dto.MapRegionDTO;
-import org.springblade.modules.map.entity.MapRegionEntity;
-import org.springblade.modules.map.mapper.MapRegionMapper;
-import org.springblade.modules.map.service.IMapRegionService;
-import org.springblade.modules.map.vo.MapRegionVO;
+import org.springblade.modules.yjxt.base.map.dto.MapRegionDTO;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionEntity;
+import org.springblade.modules.yjxt.base.map.mapper.MapRegionMapper;
+import org.springblade.modules.yjxt.base.map.service.IMapRegionService;
+import org.springblade.modules.yjxt.base.map.vo.MapRegionVO;
 import org.springframework.stereotype.Service;
 
 /***

src/main/java/org/springblade/modules/map/task/DangerAreaImportTask.java → src/main/java/org/springblade/modules/yjxt/base/map/task/DangerAreaImportTask.java

@@ -4,7 +4,7 @@
  * 项目名称:运维系统
  * 创建日期:2022/5/22
  */
-package org.springblade.modules.map.task;
+package org.springblade.modules.yjxt.base.map.task;
 
 
 import com.alibaba.fastjson.JSONArray;
@@ -13,12 +13,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.oss.model.BladeFile;
-import org.springblade.modules.map.entity.DangerAreaImportRecordEntity;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.entity.DangerAreaPointEntity;
-import org.springblade.modules.map.service.IDangerAreaImportServcie;
-import org.springblade.modules.map.service.IDangerAreaPointService;
-import org.springblade.modules.map.service.IDangerAreaService;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaPointEntity;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaImportServcie;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaPointService;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaService;
 
 import java.io.InputStream;
 import java.net.HttpURLConnection;

src/main/java/org/springblade/modules/map/task/DangerAreaLeaveLineImportTask.java → src/main/java/org/springblade/modules/yjxt/base/map/task/DangerAreaLeaveLineImportTask.java

@@ -4,7 +4,7 @@
  * 项目名称:运维系统
  * 创建日期:2022/5/22
  */
-package org.springblade.modules.map.task;
+package org.springblade.modules.yjxt.base.map.task;
 
 
 import com.alibaba.fastjson.JSONArray;
@@ -15,6 +15,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.modules.map.entity.*;
 import org.springblade.modules.map.service.*;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLinePointEntity;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaLeaveLineImportServcie;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaLeaveLinePointService;
+import org.springblade.modules.yjxt.base.map.service.IDangerAreaLeaveLineService;
 
 import java.io.InputStream;
 import java.net.HttpURLConnection;

src/main/java/org/springblade/modules/map/task/MapRegionImportTask.java → src/main/java/org/springblade/modules/yjxt/base/map/task/MapRegionImportTask.java

@@ -4,7 +4,7 @@
  * 项目名称:运维系统
  * 创建日期:2022/5/22
  */
-package org.springblade.modules.map.task;
+package org.springblade.modules.yjxt.base.map.task;
 
 
 import com.alibaba.fastjson.JSONArray;
@@ -16,10 +16,13 @@ import org.springblade.constant.BusinessConstant;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.etl.entity.EtlAdCdEntity;
 import org.springblade.etl.service.IEtlAdCdService;
-import org.springblade.modules.map.entity.MapRegionEntity;
-import org.springblade.modules.map.entity.MapRegionImportRecordEntity;
-import org.springblade.modules.map.entity.MapRegionPointEntity;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionEntity;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionPointEntity;
 import org.springblade.modules.map.service.*;
+import org.springblade.modules.yjxt.base.map.service.IMapRegionImportService;
+import org.springblade.modules.yjxt.base.map.service.IMapRegionPointService;
+import org.springblade.modules.yjxt.base.map.service.IMapRegionService;
 
 import java.io.InputStream;
 import java.net.HttpURLConnection;

src/main/java/org/springblade/modules/map/vo/DangerAreaImportRecordVO.java → src/main/java/org/springblade/modules/yjxt/base/map/vo/DangerAreaImportRecordVO.java

@@ -4,12 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.vo;
+package org.springblade.modules.yjxt.base.map.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.map.entity.DangerAreaImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaImportRecordEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/vo/DangerAreaLeaveLineImportRecordVO.java → src/main/java/org/springblade/modules/yjxt/base/map/vo/DangerAreaLeaveLineImportRecordVO.java

@@ -4,12 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.vo;
+package org.springblade.modules.yjxt.base.map.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.map.entity.DangerAreaLeaveLineImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineImportRecordEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/vo/DangerAreaLeaveLineVO.java → src/main/java/org/springblade/modules/yjxt/base/map/vo/DangerAreaLeaveLineVO.java

@@ -4,13 +4,13 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.vo;
+package org.springblade.modules.yjxt.base.map.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.map.entity.DangerAreaLeaveLineEntity;
-import org.springblade.modules.map.entity.DangerAreaLeaveLinePointEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLinePointEntity;
 
 import java.util.List;
 

src/main/java/org/springblade/modules/map/vo/DangerAreaVO.java → src/main/java/org/springblade/modules/yjxt/base/map/vo/DangerAreaVO.java

@@ -4,14 +4,14 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.vo;
+package org.springblade.modules.yjxt.base.map.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.entity.DangerAreaPointEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaEntity;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaPointEntity;
 
 import java.util.List;
 

src/main/java/org/springblade/modules/map/vo/MapRegionImportRecordVO.java → src/main/java/org/springblade/modules/yjxt/base/map/vo/MapRegionImportRecordVO.java

@@ -4,12 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.vo;
+package org.springblade.modules.yjxt.base.map.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.map.entity.MapRegionImportRecordEntity;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionImportRecordEntity;
 
 /***
  * Date:2023/9/13

src/main/java/org/springblade/modules/map/vo/MapRegionVO.java → src/main/java/org/springblade/modules/yjxt/base/map/vo/MapRegionVO.java

@@ -4,14 +4,13 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.vo;
+package org.springblade.modules.yjxt.base.map.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.map.entity.DangerAreaPointEntity;
-import org.springblade.modules.map.entity.MapRegionEntity;
-import org.springblade.modules.map.entity.MapRegionPointEntity;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionEntity;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionPointEntity;
 
 import java.util.List;
 

src/main/java/org/springblade/modules/map/wrapper/DangerAreaLeaveLineWrapper.java → src/main/java/org/springblade/modules/yjxt/base/map/wrapper/DangerAreaLeaveLineWrapper.java

@@ -4,20 +4,15 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.wrapper;
+package org.springblade.modules.yjxt.base.map.wrapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
-import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
 import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.entity.DangerAreaLeaveLineEntity;
-import org.springblade.modules.map.vo.DangerAreaLeaveLineVO;
-import org.springblade.modules.map.vo.DangerAreaVO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaLeaveLineEntity;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaLeaveLineVO;
 
 import java.util.Objects;
 

src/main/java/org/springblade/modules/map/wrapper/DangerAreaWrapper.java → src/main/java/org/springblade/modules/yjxt/base/map/wrapper/DangerAreaWrapper.java

@@ -4,20 +4,18 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.wrapper;
+package org.springblade.modules.yjxt.base.map.wrapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.SpringUtil;
-import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
 import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
 import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
 import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
-import org.springblade.modules.baseinfo.rtu.wrapper.RtuInfoWrapper;
-import org.springblade.modules.map.entity.DangerAreaEntity;
-import org.springblade.modules.map.vo.DangerAreaVO;
+import org.springblade.modules.yjxt.base.map.entity.DangerAreaEntity;
+import org.springblade.modules.yjxt.base.map.vo.DangerAreaVO;
 
 import java.util.Objects;
 

src/main/java/org/springblade/modules/map/wrapper/MapRegionWrapper.java → src/main/java/org/springblade/modules/yjxt/base/map/wrapper/MapRegionWrapper.java

@@ -4,12 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2023/9/13
  */
-package org.springblade.modules.map.wrapper;
+package org.springblade.modules.yjxt.base.map.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.map.entity.MapRegionEntity;
-import org.springblade.modules.map.vo.MapRegionVO;
+import org.springblade.modules.yjxt.base.map.entity.MapRegionEntity;
+import org.springblade.modules.yjxt.base.map.vo.MapRegionVO;
 
 import java.util.Objects;
 

src/main/java/org/springblade/modules/yjxt/business/check/controller/DanagerAreaCheckController.java

@@ -1,60 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2023/11/9
- */
-package org.springblade.modules.yjxt.business.check.controller;
-
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.enums.DanagerAreaCehckTypeEnum;
-import org.springblade.modules.system.entity.User;
-import org.springblade.modules.yjxt.business.check.dto.DanagerAreaCheckInfoDTO;
-import org.springblade.modules.yjxt.business.check.entity.DanagerAreaCheckInfoEntity;
-import org.springblade.modules.yjxt.business.check.service.IDanagerAreaCheckService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/***
- * Date:2023/11/9
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@RestController
-@RequestMapping("galaxy-business/yj/check")
-@AllArgsConstructor
-@Api(value = "应急系统巡查巡检管理接口", tags = "增、删、改、查")
-public class DanagerAreaCheckController extends BladeController {
-
-    private final IDanagerAreaCheckService danagerAreaCheckService;
-
-    /**
-     * 上报
-     */
-    @PostMapping("/report")
-    @ApiOperationSupport(order = 4)
-    @ApiOperation(value = "新增", notes = "传入 User")
-    public R report(@RequestBody DanagerAreaCheckInfoEntity entity) {
-        if (Func.isNull(entity.getCheckType())) {
-            return R.fail("参数错误");
-        }
-        if (DanagerAreaCehckTypeEnum.CHECK_2.getCode().intValue() == entity.getCheckType().intValue()) {
-            if (Func.isNull(entity.getWarnId())) {
-                return R.fail("参数错误");
-            }
-        }
-        danagerAreaCheckService.save(entity);
-        return R.status(true);
-    }
-}

src/main/java/org/springblade/modules/yjxt/business/check/controller/DangerAreaCheckController.java

@@ -0,0 +1,80 @@
+/**
+ * Copyright 2019 DH
+ * All right reserved.
+ * 项目名称: 大恒泰山系统
+ * 创建日期:2023/11/9
+ */
+package org.springblade.modules.yjxt.business.check.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.enums.DanagerAreaCehckTypeEnum;
+import org.springblade.modules.yjxt.base.servicePerson.dto.YjxtServicePersonDTO;
+import org.springblade.modules.yjxt.base.servicePerson.vo.YjxtServicePersonVO;
+import org.springblade.modules.yjxt.business.check.dto.DangerAreaCheckInfoDTO;
+import org.springblade.modules.yjxt.business.check.entity.DangerAreaCheckInfoEntity;
+import org.springblade.modules.yjxt.business.check.service.IDangerAreaCheckService;
+import org.springblade.modules.yjxt.business.check.vo.DangerAreaCheckInfoVO;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+/***
+ * Date:2023/11/9
+ * Title:文件所属模块（必须填写）
+ * Description：对本文件的详细描述，原则上不能少于30字
+ * @author dylan
+ * @version 1.0
+ * Remark：认为有必要的其他信息
+ */
+@RestController
+@RequestMapping("galaxy-business/yj/check")
+@AllArgsConstructor
+@Api(value = "应急系统巡查巡检管理接口", tags = "增、删、改、查")
+public class DangerAreaCheckController extends BladeController {
+
+    private final IDangerAreaCheckService danagerAreaCheckService;
+
+    @GetMapping("/page")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "userName", value = "名称", paramType = "query", dataType = "string"),
+    })
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "分页")
+    public R<IPage<DangerAreaCheckInfoVO>> page(@ApiIgnore DangerAreaCheckInfoDTO dto, Query query) {
+        BladeUser user = AuthUtil.getUser();
+        IPage<DangerAreaCheckInfoVO> pages = danagerAreaCheckService.selectPage(Condition.getPage(query), dto);
+        return R.data(pages);
+    }
+
+
+    /**
+     * 上报
+     */
+    @PostMapping("/report")
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "新增", notes = "传入 User")
+    public R report(@RequestBody DangerAreaCheckInfoEntity entity) {
+        if (Func.isNull(entity.getCheckType())) {
+            return R.fail("参数错误");
+        }
+        if (DanagerAreaCehckTypeEnum.CHECK_2.getCode().intValue() == entity.getCheckType().intValue()) {
+            if (Func.isNull(entity.getWarnId())) {
+                return R.fail("参数错误");
+            }
+        }
+        danagerAreaCheckService.save(entity);
+        return R.status(true);
+    }
+}

src/main/java/org/springblade/modules/yjxt/business/check/dto/DanagerAreaCheckInfoDTO.java → src/main/java/org/springblade/modules/yjxt/business/check/dto/DangerAreaCheckInfoDTO.java

@@ -8,7 +8,7 @@ package org.springblade.modules.yjxt.business.check.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.yjxt.business.check.entity.DanagerAreaCheckInfoEntity;
+import org.springblade.modules.yjxt.business.check.entity.DangerAreaCheckInfoEntity;
 
 /***
  * Date:2023/11/9
@@ -20,6 +20,6 @@ import org.springblade.modules.yjxt.business.check.entity.DanagerAreaCheckInfoEn
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class DanagerAreaCheckInfoDTO extends DanagerAreaCheckInfoEntity {
+public class DangerAreaCheckInfoDTO extends DangerAreaCheckInfoEntity {
 
 }

src/main/java/org/springblade/modules/yjxt/business/check/entity/DanagerAreaCheckInfoEntity.java → src/main/java/org/springblade/modules/yjxt/business/check/entity/DangerAreaCheckInfoEntity.java

@@ -22,8 +22,8 @@ import org.springblade.core.mp.base.BaseEntity;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("yjxt_danager_area_check_info")
-public class DanagerAreaCheckInfoEntity extends BaseEntity {
+@TableName("yjxt_danger_area_check_info")
+public class DangerAreaCheckInfoEntity extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/org/springblade/modules/yjxt/business/check/mapper/DanagerAreaCheckInfoMapper.java

@@ -1,24 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 运维系统
- * 创建日期:2022/8/22
- */
-package org.springblade.modules.yjxt.business.check.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.yjxt.business.check.entity.DanagerAreaCheckInfoEntity;
-
-
-/***
- * Date:2022/8/22
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface DanagerAreaCheckInfoMapper extends BaseMapper<DanagerAreaCheckInfoEntity> {
-
-}

src/main/java/org/springblade/modules/yjxt/business/check/mapper/DanagerAreaCheckInfoMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.yjxt.business.check.mapper.DanagerAreaCheckInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="servicePersonResultMap" type="org.springblade.modules.yjxt.business.check.entity.DanagerAreaCheckInfoEntity">
-
-        <result column="check_type" property="checkType"/>
-        <result column="warn_id" property="warnId"/>
-        <result column="latitude" property="latitude"/>
-        <result column="longitude" property="longitude"/>
-        <result column="address" property="address"/>
-        <result column="is_flood" property="isFlood"/>
-        <result column="is_damage" property="isDamage"/>
-        <result column="remark" property="remark"/>
-        <result column="check_photos" property="checkPhotos"/>
-
-    </resultMap>
-
-</mapper>

src/main/java/org/springblade/modules/yjxt/business/check/mapper/DangerAreaCheckInfoMapper.java

@@ -0,0 +1,30 @@
+/**
+ * Copyright 2019 DH
+ * All right reserved.
+ * 项目名称: 运维系统
+ * 创建日期:2022/8/22
+ */
+package org.springblade.modules.yjxt.business.check.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.yjxt.business.check.dto.DangerAreaCheckInfoDTO;
+import org.springblade.modules.yjxt.business.check.entity.DangerAreaCheckInfoEntity;
+import org.springblade.modules.yjxt.business.check.vo.DangerAreaCheckInfoVO;
+
+import java.util.List;
+
+
+/***
+ * Date:2022/8/22
+ * Title:文件所属模块（必须填写）
+ * Description：对本文件的详细描述，原则上不能少于30字
+ * @author dylan
+ * @version 1.0
+ * Remark：认为有必要的其他信息
+ */
+public interface DangerAreaCheckInfoMapper extends BaseMapper<DangerAreaCheckInfoEntity> {
+    List<DangerAreaCheckInfoVO> selectPage(IPage page, @Param("dto") DangerAreaCheckInfoDTO dto);
+}

src/main/java/org/springblade/modules/yjxt/business/check/mapper/DangerAreaCheckInfoMapper.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.yjxt.business.check.mapper.DangerAreaCheckInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="checkResultMap" type="org.springblade.modules.yjxt.business.check.entity.DangerAreaCheckInfoEntity">
+
+        <result column="check_type" property="checkType"/>
+        <result column="warn_id" property="warnId"/>
+        <result column="latitude" property="latitude"/>
+        <result column="longitude" property="longitude"/>
+        <result column="address" property="address"/>
+        <result column="is_flood" property="isFlood"/>
+        <result column="is_damage" property="isDamage"/>
+        <result column="remark" property="remark"/>
+        <result column="check_photos" property="checkPhotos"/>
+
+    </resultMap>
+
+    <resultMap id="checkVOResultMap" type="org.springblade.modules.yjxt.business.check.vo.DangerAreaCheckInfoVO">
+
+        <result column="check_type" property="checkType"/>
+        <result column="warn_id" property="warnId"/>
+        <result column="latitude" property="latitude"/>
+        <result column="longitude" property="longitude"/>
+        <result column="address" property="address"/>
+        <result column="is_flood" property="isFlood"/>
+        <result column="is_damage" property="isDamage"/>
+        <result column="remark" property="remark"/>
+        <result column="check_photos" property="checkPhotos"/>
+
+    </resultMap>
+
+    <select id="selectPage" resultMap="checkVOResultMap">
+
+        SELECT
+        p.*
+        FROM
+        yjxt_danger_area_check_info p
+        WHERE
+        p.is_deleted = 0
+
+    </select>
+
+</mapper>

src/main/java/org/springblade/modules/yjxt/business/check/service/IDanagerAreaCheckService.java

@@ -1,21 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2023/11/9
- */
-package org.springblade.modules.yjxt.business.check.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.yjxt.business.check.entity.DanagerAreaCheckInfoEntity;
-
-/***
- * Date:2023/11/9
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IDanagerAreaCheckService extends BaseService<DanagerAreaCheckInfoEntity> {
-}

src/main/java/org/springblade/modules/yjxt/business/check/service/IDangerAreaCheckService.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright 2019 DH
+ * All right reserved.
+ * 项目名称: 大恒泰山系统
+ * 创建日期:2023/11/9
+ */
+package org.springblade.modules.yjxt.business.check.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+
+import org.springblade.modules.yjxt.business.check.dto.DangerAreaCheckInfoDTO;
+import org.springblade.modules.yjxt.business.check.entity.DangerAreaCheckInfoEntity;
+import org.springblade.modules.yjxt.business.check.vo.DangerAreaCheckInfoVO;
+
+/***
+ * Date:2023/11/9
+ * Title:文件所属模块（必须填写）
+ * Description：对本文件的详细描述，原则上不能少于30字
+ * @author dylan
+ * @version 1.0
+ * Remark：认为有必要的其他信息
+ */
+public interface IDangerAreaCheckService extends BaseService<DangerAreaCheckInfoEntity> {
+    IPage<DangerAreaCheckInfoVO> selectPage(IPage page, DangerAreaCheckInfoDTO dto);
+}

src/main/java/org/springblade/modules/yjxt/business/check/service/impl/DanagerAreaCheckServiceImpl.java

@@ -1,26 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2023/11/9
- */
-package org.springblade.modules.yjxt.business.check.service.impl;
-
-import org.springblade.core.mp.base.BaseServiceImpl;
-
-import org.springblade.modules.yjxt.business.check.entity.DanagerAreaCheckInfoEntity;
-import org.springblade.modules.yjxt.business.check.mapper.DanagerAreaCheckInfoMapper;
-import org.springblade.modules.yjxt.business.check.service.IDanagerAreaCheckService;
-import org.springframework.stereotype.Service;
-
-/***
- * Date:2023/11/9
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-public class DanagerAreaCheckServiceImpl extends BaseServiceImpl<DanagerAreaCheckInfoMapper, DanagerAreaCheckInfoEntity> implements IDanagerAreaCheckService {
-}

src/main/java/org/springblade/modules/yjxt/business/check/service/impl/DangerAreaCheckServiceImpl.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2019 DH
+ * All right reserved.
+ * 项目名称: 大恒泰山系统
+ * 创建日期:2023/11/9
+ */
+package org.springblade.modules.yjxt.business.check.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+
+import org.springblade.modules.yjxt.business.check.dto.DangerAreaCheckInfoDTO;
+import org.springblade.modules.yjxt.business.check.entity.DangerAreaCheckInfoEntity;
+import org.springblade.modules.yjxt.business.check.mapper.DangerAreaCheckInfoMapper;
+import org.springblade.modules.yjxt.business.check.service.IDangerAreaCheckService;
+import org.springblade.modules.yjxt.business.check.vo.DangerAreaCheckInfoVO;
+import org.springframework.stereotype.Service;
+
+/***
+ * Date:2023/11/9
+ * Title:文件所属模块（必须填写）
+ * Description：对本文件的详细描述，原则上不能少于30字
+ * @author dylan
+ * @version 1.0
+ * Remark：认为有必要的其他信息
+ */
+@Service
+public class DangerAreaCheckServiceImpl extends BaseServiceImpl<DangerAreaCheckInfoMapper, DangerAreaCheckInfoEntity> implements IDangerAreaCheckService {
+    @Override
+    public IPage<DangerAreaCheckInfoVO> selectPage(IPage page, DangerAreaCheckInfoDTO dto) {
+        return page.setRecords(baseMapper.selectPage(page,dto));
+    }
+}

src/main/java/org/springblade/modules/yjxt/business/check/vo/DanagerAreaCheckInfoVO.java → src/main/java/org/springblade/modules/yjxt/business/check/vo/DangerAreaCheckInfoVO.java

@@ -8,7 +8,7 @@ package org.springblade.modules.yjxt.business.check.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.yjxt.business.check.entity.DanagerAreaCheckInfoEntity;
+import org.springblade.modules.yjxt.business.check.entity.DangerAreaCheckInfoEntity;
 
 /***
  * Date:2023/11/9
@@ -20,5 +20,5 @@ import org.springblade.modules.yjxt.business.check.entity.DanagerAreaCheckInfoEn
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class DanagerAreaCheckInfoVO extends DanagerAreaCheckInfoEntity {
+public class DangerAreaCheckInfoVO extends DangerAreaCheckInfoEntity {
 }

src/main/java/org/springblade/modules/yjxt/business/check/wrapper/DanagerAreaCheckWrapper.java

@@ -8,8 +8,8 @@ package org.springblade.modules.yjxt.business.check.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.yjxt.business.check.entity.DanagerAreaCheckInfoEntity;
-import org.springblade.modules.yjxt.business.check.vo.DanagerAreaCheckInfoVO;
+import org.springblade.modules.yjxt.business.check.entity.DangerAreaCheckInfoEntity;
+import org.springblade.modules.yjxt.business.check.vo.DangerAreaCheckInfoVO;
 
 import java.util.Objects;
 
@@ -21,14 +21,14 @@ import java.util.Objects;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class DanagerAreaCheckWrapper extends BaseEntityWrapper<DanagerAreaCheckInfoEntity, DanagerAreaCheckInfoVO> {
+public class DanagerAreaCheckWrapper extends BaseEntityWrapper<DangerAreaCheckInfoEntity, DangerAreaCheckInfoVO> {
     public static DanagerAreaCheckWrapper build() {
         return new DanagerAreaCheckWrapper();
     }
 
     @Override
-    public DanagerAreaCheckInfoVO entityVO(DanagerAreaCheckInfoEntity entity) {
-        DanagerAreaCheckInfoVO vo = Objects.requireNonNull(BeanUtil.copy(entity, DanagerAreaCheckInfoVO.class));
+    public DangerAreaCheckInfoVO entityVO(DangerAreaCheckInfoEntity entity) {
+        DangerAreaCheckInfoVO vo = Objects.requireNonNull(BeanUtil.copy(entity, DangerAreaCheckInfoVO.class));
         return vo;
     }
 }

src/main/java/org/springblade/modules/yjxt/business/transfer/controller/DamageTransferController.java

@@ -7,22 +7,33 @@
 package org.springblade.modules.yjxt.business.transfer.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.enums.DanagerAreaCehckTypeEnum;
-import org.springblade.modules.yjxt.business.check.entity.DanagerAreaCheckInfoEntity;
+import org.springblade.modules.yjxt.business.resident.dto.DangerAreaResidentInfoDTO;
+import org.springblade.modules.yjxt.business.resident.entity.DangerAreaResidentInfoEntity;
+import org.springblade.modules.yjxt.business.resident.service.IDangerAreaResidentService;
+import org.springblade.modules.yjxt.business.resident.vo.DangerAreaResidentInfoVO;
+import org.springblade.modules.yjxt.business.transfer.dto.DamageTransferPersonInfoDTO;
 import org.springblade.modules.yjxt.business.transfer.entity.DamageTransferPersonInfoEntity;
 import org.springblade.modules.yjxt.business.transfer.service.IDamageTransferPersonService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springblade.modules.yjxt.business.transfer.vo.DamageTransferPersonInfoVO;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
 
 /***
  * Date:2023/11/10
@@ -40,26 +51,69 @@ public class DamageTransferController extends BladeController {
 
     private final IDamageTransferPersonService damageTransferPersonService;
 
+    private final IDangerAreaResidentService dangerAreaResidentService;
+
+
+    @GetMapping("/page")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "warnId", value = "预警id", paramType = "query", dataType = "string"),
+    })
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "分页")
+    public R<IPage<DamageTransferPersonInfoVO>> page(@ApiIgnore DamageTransferPersonInfoDTO dto, Query query) {
+        BladeUser user = AuthUtil.getUser();
+        IPage<DamageTransferPersonInfoVO> pages = damageTransferPersonService.selectPage(Condition.getPage(query), dto);
+        return R.data(pages);
+    }
+
+
     /**
      * 转移人员记录
      */
     @PostMapping("/person/record")
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "新增", notes = "")
-    public R record(@RequestBody DamageTransferPersonInfoEntity entity) {
-        if (Func.isNull(entity.getWarnId()) || Func.isNull(entity.getPersonId()) || Func.isNull(entity.getPersonName())) {
+    public R record(@RequestBody DamageTransferPersonInfoDTO dto) {
+        if (Func.isNull(dto.getWarnId()) || Func.isNull(dto.getPersonId()) || Func.isNull(dto.getPersonName())) {
             return R.fail("参数错误");
         }
         LambdaQueryWrapper<DamageTransferPersonInfoEntity> wrapper = Wrappers.<DamageTransferPersonInfoEntity>query().lambda();
         wrapper.eq(DamageTransferPersonInfoEntity::getIsDeleted, 0);
-        wrapper.eq(DamageTransferPersonInfoEntity::getWarnId, entity.getWarnId());
-        wrapper.eq(DamageTransferPersonInfoEntity::getPersonId, entity.getPersonId());
+        wrapper.eq(DamageTransferPersonInfoEntity::getWarnId, dto.getWarnId());
+        wrapper.eq(DamageTransferPersonInfoEntity::getPersonId, dto.getPersonId());
         long count = damageTransferPersonService.count(wrapper);
-        if (0 == count) {
-            damageTransferPersonService.save(entity);
-            return R.status(true);
-        } else {
+        if (count >0) {
             return R.fail("该人员已经登记");
         }
+        damageTransferPersonService.save(dto);
+
+        if (Func.notNull(dto.getFamilyMembersTransferStatus())){
+            if (dto.getFamilyMembersTransferStatus() ==1){
+                DangerAreaResidentInfoDTO residentInfoDTO= new DangerAreaResidentInfoDTO();
+                residentInfoDTO.setPersonId(dto.getPersonId());
+                List<DangerAreaResidentInfoEntity> residentInfoEntityList= dangerAreaResidentService.getFamilyMembers(residentInfoDTO);
+                if (Func.notNull(residentInfoEntityList)){
+                    for (DangerAreaResidentInfoEntity entity:residentInfoEntityList){
+
+                        wrapper = Wrappers.<DamageTransferPersonInfoEntity>query().lambda();
+                        wrapper.eq(DamageTransferPersonInfoEntity::getIsDeleted, 0);
+                        wrapper.eq(DamageTransferPersonInfoEntity::getWarnId, dto.getWarnId());
+                        wrapper.eq(DamageTransferPersonInfoEntity::getPersonId, entity.getPersonId());
+                        DamageTransferPersonInfoEntity detail = damageTransferPersonService.getOne(wrapper);
+                        if (Func.isNull(detail)) {
+                            detail=new DamageTransferPersonInfoEntity();
+                        }
+
+                        detail.setWarnId(dto.getWarnId());
+                        detail.setPersonId(entity.getPersonId());
+                        detail.setPersonName(entity.getPersonName());
+                        damageTransferPersonService.saveOrUpdate(detail);
+                        }
+                    }
+                }
+
+            }
+
+        return R.status(true);
     }
 }

src/main/java/org/springblade/modules/yjxt/business/transfer/dto/DamageTransferPersonInfoDTO.java

@@ -6,6 +6,8 @@
  */
 package org.springblade.modules.yjxt.business.transfer.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.modules.yjxt.business.transfer.entity.DamageTransferPersonInfoEntity;
@@ -21,4 +23,10 @@ import org.springblade.modules.yjxt.business.transfer.entity.DamageTransferPerso
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class DamageTransferPersonInfoDTO extends DamageTransferPersonInfoEntity {
+
+    /**
+     * 0 否，1完成
+     */
+    @ApiModelProperty("家庭户是否转移完成")
+    private Integer familyMembersTransferStatus;
 }

src/main/java/org/springblade/modules/yjxt/business/transfer/mapper/DamageTransferPersonInfoMapper.java

@@ -8,7 +8,13 @@ package org.springblade.modules.yjxt.business.transfer.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.yjxt.business.transfer.dto.DamageTransferPersonInfoDTO;
 import org.springblade.modules.yjxt.business.transfer.entity.DamageTransferPersonInfoEntity;
+import org.springblade.modules.yjxt.business.transfer.vo.DamageTransferPersonInfoVO;
+
+import java.util.List;
 
 
 /***
@@ -21,4 +27,10 @@ import org.springblade.modules.yjxt.business.transfer.entity.DamageTransferPerso
  */
 public interface DamageTransferPersonInfoMapper extends BaseMapper<DamageTransferPersonInfoEntity> {
 
+    List<DamageTransferPersonInfoVO> selectPage(IPage page, DamageTransferPersonInfoDTO dto);
+
+
+    long transferPersonCount(@Param("dto") DamageTransferPersonInfoDTO dto);
+
+
 }

src/main/java/org/springblade/modules/yjxt/business/transfer/mapper/DamageTransferPersonInfoMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.yjxt.business.transfer.mapper.DamageTransferPersonInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="servicePersonResultMap"
+    <resultMap id="transferPersonResultMap"
                type="org.springblade.modules.yjxt.business.transfer.entity.DamageTransferPersonInfoEntity">
 
         <result column="warn_id" property="warnId"/>
@@ -12,4 +12,43 @@
 
     </resultMap>
 
+    <resultMap id="transferPersonVOResultMap"
+               type="org.springblade.modules.yjxt.business.transfer.vo.DamageTransferPersonInfoVO">
+
+        <result column="warn_id" property="warnId"/>
+        <result column="person_name" property="personName"/>
+        <result column="person_id" property="personId"/>
+
+    </resultMap>
+
+    <select id="selectPage" resultMap="transferPersonVOResultMap">
+
+        SELECT
+        p.*
+        FROM
+        yjxt_damage_transfer_person_info p
+        WHERE
+        p.is_deleted = 0
+        <if test="dto.warnId!=null">
+            and p.warn_id =  #{dto.warnId}
+        </if>
+        ORDER BY
+        p.person_id
+    </select>
+
+
+    <select id="transferPersonCount" resultType="java.lang.Long">
+        SELECT
+        count(n.person_id)
+        FROM
+        yjxt_damage_transfer_person_info n
+        WHERE
+        n.is_deleted = 0
+        <if test="dto.warnId!=null">
+            n.warn_id = #{dto.warnId}
+        </if>
+    </select>
+
+
+
 </mapper>

src/main/java/org/springblade/modules/yjxt/business/transfer/service/IDamageTransferPersonService.java

@@ -6,8 +6,15 @@
  */
 package org.springblade.modules.yjxt.business.transfer.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.yjxt.business.resident.dto.DangerAreaResidentInfoDTO;
+import org.springblade.modules.yjxt.business.resident.vo.DangerAreaResidentInfoVO;
+import org.springblade.modules.yjxt.business.transfer.dto.DamageTransferPersonInfoDTO;
 import org.springblade.modules.yjxt.business.transfer.entity.DamageTransferPersonInfoEntity;
+import org.springblade.modules.yjxt.business.transfer.vo.DamageTransferPersonInfoVO;
+
+import java.util.List;
 
 /***
  * Date:2023/11/10
@@ -18,4 +25,9 @@ import org.springblade.modules.yjxt.business.transfer.entity.DamageTransferPerso
  * Remark：认为有必要的其他信息
  */
 public interface IDamageTransferPersonService extends BaseService<DamageTransferPersonInfoEntity> {
+
+    IPage<DamageTransferPersonInfoVO> selectPage(IPage page, DamageTransferPersonInfoDTO dto);
+
+    long transferPersonCount(DamageTransferPersonInfoDTO dto);
+
 }

src/main/java/org/springblade/modules/yjxt/business/transfer/service/impl/DamageTransferPersonServiceImpl.java

@@ -6,10 +6,13 @@
  */
 package org.springblade.modules.yjxt.business.transfer.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.yjxt.business.transfer.dto.DamageTransferPersonInfoDTO;
 import org.springblade.modules.yjxt.business.transfer.entity.DamageTransferPersonInfoEntity;
 import org.springblade.modules.yjxt.business.transfer.mapper.DamageTransferPersonInfoMapper;
 import org.springblade.modules.yjxt.business.transfer.service.IDamageTransferPersonService;
+import org.springblade.modules.yjxt.business.transfer.vo.DamageTransferPersonInfoVO;
 import org.springframework.stereotype.Service;
 
 /***
@@ -22,4 +25,13 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class DamageTransferPersonServiceImpl extends BaseServiceImpl<DamageTransferPersonInfoMapper, DamageTransferPersonInfoEntity> implements IDamageTransferPersonService {
+    @Override
+    public IPage<DamageTransferPersonInfoVO> selectPage(IPage page, DamageTransferPersonInfoDTO dto) {
+        return null;
+    }
+
+    @Override
+    public long transferPersonCount(DamageTransferPersonInfoDTO dto) {
+        return baseMapper.transferPersonCount(dto);
+    }
 }

src/main/java/org/springblade/share/DataShareController.java

@@ -20,16 +20,19 @@ import org.springblade.constant.BusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.business.check.order.dto.CheckOrderInfoDTO;
-import org.springblade.modules.business.check.process.vo.OrderProcessInfoVO;
-import org.springblade.modules.business.check.process.wrapper.RtuOrderProcessWrapper;
+import org.springblade.etl.entity.EtlWarningInfoEntity;
+import org.springblade.etl.service.IEtlWarningService;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IUserService;
-import org.springblade.modules.yjxt.business.check.dto.DanagerAreaCheckInfoDTO;
-import org.springblade.modules.yjxt.business.check.entity.DanagerAreaCheckInfoEntity;
-import org.springblade.modules.yjxt.business.check.service.IDanagerAreaCheckService;
+import org.springblade.modules.yjxt.business.check.dto.DangerAreaCheckInfoDTO;
+import org.springblade.modules.yjxt.business.check.entity.DangerAreaCheckInfoEntity;
+import org.springblade.modules.yjxt.business.check.service.IDangerAreaCheckService;
+import org.springblade.modules.yjxt.business.resident.dto.DangerAreaResidentInfoDTO;
+import org.springblade.modules.yjxt.business.resident.service.IDangerAreaResidentService;
 import org.springblade.modules.yjxt.business.transfer.dto.DamageTransferPersonInfoDTO;
+import org.springblade.modules.yjxt.business.transfer.entity.DamageTransferPersonInfoEntity;
 import org.springblade.modules.yjxt.business.transfer.service.IDamageTransferPersonService;
+import org.springblade.modules.yjxt.business.transfer.vo.DamageTransferPersonInfoVO;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -51,8 +54,11 @@ import java.util.*;
 public class DataShareController extends BladeController {
 
     private final IUserService userService;
-    private final IDanagerAreaCheckService danagerAreaCheckService;
+    private final IDangerAreaCheckService danagerAreaCheckService;
     private final IDamageTransferPersonService damageTransferPersonService;
+    private final IDangerAreaResidentService dangerAreaResidentService;
+
+    private final IEtlWarningService warningService;
 
     /**
      * 巡查巡检列表查询，不分页
@@ -63,17 +69,17 @@ public class DataShareController extends BladeController {
     })
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "不分页", notes = "")
-    public R<List<JSONObject>> yjCheckList(DanagerAreaCheckInfoDTO dto) {
+    public R<List<JSONObject>> yjCheckList(DangerAreaCheckInfoDTO dto) {
         if (Func.isNull(dto.getWarnId())) {
             return R.fail("参数错误");
         }
-        LambdaQueryWrapper<DanagerAreaCheckInfoEntity> wrapper = Wrappers.<DanagerAreaCheckInfoEntity>query().lambda();
-        wrapper.eq(DanagerAreaCheckInfoEntity::getIsDeleted, 0);
-        wrapper.eq(DanagerAreaCheckInfoEntity::getWarnId, dto.getWarnId());
-        wrapper.orderByAsc(DanagerAreaCheckInfoEntity::getCreateTime);
-        List<DanagerAreaCheckInfoEntity> list = danagerAreaCheckService.list(wrapper);
+        LambdaQueryWrapper<DangerAreaCheckInfoEntity> wrapper = Wrappers.<DangerAreaCheckInfoEntity>query().lambda();
+        wrapper.eq(DangerAreaCheckInfoEntity::getIsDeleted, 0);
+        wrapper.eq(DangerAreaCheckInfoEntity::getWarnId, dto.getWarnId());
+        wrapper.orderByAsc(DangerAreaCheckInfoEntity::getCreateTime);
+        List<DangerAreaCheckInfoEntity> list = danagerAreaCheckService.list(wrapper);
         List<JSONObject> datas = new ArrayList<>(list.size());
-        for (DanagerAreaCheckInfoEntity entity : list) {
+        for (DangerAreaCheckInfoEntity entity : list) {
             JSONObject d = new JSONObject();
             d.put("warnId", entity.getWarnId());
             User user = userService.getById(entity.getCreateUser());
@@ -126,49 +132,50 @@ public class DataShareController extends BladeController {
         if (Func.isNull(dto.getWarnId())) {
             return R.fail("参数错误");
         }
-        LambdaQueryWrapper<DanagerAreaCheckInfoEntity> wrapper = Wrappers.<DanagerAreaCheckInfoEntity>query().lambda();
-        wrapper.eq(DanagerAreaCheckInfoEntity::getIsDeleted, 0);
-        wrapper.eq(DanagerAreaCheckInfoEntity::getWarnId, dto.getWarnId());
-        wrapper.orderByAsc(DanagerAreaCheckInfoEntity::getCreateTime);
-        List<DanagerAreaCheckInfoEntity> list = danagerAreaCheckService.list(wrapper);
-        List<JSONObject> datas = new ArrayList<>(list.size());
-        for (DanagerAreaCheckInfoEntity entity : list) {
-            JSONObject d = new JSONObject();
-            d.put("warnId", entity.getWarnId());
-            User user = userService.getById(entity.getCreateUser());
-            if (!Func.isNull(user)) {
-                d.put("checkPerson", user.getRealName());
-            } else {
-                d.put("checkPerson", "");
-            }
-            d.put("checkTime", entity.getCreateTime().getTime());
-            if (!Func.isNull(entity.getLongitude())) {
-                d.put("lng", entity.getLongitude());
-            }
-            if (!Func.isNull(entity.getLatitude())) {
-                d.put("lat", entity.getLatitude());
-            }
-            if (!Func.isNull(entity.getAddress())) {
-                d.put("location", entity.getAddress());
-            }
-            d.put("isFlood", entity.getIsFlood());
-            d.put("isDamage", entity.getIsDamage());
-            if (!Func.isNull(entity.getRemark())) {
-                d.put("remark", entity.getRemark());
-            }
-            JSONArray photos = new JSONArray();
-            if (!Func.isNull(entity.getCheckPhotos())) {
-                String photo = entity.getCheckPhotos();
-                String[] photoArr = photo.trim().split(",");
-                for (String url : photoArr) {
-                    JSONObject p = new JSONObject();
-                    p.put("url", BusinessConstant.OSS_BASE_PATH + url);
-                    photos.add(p);
-                }
+
+        LambdaQueryWrapper<EtlWarningInfoEntity> wrapper = Wrappers.<EtlWarningInfoEntity>query().lambda();
+        wrapper.eq(EtlWarningInfoEntity::getIsDeleted, 0);
+        wrapper.eq(EtlWarningInfoEntity::getRelWarnId, dto.getWarnId());
+
+        EtlWarningInfoEntity warningInfoEntity = warningService.getOne(wrapper);
+
+        if (Func.isNull(warningInfoEntity)){
+            return R.fail("预警数据空");
+        }
+
+        List<JSONObject> datas = new ArrayList<>(1);
+
+        JSONObject vo = new JSONObject();
+        DangerAreaResidentInfoDTO residentInfoDTO=new DangerAreaResidentInfoDTO();
+        residentInfoDTO.setAdCode(warningInfoEntity.getUserAdcd());
+        long totalTransferPerson =dangerAreaResidentService.residentCount(residentInfoDTO);
+
+        DamageTransferPersonInfoDTO transferPersonInfoDTO = new DamageTransferPersonInfoDTO();
+        transferPersonInfoDTO.setWarnId(dto.getWarnId());
+        long safetyTransferPerson = damageTransferPersonService.transferPersonCount(transferPersonInfoDTO);
+
+        vo.put("totalTransferPerson",totalTransferPerson);
+        vo.put("safetyTransferPerson",safetyTransferPerson);
+
+        JSONArray personList = new JSONArray();
+
+        LambdaQueryWrapper<DamageTransferPersonInfoEntity> wrapper2 = Wrappers.<DamageTransferPersonInfoEntity>query().lambda();
+        wrapper2.eq(DamageTransferPersonInfoEntity::getIsDeleted, 0);
+        wrapper2.eq(DamageTransferPersonInfoEntity::getWarnId, dto.getWarnId());
+        List<DamageTransferPersonInfoEntity> transferPersonInfoEntityList = damageTransferPersonService.list(wrapper2);
+        if (!Func.isNull(transferPersonInfoEntityList)){
+            for (DamageTransferPersonInfoEntity transferPersonInfoEntity:transferPersonInfoEntityList){
+                JSONObject person = new JSONObject();
+                person.put("personName",transferPersonInfoEntity.getPersonName());
+                person.put("recordTime",transferPersonInfoEntity.getCreateTime().getTime());
+                personList.add(person);
             }
-            d.put("photos", photos);
-            datas.add(d);
         }
+
+        vo.put("transferPersonList",personList);
+
+        datas.add(vo);
+
         return R.data(datas);
     }
 }