From 561dfb636477c1f365be4b611b9ca9969d3abc8a Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Mon, 7 Dec 2020 21:32:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/custom/SysWxUserInfoController.java | 14 ++++++++++++++ .../controller/custom/SysWxUserLogController.java | 1 + .../resources/mapper/custom/SysWxUserLogMapper.xml | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java index c360c85fa..be3f4791f 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java @@ -13,6 +13,7 @@ import com.stdiet.custom.domain.SysWxUserLog; import com.stdiet.custom.page.WxServeInfo; import com.stdiet.custom.service.ISysOrderService; import com.stdiet.custom.service.ISysWxUserInfoService; +import org.aspectj.weaver.loadtime.Aj; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -141,4 +142,17 @@ public class SysWxUserInfoController extends BaseController { return AjaxResult.success(wxServeInfo); } + + @GetMapping("/wx/user/list") + public AjaxResult userList(SysWxUserInfo sysWxUserInfo) { + startPage(); + List list = sysWxUserInfoService.selectSysWxUserInfoList(sysWxUserInfo); + + for (SysWxUserInfo userInfo : list) { + if (StringUtils.isNotEmpty(userInfo.getPhone())) { + userInfo.setPhone(userInfo.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")); + } + } + return AjaxResult.success(list); + } } \ No newline at end of file diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java index 959ae2e85..49c70453c 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java @@ -108,6 +108,7 @@ public class SysWxUserLogController extends BaseController { @GetMapping(value = "/wx/logs/list") public AjaxResult getLogs(SysWxUserLog sysWxUserLog) { + System.out.println(sysWxUserLog.toString()); List list = sysWxUserLogService.selectWxLogInfoList(sysWxUserLog); return AjaxResult.success(list); } diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml index 943d4879d..c22964621 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml @@ -49,7 +49,7 @@ - and appid = #{appid} + and openid = #{openid} and phone = #{phone} order by create_time asc From 2e3b440c426eb641fa060054a70b2ea4d58374ca Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Tue, 8 Dec 2020 20:49:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=90=8C=E5=AD=A6?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +++++----- .../controller/custom/SysWxUserInfoController.java | 6 +++--- .../com/stdiet/custom/mapper/SysWxUserInfoMapper.java | 2 ++ .../stdiet/custom/service/ISysWxUserInfoService.java | 2 ++ .../custom/service/impl/SysWxUserInfoServiceImpl.java | 5 +++++ .../resources/mapper/custom/SysWxUserInfoMapper.xml | 11 +++++++++++ 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 97e0c7670..83af8f9eb 100644 --- a/pom.xml +++ b/pom.xml @@ -254,20 +254,20 @@ - - dev + local - dev + local true + - local + dev - local + dev diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java index be3f4791f..57ea4af0b 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java @@ -144,15 +144,15 @@ public class SysWxUserInfoController extends BaseController { } @GetMapping("/wx/user/list") - public AjaxResult userList(SysWxUserInfo sysWxUserInfo) { + public TableDataInfo userList(SysWxUserInfo sysWxUserInfo) { startPage(); - List list = sysWxUserInfoService.selectSysWxUserInfoList(sysWxUserInfo); + List list = sysWxUserInfoService.selectSysWxUserInfoListNot(sysWxUserInfo); for (SysWxUserInfo userInfo : list) { if (StringUtils.isNotEmpty(userInfo.getPhone())) { userInfo.setPhone(userInfo.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")); } } - return AjaxResult.success(list); + return getDataTable(list); } } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java index e2672e4e3..5173878a0 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java @@ -27,6 +27,8 @@ public interface SysWxUserInfoMapper */ public List selectSysWxUserInfoList(SysWxUserInfo sysWxUserInfo); + public List selectSysWxUserInfoListNot(SysWxUserInfo sysWxUserInfo); + /** * 新增微信用户 * diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java index 06f905cce..45dd721fe 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java @@ -27,6 +27,8 @@ public interface ISysWxUserInfoService */ public List selectSysWxUserInfoList(SysWxUserInfo sysWxUserInfo); + public List selectSysWxUserInfoListNot(SysWxUserInfo sysWxUserInfo); + /** * 新增微信用户 * diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java index f86f47d70..a1ccb0e84 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java @@ -44,6 +44,11 @@ public class SysWxUserInfoServiceImpl implements ISysWxUserInfoService return sysWxUserInfoMapper.selectSysWxUserInfoList(sysWxUserInfo); } + @Override + public List selectSysWxUserInfoListNot(SysWxUserInfo sysWxUserInfo) { + return sysWxUserInfoMapper.selectSysWxUserInfoListNot(sysWxUserInfo); + } + /** * 新增微信用户 * diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml index a3331fcc0..0d594c189 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml @@ -35,6 +35,17 @@ + +