Merge branches 'dev1.0' and 'dev1.0-authlogin' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -31,8 +31,9 @@
         FROM
             CUSTOMER_GRID
         WHERE
-            AREA_CODE = #{areaCode}
+            del_flag = 0
-
+        AND
+            area_code = #{areaCode}
         ORDER BY
             customer_id,
             CONVERT ( grid_name USING gbk ) ASC
@@ -69,8 +70,9 @@
         FROM
             CUSTOMER_GRID
         WHERE
-            AREA_CODE LIKE CONCAT(#{areaCode},'%')
+            del_flag = 0
-
+        AND
+            area_code LIKE CONCAT(#{areaCode},'%')
         ORDER BY
             customer_id,
             CONVERT ( grid_name USING gbk ) ASC
@@ -96,8 +98,9 @@
             FROM
                 CUSTOMER_GRID a
             WHERE
+                a.del_flag = 0
+            AND
                 a.area_code = #{areaCode}
-
             ORDER BY
                 CONVERT ( a.grid_name USING gbk ) ASC
 
@@ -113,6 +116,8 @@
             FROM
                 CUSTOMER_GRID b
             WHERE
+                b.del_flag = 0
+            AND
                 b.area_code LIKE CONCAT(#{cityCode},'%')
 
             AND <![CDATA[ b.area_code <> #{areaCode}

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml

@@ -84,5 +84,6 @@
         ) a
     INNER JOIN customer_home_detail b ON a.id = b.HOME_ID AND b.DEL_FLAG = '0'
     LEFT JOIN home_component c ON b.COMPONENT_ID = c.id AND c.DEL_FLAG = '0'
+    ORDER BY b.REGION DESC,b.DISPLAY_ORDER ASC
     </select>
 </mapper>

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java

@@ -33,11 +33,4 @@ import java.util.Map;
  */
 @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/impl/StrangerAccessRecordServiceImpl.java

@@ -21,17 +21,14 @@ import com.epmet.service.StrangerAccessRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
+
-import java.util.Date;
-import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.tools.page.PageData;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Map;
 /**
  * @Description 陌生人记录访问表
  * @ClassName ResiGuideServiceImpl
@@ -57,8 +54,13 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
      */
     @Override
     public PageData<StrangerAccessRecordDTO> getStrangerAccessRecordPage(Map<String, Object> params) {
-        List<StrangerAccessRecordEntity> list = strangerAccessRecordDao.getStrangerAccessRecordPage(params);
+
-        return getPageData(list,list.size(), StrangerAccessRecordDTO.class);
+        IPage<StrangerAccessRecordEntity> page = baseDao.selectPage(
+                getPage(params, "VISIT_TIME",false),
+                getWrapper(params)
+        );
+
+        return getPageData(page,StrangerAccessRecordDTO.class);
     }
     @Override
     public PageData<StrangerAccessRecordDTO> page(Map<String, Object> params) {
@@ -76,12 +78,23 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
         return ConvertUtils.sourceToTarget(entityList, StrangerAccessRecordDTO.class);
     }
 
+    /**
+     * sql语句条件查询拼接
+     * 陌生人访客记录，逻辑删除标识为0，访问时间为当前三天，按照访问时间降序排列
+     * @param params
+     * @return QueryWrapper<StrangerAccessRecordEntity>
+     * @author
+     * @date
+     */
     private QueryWrapper<StrangerAccessRecordEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<StrangerAccessRecordEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
+        Calendar before3daysDate = Calendar.getInstance();
+        before3daysDate.setTime(new Date());
+        before3daysDate.add(Calendar.DATE,-3);
+        wrapper.between("VISIT_TIME", before3daysDate.getTime(),new Date());
         return wrapper;
     }
 

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

@@ -21,23 +21,4 @@
         <result property="area" column="AREA" />
     </resultMap>
 
-
-
-
-
-    <!-- 查询陌生人访问记录-->
-    <select id="getStrangerAccessRecordPage"  resultMap="strangerAccessRecordMap">
-        SELECT
-        a.LOCATION_AREA_CODE,
-        a.PROVINCE,
-        a.CITY,
-        a.AREA,
-        a.IS_AUTHORIZED,
-        a.VISIT_TIME
-        FROM
-        stranger_access_record AS a
-        where a.DEL_FLAG=0 and  date_sub(curdate(), interval 3 day)  &lt;= a.VISIT_TIME
-        ORDER BY a.VISIT_TIME desc
-    </select>
-
 </mapper>