diff --git a/src/main/java/com/whdc/controller/QXWarnController.java b/src/main/java/com/whdc/controller/QXWarnController.java index a3c24a9..6bf0c6f 100644 --- a/src/main/java/com/whdc/controller/QXWarnController.java +++ b/src/main/java/com/whdc/controller/QXWarnController.java @@ -7,8 +7,10 @@ import com.whdc.model.dto.ApiDto; import com.whdc.model.dto.GroupWarningDto; import com.whdc.model.dto.WarnDppleDto; import com.whdc.model.entity.AddressBook; +import com.whdc.model.entity.AddressBookOld; import com.whdc.model.entity.WarnMsgFB; import com.whdc.model.vo.*; +import com.whdc.service.IAddressBookOldService; import com.whdc.service.IAddressBookService; import com.whdc.service.IAdinfoService; import com.whdc.service.IWarnMsgFBService; @@ -43,7 +45,8 @@ import static com.whdc.controller.WarningController.THIS_REDIS_KEY; public class QXWarnController { @Autowired private IAddressBookService addressBookService; - + @Autowired + private IAddressBookOldService addressBookOldService; @Autowired private IAdinfoService adinfoService; @@ -97,12 +100,12 @@ public class QXWarnController { for(int i=0;i dpples = addressBookService.getListByAdnm(adcd); +// String adcd = adinfoService.getAdcdByAdnm2(cnnm2);//根据区县的名字找到对应的adcd +// System.out.println(adcd); + if (StringUtils.isNotBlank(cnnm2)){ + List dpples = addressBookOldService.getListByAdnm2(cnnm2); System.out.println("dpple个数:"+dpples.size()); - for(AddressBook dpple:dpples){ + for(AddressBookOld dpple:dpples){ WarnDppleVO warndpple = new WarnDppleVO(); warndpple.setCtnm(dto.getCtnm()); warndpple.setCnnm(cnnm); diff --git a/src/main/java/com/whdc/mapper/AddressBookOldMapper.java b/src/main/java/com/whdc/mapper/AddressBookOldMapper.java index 1d45269..1ff2c26 100644 --- a/src/main/java/com/whdc/mapper/AddressBookOldMapper.java +++ b/src/main/java/com/whdc/mapper/AddressBookOldMapper.java @@ -2,6 +2,9 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.whdc.model.entity.AddressBookOld; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author xusan @@ -10,4 +13,6 @@ import com.whdc.model.entity.AddressBookOld; public interface AddressBookOldMapper extends BaseMapper { + List getListByAdnm2(@Param("adnm")String adnm); +// List getListByAdnm(@Param("adnm") String adnm); } \ No newline at end of file diff --git a/src/main/java/com/whdc/service/IAddressBookOldService.java b/src/main/java/com/whdc/service/IAddressBookOldService.java index d0ea220..16538b4 100644 --- a/src/main/java/com/whdc/service/IAddressBookOldService.java +++ b/src/main/java/com/whdc/service/IAddressBookOldService.java @@ -3,6 +3,8 @@ package com.whdc.service; import com.baomidou.mybatisplus.extension.service.IService; import com.whdc.model.entity.AddressBookOld; +import java.util.List; + /** *

* 服务类 @@ -11,6 +13,5 @@ import com.whdc.model.entity.AddressBookOld; * @date 2024-05-11 */ public interface IAddressBookOldService extends IService { - - + List getListByAdnm2(String cnnm2); } \ No newline at end of file diff --git a/src/main/java/com/whdc/service/impl/AddressBookOldServiceImpl.java b/src/main/java/com/whdc/service/impl/AddressBookOldServiceImpl.java index 0a1f25a..bd90199 100644 --- a/src/main/java/com/whdc/service/impl/AddressBookOldServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/AddressBookOldServiceImpl.java @@ -9,6 +9,8 @@ import com.whdc.model.entity.AddressBookOld; import com.whdc.service.IAddressBookOldService; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 服务实现类 @@ -20,4 +22,8 @@ import org.springframework.stereotype.Service; @Service public class AddressBookOldServiceImpl extends ServiceImpl implements IAddressBookOldService { + @Override + public List getListByAdnm2(String adnm) { + return baseMapper.getListByAdnm2(adnm); + } } diff --git a/src/main/resources/mapper/AddressBookOldMapper.xml b/src/main/resources/mapper/AddressBookOldMapper.xml index 8bbb0b3..d60a35e 100644 --- a/src/main/resources/mapper/AddressBookOldMapper.xml +++ b/src/main/resources/mapper/AddressBookOldMapper.xml @@ -89,6 +89,13 @@ LEFT JOIN ADINFO A ON AB.ADCD = A.ADCD WHERE AB.OPENID = #{id} + \ No newline at end of file