From e8743045fe6b9637ff1f024cfe2a2fbb5d916255 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Thu, 19 Mar 2020 14:55:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-guide/resi-guide-server/pom.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 44de695c38..f5959bc1c1 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -64,18 +64,6 @@ 2.0.0 compile - - com.epmet - epmet-user-client - 2.0.0 - compile - - - com.epmet - epmet-user-server - 2.0.0 - compile - com.epmet gov-org-client @@ -88,12 +76,6 @@ 2.0.0 compile - - com.epmet - oper-customize-client - 2.0.0 - compile - From 9edb5ab23804864ddfa5ac99ee6f8ab27f64ffd5 Mon Sep 17 00:00:00 2001 From: yangshaoping <123456> Date: Thu, 19 Mar 2020 15:00:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=99=8C=E7=94=9F=E4=BA=BA=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E8=AE=B0=E5=BD=95=E8=A1=A8=20-=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/StrangerAccessRecordController.java | 4 +++- .../main/java/com/epmet/dao/StrangerAccessRecordDao.java | 9 +++++++-- .../com/epmet/service/StrangerAccessRecordService.java | 5 ++--- .../service/impl/StrangerAccessRecordServiceImpl.java | 7 +++++++ .../main/resources/mapper/StrangerAccessRecordDao.xml | 5 ++--- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java index 8334da4851..23de95f078 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java @@ -58,7 +58,9 @@ public class StrangerAccessRecordController { return new Result>().ok(strangerAccessRecordService.ListCustomerGrid(customerGridListQueryDTO)); } /** - * 陌生人列表查询 + * 查询陌生人访问记录 + * @Author yangshaoping + * @date 2020.03.1811:33 * */ @GetMapping("getStrangerAccessRecordPage") public Result> getStrangerAccessRecordPage(@RequestParam Map params){ diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java index 6870fa0b7f..625e30b399 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java @@ -26,13 +26,18 @@ import java.util.List; import java.util.Map; /** - * 陌生人访问记录表 + * 陌生人访问记录 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-16 */ @Mapper public interface StrangerAccessRecordDao extends BaseDao { - //陌生人访问记录表 + /** + * 查询陌生人访问记录 + * @param params + * @author yangshaoping + * @date 2020-03-19 + */ List getStrangerAccessRecordPage(Map params); } \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java index 1a6a9b2ed7..178521e40c 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java @@ -17,11 +17,10 @@ import java.util.Map; public interface StrangerAccessRecordService extends BaseService { /** - * 陌生人列表查询 - * + * 查询陌生人访问记录 * @param params * @return PageData - * @author generator + * @author yangshaoping * @date 2020-03-19 */ PageData getStrangerAccessRecordPage(Map params); diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java index f976b96a6a..a06fe53573 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java @@ -37,6 +37,13 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl + * @author yangshaoping + * @date 2020-03-19 + */ @Override public PageData getStrangerAccessRecordPage(Map params) { List list = strangerAccessRecordDao.getStrangerAccessRecordPage(params); diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml index 58cdb8d3c4..ee340ac3e7 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml @@ -25,9 +25,8 @@ - - SELECT a.LOCATION_AREA_CODE, a.PROVINCE,