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; } 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); } } 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); } 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> 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); } 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) {