From 31e95b7582402218f23c0fbd7794858a5f81a439 Mon Sep 17 00:00:00 2001 From: xjm Date: Tue, 4 Jun 2024 15:05:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/whdc/controller/AddressBookController.java | 5 +++-- src/main/java/com/whdc/controller/AdinfoController.java | 4 +++- src/main/java/com/whdc/controller/WarningController.java | 3 ++- src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java | 7 +++++++ src/main/java/com/whdc/service/impl/UserServiceImpl.java | 4 ++++ 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java index 6d63945..cb5a48d 100644 --- a/src/main/java/com/whdc/controller/AddressBookController.java +++ b/src/main/java/com/whdc/controller/AddressBookController.java @@ -42,6 +42,7 @@ import java.util.Objects; import java.util.stream.Collectors; import static com.whdc.model.MyConstant.REDIS_KEY; +import static com.whdc.service.impl.AdinfoServiceImpl.TREE_ALL; /** * @author xusan @@ -545,7 +546,7 @@ public class AddressBookController { adnm = ""; } - List tree = adinfoService.tree(null, null); + List tree = adinfoService.tree(TREE_ALL, TREE_ALL); if (CollectionUtils.isEmpty(tree)) { throw new MyException("当前行政区划不存在"); @@ -626,7 +627,7 @@ public class AddressBookController { throw new MyException("文件为空"); } - List tree = adinfoService.tree(null, null); + List tree = adinfoService.tree(TREE_ALL, TREE_ALL); appends.forEach(vo ->{ diff --git a/src/main/java/com/whdc/controller/AdinfoController.java b/src/main/java/com/whdc/controller/AdinfoController.java index b855b61..24ac7fd 100644 --- a/src/main/java/com/whdc/controller/AdinfoController.java +++ b/src/main/java/com/whdc/controller/AdinfoController.java @@ -21,6 +21,8 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +import static com.whdc.service.impl.AdinfoServiceImpl.TREE_ALL; + /** * @author xusan * @date 2024-05-11 @@ -60,7 +62,7 @@ public class AdinfoController { String adcdOradnm) { - List list = service.tree(null, null); + List list = service.tree(TREE_ALL, TREE_ALL); // 查询全部标识 if ("all".equals(adcdOradnm)) { return ResultJson.ok(list); diff --git a/src/main/java/com/whdc/controller/WarningController.java b/src/main/java/com/whdc/controller/WarningController.java index 48d55a0..921dac9 100644 --- a/src/main/java/com/whdc/controller/WarningController.java +++ b/src/main/java/com/whdc/controller/WarningController.java @@ -32,6 +32,7 @@ import java.util.*; import java.util.stream.Collectors; import static com.whdc.model.MyConstant.REDIS_KEY; +import static com.whdc.service.impl.AdinfoServiceImpl.TREE_ALL; /** * Description: @@ -390,7 +391,7 @@ public class WarningController { // 进行行政区划匹配 if (CollectionUtils.isNotEmpty(voList)) { - List tree = adinfoService.tree(null, null); + List tree = adinfoService.tree(TREE_ALL, TREE_ALL); Map> areaMap = voList.stream() .collect(Collectors .groupingBy(WarningHistoryListVo::getEffectArea, Collectors.toList())); diff --git a/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java b/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java index 42a1014..d9f1d4d 100644 --- a/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.whdc.model.MyConstant.REDIS_KEY; public class AdinfoServiceImpl extends ServiceImpl implements IAdinfoService { public static final String ADINFO_REDIS_KEY = REDIS_KEY + "adinfo"; + public static final String TREE_ALL = REDIS_KEY + "tree_all"; @Override public IPage page(Adinfo dto) { @@ -60,6 +61,12 @@ public class AdinfoServiceImpl extends ServiceImpl impleme @Cacheable(cacheNames = {ADINFO_REDIS_KEY}, key = "getMethodName()", condition = "#adcd + #adnm", unless = "false") public List tree(String adcd, String adnm) { + if (TREE_ALL.equals(adcd)){ + adcd = null; + } + if (TREE_ALL.equals(adnm)){ + adnm = null; + } List list = treeList(adcd, adnm); if (CollectionUtils.isNotEmpty(list)){ diff --git a/src/main/java/com/whdc/service/impl/UserServiceImpl.java b/src/main/java/com/whdc/service/impl/UserServiceImpl.java index 18be664..c18d334 100644 --- a/src/main/java/com/whdc/service/impl/UserServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/UserServiceImpl.java @@ -172,6 +172,10 @@ public class UserServiceImpl extends ServiceImpl implements IU if (StringUtils.isNotBlank(book.getOpenid())){ + System.out.println("openid1:"+sysUser.getAbId()); + System.out.println("openid2:"+openid); + System.out.println("openid3:"+book.getOpenid()); + if(!openid.equals(book.getOpenid())){ throw new MyException("当前手机号已绑定其他账号,请先解绑!"); }