From 62428f7b629da3e4eb40937466e38f2cd9ef7ed9 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 16 Apr 2024 16:03:48 +0800
Subject: [PATCH] app行政区划接口

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java            |    4 ++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java |   10 ++++++++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java    |    7 +++++++
 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java     |    5 +++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml             |    7 ++++++-
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java         |    2 ++
 6 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java
index b8f3ccb..695b0d3 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java
@@ -46,5 +46,10 @@
 	 */
 	private String source;
 
+	private String resGuid;
 
+	private String feedback;
+
+	//是否异常 1是 2 否
+	private String alertStatus;
 }
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java
index 687816b..0b1e14b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java
@@ -158,4 +158,11 @@
 		return ForestNodeMerger.merge(list);
 	}
 
+
+	@GetMapping("/getYwxtAttadBaseList")
+	public R getYwxtAttadBaseList(String parentId,String isYwxtRegion){
+		List<AttAdBase> attAdBases = attAdBaseService.getYwxtAttadBaseList(parentId,isYwxtRegion);
+		return R.data(attAdBases);
+	}
+
 }
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java
index aba6d86..fe45c59 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java
@@ -50,4 +50,8 @@
 	AttAdBase getYwxtAdDetail(@Param("adCode") String adCode);
 
     List<AttAdBase> getYwxtAdList(@Param("adCode") String guid);
+
+    List<AttAdBase> getYwxtAttAdBaseList(@Param("parentId") String parentId);
+
+	List<AttAdBase> getZtAttAdBaseList(@Param("parentId") String parentId);
 }
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml
index 01bc8fb..3fae880 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml
@@ -173,6 +173,11 @@
     <select id="getYwxtAdList" resultType="cn.gistack.sm.sjztmd.entity.AttAdBase">
         SELECT * FROM YWXT."att_ad_base" WHERE "ad_code" = #{adCode}
     </select>
-
+    <select id="getZtAttAdBaseList" resultType="cn.gistack.sm.sjztmd.entity.AttAdBase">
+        SELECT * FROM SJZT_MD."att_ad_base" where "p_ad_code" = #{parentId}
+    </select>
+    <select id="getYwxtAttAdBaseList" resultType="cn.gistack.sm.sjztmd.entity.AttAdBase">
+        SELECT * FROM YWXT."att_ad_base" where "p_ad_code" = #{parentId}
+    </select>
 
 </mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java
index c3d4099..d9a4f02 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java
@@ -50,4 +50,6 @@
 	AttAdBase getYwxtAdDetail(String adCode);
 
 	List<AttAdBase> getYwxtAdList(String guid);
+
+	List<AttAdBase> getYwxtAttadBaseList(String parentId,String isYwxtRegion);
 }
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java
index cffc957..9293c4e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java
@@ -10,6 +10,7 @@
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.Comparator;
@@ -108,6 +109,15 @@
 		return baseMapper.getYwxtAdList(guid);
 	}
 
+	@Override
+	public List<AttAdBase> getYwxtAttadBaseList(String parentId,String isYwxtRegion) {
+		if (StringUtil.isNotBlank(isYwxtRegion)){
+			return baseMapper.getYwxtAttAdBaseList(parentId);
+		}else {
+			return baseMapper.getZtAttAdBaseList(parentId);
+		}
+	}
+
 
 	@Override
 	public boolean save(AttAdBase entity) {

--
Gitblit v1.9.3