review code dir

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

@@ -1,65 +0,0 @@
-package com.vcarecity.elastic.publish.task;
-
-import com.vcarecity.elastic.publish.entity.UnitAgencyMergeEntity;
-import com.vcarecity.elastic.publish.mapper.AgencyMapper;
-import com.vcarecity.elastic.publish.mapper.BuildingMapper;
-import com.vcarecity.elastic.publish.mapper.UnitMapper;
-import com.vcarecity.elastic.publish.service.CheckTimeService;
-import com.vcarecity.elastic.publish.util.DateUtil;
-
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author Kerry on 19/12/11
- */
-
-//@Component
-public class CheckUpdateTask {
-
-    private final CheckTimeService checkTimeService;
-    private final AgencyMapper agencyMapper;
-    private final UnitMapper unitMapper;
-    private final BuildingMapper buildingMapper;
-
-    public CheckUpdateTask(CheckTimeService checkTimeService, AgencyMapper agencyMapper,
-                           UnitMapper unitMapper,
-                           BuildingMapper buildingMapper) {
-        this.checkTimeService = checkTimeService;
-        this.agencyMapper = agencyMapper;
-        this.unitMapper = unitMapper;
-        this.buildingMapper = buildingMapper;
-    }
-
-
-    public void checkTask() {
-
-        long curCheckTime = System.currentTimeMillis();
-        String toDateTime = LocalDateTime.ofInstant(new Date(curCheckTime).toInstant(), ZoneId.systemDefault()).format(DateUtil.DATE_TIME_FORMATTER);
-
-        List<UnitAgencyMergeEntity> updateUaList;
-        String fromDateTime;
-
-        fromDateTime = checkTimeService.getLastDateTime("T_UNIT");
-        updateUaList = unitMapper.findUpdateUaList(fromDateTime, toDateTime);
-        if (!updateUaList.isEmpty()) {
-
-        }
-        checkTimeService.setLastDateTime("T_UNIT", curCheckTime);
-        updateUaList.clear();
-
-        fromDateTime = checkTimeService.getLastDateTime("T_AGENCY");
-        updateUaList = agencyMapper.findUpdateUaList(fromDateTime, toDateTime);
-
-        if (!updateUaList.isEmpty()) {
-
-        }
-        checkTimeService.setLastDateTime("T_AGENCY", curCheckTime);
-        updateUaList.clear();
-
-
-    }
-
-}

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

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

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/config/ElasticConfig.java → elastic-publish-service/src/main/java/com/vcarecity/publish/config/ElasticConfig.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.config;
+package com.vcarecity.publish.config;
 
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/config/MapperConfig.java → elastic-publish-service/src/main/java/com/vcarecity/publish/config/MapperConfig.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.config;
+package com.vcarecity.publish.config;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.DeserializationFeature;

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

@@ -1,8 +1,8 @@
-package com.vcarecity.elastic.publish.controller;
+package com.vcarecity.publish.controller;
 
-import com.vcarecity.elastic.publish.pojo.dto.UnitAgencyDTO;
-import com.vcarecity.elastic.publish.pojo.query.UnitAgencyQuery;
-import com.vcarecity.elastic.publish.service.UnitService;
+import com.vcarecity.publish.pojo.dto.UnitAgencyDTO;
+import com.vcarecity.publish.pojo.query.UnitAgencyQuery;
+import com.vcarecity.publish.sql.service.UnitService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.controller;
+package com.vcarecity.publish.controller;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

elastic-publish-service/src/main/java/com/vcarecity/publish/elastic/entity/UnitAgencyDetailEntity.java

@@ -0,0 +1,17 @@
+package com.vcarecity.publish.elastic.entity;
+
+import com.vcarecity.publish.entity.UnitAgencyMergeEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @author kerryzhang on 2019/12/17
+ */
+
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class UnitAgencyDetailEntity extends UnitAgencyMergeEntity {
+    private String agencyDetail;
+}

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

@@ -0,0 +1,8 @@
+package com.vcarecity.publish.elastic.service;
+
+/**
+ * @author kerryzhang on 2019/12/17
+ */
+
+public interface ElasticLoadDataService {
+}

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/service/QueryElasticService.java → elastic-publish-service/src/main/java/com/vcarecity/publish/elastic/service/ElasticQueryService.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.service;
+package com.vcarecity.publish.elastic.service;
 
 import java.util.List;
 
@@ -6,7 +6,8 @@ import java.util.List;
  * @author VcKerry on 12/17/19
  */
 
-public interface QueryElasticService {
+public interface ElasticQueryService {
+
 
     List<Long> queryById();
 }

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/service/UpdateElasticService.java → elastic-publish-service/src/main/java/com/vcarecity/publish/elastic/service/ElasticUpdateService.java

@@ -1,6 +1,6 @@
-package com.vcarecity.elastic.publish.service;
+package com.vcarecity.publish.elastic.service;
 
-import com.vcarecity.elastic.publish.entity.UnitAgencyMergeEntity;
+import com.vcarecity.publish.entity.UnitAgencyMergeEntity;
 
 import java.io.IOException;
 import java.util.List;
@@ -9,7 +9,7 @@ import java.util.List;
  * @author Kerry on 12/17/19
  */
 
-public interface UpdateElasticService {
+public interface ElasticUpdateService {
 
     void updateTest() throws IOException;
 

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

@@ -0,0 +1,12 @@
+package com.vcarecity.publish.elastic.service.impl;
+
+import com.vcarecity.publish.elastic.service.ElasticLoadDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author kerryzhang on 2019/12/17
+ */
+
+@Service
+public class ElasticLoadDataServiceImpl implements ElasticLoadDataService {
+}

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/service/impl/QueryElasticServiceImpl.java → elastic-publish-service/src/main/java/com/vcarecity/publish/elastic/service/impl/ElasticQueryServiceImpl.java

@@ -1,6 +1,6 @@
-package com.vcarecity.elastic.publish.service.impl;
+package com.vcarecity.publish.elastic.service.impl;
 
-import com.vcarecity.elastic.publish.service.QueryElasticService;
+import com.vcarecity.publish.elastic.service.ElasticQueryService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -10,7 +10,7 @@ import java.util.List;
  */
 
 @Service
-public class QueryElasticServiceImpl implements QueryElasticService {
+public class ElasticQueryServiceImpl implements ElasticQueryService {
     @Override
     public List<Long> queryById() {
         return null;

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

@@ -1,7 +1,9 @@
-package com.vcarecity.elastic.publish.service.impl;
+package com.vcarecity.publish.elastic.service.impl;
 
-import com.vcarecity.elastic.publish.entity.UnitAgencyMergeEntity;
-import com.vcarecity.elastic.publish.service.UpdateElasticService;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.vcarecity.publish.entity.UnitAgencyMergeEntity;
+import com.vcarecity.publish.elastic.service.ElasticUpdateService;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -13,6 +15,7 @@ import org.elasticsearch.script.ScriptType;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -23,14 +26,17 @@ import java.util.Map;
  */
 
 @Service
-public class UpdateElasticServiceImpl implements UpdateElasticService {
+public class ElasticUpdateServiceImpl implements ElasticUpdateService {
 
     public static final String INDEX = "unit-agency";
 
     private final RestHighLevelClient restHighLevelClient;
+    private final ObjectMapper objectMapper;
 
-    public UpdateElasticServiceImpl(RestHighLevelClient restHighLevelClient) {
+    public ElasticUpdateServiceImpl(RestHighLevelClient restHighLevelClient,
+                                    ObjectMapper objectMapper) {
         this.restHighLevelClient = restHighLevelClient;
+        this.objectMapper = objectMapper;
     }
 
 
@@ -69,14 +75,34 @@ public class UpdateElasticServiceImpl implements UpdateElasticService {
 
     @Override
     public void updateUnit(List<UnitAgencyMergeEntity> list) throws IOException {
+        List<UnitAgencyMergeEntity> updateList = new ArrayList<>();
         List<Long> deleteId = new ArrayList<>();
         for (UnitAgencyMergeEntity uae : list) {
             if (uae.getIsDeleted() == 1) {
                 deleteId.add(uae.getUnitId());
+            } else if (uae.getIsDeleted() == 0) {
+                updateList.add(uae);
             }
         }
         deleteById("unitId", deleteId);
+        if (updateList.isEmpty()) {
+            return;
+        }
+        for (UnitAgencyMergeEntity entity : updateList) {
+
+            Map<String, Object> map = objectMapper.convertValue(entity, new TypeReference<Map<String, Object>>() {
+                @Override
+                public Type getType() {
+                    return super.getType();
+                }
+            });
+
+            map.remove("unitId");
 
+            UpdateByQueryRequest request = new UpdateByQueryRequest(INDEX);
+            request.setQuery(QueryBuilders.termQuery("unitId", entity.getUnitId()));
+
+        }
     }
 
     @Override
@@ -92,12 +118,18 @@ public class UpdateElasticServiceImpl implements UpdateElasticService {
         }
         deleteById("agencyId", deleteId);
         list.clear();
-
+        updateElasticData("agencyId", updateList);
     }
 
 
-    private void insertData(List<UnitAgencyMergeEntity> list) {
-
+    private void updateElasticData(String key, List<UnitAgencyMergeEntity> list) throws IOException {
+        if (list == null || list.isEmpty()) {
+            return;
+        }
+        for (UnitAgencyMergeEntity item : list) {
+            UpdateByQueryRequest request = new UpdateByQueryRequest(INDEX);
+            request.setQuery(QueryBuilders.termQuery(key, item.getAgencyId()));
+        }
     }
 
     private void deleteById(String key, List<Long> deleteId) throws IOException {

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/entity/AgencyEntity.java → elastic-publish-service/src/main/java/com/vcarecity/publish/entity/AgencyEntity.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.entity;
+package com.vcarecity.publish.entity;
 
 import lombok.Data;
 

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/entity/BuildingEntity.java → elastic-publish-service/src/main/java/com/vcarecity/publish/entity/BuildingEntity.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.entity;
+package com.vcarecity.publish.entity;
 
 import lombok.Data;
 

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/entity/UnitAgencyMergeEntity.java → elastic-publish-service/src/main/java/com/vcarecity/publish/entity/UnitAgencyMergeEntity.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.entity;
+package com.vcarecity.publish.entity;
 
 import lombok.Data;
 

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/entity/UnitEntity.java → elastic-publish-service/src/main/java/com/vcarecity/publish/entity/UnitEntity.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.entity;
+package com.vcarecity.publish.entity;
 
 import lombok.Data;
 

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

@@ -1,7 +1,7 @@
-package com.vcarecity.elastic.publish.mapper;
+package com.vcarecity.publish.mapper;
 
-import com.vcarecity.elastic.publish.entity.AgencyEntity;
-import com.vcarecity.elastic.publish.entity.UnitAgencyMergeEntity;
+import com.vcarecity.publish.entity.AgencyEntity;
+import com.vcarecity.publish.entity.UnitAgencyMergeEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,4 +35,11 @@ public interface AgencyMapper {
     List<UnitAgencyMergeEntity> findUpdateUaList(@Param("fromDate") String fromDate, @Param("toDate") String toDate);
 
 
+    /**
+     * 获取ID对应的AgencyName
+     *
+     * @param agencyPathIds
+     * @return
+     */
+    List<String> findAgencyNameByAgencyIdList(@Param("agencyPathIds") List<Integer> agencyPathIds);
 }

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

@@ -1,6 +1,6 @@
-package com.vcarecity.elastic.publish.mapper;
+package com.vcarecity.publish.mapper;
 
-import com.vcarecity.elastic.publish.entity.BuildingEntity;
+import com.vcarecity.publish.entity.BuildingEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -1,7 +1,7 @@
-package com.vcarecity.elastic.publish.mapper;
+package com.vcarecity.publish.mapper;
 
-import com.vcarecity.elastic.publish.entity.UnitAgencyMergeEntity;
-import com.vcarecity.elastic.publish.entity.UnitEntity;
+import com.vcarecity.publish.entity.UnitAgencyMergeEntity;
+import com.vcarecity.publish.entity.UnitEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/pojo/dto/UnitAgencyDTO.java → elastic-publish-service/src/main/java/com/vcarecity/publish/pojo/dto/UnitAgencyDTO.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.pojo.dto;
+package com.vcarecity.publish.pojo.dto;
 
 import lombok.Data;
 

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/pojo/query/UnitAgencyQuery.java → elastic-publish-service/src/main/java/com/vcarecity/publish/pojo/query/UnitAgencyQuery.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.pojo.query;
+package com.vcarecity.publish.pojo.query;
 
 import lombok.Data;
 

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/service/CheckTimeService.java → elastic-publish-service/src/main/java/com/vcarecity/publish/service/CheckTimeService.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.service;
+package com.vcarecity.publish.service;
 
 /**
  * @author VcKerry on 12/17/19

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

@@ -1,7 +1,7 @@
-package com.vcarecity.elastic.publish.service.impl;
+package com.vcarecity.publish.service.impl;
 
-import com.vcarecity.elastic.publish.service.CheckTimeService;
-import com.vcarecity.elastic.publish.util.DateUtil;
+import com.vcarecity.publish.service.CheckTimeService;
+import com.vcarecity.publish.util.DateUtil;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;

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

@@ -0,0 +1,18 @@
+package com.vcarecity.publish.sql.service;
+
+import java.util.List;
+
+/**
+ * @author kerryzhang on 2019/12/17
+ */
+
+public interface AgencyService {
+
+    /**
+     * 获取
+     *
+     * @param agencyPath
+     * @return
+     */
+    List<String> getAgencyPathDetail(List<Integer> agencyPath);
+}

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/service/UnitService.java → elastic-publish-service/src/main/java/com/vcarecity/publish/sql/service/UnitService.java

@@ -1,6 +1,6 @@
-package com.vcarecity.elastic.publish.service;
+package com.vcarecity.publish.sql.service;
 
-import com.vcarecity.elastic.publish.pojo.dto.UnitAgencyDTO;
+import com.vcarecity.publish.pojo.dto.UnitAgencyDTO;
 
 import java.io.IOException;
 import java.util.List;

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

@@ -0,0 +1,28 @@
+package com.vcarecity.publish.sql.service.impl;
+
+import com.vcarecity.publish.mapper.AgencyMapper;
+import com.vcarecity.publish.sql.service.AgencyService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author kerryzhang on 2019/12/17
+ */
+
+@Service
+public class AgencyServiceImpl implements AgencyService {
+
+    private final AgencyMapper agencyMapper;
+
+    public AgencyServiceImpl(AgencyMapper agencyMapper) {
+        this.agencyMapper = agencyMapper;
+    }
+
+    @Override
+    public List<String> getAgencyPathDetail(List<Integer> agencyPath) {
+
+        //TODO 可以优化的空间
+        return agencyMapper.findAgencyNameByAgencyIdList(agencyPath);
+    }
+}

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

@@ -1,8 +1,8 @@
-package com.vcarecity.elastic.publish.service.impl;
+package com.vcarecity.publish.sql.service.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.vcarecity.elastic.publish.pojo.dto.UnitAgencyDTO;
-import com.vcarecity.elastic.publish.service.UnitService;
+import com.vcarecity.publish.pojo.dto.UnitAgencyDTO;
+import com.vcarecity.publish.sql.service.UnitService;
 import com.vcarecity.elastic.util.AgencyPathUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.elasticsearch.action.search.SearchRequest;

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

@@ -0,0 +1,76 @@
+package com.vcarecity.publish.task;
+
+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 org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Kerry on 19/12/11
+ */
+
+@Component
+public class CheckUpdateTask {
+
+    private final CheckTimeService checkTimeService;
+    private final ElasticUpdateService elasticUpdateService;
+    private final AgencyMapper agencyMapper;
+    private final UnitMapper unitMapper;
+
+
+    public CheckUpdateTask(CheckTimeService checkTimeService,
+                           ElasticUpdateService elasticUpdateService,
+                           AgencyMapper agencyMapper,
+                           UnitMapper unitMapper) {
+        this.checkTimeService = checkTimeService;
+        this.elasticUpdateService = elasticUpdateService;
+        this.agencyMapper = agencyMapper;
+        this.unitMapper = unitMapper;
+    }
+
+
+    public void checkTask() {
+
+        // 当前更新时间
+        long curCheckTime = System.currentTimeMillis();
+        String toDateTime = LocalDateTime.ofInstant(new Date(curCheckTime).toInstant(), ZoneId.systemDefault()).format(DateUtil.DATE_TIME_FORMATTER);
+
+        List<UnitAgencyMergeEntity> updateUaList;
+        String fromDateTime;
+
+        // 获取上一次的时间
+        fromDateTime = checkTimeService.getLastDateTime("T_UNIT");
+        try {
+            updateUaList = unitMapper.findUpdateUaList(fromDateTime, toDateTime);
+            if (!updateUaList.isEmpty()) {
+                elasticUpdateService.updateUnit(updateUaList);
+            }
+            checkTimeService.setLastDateTime("T_UNIT", curCheckTime);
+            updateUaList.clear();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+
+        fromDateTime = checkTimeService.getLastDateTime("T_AGENCY");
+        try {
+            updateUaList = agencyMapper.findUpdateUaList(fromDateTime, toDateTime);
+            if (!updateUaList.isEmpty()) {
+                elasticUpdateService.updateAgency(updateUaList);
+            }
+            checkTimeService.setLastDateTime("T_AGENCY", curCheckTime);
+            updateUaList.clear();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}

elastic-publish-service/src/main/java/com/vcarecity/elastic/publish/util/DateUtil.java → elastic-publish-service/src/main/java/com/vcarecity/publish/util/DateUtil.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.util;
+package com.vcarecity.publish.util;
 
 import java.time.format.DateTimeFormatter;
 

elastic-publish-service/src/main/resources/application-dev.yml

@@ -20,5 +20,5 @@ logging:
     com:
       vcarecity: debug
 mybatis:
-  type-aliases-package: com.vcarecity.elastic.publish.entity
+  type-aliases-package: com.vcarecity.publish.entity
   mapper-locations: classpath:mapper/*.xml

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

@@ -1,12 +1,14 @@
 <?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.elastic.publish.mapper.AgencyMapper">
+<mapper namespace="com.vcarecity.publish.mapper.AgencyMapper">
 
 
     <select id="findUpdateList" resultType="agencyEntity">
-        select AGENCY_ID,AGENCY_PATH,AGENCY_NAME,ISDELETED from T_AGENCY where UPDATESTAMP between to_date('${fromDate}','YYYY-MM-DD HH24:MI:SS')
-        and to_date('${toDate}','YYYY-MM-DD HH24:MI:SS')
+        select AGENCY_ID, AGENCY_PATH, AGENCY_NAME, ISDELETED
+        from T_AGENCY
+        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">
@@ -47,5 +49,15 @@
                  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
+        <where>
+            AGENCY_ID in
+            <foreach item="item" collection="agencyPathIds" separator="," open="(" close=")" index="">
+                ${item}
+            </foreach>
+        </where>
+    </select>
+
 
 </mapper>

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

@@ -1,6 +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.elastic.publish.mapper.BuildingMapper">
+<mapper namespace="com.vcarecity.publish.mapper.BuildingMapper">
 
     <select id="findUpdateList" resultType="buildingEntity">
         select BUILDING_ID, NAME_OF_BUILDING, ISDELETED

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

@@ -1,6 +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.elastic.publish.mapper.UnitMapper">
+<mapper namespace="com.vcarecity.publish.mapper.UnitMapper">
 
     <select id="findUpdateList" resultType="unitEntity">
         select UNIT_ID, DTU_NO, PUSER_CODE, ISDELETED

elastic-publish-service/src/test/java/com/vcarecity/elastic/publish/service/impl/UpdateElasticServiceImplTest.java

@@ -1,21 +0,0 @@
-package com.vcarecity.elastic.publish.service.impl;
-
-import com.vcarecity.elastic.publish.service.UpdateElasticService;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-
-@SpringBootTest
-public class UpdateElasticServiceImplTest {
-
-    @Autowired
-    private UpdateElasticService updateElasticService;
-
-    @Test
-    void updateTest() throws Exception {
-        updateElasticService.updateTest();
-    }
-
-
-}

elastic-publish-service/src/test/java/com/vcarecity/elastic/publish/mapper/AgencyMapperTest.java → elastic-publish-service/src/test/java/com/vcarecity/publish/mapper/AgencyMapperTest.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.mapper;
+package com.vcarecity.publish.mapper;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

elastic-publish-service/src/test/java/com/vcarecity/elastic/publish/mapper/BuildingMapperTest.java → elastic-publish-service/src/test/java/com/vcarecity/publish/mapper/BuildingMapperTest.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.mapper;
+package com.vcarecity.publish.mapper;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

elastic-publish-service/src/test/java/com/vcarecity/elastic/publish/mapper/UnitMapperTest.java → elastic-publish-service/src/test/java/com/vcarecity/publish/mapper/UnitMapperTest.java

@@ -1,6 +1,6 @@
-package com.vcarecity.elastic.publish.mapper;
+package com.vcarecity.publish.mapper;
 
-import com.vcarecity.elastic.publish.entity.UnitAgencyMergeEntity;
+import com.vcarecity.publish.entity.UnitAgencyMergeEntity;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

elastic-publish-service/src/test/java/com/vcarecity/publish/service/impl/ElasticUpdateServiceImplTest.java

@@ -0,0 +1,21 @@
+package com.vcarecity.publish.service.impl;
+
+import com.vcarecity.publish.elastic.service.ElasticUpdateService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+
+@SpringBootTest
+public class ElasticUpdateServiceImplTest {
+
+    @Autowired
+    private ElasticUpdateService elasticUpdateService;
+
+    @Test
+    void updateTest() throws Exception {
+        elasticUpdateService.updateTest();
+    }
+
+
+}

elastic-publish-service/src/test/java/com/vcarecity/elastic/publish/service/impl/UnitServiceImplTest.java → elastic-publish-service/src/test/java/com/vcarecity/publish/service/impl/UnitServiceImplTest.java

@@ -1,4 +1,4 @@
-package com.vcarecity.elastic.publish.service.impl;
+package com.vcarecity.publish.service.impl;
 
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.RestHighLevelClient;