内蒙山洪运维系统-应急系统功能模块开发

src/main/java/org/springblade/config/MultipartConfig.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/8
  */
 package org.springblade.config;

src/main/java/org/springblade/etl/EtlRegionDataTask.java

@@ -8,10 +8,14 @@ package org.springblade.etl;
 
 
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.etl.entity.EtlAdCdEntity;
 import org.springblade.etl.service.IEtlAdCdService;
-import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
+import org.springblade.modules.baseinfo.region.entity.BaseRegionInfoEntity;
+import org.springblade.modules.baseinfo.region.service.IBaseRegionInfoService;
+import org.springblade.modules.baseinfo.region.service.IRegionInfoService;
 import org.springframework.data.redis.core.RedisTemplate;
 
+import java.util.List;
 import java.util.concurrent.Callable;
 
 /***
@@ -25,24 +29,56 @@ import java.util.concurrent.Callable;
 @Slf4j
 public class EtlRegionDataTask implements Callable<Integer> {
 
-	private RedisTemplate redisTemplate;
+
 	private IEtlAdCdService etlAdCdService;
-	private IBaseInfoRegionService regionService;
+	private IBaseRegionInfoService baseRegionInfoService;
 
 
-	EtlRegionDataTask(RedisTemplate redisTemplate, IEtlAdCdService etlAdCdService, IBaseInfoRegionService regionService) {
-		this.redisTemplate = redisTemplate;
+	public EtlRegionDataTask(IEtlAdCdService etlAdCdService, IBaseRegionInfoService baseRegionInfoService) {
 		this.etlAdCdService = etlAdCdService;
-		this.regionService = regionService;
+		this.baseRegionInfoService = baseRegionInfoService;
+	}
+
+	private void crateChildRegion(BaseRegionInfoEntity root,String ancestors){
+		EtlAdCdEntity etlAdCdEntity = new EtlAdCdEntity();
+		etlAdCdEntity.setSuperioradcd(root.getAdcd());
+		List<EtlAdCdEntity> list =etlAdCdService.selectList(etlAdCdEntity);
+		for (EtlAdCdEntity entity:list){
+			BaseRegionInfoEntity baseRegionInfoEntity= new BaseRegionInfoEntity();
+			baseRegionInfoEntity.setAdcd(entity.getAdcd());
+			baseRegionInfoEntity.setAdnm(entity.getAdnm());
+			baseRegionInfoEntity.setParentCode(root.getAdcd());
+			baseRegionInfoEntity.setAncestors(ancestors+","+root.getAdcd());
+			baseRegionInfoEntity.setAddType(entity.getAddtype());
+			baseRegionInfoEntity.setLgtd(entity.getLgtd());
+			baseRegionInfoEntity.setLttd(entity.getLttd());
+			baseRegionInfoService.save(baseRegionInfoEntity);
+			crateChildRegion(baseRegionInfoEntity,baseRegionInfoEntity.getAncestors());
+		}
 	}
 
+
 	@Override
 	public Integer call() {
 		try {
 			log.info("行政区划数据抽取开始**************");
+			EtlAdCdEntity etlAdCdEntity = new EtlAdCdEntity();
+			etlAdCdEntity.setAdcd("150000000000000");
+			List<EtlAdCdEntity> list =etlAdCdService.selectList(etlAdCdEntity);
+			for (EtlAdCdEntity entity:list){
+				BaseRegionInfoEntity baseRegionInfoEntity= new BaseRegionInfoEntity();
+				baseRegionInfoEntity.setAdcd(entity.getAdcd());
+				baseRegionInfoEntity.setAdnm(entity.getAdnm());
+				baseRegionInfoEntity.setParentCode("00");
+				baseRegionInfoEntity.setAncestors("00");
+				baseRegionInfoEntity.setAddType(entity.getAddtype());
+				baseRegionInfoEntity.setLgtd(entity.getLgtd());
+				baseRegionInfoEntity.setLttd(entity.getLttd());
+				baseRegionInfoService.save(baseRegionInfoEntity);
+				crateChildRegion(baseRegionInfoEntity,baseRegionInfoEntity.getAncestors());
+			}
 
-
-
+			log.info("行政区划数据抽取完成**************");
 		} catch (Exception e) {
 			log.error("实时数据统计任务异常 {}", e.getMessage());
 		}

src/main/java/org/springblade/etl/EtlRtuDataTask.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/2/21
  */
 package org.springblade.etl;

src/main/java/org/springblade/etl/controller/EtlTestController.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.etl.controller;

src/main/java/org/springblade/etl/dto/EtlAdCdDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.dto;

src/main/java/org/springblade/etl/dto/EtlGroundDataDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.dto;

src/main/java/org/springblade/etl/dto/EtlMvAttStBaseDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.dto;

src/main/java/org/springblade/etl/dto/EtlRainDataDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.dto;

src/main/java/org/springblade/etl/dto/EtlRiverDataDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.dto;

src/main/java/org/springblade/etl/dto/EtlRsvrDataDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.dto;

src/main/java/org/springblade/etl/dto/EtlWarningInfoDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.dto;

src/main/java/org/springblade/etl/entity/EtlAdCdEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.entity;

src/main/java/org/springblade/etl/entity/EtlGroundDataEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.entity;

src/main/java/org/springblade/etl/entity/EtlMvAttStBaseEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.entity;

src/main/java/org/springblade/etl/entity/EtlRainDataEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.entity;

src/main/java/org/springblade/etl/entity/EtlRiverDataEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.entity;

src/main/java/org/springblade/etl/entity/EtlRsvrDataEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.entity;

src/main/java/org/springblade/etl/entity/EtlTaskInfoEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/4/20
  */
 package org.springblade.etl.entity;

src/main/java/org/springblade/etl/entity/EtlWarningInfoEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.entity;

src/main/java/org/springblade/etl/mapper/EtlAdCdMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/24
  */
 package org.springblade.etl.mapper;

src/main/java/org/springblade/etl/mapper/EtlAdCdMapper.xml

@@ -19,14 +19,11 @@
         FROM
         etl_ad_cd_b d
         WHERE 1=1
-
         <if test="entity.adcd!=null">
             and d.ADCD = #{entity.adcd}
         </if>
-
         <if test="entity.superioradcd!=null">
             and d.SUPERIORADCD = #{entity.superioradcd}
         </if>
-
     </select>
 </mapper>

src/main/java/org/springblade/etl/mapper/EtlGroundDataMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/24
  */
 package org.springblade.etl.mapper;

src/main/java/org/springblade/etl/mapper/EtlMvAttStBaseMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/24
  */
 package org.springblade.etl.mapper;

src/main/java/org/springblade/etl/mapper/EtlRainDataMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/24
  */
 package org.springblade.etl.mapper;

src/main/java/org/springblade/etl/mapper/EtlRiverDataMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/24
  */
 package org.springblade.etl.mapper;

src/main/java/org/springblade/etl/mapper/EtlRsvrDataMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/24
  */
 package org.springblade.etl.mapper;

src/main/java/org/springblade/etl/mapper/EtlTaskInfoMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.etl.mapper;

src/main/java/org/springblade/etl/mapper/EtlWarningInfoMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/24
  */
 package org.springblade.etl.mapper;

src/main/java/org/springblade/etl/service/IEtlAdCdService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service;

src/main/java/org/springblade/etl/service/IEtlGroundDataService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service;

src/main/java/org/springblade/etl/service/IEtlMvAttStBaseService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service;

src/main/java/org/springblade/etl/service/IEtlRainDataService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service;

src/main/java/org/springblade/etl/service/IEtlRiverDataService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service;

src/main/java/org/springblade/etl/service/IEtlRsvrDataService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service;

src/main/java/org/springblade/etl/service/IEtlTaskInfoService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service;

src/main/java/org/springblade/etl/service/IEtlWarningService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service;

src/main/java/org/springblade/etl/service/impl/EtlAdCdServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service.impl;

src/main/java/org/springblade/etl/service/impl/EtlGroundDataServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service.impl;

src/main/java/org/springblade/etl/service/impl/EtlMvAttStBaseServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service.impl;

src/main/java/org/springblade/etl/service/impl/EtlRainDataServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service.impl;

src/main/java/org/springblade/etl/service/impl/EtlRiverDataServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service.impl;

src/main/java/org/springblade/etl/service/impl/EtlRsvrDataServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service.impl;

src/main/java/org/springblade/etl/service/impl/EtlTaskInfoServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service.impl;

src/main/java/org/springblade/etl/service/impl/EtlWarningServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.etl.service.impl;

src/main/java/org/springblade/jobtask/ReportCountProcessor.java

@@ -22,7 +22,7 @@ import org.springblade.modules.baseinfo.dict.service.IBaseInfoDictService;
 import org.springblade.modules.baseinfo.org.entity.DeptRegionEntity;
 import org.springblade.modules.baseinfo.org.service.IDeptRegionService;
 import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
-import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
+import org.springblade.modules.baseinfo.region.service.IRegionInfoService;
 import org.springblade.modules.baseinfo.rtu.dto.RtuInfoDTO;
 import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
 import org.springblade.modules.business.check.order.dto.CheckOrderInfoDTO;
@@ -105,7 +105,7 @@ public class ReportCountProcessor {
 	private IDeptRegionService deptRegionService;
 
 	@Resource
-	private IBaseInfoRegionService regionService;
+	private IRegionInfoService regionService;
 
 	@Resource
 	private IDeptService deptService;

src/main/java/org/springblade/modules/baseinfo/dict/controller/BaseInfoDictController.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.dict.controller;

src/main/java/org/springblade/modules/baseinfo/dict/mapper/DictInfoMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.dict.mapper;

src/main/java/org/springblade/modules/baseinfo/dict/service/IBaseInfoDictService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.dict.service;

src/main/java/org/springblade/modules/baseinfo/dict/service/impl/BaseInfoDictServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.dict.service.impl;

src/main/java/org/springblade/modules/baseinfo/org/controller/BaseInfoOrgController.java

@@ -26,7 +26,7 @@ import org.springblade.modules.baseinfo.org.entity.DeptRegionEntity;
 import org.springblade.modules.baseinfo.org.service.IDeptRegionService;
 import org.springblade.modules.baseinfo.org.vo.OrgInfoVO;
 import org.springblade.modules.baseinfo.org.wrapper.OrgInfoWrapper;
-import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
+import org.springblade.modules.baseinfo.region.service.IRegionInfoService;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.service.IDeptService;
 import org.springframework.transaction.annotation.Transactional;
@@ -51,7 +51,7 @@ import java.util.List;
 public class BaseInfoOrgController extends BladeController {
 	private final IDeptService deptService;
 	private final IDeptRegionService deptRegionService;
-	private final IBaseInfoRegionService regionService;
+	private final IRegionInfoService regionService;
 
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 1)

src/main/java/org/springblade/modules/baseinfo/org/wrapper/OrgInfoWrapper.java

@@ -16,7 +16,7 @@ import org.springblade.modules.baseinfo.org.entity.DeptRegionEntity;
 import org.springblade.modules.baseinfo.org.service.IDeptRegionService;
 import org.springblade.modules.baseinfo.org.vo.OrgInfoVO;
 import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
-import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
+import org.springblade.modules.baseinfo.region.service.IRegionInfoService;
 import org.springblade.modules.system.entity.Dept;
 
 import java.util.Objects;
@@ -35,11 +35,11 @@ public class OrgInfoWrapper extends BaseEntityWrapper<Dept, OrgInfoVO> {
 		return new OrgInfoWrapper();
 	}
 
-	private static IBaseInfoRegionService baseInfoRegionService;
+	private static IRegionInfoService baseInfoRegionService;
 
-	private static IBaseInfoRegionService getBaseInfoRegionService() {
+	private static IRegionInfoService getBaseInfoRegionService() {
 		if (baseInfoRegionService == null) {
-			baseInfoRegionService = SpringUtil.getBean(IBaseInfoRegionService.class);
+			baseInfoRegionService = SpringUtil.getBean(IRegionInfoService.class);
 		}
 		return baseInfoRegionService;
 	}

src/main/java/org/springblade/modules/baseinfo/project/controller/ProjectBaseInfoController.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.project.controller;

src/main/java/org/springblade/modules/baseinfo/project/entity/ProjectInfoEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.project.entity;

src/main/java/org/springblade/modules/baseinfo/project/entity/ProjectTreeNodeEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/28
  */
 package org.springblade.modules.baseinfo.project.entity;

src/main/java/org/springblade/modules/baseinfo/project/entity/ProjectWarningSettingEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/23
  */
 package org.springblade.modules.baseinfo.project.entity;

src/main/java/org/springblade/modules/baseinfo/project/mapper/ProjectInfoMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.project.mapper;

src/main/java/org/springblade/modules/baseinfo/project/mapper/ProjectWarningSettingMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/23
  */
 package org.springblade.modules.baseinfo.project.mapper;

src/main/java/org/springblade/modules/baseinfo/project/service/IProjectBaseInfoService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.project.service;

src/main/java/org/springblade/modules/baseinfo/project/service/IProjectWarningSettingService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/23
  */
 package org.springblade.modules.baseinfo.project.service;

src/main/java/org/springblade/modules/baseinfo/project/service/impl/ProjectBaseInfoServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.project.service.impl;

src/main/java/org/springblade/modules/baseinfo/project/service/impl/ProjectWarningSettingServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/23
  */
 package org.springblade.modules.baseinfo.project.service.impl;

src/main/java/org/springblade/modules/baseinfo/project/vo/ProjectInfoVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.project.vo;

src/main/java/org/springblade/modules/baseinfo/region/controller/BaseInfoRegionController.java → src/main/java/org/springblade/modules/baseinfo/region/controller/RegionInfoController.java

@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.mysql.cj.log.Log;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -23,15 +22,19 @@ 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.etl.EtlRegionDataTask;
 import org.springblade.etl.entity.EtlAdCdEntity;
 import org.springblade.etl.service.IEtlAdCdService;
+import org.springblade.jobtask.ReportCountProcessor;
+import org.springblade.jobtask.TaskManager;
 import org.springblade.modules.baseinfo.org.entity.DeptRegionEntity;
 import org.springblade.modules.baseinfo.org.service.IDeptRegionService;
 import org.springblade.modules.baseinfo.region.dto.RegionInfoDTO;
+import org.springblade.modules.baseinfo.region.entity.BaseRegionInfoEntity;
 import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
 import org.springblade.modules.baseinfo.region.entity.RegionTreeNodeEntity;
-import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
-import org.springblade.modules.baseinfo.region.service.IOrgRegionInfoService;
+import org.springblade.modules.baseinfo.region.service.IBaseRegionInfoService;
+import org.springblade.modules.baseinfo.region.service.IRegionInfoService;
 import org.springblade.modules.baseinfo.region.vo.RegionInfoVO;
 import org.springblade.modules.baseinfo.region.wrapper.RegionInfoWrapper;
 import org.springblade.modules.system.entity.Dept;
@@ -44,6 +47,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.FutureTask;
 
 
 /***
@@ -59,11 +63,15 @@ import java.util.List;
 @RequestMapping("galaxy-business/baseinfo/region")
 @RequiredArgsConstructor
 @Api(value = "行政区划管理", tags = "行政区划管理")
-public class BaseInfoRegionController extends BladeController {
-	private final IBaseInfoRegionService baseInfoRegionService;
+public class RegionInfoController extends BladeController {
+	private final IRegionInfoService baseInfoRegionService;
 	private final IDeptService deptService;
 	private final IEtlAdCdService etlAdCdService;
 	private final IDeptRegionService deptRegionService;
+	private final IBaseRegionInfoService baseRegionInfoService;
+
+	@Resource
+	private TaskManager taskManager;
 
 	@Value("${region-ver-config.ver}")
 	private String regionVer;
@@ -515,6 +523,51 @@ public class BaseInfoRegionController extends BladeController {
 		return R.status(true);
 	}
 
+	@GetMapping("/create/region")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "", notes = "")
+	public R createRegion() {
+		EtlRegionDataTask  task = new EtlRegionDataTask(etlAdCdService,baseRegionInfoService);
+		FutureTask<Integer> futureTask = new FutureTask<>(task);
+		taskManager.submitTask(futureTask);
+
+//		EtlAdCdEntity etlAdCdEntity = new EtlAdCdEntity();
+//		etlAdCdEntity.setAdcd("150000000000000");
+//		List<EtlAdCdEntity> list =etlAdCdService.selectList(etlAdCdEntity);
+//		for (EtlAdCdEntity entity:list){
+//			BaseRegionInfoEntity baseRegionInfoEntity= new BaseRegionInfoEntity();
+//			baseRegionInfoEntity.setAdcd(entity.getAdcd());
+//			baseRegionInfoEntity.setAdnm(entity.getAdnm());
+//			baseRegionInfoEntity.setParentCode("00");
+//			baseRegionInfoEntity.setAncestors("00");
+//			baseRegionInfoEntity.setAddType(entity.getAddtype());
+//			baseRegionInfoEntity.setLgtd(entity.getLgtd());
+//			baseRegionInfoEntity.setLttd(entity.getLttd());
+//			baseRegionInfoService.save(baseRegionInfoEntity);
+//			crateChildRegion(baseRegionInfoEntity,baseRegionInfoEntity.getAncestors());
+//		}
+		return R.success("ok");
+	}
+
+	private void crateChildRegion(BaseRegionInfoEntity root,String ancestors){
+		EtlAdCdEntity etlAdCdEntity = new EtlAdCdEntity();
+		etlAdCdEntity.setSuperioradcd(root.getAdcd());
+		List<EtlAdCdEntity> list =etlAdCdService.selectList(etlAdCdEntity);
+		for (EtlAdCdEntity entity:list){
+			BaseRegionInfoEntity baseRegionInfoEntity= new BaseRegionInfoEntity();
+			baseRegionInfoEntity.setAdcd(entity.getAdcd());
+			baseRegionInfoEntity.setAdnm(entity.getAdnm());
+			baseRegionInfoEntity.setParentCode(root.getAdcd());
+			baseRegionInfoEntity.setAncestors(ancestors+","+root.getAdcd());
+			baseRegionInfoEntity.setAddType(entity.getAddtype());
+			baseRegionInfoEntity.setLgtd(entity.getLgtd());
+			baseRegionInfoEntity.setLttd(entity.getLttd());
+			baseRegionInfoService.save(baseRegionInfoEntity);
+			crateChildRegion(baseRegionInfoEntity,baseRegionInfoEntity.getAncestors());
+		}
+	}
+
+
 	private boolean importAdcd(int level, int currLevel, String parentCode, String ancestors) {
 		if (currLevel > level) {
 			return true;

src/main/java/org/springblade/modules/baseinfo/region/dto/RegionInfoDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.region.dto;

src/main/java/org/springblade/modules/baseinfo/region/entity/OrgRegionInfoEntity.java → src/main/java/org/springblade/modules/baseinfo/region/entity/BaseRegionInfoEntity.java

@@ -14,14 +14,15 @@ import org.springblade.core.mp.base.BaseEntity;
 
 
 /**
- * 运维单位行政机构信息
+ * 基础行政区划信息
+ * 包括所有行政区，到村
  *
  * @author swp
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("base_data_custom_region")
-public class OrgRegionInfoEntity extends BaseEntity {
+@TableName("base_data_ad_cd")
+public class BaseRegionInfoEntity extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
@@ -31,12 +32,6 @@ public class OrgRegionInfoEntity extends BaseEntity {
 	@ApiModelProperty("租户ID")
 	private String tenantId;
 
-	/**
-	 * 部门ID
-	 */
-	@ApiModelProperty(value = "部门ID")
-	private Long deptId;
-
 	/**
 	 * 行政区划代码
 	 */
@@ -66,4 +61,16 @@ public class OrgRegionInfoEntity extends BaseEntity {
 	 */
 	@ApiModelProperty(value = "政区类型")
 	private String addType;
+
+	/**
+	 * 经度
+	 */
+	@ApiModelProperty(value = "经度")
+	private String lgtd;
+
+	/**
+	 * 纬度
+	 */
+	@ApiModelProperty(value = "纬度")
+	private String lttd;
 }

src/main/java/org/springblade/modules/baseinfo/region/entity/RegionTreeNodeEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/6
  */
 package org.springblade.modules.baseinfo.region.entity;

src/main/java/org/springblade/modules/baseinfo/region/mapper/OrgRegionInfoMapper.java → src/main/java/org/springblade/modules/baseinfo/region/mapper/BaseRegionInfoMapper.java

@@ -7,7 +7,7 @@
 package org.springblade.modules.baseinfo.region.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.baseinfo.region.entity.OrgRegionInfoEntity;
+import org.springblade.modules.baseinfo.region.entity.BaseRegionInfoEntity;
 
 /***
  * Date:2022/8/22
@@ -17,6 +17,6 @@ import org.springblade.modules.baseinfo.region.entity.OrgRegionInfoEntity;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface OrgRegionInfoMapper extends BaseMapper<OrgRegionInfoEntity> {
+public interface BaseRegionInfoMapper extends BaseMapper<BaseRegionInfoEntity> {
 
 }

src/main/java/org/springblade/modules/baseinfo/region/mapper/OrgRegionInfoMapper.xml → src/main/java/org/springblade/modules/baseinfo/region/mapper/BaseRegionInfoMapper.xml

@@ -1,14 +1,15 @@
 <?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.baseinfo.region.mapper.OrgRegionInfoMapper">
+<mapper namespace="org.springblade.modules.baseinfo.region.mapper.BaseRegionInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="orgRegionResultMap" type="org.springblade.modules.baseinfo.region.entity.OrgRegionInfoEntity">
-        <result column="dept_id" property="deptId"/>
+    <resultMap id="orgRegionResultMap" type="org.springblade.modules.baseinfo.region.entity.BaseRegionInfoEntity">
         <result column="adcd" property="adcd"/>
         <result column="adnm" property="adnm"/>
         <result column="parent_code" property="parentCode"/>
         <result column="ancestors" property="ancestors"/>
         <result column="add_type" property="addType"/>
+        <result column="lgtd" property="lgtd"/>
+        <result column="lttd" property="lttd"/>
     </resultMap>
 </mapper>

src/main/java/org/springblade/modules/baseinfo/region/mapper/RegionInfoMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.region.mapper;

src/main/java/org/springblade/modules/baseinfo/region/service/IOrgRegionInfoService.java → src/main/java/org/springblade/modules/baseinfo/region/service/IBaseRegionInfoService.java

@@ -7,7 +7,7 @@
 package org.springblade.modules.baseinfo.region.service;
 
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.baseinfo.region.entity.OrgRegionInfoEntity;
+import org.springblade.modules.baseinfo.region.entity.BaseRegionInfoEntity;
 
 /***
  * Date:2022/8/22
@@ -17,10 +17,6 @@ import org.springblade.modules.baseinfo.region.entity.OrgRegionInfoEntity;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface IOrgRegionInfoService extends BaseService<OrgRegionInfoEntity> {
-	/**
-	 * 更新自定义行政机构信息
-	 */
-	boolean createCustomRegion(Long deptId,String adCode);
-	boolean removeCustomRegion(Long deptId);
+public interface IBaseRegionInfoService extends BaseService<BaseRegionInfoEntity> {
+
 }

src/main/java/org/springblade/modules/baseinfo/region/service/IBaseInfoRegionService.java → src/main/java/org/springblade/modules/baseinfo/region/service/IRegionInfoService.java

@@ -12,7 +12,6 @@ import org.springblade.modules.baseinfo.region.dto.RegionInfoDTO;
 import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
 import org.springblade.modules.baseinfo.region.entity.RegionTreeNodeEntity;
 
-import java.util.List;
 
 
 /***
@@ -23,7 +22,7 @@ import java.util.List;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface IBaseInfoRegionService extends BaseService<RegionInfoEntity> {
+public interface IRegionInfoService extends BaseService<RegionInfoEntity> {
 
 	/**
 	 * 排除行政区划

src/main/java/org/springblade/modules/baseinfo/region/service/impl/BaseRegionInfoServiceImpl.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright 2019 DH
+ * All right reserved.
+ * 项目名称: 运维系统
+ * 创建日期:2022/8/22
+ */
+package org.springblade.modules.baseinfo.region.service.impl;
+
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.baseinfo.region.entity.BaseRegionInfoEntity;
+import org.springblade.modules.baseinfo.region.mapper.BaseRegionInfoMapper;
+import org.springblade.modules.baseinfo.region.service.IBaseRegionInfoService;
+import org.springframework.stereotype.Service;
+
+/***
+ * Date:2022/8/22
+ * Title:文件所属模块（必须填写）
+ * Description：对本文件的详细描述，原则上不能少于30字
+ * @author dylan
+ * @version 1.0
+ * Remark：认为有必要的其他信息
+ */
+@Service
+public class BaseRegionInfoServiceImpl extends BaseServiceImpl<BaseRegionInfoMapper, BaseRegionInfoEntity> implements IBaseRegionInfoService {
+
+
+}

src/main/java/org/springblade/modules/baseinfo/region/service/impl/OrgRegionInfoServiceImpl.java

@@ -1,37 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 运维系统
- * 创建日期:2022/8/22
- */
-package org.springblade.modules.baseinfo.region.service.impl;
-
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.baseinfo.region.entity.OrgRegionInfoEntity;
-import org.springblade.modules.baseinfo.region.mapper.OrgRegionInfoMapper;
-import org.springblade.modules.baseinfo.region.service.IOrgRegionInfoService;
-import org.springframework.stereotype.Service;
-
-/***
- * Date:2022/8/22
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-public class OrgRegionInfoServiceImpl extends BaseServiceImpl<OrgRegionInfoMapper, OrgRegionInfoEntity> implements IOrgRegionInfoService {
-
-
-	@Override
-	public boolean createCustomRegion(Long deptId,String adCode) {
-
-		return false;
-	}
-
-	@Override
-	public boolean removeCustomRegion(Long deptId) {
-		return false;
-	}
-}

src/main/java/org/springblade/modules/baseinfo/region/service/impl/BaseInfoRegionServiceImpl.java → src/main/java/org/springblade/modules/baseinfo/region/service/impl/RegionInfoServiceImpl.java

@@ -17,7 +17,7 @@ import org.springblade.modules.baseinfo.region.dto.RegionInfoDTO;
 import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
 import org.springblade.modules.baseinfo.region.entity.RegionTreeNodeEntity;
 import org.springblade.modules.baseinfo.region.mapper.RegionInfoMapper;
-import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
+import org.springblade.modules.baseinfo.region.service.IRegionInfoService;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
@@ -35,7 +35,7 @@ import java.util.List;
  * Remark：认为有必要的其他信息
  */
 @Service
-public class BaseInfoRegionServiceImpl extends BaseServiceImpl<RegionInfoMapper, RegionInfoEntity> implements IBaseInfoRegionService {
+public class RegionInfoServiceImpl extends BaseServiceImpl<RegionInfoMapper, RegionInfoEntity> implements IRegionInfoService {
 
 	@Resource
 	private RedisTemplate redisTemplate;

src/main/java/org/springblade/modules/baseinfo/region/vo/RegionInfoVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.region.vo;

src/main/java/org/springblade/modules/baseinfo/region/wrapper/RegionInfoNodeWrapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.region.wrapper;
@@ -13,7 +13,7 @@ import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
 import org.springblade.modules.baseinfo.region.entity.RegionTreeNodeEntity;
-import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
+import org.springblade.modules.baseinfo.region.service.IRegionInfoService;
 
 /***
  * Date:2022/8/22
@@ -25,11 +25,11 @@ import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
  */
 public class RegionInfoNodeWrapper extends BaseEntityWrapper<RegionInfoEntity, RegionTreeNodeEntity> {
 
-	private static IBaseInfoRegionService baseInfoRegionService;
+	private static IRegionInfoService baseInfoRegionService;
 
-	private static IBaseInfoRegionService getBaseInfoRegionService() {
+	private static IRegionInfoService getBaseInfoRegionService() {
 		if (baseInfoRegionService == null) {
-			baseInfoRegionService = SpringUtil.getBean(IBaseInfoRegionService.class);
+			baseInfoRegionService = SpringUtil.getBean(IRegionInfoService.class);
 		}
 		return baseInfoRegionService;
 	}

src/main/java/org/springblade/modules/baseinfo/region/wrapper/RegionInfoWrapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.region.wrapper;
@@ -13,7 +13,7 @@ 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.region.service.IRegionInfoService;
 import org.springblade.modules.baseinfo.region.vo.RegionInfoVO;
 
 
@@ -29,11 +29,11 @@ import java.util.Objects;
  */
 public class RegionInfoWrapper extends BaseEntityWrapper<RegionInfoEntity, RegionInfoVO> {
 
-	private static IBaseInfoRegionService baseInfoRegionService;
+	private static IRegionInfoService baseInfoRegionService;
 
-	private static IBaseInfoRegionService getBaseInfoRegionService() {
+	private static IRegionInfoService getBaseInfoRegionService() {
 		if (baseInfoRegionService == null) {
-			baseInfoRegionService = SpringUtil.getBean(IBaseInfoRegionService.class);
+			baseInfoRegionService = SpringUtil.getBean(IRegionInfoService.class);
 		}
 		return baseInfoRegionService;
 	}

src/main/java/org/springblade/modules/baseinfo/rtu/controller/RtuBaseInfoController.java

@@ -27,7 +27,7 @@ import org.springblade.modules.baseinfo.org.entity.DeptRegionEntity;
 import org.springblade.modules.baseinfo.org.service.IDeptRegionService;
 import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
 import org.springblade.modules.baseinfo.region.entity.RegionTreeNodeEntity;
-import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
+import org.springblade.modules.baseinfo.region.service.IRegionInfoService;
 import org.springblade.modules.baseinfo.rtu.dto.RtuInfoDTO;
 import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
 import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
@@ -79,7 +79,7 @@ public class RtuBaseInfoController extends BladeController {
 	private final IRtuDataRsvrService rtuDataRsvrService;
 	private final IDictBizService dictBizService;
 	private final IDeptRegionService deptRegionService;
-	private final IBaseInfoRegionService regionService;
+	private final IRegionInfoService regionService;
 
 
 	/**

src/main/java/org/springblade/modules/baseinfo/rtu/dto/RtuInfoDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/7
  */
 package org.springblade.modules.baseinfo.rtu.dto;

src/main/java/org/springblade/modules/baseinfo/rtu/mapper/RtuInfoMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.rtu.mapper;

src/main/java/org/springblade/modules/baseinfo/rtu/service/IRtuBaseInfoService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.rtu.service;

src/main/java/org/springblade/modules/baseinfo/rtu/service/impl/RtuBaseInfoServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.rtu.service.impl;
@@ -9,21 +9,14 @@ package org.springblade.modules.baseinfo.rtu.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springblade.constant.BusinessConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
 import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
-import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
-import org.springblade.modules.baseinfo.region.service.impl.BaseInfoRegionServiceImpl;
+import org.springblade.modules.baseinfo.region.service.IRegionInfoService;
 import org.springblade.modules.baseinfo.rtu.dto.RtuInfoDTO;
 import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
 import org.springblade.modules.baseinfo.rtu.mapper.RtuInfoMapper;
 import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
 import org.springblade.modules.baseinfo.rtu.vo.RtuInfoVO;
-import org.springblade.modules.baseinfo.rtu.wrapper.RtuInfoWrapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -40,7 +33,7 @@ import java.util.List;
 @Service
 public class RtuBaseInfoServiceImpl extends BaseServiceImpl<RtuInfoMapper, RtuInfoEntity> implements IRtuBaseInfoService {
 	@Resource
-	private IBaseInfoRegionService baseInfoRegionService;
+	private IRegionInfoService baseInfoRegionService;
 
 	@Override
 	public IPage<RtuInfoVO> selectPage(IPage<RtuInfoVO> page, RtuInfoDTO rtuInfoDTO) {

src/main/java/org/springblade/modules/baseinfo/rtu/vo/RtuInfoVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.rtu.vo;

src/main/java/org/springblade/modules/baseinfo/rtu/vo/RtuStatisticsInfoVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/24
  */
 package org.springblade.modules.baseinfo.rtu.vo;

src/main/java/org/springblade/modules/baseinfo/rtu/wrapper/RtuInfoWrapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.rtu.wrapper;
@@ -13,7 +13,7 @@ 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.region.service.IRegionInfoService;
 import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
 import org.springblade.modules.baseinfo.rtu.vo.RtuInfoVO;
 import org.springblade.modules.system.service.IDictBizService;
@@ -42,11 +42,11 @@ public class RtuInfoWrapper extends BaseEntityWrapper<RtuInfoEntity, RtuInfoVO>
 		return dictBizService;
 	}
 
-	private static IBaseInfoRegionService  regionService;
+	private static IRegionInfoService regionService;
 
-	private static IBaseInfoRegionService getRegionService() {
+	private static IRegionInfoService getRegionService() {
 		if (regionService == null) {
-			regionService = SpringUtil.getBean(IBaseInfoRegionService.class);
+			regionService = SpringUtil.getBean(IRegionInfoService.class);
 		}
 		return regionService;
 	}

src/main/java/org/springblade/modules/baseinfo/stbase/entity/MvAttStBaseEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.modules.baseinfo.stbase.entity;

src/main/java/org/springblade/modules/baseinfo/stbase/mapper/MvAttStBaseMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/24
  */
 package org.springblade.modules.baseinfo.stbase.mapper;

src/main/java/org/springblade/modules/baseinfo/stbase/service/IMvAttStBaseService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.modules.baseinfo.stbase.service;

src/main/java/org/springblade/modules/baseinfo/stbase/service/impl/MvAttStBaseServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.modules.baseinfo.stbase.service.impl;

src/main/java/org/springblade/modules/business/check/order/controller/RtuCheckOrderController.java

@@ -28,7 +28,7 @@ import org.springblade.modules.baseinfo.org.entity.DeptRegionEntity;
 import org.springblade.modules.baseinfo.org.service.IDeptRegionService;
 import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
 import org.springblade.modules.baseinfo.region.entity.RegionTreeNodeEntity;
-import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
+import org.springblade.modules.baseinfo.region.service.IRegionInfoService;
 import org.springblade.modules.baseinfo.rtu.dto.RtuInfoDTO;
 import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
 import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
@@ -93,7 +93,7 @@ public class RtuCheckOrderController extends BladeController {
 	private final IBaseInfoDictService baseInfoDictService;
 	private final IDeptRegionService deptRegionService;
 	private final ICheckOrderSettingService checkOrderSettingService;
-	private final IBaseInfoRegionService regionService;
+	private final IRegionInfoService regionService;
 	private final IBaseInfoDictService dictService;
 
 	/**

src/main/java/org/springblade/modules/business/check/order/dto/CheckOrderInfoDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.dto;

src/main/java/org/springblade/modules/business/check/order/entity/CheckOrderInfoEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.entity;

src/main/java/org/springblade/modules/business/check/order/entity/CheckOrderSettingEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/3/8
  */
 package org.springblade.modules.business.check.order.entity;

src/main/java/org/springblade/modules/business/check/order/mapper/CheckOrderSettingMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.mapper;

src/main/java/org/springblade/modules/business/check/order/mapper/RtuCheckOrderMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.mapper;

src/main/java/org/springblade/modules/business/check/order/service/ICheckOrderSettingService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.service;

src/main/java/org/springblade/modules/business/check/order/service/IRtuCheckOrderService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.service;

src/main/java/org/springblade/modules/business/check/order/service/impl/CheckOrderSettingServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.service.impl;

src/main/java/org/springblade/modules/business/check/order/service/impl/RtuCheckOrderServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.service.impl;
@@ -19,7 +19,7 @@ import org.springblade.modules.baseinfo.dict.service.IBaseInfoDictService;
 import org.springblade.modules.baseinfo.org.entity.DeptRegionEntity;
 import org.springblade.modules.baseinfo.org.service.IDeptRegionService;
 import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
-import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
+import org.springblade.modules.baseinfo.region.service.IRegionInfoService;
 import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
 import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
 import org.springblade.modules.business.check.order.dto.CheckOrderInfoDTO;
@@ -68,7 +68,7 @@ public class RtuCheckOrderServiceImpl extends BaseServiceImpl<RtuCheckOrderMappe
 	private IRtuOrderProcessService rtuOrderProcessService;
 
 	@Resource
-	private IBaseInfoRegionService baseInfoRegionService;
+	private IRegionInfoService baseInfoRegionService;
 
 	@Resource
 	private IDeptRegionService deptRegionService;

src/main/java/org/springblade/modules/business/check/order/vo/CheckOrderCountVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/22
  */
 package org.springblade.modules.business.check.order.vo;