ADD req fields

elastic-publish-service/action.sh

@@ -0,0 +1,127 @@
+#!/bin/sh
+
+# PS some OS location: /usr/sbin/cronolog OR /usr/local/sbin/cronolog OR /usr/bin/cronolog(ubuntu)
+CRONOLOG_PATH=/usr/local/sbin/cronolog
+if [ ! -f "$CRONOLOG_PATH" ]; then
+    CRONOLOG_PATH=/usr/sbin/cronolog
+    if [ ! -f "$CRONOLOG_PATH" ]; then
+        CRONOLOG_PATH=/usr/bin/cronolog
+    fi;
+fi;
+
+# 当前脚本所在目录
+SERVER=$(cd `dirname $0`; pwd)
+cd $SERVER
+
+# 文件全路径
+FULL_PATH=$SERVER/elastic-publish-service-1.0.0.jar
+# 程序的名字,不包括版本号,一般JAR包文件名为: $APP_SIGNATURE-1.0.0.jar ,备份用.
+APP_SIGNATURE=elastic-publish-service
+# 运行参数,如: -Xmx800m
+RUN_PARAM=
+
+# 组合命令,如果是Java,运行其他程序,改这里,如其他运行: ./frpc -c frpc.ini
+RUN_COMMAND="java -jar $FULL_PATH"
+
+# 运行程序的PID文件名
+PID_FILE_NAME=.pid
+# 程序运行日志文件
+APP_LOG_FILE=application.log
+
+# 检查文件是否存在,
+if [ ! -f "$FULL_PATH" ];then
+    echo "file = [$FULL_PATH] not found..."
+    exit 0
+fi
+
+NOHUP_PREFIX=logs/nohup_
+
+res=""
+
+if [ $# -eq 0 ] ; then
+    echo "Usage: {start|stop|restart|fstop|np|nph|al|alh}"
+else
+    case "$1" in
+        start)
+                # kill 
+                res=`ps aux | grep "$SERVER/$APP_SIGNATURE" | grep -v "grep" | awk '{print $2}'`
+                if [ -n "$res" ];then
+                    kill -9 $(ps aux | grep "$SERVER/$APP_SIGNATURE" | grep -v "grep" | awk '{print $2}')
+                    sleep 1
+                fi
+                nohup $RUN_COMMAND $RUN_PARAM 2>&1 | $CRONOLOG_PATH ./$NOHUP_PREFIX%Y%m%d.log &
+                echo $[$!-1] > $SERVER/$PID_FILE_NAME
+                ;;
+
+        stop)
+            kill  `cat $SERVER/$PID_FILE_NAME`
+            rm -rf $SERVER/$PID_FILE_NAME
+            ;;
+
+        restart)
+            kill  `cat $SERVER/$PID_FILE_NAME`
+            rm -rf $SERVER/$PID_FILE_NAME
+            sleep 1
+            nohup $RUN_COMMAND $RUN_PARAM 2>&1 | $CRONOLOG_PATH ./$NOHUP_PREFIX%Y%m%d.log &
+            echo $[$!-1] > $SERVER/$PID_FILE_NAME
+            ;;
+
+        fstop)
+            kill -9 `cat $SERVER/$PID_FILE_NAME`
+            rm -rf $SERVER/$PID_FILE_NAME
+            ;;
+
+        np)
+            # echo $2
+            DATE=$(date +%Y%m%d)
+            tail -f  "./$NOHUP_PREFIX$DATE.log" | grep "$2"
+            ;;
+        nph)
+            # echo $2
+            DATE=$(date +%Y%m%d)
+            tail -f  "./$NOHUP_PREFIX$DATE.log" | perl -pe 's/('$2')/\e[1;31m$1\e[0m/g'
+            ;;
+        al)
+            tail -f  "./logs/$APP_LOG_FILE" | grep "$2"
+            ;;
+        alh)
+            tail -f  "./logs/$APP_LOG_FILE" | perl -pe 's/('$2')/\e[1;31m$1\e[0m/g'
+            ;;
+        backup)
+            BACKUP_DATE=$(date +%Y%m%d%H%M)
+            BACKUP_FOLDER=$SERVER/backup
+            if [ ! -d "$BACKUP_FOLDER" ];then
+                mkdir $BACKUP_FOLDER
+            fi
+            CU_BACK_UP=$BACKUP_FOLDER/$BACKUP_DATE
+            if [ ! -d "$CU_BACK_UP" ];then
+                mkdir $CU_BACK_UP
+            fi
+            cp $SERVER/$APP_SIGNATURE*.jar $CU_BACK_UP/
+            cp -R $SERVER/lib $CU_BACK_UP/
+            cp -R $SERVER/config $CU_BACK_UP/
+            ;;
+        rollback)
+            if [ $# -eq 2 ] ; then
+                ROLLBACK_FOLDER=$SERVER/backup/$2
+                echo "rollback version:"$ROLLBACK_FOLDER
+                if [ ! -d "$ROLLBACK_FOLDER" ];then
+                    echo "rollback version not found in file system. "$ROLLBACK_FOLDER
+                    exit 0
+                fi
+                rm -rf $SERVER/$APP_SIGNATURE*.jar
+                rm -rf $SERVER/lib
+                rm -rf $SERVER/config
+                cp $ROLLBACK_FOLDER/$APP_SIGNATURE*.jar $SERVER
+                cp -R $ROLLBACK_FOLDER/lib $SERVER/lib
+                cp -R $ROLLBACK_FOLDER/config $SERVER/config
+            else
+                echo "not input rollback version"
+            fi;
+            ;;
+        *)
+            echo "Usage: {start|stop|restart|fstop|np|nph}"
+            ;;
+        esac
+fi;
+exit 0

elastic-publish-service/config/logback-my.xml

@@ -0,0 +1,63 @@
+<included>
+
+    <!--默认 Appender-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>utf8</charset>
+        </encoder>
+    </appender>
+
+    <!-- LOG TO FILE -->
+    <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/application.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>logs/application.%d{yyyyMMdd}_%i.log</fileNamePattern>
+            <maxHistory>30</maxHistory>
+            <totalSizeCap>20GB</totalSizeCap>
+            <maxFileSize>50MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- profile -->
+    <springProfile name="dev">
+        <logger name="com.vcarecity" level="DEBUG" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+
+        <logger name="com.vcarecity.publish.mapper.AgencyMapper" level="INFO" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+
+    </springProfile>
+
+    <springProfile name="beta">
+        <logger name="com.vcarecity" level="DEBUG" additivity="false">
+            <appender-ref ref="LOGFILE"/>
+        </logger>
+
+        <logger name="com.vcarecity.publish.mapper.AgencyMapper" level="INFO" additivity="false">
+            <appender-ref ref="LOGFILE"/>
+        </logger>
+
+    </springProfile>
+
+
+    <springProfile name="production">
+        <logger name="com.vcarecity" level="DEBUG" additivity="false">
+            <appender-ref ref="LOGFILE"/>
+        </logger>
+
+        <logger name="com.vcarecity.publish.mapper.AgencyMapper" level="INFO" additivity="false">
+            <appender-ref ref="LOGFILE"/>
+        </logger>
+
+    </springProfile>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+    </root>
+</included>

elastic-publish-service/req/http-client.env.json

@@ -1,5 +1,11 @@
 {
   "dev": {
     "host": "http://192.168.10.179:7080"
+  },
+  "beta": {
+    "host": "http://192.168.10.100:8092"
+  },
+  "beta-out": {
+    "host": "http://103.239.204.35:8092"
   }
 }

elastic-publish-service/req/load.http

@@ -0,0 +1,3 @@
+GET http://{{host}}/load
+
+### load data

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

@@ -9,7 +9,8 @@ Content-Type: application/json
   "regulatoryLevelId": "",
   "property": "",
   "classify": "",
-  "agencyAttributeClassId": ""
+  "agencyAttributeClassId": "",
+  "unitTypeId": ""
 }
 
 ### unitId 信息
@@ -26,7 +27,8 @@ Content-Type: application/json
   "regulatoryLevelId": "",
   "property": "",
   "classify": "",
-  "agencyAttributeClassId": ""
+  "agencyAttributeClassId": "",
+  "unitTypeId": ""
 }
 
 ### 详情信息

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

@@ -1,19 +1,15 @@
 package com.vcarecity.publish.aop;
 
-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.springframework.stereotype.Component;
 
 /**
  * @author VcKerry on 12/20/19
  */
 
-@Aspect
-@Component
+//@Aspect
+//@Component
 public class PrepareAopController {
 
 
@@ -25,18 +21,7 @@ public class PrepareAopController {
 
     @Around("preparePointcut()")
     public Object check(ProceedingJoinPoint pjp) throws Throwable {
-        Object target = pjp.getTarget();
-
-        if (target instanceof PrepareController) {
-
-            if (((PrepareController) target).isPrepare()) {
-                return pjp.proceed();
-            }
-            // 数据没有准备好...
-            return ApiResult.builder().status(40000).message("data loading ").build();
-        }
-
-        return pjp.proceed();
+        return pjp.getTarget();
     }
 
 }

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

@@ -1,6 +1,5 @@
 package com.vcarecity.publish.constants;
 
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 
 /**
@@ -23,5 +22,18 @@ public class ElasticConstant {
     public static final DateTimeFormatter ES_DT_FORMATTER = DateTimeFormatter.ofPattern(ES_DATETIME_PATTERN);
 
 
-    public static final String SYSTEM_TIMEZONE = ZoneId.systemDefault().getId();
+    /**
+     * 数据未加载
+     */
+    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

@@ -9,47 +9,64 @@ import com.vcarecity.publish.pojo.dto.UnitAgencyDTO;
 import com.vcarecity.publish.pojo.dto.UnitIdDTO;
 import com.vcarecity.publish.pojo.query.UnitAgencyQuery;
 import com.vcarecity.publish.sql.service.UnitService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @author Kerry on 19/12/11
  */
 
+@Slf4j
 @RestController
 public class MainController implements PrepareController {
 
-    private int status = -1;
+    private AtomicInteger dataStatus;
 
     private final UnitService unitService;
     private final ElasticLoadDataService elasticLoadDataService;
 
-    public MainController(UnitService unitService, ElasticLoadDataService elasticLoadDataService) {
+    public MainController(UnitService unitService,
+                          ElasticLoadDataService elasticLoadDataService,
+                          @Value("${app.scheduling.enable}") Boolean schedulingEnable) {
         this.unitService = unitService;
         this.elasticLoadDataService = elasticLoadDataService;
+
+        if (schedulingEnable) {
+            dataStatus = new AtomicInteger(ElasticConstant.DATA_STATUS_LOADED);
+        } else {
+            dataStatus = new AtomicInteger(ElasticConstant.DATA_STATUS_NOT_LOAD);
+        }
     }
 
 
+    @ResponseBody
     @RequestMapping(value = "/load", method = {RequestMethod.GET, RequestMethod.POST})
     public ApiResult loadData() {
-        if (status == -1) {
-            status = 0;
-            synchronized (this) {
+        synchronized (this) {
+            if (dataStatus.get() == ElasticConstant.DATA_STATUS_NOT_LOAD) {
+                logger.info("prepare to load data into elasticsearch");
+                dataStatus.set(ElasticConstant.DATA_STATUS_LOADING);
                 new Thread(() -> {
                     try {
                         elasticLoadDataService.loadData();
-                        status = 1;
+                        dataStatus.set(ElasticConstant.DATA_STATUS_LOADED);
                     } catch (IOException e) {
                         e.printStackTrace();
-                        status = -1;
+                        dataStatus.set(ElasticConstant.DATA_STATUS_NOT_LOAD);
                     }
                 }).start();
+                return ApiResult.builder().status(40000).message("first load data into elasticsearch").build();
+            } else if (dataStatus.get() == ElasticConstant.DATA_STATUS_LOADING) {
+                return ApiResult.builder().status(40000).message("loading data into elasticsearch").build();
             }
         }
-        return ApiResult.builder().status(40000).message("loading data").build();
+        return ApiResult.builder().status(40000).message("already load data success!").build();
     }
 
 
@@ -67,9 +84,10 @@ public class MainController implements PrepareController {
         return ApiResult.builder().status(ApiStatus.SUCCESS_CODE).data(data).build();
     }
 
+
     @SkipMethod
     @Override
-    public boolean isPrepare() {
-        return false;
+    public int getDataStatus() {
+        return dataStatus.get();
     }
 }

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

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

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

@@ -27,5 +27,6 @@ public class UnitAgencyQuery {
     private String classify;
     private String regulatoryLevelId;
     private String agencyAttributeClassId;
+    private String unitTypeId;
 
 }

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

@@ -47,6 +47,7 @@ public class UnitServiceImpl implements UnitService {
     static final String[] MATCH_KEY_NAMES = new String[]{
             "agencyAttributeClassId",
             "regulatoryLevelId",
+            "unitTypeId",
             "property",
             "classify"
     };

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

@@ -1,8 +1,8 @@
 server:
-  port: 7080
+  port: 8092
 spring:
   datasource:
-    url: jdbc:mysql:replication://192.168.10.210:6446,192.168.10.210:6447/fmmp?serverTimezone=Asia/Shanghai
+    url: jdbc:mysql:replication://192.168.10.31:6446,192.168.10.31:6447/fmmp?serverTimezone=Asia/Shanghai
     username: root
     password: R00T@mysql
   elasticsearch:
@@ -14,7 +14,7 @@ spring:
       password: abcd!234
   redis:
     database: 2
-    host: 192.168.10.112
+    host: 192.168.10.240
     port: 6379
     password: admin~1(^-^)
 mybatis:

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

@@ -26,4 +26,4 @@ mybatis:
 debug: true
 app:
   scheduling:
-    enable: true
+    enable: false

elastic-publish-service/src/main/resources/logback-spring.xml

@@ -3,35 +3,9 @@
 
     <!--spring-boot-2.0.3.RELEASE.jar!/org/springframework/boot/logging/logback/defaults.xml-->
     <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include file="config/logback-my.xml"/>
 
 
-    <!--默认 Appender-->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-            <charset>utf8</charset>
-        </encoder>
-    </appender>
-
-
-    <root level="INFO">
-        <appender-ref ref="CONSOLE"/>
-    </root>
-
-
-    <springProfile name="dev">
-
-        <logger name="com.vcarecity" level="DEBUG" additivity="false">
-            <appender-ref ref="CONSOLE"/>
-        </logger>
-
-        <logger name="com.vcarecity.publish.mapper.AgencyMapper" level="INFO" additivity="false">
-            <appender-ref ref="CONSOLE"/>
-        </logger>
-
-
-    </springProfile>
-
 
     <springProfile name="beta">