manual add by UnitId

elastic-publish-service/req/main-controller.http

@@ -21,7 +21,7 @@ Content-Type: application/json
 
 {
   "agencyPath": "/1",
-  "keyword": "科苑一区",
+  "keyword": "33E9D1",
   "page": 1,
   "size": 10,
   "regulatoryLevelId": "",
@@ -45,4 +45,9 @@ GET http://{{host}}/set-load
 
 GET http://{{host}}/loadByAgencyIds?agencyIds=190084,196581
 
-### load data
+### load data
+
+
+GET http://{{host}}/loadByUnitIds?unitIds=545775
+
+### load by unitId

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

@@ -91,11 +91,8 @@ public class MainController implements PrepareController {
         return ApiResult.builder().status(20000).message("already load data success!").build();
     }
 
-
-    @ResponseBody
-    @RequestMapping(value = "/loadByAgencyIds", method = {RequestMethod.POST, RequestMethod.GET})
-    public ApiResult loadByAgencyIds(@RequestParam("agencyIds") String agencyIds) {
-        String[] split = agencyIds.split(",");
+    private List<Long> toQueryIds(String idStr) {
+        String[] split = idStr.split(",");
         List<Long> ids = new ArrayList<>(split.length);
         for (String s : split) {
             try {
@@ -104,6 +101,14 @@ public class MainController implements PrepareController {
                 e.printStackTrace();
             }
         }
+        return ids;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/loadByAgencyIds", method = {RequestMethod.POST, RequestMethod.GET})
+    public ApiResult loadByAgencyIds(@RequestParam("agencyIds") String agencyIds) {
+        List<Long> ids = toQueryIds(agencyIds);
+
         List<UnitAgencyMergeEntity> result = agencyService.loadByAgencyIds(ids);
         if (result == null) {
             return ApiResult.builder().status(ApiStatus.FAILED_CODE).build();
@@ -117,6 +122,23 @@ public class MainController implements PrepareController {
         }
     }
 
+    @ResponseBody
+    @RequestMapping(value = "/loadByUnitIds", method = {RequestMethod.POST, RequestMethod.GET})
+    public ApiResult loadByUnitIds(@RequestParam("unitIds") String unitIds) {
+        List<Long> ids = toQueryIds(unitIds);
+        List<UnitAgencyMergeEntity> result = unitService.loadByUnitIds(ids);
+        if (result == null || result.isEmpty()) {
+            return ApiResult.builder().status(ApiStatus.FAILED_CODE).build();
+        }
+        try {
+            elasticUpdateService.handlerDataChange("unitId", result);
+            return ApiResult.builder().status(ApiStatus.SUCCESS_CODE).build();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return ApiResult.builder().status(40000).message(e.getMessage()).build();
+        }
+    }
+
 
     @PostMapping("/query-unit-agency")
     public ApiResult queryUnitAgency(@RequestBody @Valid UnitAgencyQuery unitAgencyQuery) throws IOException {

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

@@ -45,4 +45,11 @@ public interface UnitMapper {
     List<UnitAgencyMergeEntity> findAllWithPage(@Param("page") int page, @Param("size") int size);
 
 
+    /**
+     * load
+     *
+     * @param unitIds
+     * @return
+     */
+    List<UnitAgencyMergeEntity> loadByUnitIds(@Param("unitIds") List<Long> unitIds);
 }

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

@@ -1,5 +1,6 @@
 package com.vcarecity.publish.sql.service;
 
+import com.vcarecity.publish.entity.UnitAgencyMergeEntity;
 import com.vcarecity.publish.pojo.dto.TotalResultDTO;
 import com.vcarecity.publish.pojo.dto.UnitIdDTO;
 import com.vcarecity.publish.pojo.query.UnitAgencyQuery;
@@ -24,4 +25,11 @@ public interface UnitService {
      */
     <T extends UnitIdDTO> TotalResultDTO<List<T>> getUnitAgencyByQuery(UnitAgencyQuery queryParam, Class<T> cls, String... indices) throws IOException;
 
+    /**
+     * add by Unit ID
+     *
+     * @param unitIds
+     * @return
+     */
+    List<UnitAgencyMergeEntity> loadByUnitIds(List<Long> unitIds);
 }

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

@@ -2,6 +2,8 @@ package com.vcarecity.publish.sql.service.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.vcarecity.elastic.util.AgencyPathUtil;
+import com.vcarecity.publish.entity.UnitAgencyMergeEntity;
+import com.vcarecity.publish.mapper.UnitMapper;
 import com.vcarecity.publish.pojo.dto.TotalResultDTO;
 import com.vcarecity.publish.pojo.dto.UnitIdDTO;
 import com.vcarecity.publish.pojo.query.UnitAgencyQuery;
@@ -37,6 +39,7 @@ public class UnitServiceImpl implements UnitService {
 
     private final RestHighLevelClient restHighLevelClient;
     private final ObjectMapper objectMapper;
+    private final UnitMapper unitMapper;
 
     /*static final String[] SEARCH_KEY_NAMES = new String[]{
             "dtuNo.keyword",
@@ -64,9 +67,10 @@ public class UnitServiceImpl implements UnitService {
 
 
     public UnitServiceImpl(RestHighLevelClient restHighLevelClient,
-                           ObjectMapper objectMapper) {
+                           ObjectMapper objectMapper, UnitMapper unitMapper) {
         this.restHighLevelClient = restHighLevelClient;
         this.objectMapper = objectMapper;
+        this.unitMapper = unitMapper;
     }
 
     @Override
@@ -129,6 +133,14 @@ public class UnitServiceImpl implements UnitService {
         return new TotalResultDTO<>(res, total);
     }
 
+    @Override
+    public List<UnitAgencyMergeEntity> loadByUnitIds(List<Long> unitIds) {
+        if (unitIds == null || unitIds.isEmpty()) {
+            return null;
+        }
+        return unitMapper.loadByUnitIds(unitIds);
+    }
+
     /**
      * agency id
      * <pre>

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

@@ -84,4 +84,37 @@
                  INNER JOIN T_AGENCY_EXTEND TAE ON TAE.AGENCY_ID = TU.AGENCY_ID
         limit ${page},${size}
     </select>
+
+    <select id="loadByUnitIds" resultMap="unitAgencyMergeEntityMap">
+        SELECT TU.UNIT_ID,
+        TU.DTU_NO,
+        TU.PUSER_CODE,
+        TU.USER_CODE,
+        TU.POSITIONS,
+        TU.ISDELETED,
+        TU.UPDATESTAMP UNIT_UPDATE_STAMP,
+        TAG.AGENCY_ID,
+        TAG.AGENCY_PATH,
+        TAG.AGENCY_NAME,
+        TB.BUILDING_ID,
+        TB.NAME_OF_BUILDING,
+        TUT.UNIT_TYPE_ID,
+        TUT.UNIT_TYPE,
+        TUT.PROPERTY,
+        TUT.CLASSIFY,
+        TAE.REGULATORY_LEVEL_ID,
+        TAE.AGENCY_ATTRIBUTE_CLASS_ID
+        FROM (
+        SELECT TUI.*
+        from T_UNIT TUI
+        where TUI.UNIT_ID in
+        <foreach item="item" collection="unitIds" separator="," open="(" close=")" index="">
+            ${item}
+        </foreach>
+        ) 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
+        INNER JOIN T_AGENCY_EXTEND TAE ON TAE.AGENCY_ID = TU.AGENCY_ID
+    </select>
 </mapper>

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

@@ -1,5 +1,7 @@
 package com.vcarecity.publish.service.impl;
 
+import com.vcarecity.publish.entity.UnitAgencyMergeEntity;
+import com.vcarecity.publish.mapper.UnitMapper;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.script.Script;
@@ -8,7 +10,9 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 
@@ -18,6 +22,9 @@ class UnitServiceImplTest {
     @Autowired
     private RestHighLevelClient restHighLevelClient;
 
+    @Autowired
+    private UnitMapper unitMapper;
+
     @Test
     public void getUnitAgencyByQuery() {
 
@@ -32,4 +39,14 @@ class UnitServiceImplTest {
 
         request.script(inline);
     }
+
+    @Test
+    public void loadByUnitIds() throws Exception {
+        List<Long> ids = new ArrayList<>();
+        ids.add(545775L);
+        final List<UnitAgencyMergeEntity> unitAgencyMergeEntities = unitMapper.loadByUnitIds(ids);
+        for (UnitAgencyMergeEntity unitAgencyMergeEntity : unitAgencyMergeEntities) {
+            System.out.println(unitAgencyMergeEntity);
+        }
+    }
 }

pom.xml

@@ -163,6 +163,7 @@
                 <configuration>
                     <source>8</source>
                     <target>8</target>
+                    <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
         </plugins>