Merge remote-tracking branch 'origin/dev1.0-resiguide' into dev1.0-resiguide

epmet-module/resi-guide/resi-guide-server/pom.xml

@@ -64,18 +64,6 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>epmet-user-client</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>epmet-user-server</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>gov-org-client</artifactId>
@@ -88,12 +76,6 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>oper-customize-client</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

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<List<CustomerGridForStangerResultDTO>>().ok(strangerAccessRecordService.ListCustomerGrid(customerGridListQueryDTO));
     }
     /**
-     *  陌生人列表查询
+     *  查询陌生人访问记录
+     * @Author yangshaoping
+     * @date 2020.03.1811:33
      * */
     @GetMapping("getStrangerAccessRecordPage")
     public Result<PageData<StrangerAccessRecordDTO>> getStrangerAccessRecordPage(@RequestParam Map<String, Object> params){

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<StrangerAccessRecordEntity> {
-    //陌生人访问记录表
+    /**
+     * 查询陌生人访问记录
+     * @param params
+     * @author yangshaoping
+     * @date 2020-03-19
+     */
     List<StrangerAccessRecordEntity> getStrangerAccessRecordPage(Map<String, Object> params);
 }

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<StrangerAccessRecordEntity> {
 
     /**
-     * 陌生人列表查询
-     *
+     * 查询陌生人访问记录
      * @param params
      * @return PageData<StrangerAccessRecordDTO>
-     * @author generator
+     * @author yangshaoping
      * @date 2020-03-19
      */
     PageData<StrangerAccessRecordDTO> getStrangerAccessRecordPage(Map<String, Object> params);

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<StrangerAcc
     private StrangerAccessRecordDao strangerAccessRecordDao;
     @Autowired
     private GovOrgFeignClient govOrgFeignClient;
+    /**
+     * 查询陌生人访问记录
+     * @param params
+     * @return PageData<StrangerAccessRecordDTO>
+     * @author yangshaoping
+     * @date 2020-03-19
+     */
     @Override
     public PageData<StrangerAccessRecordDTO> getStrangerAccessRecordPage(Map<String, Object> params) {
         List<StrangerAccessRecordEntity> list = strangerAccessRecordDao.getStrangerAccessRecordPage(params);

epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml

@@ -25,9 +25,8 @@
 
 
 
-    <!-- 陌生人列表查询-->
-    <select id="getStrangerAccessRecordPage"
-            parameterType="com.epmet.dto.StrangerAccessRecordDTO"  resultMap="strangerAccessRecordMap">
+    <!-- 查询陌生人访问记录-->
+    <select id="getStrangerAccessRecordPage"  resultMap="strangerAccessRecordMap">
         SELECT
         a.LOCATION_AREA_CODE,
         a.PROVINCE,