add miss key field

elastic-publish-service/index-text/unit-agency.mapping.json

@@ -44,7 +44,18 @@
         }
       }
     },
-    "dtuNo": {
+    "userCode": {
+      "type": "text",
+      "analyzer": "case_sensitive",
+      "search_analyzer": "case_sensitive",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "positions": {
       "type": "text",
       "analyzer": "case_sensitive",
       "search_analyzer": "case_sensitive",

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

@@ -21,7 +21,7 @@ Content-Type: application/json
 
 {
   "agencyPath": "/1",
-  "keyword": "卡拉ok",
+  "keyword": "b楼",
   "page": 1,
   "size": 10,
   "regulatoryLevelId": "",
@@ -31,4 +31,9 @@ Content-Type: application/json
   "unitTypeId": ""
 }
 
-### 详情信息
+### 详情信息
+
+
+GET http://{{host}}/load
+
+### load data

elastic-publish-service/src/main/java/com/vcarecity/publish/aop/PrepareAopController.java

@@ -1,15 +1,23 @@
 package com.vcarecity.publish.aop;
 
+import com.vcarecity.publish.annotation.SkipMethod;
+import com.vcarecity.publish.api.ApiResult;
+import com.vcarecity.publish.controller.PrepareController;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
 
 /**
  * @author VcKerry on 12/20/19
  */
 
-//@Aspect
-//@Component
+@Aspect
+@Component
 public class PrepareAopController {
 
 
@@ -21,7 +29,22 @@ public class PrepareAopController {
 
     @Around("preparePointcut()")
     public Object check(ProceedingJoinPoint pjp) throws Throwable {
-        return pjp.getTarget();
-    }
 
+        Object target = pjp.getTarget();
+        if (target instanceof PrepareController) {
+            MethodSignature signature = (MethodSignature) pjp.getSignature();
+            Method method = signature.getMethod();
+            if (method.getAnnotation(SkipMethod.class) != null) {
+                return pjp.proceed();
+            }
+
+            PrepareController o = (PrepareController) target;
+            if (o.isLoadData()) {
+                return pjp.proceed();
+            } else {
+                return ApiResult.builder().status(40000).message("data not loaded").build();
+            }
+        }
+        return pjp.proceed();
+    }
 }

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

@@ -22,18 +22,5 @@ public class ElasticConstant {
     public static final DateTimeFormatter ES_DT_FORMATTER = DateTimeFormatter.ofPattern(ES_DATETIME_PATTERN);
 
 
-    /**
-     * 数据未加载
-     */
-    public static final int DATA_STATUS_NOT_LOAD = -1;
-    /**
-     * 数据加载中
-     */
-    public static final int DATA_STATUS_LOADING = 0;
-    /**
-     * 数据加载完成
-     */
-    public static final int DATA_STATUS_LOADED = 1;
-
 
 }

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

@@ -35,34 +35,36 @@ public class MainController implements PrepareController {
     public MainController(UnitService unitService,
                           ElasticLoadDataService elasticLoadDataService,
                           LoadDataStatusService loadDataStatusService,
-                          @Value("${app.scheduling.enable}") Boolean schedulingEnable) {
+                          @Value("${app.index.reload}") Boolean reloadData) {
         this.unitService = unitService;
         this.elasticLoadDataService = elasticLoadDataService;
         this.loadDataStatusService = loadDataStatusService;
-        if (!schedulingEnable) {
-            loadDataStatusService.setStatus(ElasticConstant.DATA_STATUS_LOADED);
+
+        if (!reloadData) {
+            // 不重新加载
+            loadDataStatusService.setStatus(LoadDataStatusService.DATA_STATUS_LOADED);
         }
     }
 
-
+    @SkipMethod
     @ResponseBody
     @RequestMapping(value = "/load", method = {RequestMethod.GET, RequestMethod.POST})
     public ApiResult loadData() {
         synchronized (this) {
-            if (loadDataStatusService.getStatus() == ElasticConstant.DATA_STATUS_NOT_LOAD) {
+            if (loadDataStatusService.getStatus() == LoadDataStatusService.DATA_STATUS_NOT_LOAD) {
                 logger.info("prepare to load data into elasticsearch");
-                loadDataStatusService.setStatus(ElasticConstant.DATA_STATUS_LOADING);
+                loadDataStatusService.setStatus(LoadDataStatusService.DATA_STATUS_LOADING);
                 new Thread(() -> {
                     try {
                         elasticLoadDataService.loadData();
-                        loadDataStatusService.setStatus(ElasticConstant.DATA_STATUS_LOADED);
+                        loadDataStatusService.setStatus(LoadDataStatusService.DATA_STATUS_LOADED);
                     } catch (IOException e) {
                         e.printStackTrace();
-                        loadDataStatusService.setStatus(ElasticConstant.DATA_STATUS_NOT_LOAD);
+                        loadDataStatusService.setStatus(LoadDataStatusService.DATA_STATUS_NOT_LOAD);
                     }
                 }).start();
                 return ApiResult.builder().status(40000).message("first load data into elasticsearch").build();
-            } else if (loadDataStatusService.getStatus() == ElasticConstant.DATA_STATUS_LOADING) {
+            } else if (loadDataStatusService.getStatus() == LoadDataStatusService.DATA_STATUS_LOADING) {
                 return ApiResult.builder().status(40000).message("loading data into elasticsearch").build();
             }
         }
@@ -95,7 +97,7 @@ public class MainController implements PrepareController {
 
     @SkipMethod
     @Override
-    public int getDataStatus() {
-        return loadDataStatusService.getStatus();
+    public boolean isLoadData() {
+        return loadDataStatusService.isLoaded();
     }
 }

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

@@ -15,6 +15,6 @@ public interface PrepareController {
      * @return
      */
     @SkipMethod
-    int getDataStatus();
+    boolean isLoadData();
 
 }

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

@@ -19,6 +19,10 @@ public class UnitAgencyMergeEntity {
 
     private String puserCode;
 
+    private String userCode;
+
+    private String positions;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = ElasticConstant.ES_DATETIME_PATTERN, timezone = "GMT+8")
     private Date unitUpdateStamp;
 

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

@@ -13,7 +13,9 @@ import lombok.ToString;
 @Data
 public class UnitAgencyDTO extends UnitIdDTO {
     private String dtuNo;
+    private String userCode;
     private String agencyName;
+    private String positions;
     private String nameOfBuilding;
     private String unitType;
     private String unitUpdateStamp;

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

@@ -47,10 +47,11 @@ public class UnitServiceImpl implements UnitService {
 
 
     static final String[] SEARCH_KEY_NAMES = new String[]{
-            "dtuNo",
             "agencyName",
             "unitType",
             "nameOfBuilding",
+            "userCode",
+            "positions"
     };
 
     static final String[] MATCH_KEY_NAMES = new String[]{
@@ -331,7 +332,7 @@ public class UnitServiceImpl implements UnitService {
         if (keyword == null || keyword.trim().length() == 0) {
             return null;
         }
-
+        keyword = keyword.toLowerCase();
 
         final BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
 

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

@@ -26,5 +26,6 @@ debug: true
 app:
   index:
     config: index-text
+    reload: true
   scheduling:
     enable: true

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

@@ -27,5 +27,6 @@ debug: true
 app:
   index:
     config: index-text
+    reload: true
   scheduling:
     enable: false

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

@@ -15,6 +15,8 @@
         <result column="UNIT_ID" property="unitId"/>
         <result column="DTU_NO" property="dtuNo"/>
         <result column="PUSER_CODE" property="puserCode"/>
+        <result column="USER_CODE" property="userCode"/>
+        <result column="POSITIONS" property="positions"/>
         <result column="UNIT_UPDATE_STAMP" property="unitUpdateStamp" javaType="java.util.Date"/>
         <result column="ISDELETED" property="isDeleted"/>
         <result column="AGENCY_ID" property="agencyId"/>
@@ -35,6 +37,8 @@
         SELECT TU.UNIT_ID,
                TU.DTU_NO,
                TU.PUSER_CODE,
+               TU.USER_CODE,
+               TU.POSITIONS,
                TU.UPDATESTAMP UNIT_UPDATE_STAMP,
                TAG.AGENCY_ID,
                TAG.AGENCY_PATH,

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

@@ -6,6 +6,8 @@
         <result column="UNIT_ID" property="unitId"/>
         <result column="DTU_NO" property="dtuNo"/>
         <result column="PUSER_CODE" property="puserCode"/>
+        <result column="USER_CODE" property="userCode"/>
+        <result column="POSITIONS" property="positions"/>
         <result column="UNIT_UPDATE_STAMP" property="unitUpdateStamp" javaType="java.util.Date"/>
         <result column="ISDELETED" property="isDeleted"/>
         <result column="AGENCY_ID" property="agencyId"/>
@@ -32,6 +34,8 @@
         SELECT TU.UNIT_ID,
                TU.DTU_NO,
                TU.PUSER_CODE,
+               TU.USER_CODE,
+               TU.POSITIONS,
                TU.UPDATESTAMP UNIT_UPDATE_STAMP,
                TU.ISDELETED,
                TAG.AGENCY_ID,
@@ -59,6 +63,8 @@
         SELECT TU.UNIT_ID,
                TU.DTU_NO,
                TU.PUSER_CODE,
+               TU.USER_CODE,
+               TU.POSITIONS,
                TU.UPDATESTAMP UNIT_UPDATE_STAMP,
                TAG.AGENCY_ID,
                TAG.AGENCY_PATH,