feat: 不动产数据稽查页面脚本

readme.md

@@ -2,6 +2,64 @@
 
 ## [接口文档](http://192.168.50.3:12130/doc.html)
 
+## 正式环境
+
+### 后端
+
+133.96.95.30/app/finance-api
+
+### 不动产资源地图页面
+
+- 部署位置
+
+133.96.95.30/app/house-resource-map
+
+- 页面地址
+
+https://133.96.95.30:8000/house-car/house/resource-map/#/?data=zoQtYlmhk/add/mBUBZD5mFJB1IXEwaLRS97Uf9z9Hlqdh/UHio66b35GOo/eEziALCI90sLNBn3WM7k1/FVGgGiDUO84mJ2JUgw5zHx8fvcO/OxqUB83JYaeV6eJIWkvJpp
+
+### 不动产报告页面
+
+- 部署位置
+
+133.96.95.30/app/house-report
+
+- 页面地址
+
+https://133.96.95.30:8000/house-car/house/report/#/?data=zoQtYlmhk/add/mBUBZD5mFJB1IXEwaLRS97Uf9z9Hlqdh/UHio66b35GOo/eEziALCI90sLNBn3WM7k1/FVGgGiDUO84mJ2JUgw5zHx8fvcO/OxqUB83JYaeV6eJIWkvJpp
+
+### 不动产数据稽查页面
+
+- 部署位置
+
+133.96.95.30/app/house-data-check
+
+- 页面地址
+
+https://133.96.95.30:8000/house-car/house/data-check/#/?data=zoQtYlmhk/add/mBUBZD5mFJB1IXEwaLRS97Uf9z9Hlqdh/UHio66b35GOo/eEziALCI90sLNBn3WM7k1/FVGgGiDUO84mJ2JUgw5zHx8fvcO/OxqUB83JYaeV6eJIWkvJpp
+
+### 车辆资源地图页面
+
+- 部署位置
+
+133.96.95.30/app/car-resource-map
+
+- 页面地址
+
+https://133.96.95.30:8000/house-car/car/resource-map/#/?data=zoQtYlmhk/add/mBUBZD5mFJB1IXEwaLRS97Uf9z9Hlqdh/UHio66b35GOo/eEziALCI90sLNBn3WM7k1/FVGgGiDUO84mJ2JUgw5zHx8fvcO/OxqUB83JYaeV6eJIWkvJpp
+
+### 车辆报告页面
+
+- 部署位置
+
+133.96.95.30/app/car-report
+
+- 页面地址
+
+https://133.96.95.30:8000/house-car/car/report/#/?data=zoQtYlmhk/add/mBUBZD5mFJB1IXEwaLRS97Uf9z9Hlqdh/UHio66b35GOo/eEziALCI90sLNBn3WM7k1/FVGgGiDUO84mJ2JUgw5zHx8fvcO/OxqUB83JYaeV6eJIWkvJpp
+
 ## 测试环境
 
-192.168.50.3/data/finance-api
+### 后端
+
+192.168.50.3/data/finance-api

scripts/8000.conf

@@ -10,7 +10,10 @@ server {
     ssl_protocols TLSv1.2 TLSv1.3;
     ssl_prefer_server_ciphers on;
     server_tokens off;
+    proxy_hide_header X-Powered-By;
 
+        proxy_hide_header Server;
+    #add_header X-Frame-Options SAMEORIGIN;
     #access_log  /var/log/nginx/host.access.log  main;
 
     # minio
@@ -62,10 +65,63 @@ server {
         proxy_pass http://172.16.107.4:39204;
     }
 
+    # 不动产数据稽查页面接口
+    location /house-car/house/DATA-CHECK/api {
+        proxy_pass http://172.16.107.4:39205;
+    }
+
+    # 不动产数据稽查页面
+    location /house-car/house/DATA-CHECK {
+        rewrite ^/house-car/house/DATA-CHECK/(.*)$ /$1 break;
+        proxy_pass http://172.16.107.4:39205;
+    }
+
+    # 不动产数据稽查页面接口
+    location /house-car/house/data-check/api {
+        proxy_pass http://172.16.107.4:39205;
+    }
+
+    # 不动产数据稽查页面
+    location /house-car/house/data-check {
+        rewrite ^/house-car/house/data-check/(.*)$ /$1 break;
+        proxy_pass http://172.16.107.4:39205;
+    }
+
+
     # 不动产系统
     location /house-car/house/dist/ {
         proxy_pass http://172.16.107.4:39089/house/dist/;
     }
+    location /house-car/house/api/ { 
+  	proxy_pass http://172.16.107.4:39089/house/api/; 
+    }
+
+    #车辆系统
+    location /house-car/car/ {
+        proxy_redirect off;
+        proxy_set_header Host $host:$server_port;
+        proxy_set_header X-Real-IP  $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass https://127.0.0.1:8080/;
+     }
+
+     location /house-car/car/assets/ {
+        #    add_header Access-Control-Allow-Origin '*' always;
+        #    add_header Access-Control-Allow-Headers '*';
+        #    add_header Access-Control-Allow-Methods '*';
+        #    add_header Access-Control-Allow-Credentials 'false';
+        #    if ($request_method = 'OPTIONS') {
+        #        return 204;
+        #    }
+        proxy_redirect off;
+        proxy_set_header Host $host:$server_port;
+        proxy_set_header X-Real-IP  $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass https://127.0.0.1:8080/assets/;
+     }
+
+
+
 
     #error_page  404              /404.html;
 
@@ -98,4 +154,4 @@ server {
     #location ~ /\.ht {
     #    deny  all;
     #}
-}
+}

scripts/house-data-check/.dockerignore

@@ -0,0 +1,3 @@
+*
+!default.conf
+!dist.zip

scripts/house-data-check/Dockerfile

@@ -0,0 +1,5 @@
+FROM nginx:1.24.0-alpine-slim
+LABEL type="app" name="house-data-check"
+COPY dist.zip dist.zip
+RUN unzip dist.zip && rm -rf dist.zip
+COPY default.conf /etc/nginx/conf.d/

scripts/house-data-check/default.conf

@@ -0,0 +1,22 @@
+server {
+    listen       39205;
+    listen  [::]:39205;
+    server_name localhost;
+
+    access_log access.log;
+    error_log error.log;
+
+    location / {
+        root   /dist;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+    # 后端
+    location /house-car/house/data-check/api {
+        proxy_pass http://172.16.107.4:39100;
+    }
+    # minio
+    location /house-car/oss {
+        proxy_pass http://172.16.107.4:39000;
+    }
+}

scripts/house-data-check/rollback.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+CONTAINER_NAME=house-data-check
+TAG=$1
+docker stop "${CONTAINER_NAME}" && docker rm -f "${CONTAINER_NAME}"
+docker run --name "${CONTAINER_NAME}" --restart=unless-stopped --network=host -d "${CONTAINER_NAME}":"${TAG}"

scripts/house-data-check/update.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+CONTAINER_NAME=house-data-check
+TAG=$(date +%Y%m%d%H%M%S)
+docker stop "${CONTAINER_NAME}" && docker rm -f "${CONTAINER_NAME}"
+docker build -t "${CONTAINER_NAME}":"${TAG}" .
+docker run --name "${CONTAINER_NAME}" --restart=unless-stopped --network=host -d "${CONTAINER_NAME}":"${TAG}"

src/main/java/com/nokia/financeapi/dao/house/HouseResourceMapMapper.java

@@ -85,6 +85,8 @@ where
         max(year_month)
     from
         house.building_month)
+    and city is not null
+    and city != ''
 group by
     city
 ),
@@ -100,6 +102,8 @@ where
         max(year_month)
     from
         house.land_month)
+    and city is not null
+    and city != ''
 group by
     city
 )

src/main/resources/application-dev.properties

@@ -0,0 +1,16 @@
+server.port=39100
+logging.level.com.nokia=debug
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.url=jdbc:postgresql://192.168.154.130:5432/financialdb
+spring.datasource.username=postgres
+spring.datasource.password=Test!234
+# minio配置
+minio.endpoint=http://192.168.10.7:19000/
+minio.bucket=house-car
+minio.accessKey=house-car
+minio.secretKey=EGqIq7zKZwfasMQ5eLIoLId631vmLaal
+minio.expiry=15
+# 一房产一局址页面url
+pages.house.siteUrl=house-car/house/dist/index.html#/administrative/overview
+house.import-data.wxys=data/import-data/house/wxys/
+house.import-data.czys=data/import-data/house/czys/