add Scheduled

common/src/main/java/com/vcarecity/elastic/constants/ElasticConstant.java

@@ -15,4 +15,7 @@ public class ElasticConstant {
     public static final DateTimeFormatter ES_DATE_FORMATTER = DateTimeFormatter.ofPattern(ES_DATE);
 
     public static final String ES_AGENCY_ID_PREFIX = "aId";
+
+
+    public static final String UNIT_AGENCY_INDEX = "unit-agency";
 }

elastic-load-data/src/main/java/com/vcarecity/test/service/elastic/ElasticSaveServiceImpl.java

@@ -49,13 +49,13 @@ public class ElasticSaveServiceImpl implements ElasticSaveService {
 
         List<Map> saveResult = new ArrayList<>(result.size());
 
-        for (UnitAgencyEntity uae : result) {
+
+            for (UnitAgencyEntity uae : result) {
             final List<Integer> agencyIdList = AgencyPathUtil.splitAgencyId(uae.getAgencyPath());
             List<String> agencyPathDetail = agencyService.getAgencyPathDetail(agencyIdList);
 
             UnitAgencyDetailEntity unitAgencyDetailEntity = new UnitAgencyDetailEntity();
 
-
             beanCopier.copy(uae, unitAgencyDetailEntity, null);
 
             unitAgencyDetailEntity.setAgencyDetail(String.join("", agencyPathDetail));
@@ -85,8 +85,9 @@ public class ElasticSaveServiceImpl implements ElasticSaveService {
                 bulkRequest.add(indexRequest);
             }
             if (hasData) {
+                long time = System.currentTimeMillis();
                 BulkResponse bulkResponse = restHighLevelClient.bulk(bulkRequest, RequestOptions.DEFAULT);
-                logger.info("bulk insert status {}", bulkResponse.status());
+                logger.info("bulk insert status {}. usage: {} /ms", bulkResponse.status(), (System.currentTimeMillis() - time));
             }
         } catch (IOException e) {
             e.printStackTrace();

elastic-load-data/src/main/java/com/vcarecity/test/service/elastic/QueryDataServiceImpl.java

@@ -1,6 +1,7 @@
 package com.vcarecity.test.service.elastic;
 
 import com.google.inject.Inject;
+import com.vcarecity.elastic.constants.ElasticConstant;
 import com.vcarecity.elastic.util.AgencyPathUtil;
 import com.vcarecity.test.service.QueryDataService;
 import org.elasticsearch.action.search.SearchRequest;
@@ -27,9 +28,12 @@ public class QueryDataServiceImpl implements QueryDataService {
 
     private final RestHighLevelClient restHighLevelClient;
 
+    private final String index;
+
     @Inject
     public QueryDataServiceImpl(RestHighLevelClient restHighLevelClient) {
         this.restHighLevelClient = restHighLevelClient;
+        this.index = ElasticConstant.UNIT_AGENCY_INDEX;
     }
 
 
@@ -38,7 +42,7 @@ public class QueryDataServiceImpl implements QueryDataService {
         List<Integer> agencyIds = AgencyPathUtil.splitAgencyId(agencyPath);
         BoolQueryBuilder boolQueryBuilder = agencyCondition(agencyIds);
 
-        String index = "unit-agency";
+
 
 
         SearchRequest searchRequest = new SearchRequest();

elastic-load-data/src/main/java/com/vcarecity/test/service/mysql/MySQLObtainDataServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.List;
 @Slf4j
 public class MySQLObtainDataServiceImpl implements ObtainDataService {
 
-    //language=mysql
+    //language=sql
     private static final String OB_SQL = "SELECT TU.UNIT_ID,\n" +
             "       TU.DTU_NO,\n" +
             "       TU.PUSER_CODE,\n" +
@@ -34,7 +34,7 @@ public class MySQLObtainDataServiceImpl implements ObtainDataService {
             "FROM T_UNIT TU\n" +
             "         INNER JOIN T_AGENCY TAG ON TU.AGENCY_ID = TAG.AGENCY_ID AND TU.ISDELETED = 0\n" +
             "         INNER JOIN T_BUILDING TB ON TB.BUILDING_ID = TU.BUILDING_ID\n" +
-            "         INNER JOIN T_UNIT_TYPE TUT ON TUT.UNIT_TYPE_ID = TU.UNIT_TYPE_ID  limit ?,?";
+            "         INNER JOIN T_UNIT_TYPE TUT ON TUT.UNIT_TYPE_ID = TU.UNIT_TYPE_ID limit ?,?";
 
     private final DataSource dataSource;
     private final TypeHandler typeHandler;

elastic-publish-service/src/main/java/com/vcarecity/publish/ElasticPublishApplication.java

@@ -3,11 +3,14 @@ package com.vcarecity.publish;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * @author Kerry on 19/12/11
  */
 
+
+@EnableScheduling
 @MapperScan("com.vcarecity.publish.mapper")
 @SpringBootApplication
 public class ElasticPublishApplication {

elastic-publish-service/src/main/java/com/vcarecity/publish/api/ApiResult.java

@@ -0,0 +1,15 @@
+package com.vcarecity.publish.api;
+
+import lombok.Builder;
+
+/**
+ * @author VcKerry on 12/18/19
+ */
+
+@Builder
+public class ApiResult {
+    private int status;
+    private String message;
+    private int errorCode;
+    private Object data;
+}

elastic-publish-service/src/main/java/com/vcarecity/publish/api/ApiStatus.java

@@ -0,0 +1,10 @@
+package com.vcarecity.publish.api;
+
+/**
+ * @author VcKerry on 12/18/19
+ */
+
+public class ApiStatus {
+    public static final int SUCCESS_CODE = 20000;
+    public static final int FAILED_CODE = 40000;
+}

elastic-publish-service/src/main/java/com/vcarecity/publish/constants/CheckConstant.java

@@ -1,9 +0,0 @@
-package com.vcarecity.publish.constants;
-
-/**
- * @author VcKerry on 12/18/19
- */
-
-public class CheckConstant {
-    public static final long CHECK_TIME_INTERVAL = 1000 * 3 * 60;
-}

elastic-publish-service/src/main/java/com/vcarecity/publish/constants/ElasticConstant.java

@@ -0,0 +1,14 @@
+package com.vcarecity.publish.constants;
+
+/**
+ * @author VcKerry on 12/18/19
+ */
+
+public class ElasticConstant {
+    public static final long CHECK_TIME_INTERVAL = 1000 * 3 * 60;
+
+    public static final String UNIT_AGENCY_INDEX = "unit-agency";
+
+
+    public static final int QUERY_PAGE_COUNT = 2000;
+}

elastic-publish-service/src/main/java/com/vcarecity/publish/controller/MainController.java

@@ -1,5 +1,8 @@
 package com.vcarecity.publish.controller;
 
+import com.vcarecity.publish.api.ApiResult;
+import com.vcarecity.publish.api.ApiStatus;
+import com.vcarecity.publish.constants.ElasticConstant;
 import com.vcarecity.publish.pojo.dto.UnitAgencyDTO;
 import com.vcarecity.publish.pojo.query.UnitAgencyQuery;
 import com.vcarecity.publish.sql.service.UnitService;
@@ -26,16 +29,18 @@ public class MainController {
     }
 
     @PostMapping("/query-unit-agency")
-    public Object queryUnitAgency(@RequestBody @Valid UnitAgencyQuery unitAgencyQuery) throws IOException {
+    public ApiResult queryUnitAgency(@RequestBody @Valid UnitAgencyQuery unitAgencyQuery) throws IOException {
         final List<UnitAgencyDTO> unitAgencyByQuery = unitService.getUnitAgencyByQuery(unitAgencyQuery.getAgencyPath(), unitAgencyQuery.getKeyword(),
-                unitAgencyQuery.getPage(), unitAgencyQuery.getSize(), "unit-agency");
-        return unitAgencyByQuery.stream().map(UnitAgencyDTO::getUnitId).collect(Collectors.toList());
+                unitAgencyQuery.getPage(), unitAgencyQuery.getSize(), ElasticConstant.UNIT_AGENCY_INDEX);
+        List<Long> data = unitAgencyByQuery.stream().map(UnitAgencyDTO::getUnitId).collect(Collectors.toList());
+        return ApiResult.builder().status(ApiStatus.SUCCESS_CODE).data(data).build();
     }
 
     @PostMapping("/test/query-unit-agency")
-    public Object testQueryUnitAgency(@RequestBody @Valid UnitAgencyQuery unitAgencyQuery) throws IOException {
-        return unitService.getUnitAgencyByQuery(unitAgencyQuery.getAgencyPath(), unitAgencyQuery.getKeyword(),
-                unitAgencyQuery.getPage(), unitAgencyQuery.getSize(), "unit-agency");
+    public ApiResult testQueryUnitAgency(@RequestBody @Valid UnitAgencyQuery unitAgencyQuery) throws IOException {
+        List<UnitAgencyDTO> data = unitService.getUnitAgencyByQuery(unitAgencyQuery.getAgencyPath(), unitAgencyQuery.getKeyword(),
+                unitAgencyQuery.getPage(), unitAgencyQuery.getSize(), ElasticConstant.UNIT_AGENCY_INDEX);
+        return ApiResult.builder().status(ApiStatus.SUCCESS_CODE).data(data).build();
     }
 
 

elastic-publish-service/src/main/java/com/vcarecity/publish/elastic/service/ElasticIndexService.java

@@ -1,14 +1,41 @@
 package com.vcarecity.publish.elastic.service;
 
+import java.util.List;
+
 /**
  * @author kerryzhang on 2019/12/17
  */
 
 public interface ElasticIndexService {
 
-    void createIndex(String ...indices);
+    /**
+     * index 是否存在
+     *
+     * @param index
+     * @return
+     */
+    boolean indexExist(String index);
+
+    /**
+     * create index
+     *
+     * @param indices
+     */
+    void createIndex(String... indices);
 
+    /**
+     * delete index
+     *
+     * @param indices
+     */
     void deleteIndex(String... indices);
 
 
+    /**
+     * list index
+     *
+     * @return
+     */
+    List<String> indices();
+
 }

elastic-publish-service/src/main/java/com/vcarecity/publish/elastic/service/ElasticLoadDataService.java

@@ -1,8 +1,16 @@
 package com.vcarecity.publish.elastic.service;
 
+import java.io.IOException;
+
 /**
  * @author kerryzhang on 2019/12/17
  */
 
 public interface ElasticLoadDataService {
+    /**
+     * load data
+     *
+     * @throws IOException
+     */
+    void loadData() throws IOException;
 }

elastic-publish-service/src/main/java/com/vcarecity/publish/elastic/service/impl/ElasticIndexServiceImpl.java

@@ -1,8 +1,11 @@
 package com.vcarecity.publish.elastic.service.impl;
 
 import com.vcarecity.publish.elastic.service.ElasticIndexService;
+import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author kerryzhang on 2019/12/17
  */
@@ -10,6 +13,17 @@ import org.springframework.stereotype.Service;
 @Service
 public class ElasticIndexServiceImpl implements ElasticIndexService {
 
+    private final RestHighLevelClient restHighLevelClient;
+
+    public ElasticIndexServiceImpl(RestHighLevelClient restHighLevelClient) {
+        this.restHighLevelClient = restHighLevelClient;
+    }
+
+    @Override
+    public boolean indexExist(String index) {
+
+        return false;
+    }
 
     @Override
     public void createIndex(String... indices) {
@@ -20,4 +34,9 @@ public class ElasticIndexServiceImpl implements ElasticIndexService {
     public void deleteIndex(String... indices) {
 
     }
+
+    @Override
+    public List<String> indices() {
+        return null;
+    }
 }

elastic-publish-service/src/main/java/com/vcarecity/publish/elastic/service/impl/ElasticLoadDataServiceImpl.java

@@ -1,12 +1,68 @@
 package com.vcarecity.publish.elastic.service.impl;
 
+import com.vcarecity.publish.constants.ElasticConstant;
 import com.vcarecity.publish.elastic.service.ElasticLoadDataService;
+import com.vcarecity.publish.elastic.service.ElasticUpdateService;
+import com.vcarecity.publish.entity.UnitAgencyMergeEntity;
+import com.vcarecity.publish.mapper.UnitMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+import java.util.List;
+
 /**
  * @author kerryzhang on 2019/12/17
  */
 
+@Slf4j
 @Service
 public class ElasticLoadDataServiceImpl implements ElasticLoadDataService {
+
+
+    private final UnitMapper unitMapper;
+    private final ElasticUpdateService elasticUpdateService;
+    private final int pageCount;
+
+    public ElasticLoadDataServiceImpl(UnitMapper unitMapper,
+                                      ElasticUpdateService elasticUpdateService) {
+        this.unitMapper = unitMapper;
+        this.elasticUpdateService = elasticUpdateService;
+        this.pageCount = ElasticConstant.QUERY_PAGE_COUNT;
+    }
+
+
+    @Override
+    public void loadData() throws IOException {
+
+        long allTime = System.currentTimeMillis();
+
+        // calc handler count
+        int count = 0;
+        // page
+        int start = 0;
+
+        List<UnitAgencyMergeEntity> result;
+        do {
+
+            long startTime = System.currentTimeMillis();
+
+            result = unitMapper.findAllWithPage(start * pageCount, pageCount);
+            start++;
+            count += result.size();
+
+            logger.debug("query database usageTime: {} ms. count = {}", (System.currentTimeMillis() - startTime), count);
+
+            startTime = System.currentTimeMillis();
+
+            elasticUpdateService.addElasticData(result);
+
+            logger.debug("write to Elasticsearch usageTime: {} ms.", (System.currentTimeMillis() - startTime));
+
+        } while (result.size() == pageCount);
+
+        logger.info("loadData ok. All usageTime = {} ms.", (System.currentTimeMillis() - allTime));
+
+    }
+
 }

elastic-publish-service/src/main/java/com/vcarecity/publish/elastic/service/impl/ElasticUpdateServiceImpl.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.vcarecity.elastic.util.AgencyPathUtil;
 import com.vcarecity.elastic.util.SnowFlake;
+import com.vcarecity.publish.constants.ElasticConstant;
 import com.vcarecity.publish.elastic.entity.UnitAgencyDetailEntity;
 import com.vcarecity.publish.elastic.service.ElasticUpdateService;
 import com.vcarecity.publish.entity.UnitAgencyMergeEntity;
@@ -39,7 +40,7 @@ import java.util.Map;
 @Service
 public class ElasticUpdateServiceImpl implements ElasticUpdateService {
 
-    public static final String INDEX = "unit-agency";
+    public final String index;
 
     private final RestHighLevelClient restHighLevelClient;
     private final ObjectMapper objectMapper;
@@ -52,6 +53,7 @@ public class ElasticUpdateServiceImpl implements ElasticUpdateService {
         this.objectMapper = objectMapper;
         this.agencyService = agencyService;
 
+        this.index = ElasticConstant.UNIT_AGENCY_INDEX;
     }
 
 
@@ -102,6 +104,8 @@ public class ElasticUpdateServiceImpl implements ElasticUpdateService {
         // 更新数据
         List<UnitAgencyMergeEntity> addData = updateDataByQuery(key, updateList);
 
+        logger.info("add data size = {}", addData.size());
+
         // 添加数据
         this.addElasticData(addData);
     }
@@ -113,7 +117,7 @@ public class ElasticUpdateServiceImpl implements ElasticUpdateService {
             return;
         }
         for (Long id : ids) {
-            DeleteByQueryRequest request = new DeleteByQueryRequest(INDEX);
+            DeleteByQueryRequest request = new DeleteByQueryRequest(index);
             request.setQuery(QueryBuilders.termQuery(key, id));
             restHighLevelClient.deleteByQuery(request, RequestOptions.DEFAULT);
         }
@@ -129,7 +133,7 @@ public class ElasticUpdateServiceImpl implements ElasticUpdateService {
             Object value = params.get(key);
             params.remove(key);
 
-            UpdateByQueryRequest request = new UpdateByQueryRequest(INDEX);
+            UpdateByQueryRequest request = new UpdateByQueryRequest(index);
             request.setQuery(QueryBuilders.termQuery(key, value));
             request.setScript(new Script(ScriptType.INLINE, "painless", getPainlessCode(params), params));
 
@@ -137,7 +141,7 @@ public class ElasticUpdateServiceImpl implements ElasticUpdateService {
 
             logger.info("response:{}", response);
 
-            if (response.getUpdated() != 0L) {
+            if (response.getUpdated() == 0L) {
                 addList.add(item);
             }
         }
@@ -164,11 +168,13 @@ public class ElasticUpdateServiceImpl implements ElasticUpdateService {
         try {
             BulkRequest bulkRequest = new BulkRequest();
             for (Map<String, Object> val : saveResult) {
-                IndexRequest indexRequest = createIndexRequest(INDEX, val);
+                IndexRequest indexRequest = createIndexRequest(index, val);
                 bulkRequest.add(indexRequest);
             }
             BulkResponse bulkResponse = restHighLevelClient.bulk(bulkRequest, RequestOptions.DEFAULT);
-            logger.info("bulk insert status {}", bulkResponse.status());
+
+            logger.debug("bulk addElasticData status {}, size = {}", bulkResponse.status(), saveResult.size());
+
         } catch (IOException e) {
             e.printStackTrace();
         }

elastic-publish-service/src/main/java/com/vcarecity/publish/mapper/AgencyMapper.java

@@ -41,5 +41,5 @@ public interface AgencyMapper {
      * @param agencyPathIds
      * @return
      */
-    List<String> findAgencyNameByAgencyIdList(@Param("agencyPathIds") List<Integer> agencyPathIds);
+    List<AgencyEntity> findAgencyNameByAgencyIdList(@Param("agencyPathIds") List<Integer> agencyPathIds);
 }

elastic-publish-service/src/main/java/com/vcarecity/publish/mapper/UnitMapper.java

@@ -35,4 +35,14 @@ public interface UnitMapper {
     List<UnitAgencyMergeEntity> findUpdateUaList(@Param("fromDate") String fromDate, @Param("toDate") String toDate);
 
 
+    /**
+     * find all by page
+     *
+     * @param page
+     * @param size
+     * @return
+     */
+    List<UnitAgencyMergeEntity> findAllWithPage(@Param("page") int page, @Param("size") int size);
+
+
 }

elastic-publish-service/src/main/java/com/vcarecity/publish/service/impl/CheckTimeServiceImpl.java

@@ -1,6 +1,6 @@
 package com.vcarecity.publish.service.impl;
 
-import com.vcarecity.publish.constants.CheckConstant;
+import com.vcarecity.publish.constants.ElasticConstant;
 import com.vcarecity.publish.service.CheckTimeService;
 import com.vcarecity.publish.util.DateUtil;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -37,7 +37,7 @@ public class CheckTimeServiceImpl implements CheckTimeService {
             LocalDateTime.ofInstant(new Date(Long.parseLong(value.toString())).toInstant(), ZoneId.systemDefault()).format(DateUtil.DATE_TIME_FORMATTER);
         }
 
-        long last = System.currentTimeMillis() - CheckConstant.CHECK_TIME_INTERVAL;
+        long last = System.currentTimeMillis() - ElasticConstant.CHECK_TIME_INTERVAL;
         redisTemplate.opsForValue().set(redisKey, last);
 
         return LocalDateTime.ofInstant(new Date(last).toInstant(), ZoneId.systemDefault()).format(DateUtil.DATE_TIME_FORMATTER);

elastic-publish-service/src/main/java/com/vcarecity/publish/sql/service/impl/AgencyServiceImpl.java

@@ -1,10 +1,12 @@
 package com.vcarecity.publish.sql.service.impl;
 
+import com.vcarecity.publish.entity.AgencyEntity;
 import com.vcarecity.publish.mapper.AgencyMapper;
 import com.vcarecity.publish.sql.service.AgencyService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author kerryzhang on 2019/12/17
@@ -23,6 +25,7 @@ public class AgencyServiceImpl implements AgencyService {
     public List<String> getAgencyPathDetail(List<Integer> agencyPath) {
 
         //TODO 可以优化的空间
-        return agencyMapper.findAgencyNameByAgencyIdList(agencyPath);
+        List<AgencyEntity> agencyNameByAgencyIdList = agencyMapper.findAgencyNameByAgencyIdList(agencyPath);
+        return agencyNameByAgencyIdList.stream().map(AgencyEntity::getAgencyName).collect(Collectors.toList());
     }
 }

elastic-publish-service/src/main/java/com/vcarecity/publish/sql/service/impl/UnitServiceImpl.java

@@ -35,6 +35,15 @@ public class UnitServiceImpl implements UnitService {
     private final RestHighLevelClient restHighLevelClient;
     private final ObjectMapper objectMapper;
 
+    static final String[] keyNames = new String[]{
+            "agencyName.keyword",
+            "agencyDetail.keyword",
+            "unitType.keyword",
+            "nameOfBuilding.keyword",
+    };
+
+    static String[] queryColumns = new String[]{"unitId", "nameOfBuilding", "agencyDetail", "agencyName"};
+
     public UnitServiceImpl(RestHighLevelClient restHighLevelClient,
                            ObjectMapper objectMapper) {
         this.restHighLevelClient = restHighLevelClient;
@@ -56,7 +65,6 @@ public class UnitServiceImpl implements UnitService {
             queryBuilder.must(keywordBoolQuery);
         }
 
-        String[] queryColumns = new String[]{"unitId", "nameOfBuilding", "agencyDetail", "agencyName"};
 
         SearchRequest searchRequest = new SearchRequest();
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
@@ -285,11 +293,6 @@ public class UnitServiceImpl implements UnitService {
             return null;
         }
 
-        final String[] keyNames = new String[]{
-                "agencyName.keyword",
-                "agencyDetail.keyword",
-                "nameOfBuilding.keyword",
-        };
 
         final BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
 

elastic-publish-service/src/main/java/com/vcarecity/publish/task/CheckUpdateTask.java

@@ -1,12 +1,14 @@
 package com.vcarecity.publish.task;
 
+import com.vcarecity.publish.constants.ElasticConstant;
+import com.vcarecity.publish.elastic.service.ElasticUpdateService;
 import com.vcarecity.publish.entity.UnitAgencyMergeEntity;
 import com.vcarecity.publish.mapper.AgencyMapper;
 import com.vcarecity.publish.mapper.UnitMapper;
 import com.vcarecity.publish.service.CheckTimeService;
-import com.vcarecity.publish.elastic.service.ElasticUpdateService;
 import com.vcarecity.publish.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -38,6 +40,8 @@ public class CheckUpdateTask {
         this.unitMapper = unitMapper;
     }
 
+
+    @Scheduled(initialDelay = 1000L, fixedDelay = ElasticConstant.CHECK_TIME_INTERVAL)
     public void checkUpdateTask() {
 
         // 当前更新时间

elastic-publish-service/src/main/resources/mapper/AgencyMapper.xml

@@ -47,8 +47,8 @@
                  INNER JOIN T_UNIT_TYPE TUT ON TUT.UNIT_TYPE_ID = TU.UNIT_TYPE_ID
     </select>
 
-    <select id="findAgencyNameByAgencyIdList" resultType="string" parameterType="list">
-        select AGENCY_NAME from T_AGENCY
+    <select id="findAgencyNameByAgencyIdList" resultType="agencyEntity" parameterType="list">
+        select AGENCY_NAME,AGENCY_ID from T_AGENCY
         <where>
             AGENCY_ID in
             <foreach item="item" collection="agencyPathIds" separator="," open="(" close=")" index="">

elastic-publish-service/src/main/resources/mapper/UnitMapper.xml

@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.vcarecity.publish.mapper.UnitMapper">
-
-    <select id="findUpdateList" resultType="unitEntity">
-        select UNIT_ID, DTU_NO, PUSER_CODE, ISDELETED
-        from T_UNIT
-        where UPDATESTAMP between to_date('${fromDate}', 'YYYY-MM-DD HH24:MI:SS')
-                  and to_date('${toDate}', 'YYYY-MM-DD HH24:MI:SS')
-    </select>
-
     <resultMap id="unitAgencyMergeEntityMap" type="unitAgencyMergeEntity">
         <result column="UNIT_ID" property="unitId"/>
         <result column="DTU_NO" property="dtuNo"/>
@@ -23,6 +15,12 @@
         <result column="UNIT_TYPE" property="unitType"/>
     </resultMap>
 
+    <select id="findUpdateList" resultType="unitEntity">
+        select UNIT_ID, DTU_NO, PUSER_CODE, ISDELETED
+        from T_UNIT
+        where UPDATESTAMP between '${fromDate}' and '${toDate}'
+    </select>
+
 
     <select id="findUpdateUaList" resultMap="unitAgencyMergeEntityMap">
         SELECT TU.UNIT_ID,
@@ -44,4 +42,22 @@
                  INNER JOIN T_BUILDING TB ON TB.BUILDING_ID = TU.BUILDING_ID
                  INNER JOIN T_UNIT_TYPE TUT ON TUT.UNIT_TYPE_ID = TU.UNIT_TYPE_ID
     </select>
+
+    <select id="findAllWithPage" resultType="unitAgencyMergeEntity">
+        SELECT TU.UNIT_ID,
+               TU.DTU_NO,
+               TU.PUSER_CODE,
+               TAG.AGENCY_ID,
+               TAG.AGENCY_PATH,
+               TAG.AGENCY_NAME,
+               TB.BUILDING_ID,
+               TB.NAME_OF_BUILDING,
+               TUT.UNIT_TYPE_ID,
+               TUT.UNIT_TYPE
+        FROM T_UNIT TU
+                 INNER JOIN T_AGENCY TAG ON TU.AGENCY_ID = TAG.AGENCY_ID AND TU.ISDELETED = 0
+                 INNER JOIN T_BUILDING TB ON TB.BUILDING_ID = TU.BUILDING_ID
+                 INNER JOIN T_UNIT_TYPE TUT ON TUT.UNIT_TYPE_ID = TU.UNIT_TYPE_ID
+        limit ?,?
+    </select>
 </mapper>