From 4d4d36ddeffeaf03bdd9d541dc01956e27e20eb0 Mon Sep 17 00:00:00 2001
From: purple <purple_lihe@163.com>
Date: Fri, 10 Jul 2020 17:36:31 +0800
Subject: [PATCH] =?UTF-8?q?feature=20(=E4=BD=8F=E5=AE=85=E9=94=80=E5=94=AE?=
=?UTF-8?q?=E6=8C=82=E7=89=8C=E6=A1=88=E4=BE=8B=E4=B8=8A=E4=BC=A0=E5=88=B0?=
=?UTF-8?q?CALC)=EF=BC=9A=20=E6=8E=A8=E9=80=81=E4=BD=8F=E5=AE=85=E9=94=80?=
=?UTF-8?q?=E5=94=AE=E6=8C=82=E7=89=8C=E6=A1=88=E4=BE=8B=E5=88=B0CALC?=
=?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
1. 推送住宅销售挂牌案例到CALC库
2. 修改dialog弹窗，点击其他地方自动消失问题
---
ruoyi-ui/nginx/default.conf | 4 +-
.../data/price/UltimateOfficeBasePrice.vue | 180 ------------------
...alResidenceSaleOpeningCaseServiceImpl.java | 6 +-
...OriginalResidenceSaleOpeningCaseMapper.xml | 166 ++++++++++------
.../java/com/ruoyi/GenerateTableTests.java | 2 +-
...idenceSaleClosingCaseServiceImplTests.java | 23 ++-
6 files changed, 128 insertions(+), 253 deletions(-)
diff --git a/ruoyi-ui/nginx/default.conf b/ruoyi-ui/nginx/default.conf
index 50c79cecf..8b7edd201 100644
--- a/ruoyi-ui/nginx/default.conf
+++ b/ruoyi-ui/nginx/default.conf
@@ -10,8 +10,8 @@ server {
}
location /prod-api/ {
- # proxy_set_header Host $http_host;
- # proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header REMOTE-HOST $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://172.16.30.243:9700/;
diff --git a/ruoyi-ui/src/views/data/price/UltimateOfficeBasePrice.vue b/ruoyi-ui/src/views/data/price/UltimateOfficeBasePrice.vue
index aaf1ae495..3bd9bf9fe 100644
--- a/ruoyi-ui/src/views/data/price/UltimateOfficeBasePrice.vue
+++ b/ruoyi-ui/src/views/data/price/UltimateOfficeBasePrice.vue
@@ -70,15 +70,6 @@
v-hasPermi="['system:user:import']"
>文件导入</el-button>
</el-col>
- <!-- <el-col :span="1.5">
- <el-button
- type="success"
- icon="el-icon-druid"
- size="mini"
- @click="handleImport"
- v-hasPermi="['system:user:import']"
- >基价变化一览</el-button>
- </el-col>-->
</el-row>
<el-table v-loading="loading" :data="dataList">
@@ -112,22 +103,6 @@
/>
<el-table-column label="价格更改说明" align="center" prop="adjustPriceComment" />
<el-table-column label="更新日期" align="center" prop="updateDate" :formatter="dateFormatter" />
- <!-- <el-table-column
- label="操作"
- align="center"
- class-name="small-padding fixed-width"
- fixed="right"
- >
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:user:edit']"
- >修改</el-button>
- </template>
- </el-table-column>-->
</el-table>
<pagination
@@ -138,161 +113,6 @@
@pagination="getList"
/>
- <!-- 添加或修改办公基价对话框 -->
- <!-- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
- <el-form ref="form" :model="form" :rules="updateRules" label-width="160px">
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="小区ID">
- <el-input v-model="form.communityId" disabled readonly />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="楼栋ID">
- <el-input v-model="form.buildingId" disabled readonly />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="项目名称">
- <el-input v-model="form.communityName" disabled readonly />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="办公项目地址">
- <el-input v-model="form.communityAddress" disabled readonly />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <!-- <el-col :span="24">
- <el-form-item label="楼栋地址">
- <el-input v-model="form.buildingAddress" disabled readonly />
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="楼栋地址">
- <el-input v-model="form.complexRegion" disabled readonly />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="建成年代">
- <el-input v-model="form.year" disabled readonly />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="年份修正系数">
- <el-input v-model="form.yearCoefficient" disabled readonly />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="平均面积">
- <el-input v-model="form.avgArea" disabled readonly />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="面积修正系数">
- <el-input v-model="form.areaCoefficient" disabled readonly />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="地上层数/总层数">
- <el-input v-model="form.complexFloorInfo" disabled readonly />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="办公分类-办公等级">
- <el-input v-model="form.complexOfficeInfo" disabled readonly />
- </el-form-item>
- </el-col>
- </el-row>
-
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="主力基价涨跌幅">
- <el-input v-model="form.mainPricePst" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="主力租金涨跌幅">
- <el-input v-model="form.mainPriceRentPst" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="主力基价类型">
- <el-input v-model="form.mainPriceType" disabled readonly />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="主力租金类型">
- <el-input v-model="form.mainPriceRentType" disabled readonly />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="基价楼栋系数">
- <el-input v-model="form.buildingCoefficient" disabled readonly />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="是否标准楼栋">
- <el-input
- v-model="form.standardBuilding"
- disabled
- readonly
- :formatter="yesOrNotFormatter"
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="主力基价(上期)" prop="mainPrice_1">
- <el-input v-model="form.mainPrice_1" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="主力租金(上期)" prop="mainPriceRent_1">
- <el-input v-model="form.mainPriceRent_1" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="主力基价（元/㎡）" prop="mainPrice">
- <el-input v-model="form.mainPrice" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="主力租金（元/月·㎡）" prop="mainPriceRent">
- <el-input v-model="form.mainPriceRent" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="24">
- <el-form-item label="更改价格说明">
- <el-input v-model="form.adjustPriceComment" />
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">确 定</el-button>
- <el-button @click="cancel">取 消</el-button>
- </div>
- </el-dialog>-->
-
<el-dialog
:title="upload.title"
:visible.sync="upload.open"
diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/DownloadOriginalResidenceSaleOpeningCaseServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/DownloadOriginalResidenceSaleOpeningCaseServiceImpl.java
index a28de45c6..912e060ae 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/DownloadOriginalResidenceSaleOpeningCaseServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/DownloadOriginalResidenceSaleOpeningCaseServiceImpl.java
@@ -13,8 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
-import java.util.Calendar;
-import java.util.Date;
+
import java.util.List;
/**
@@ -96,7 +95,10 @@ public class DownloadOriginalResidenceSaleOpeningCaseServiceImpl {
List<OriginalResidenceSaleOpeningCase> originalResidenceSaleOpeningCaseList) {
originalResidenceSaleOpeningCaseList.parallelStream().forEach(originalResidenceSaleOpeningCase -> {
+ originalResidenceSaleOpeningCase.setYearMonth(tableRoute);
+ originalResidenceSaleOpeningCase.setCaseId(originalResidenceSaleOpeningCase.getNewCaseId());
originalResidenceSaleOpeningCaseMapper.insertRawTable(originalResidenceSaleOpeningCase);
+ originalResidenceSaleOpeningCase.setYearMonth(remoteTableRoute);
syncOriginalResidenceSaleOpeningCaseMapper.insertRawTable(originalResidenceSaleOpeningCase);
});
}
diff --git a/ruoyi/src/main/resources/mybatis/data/OriginalResidenceSaleOpeningCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/OriginalResidenceSaleOpeningCaseMapper.xml
index a63535422..5c95a057d 100644
--- a/ruoyi/src/main/resources/mybatis/data/OriginalResidenceSaleOpeningCaseMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/OriginalResidenceSaleOpeningCaseMapper.xml
@@ -11,7 +11,7 @@
create table ${targetTableName}
(
- case_id varchar (32) not null primary key
+ case_id varchar (32) not null
, llid bigint
, lcid bigint
, Name sql_variant
@@ -35,68 +35,122 @@
, CurlDate date
);
</update>
+
+ <insert id="insertRawTable" parameterType="com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCase">
+ <bind name="targetTableName" value="'dbo.ODS_HOUSINGCASELISTED_LJ_' + yearMonth +'_RAW'"/>
+ insert into ${targetTableName}
+ (
+ case_id
+ , llid
+ , lcid
+ , Name
+ , Roomtype
+ , Area
+ , Towards
+ , Storey
+ , Lastdeal
+ , Condoelev
+ , Decoration
+ , Year
+ , Address
+ , Price
+ , Cname
+ , Visited_Num
+ , First_Visit_Time
+ , Visited_Num_15
+ , Visited_Num_30
+ , Url
+ , Curl
+ , CurlDate
+ ) values (
+ #{caseId},
+ #{caseLianJiaId},
+ #{caseLianJiaCommunityId},
+ #{caseTitle},
+ #{caseApartmentLayout},
+ #{caseArea},
+ #{caseToward},
+ #{caseStorey},
+ #{caseLastDeal,jdbcType=DATE},
+ #{caseElevator},
+ #{caseDecoration},
+ #{caseYear},
+ #{caseAddress},
+ #{casePrice},
+ #{caseCommunityName},
+ #{caseVisitedNum},
+ #{caseFirstVisitTime},
+ #{caseVisitedNum15},
+ #{caseVisitedNum30},
+ #{caseUrl},
+ #{caseCommunityUrl},
+ getdate()
+ )
+
+ </insert>
+
<!--原始数据-->
<!-- <update id="createRawTable">-->
<!-- <bind name="targetTableName" value="'dbo.original_residence_sale_opening_case_' + yearMonth"/>-->
<!-- IF OBJECT_ID(#{targetTableName}, 'U') IS NOT NULL-->
-<!-- drop table ${targetTableName};-->
+<!-- drop table ${targetTableName};-->
<!-- CREATE TABLE ${targetTableName}-->
<!-- (-->
-<!-- case_id varchar (32) NOT NULL,-->
-<!-- case_lianjia_id nvarchar (50) NOT null primary key,-->
-<!-- case_lianjia_community_id nvarchar (50) NOT NULL,-->
-<!-- case_title nvarchar (500) NOT NULL,-->
-<!-- clean_property_type nvarchar (20) NULL,-->
-<!-- case_apartment_layout nvarchar (500) NOT NULL,-->
-<!-- case_house_structure nvarchar (50) NULL,-->
-<!-- case_area decimal (10, 2) NOT NULL,-->
-<!-- case_underground_area decimal (10, 2) NULL,-->
-<!-- case_toward nvarchar (50) NOT NULL,-->
-<!-- clean_toward nvarchar (50) NULL,-->
-<!-- case_storey nvarchar (20) NOT NULL,-->
-<!-- clean_total_floor int NOT NULL,-->
-<!-- clean_current_floor_desc nvarchar (20) NULL,-->
-<!-- case_elevator nvarchar (20) NULL,-->
-<!-- clean_elevator nvarchar (20) NULL,-->
-<!-- case_tihu nvarchar (20) NULL,-->
-<!-- case_decoration nvarchar (20) NULL,-->
-<!-- clean_decoration nvarchar (50) NULL,-->
-<!-- case_year int NOT NULL,-->
-<!-- clean_year int NOT NULL,-->
-<!-- case_address nvarchar (500) NULL,-->
-<!-- case_vid nvarchar (500) NULL,-->
-<!-- case_chan_quan_xing_zhi nvarchar (200) NULL,-->
-<!-- case_price decimal (18, 2) NOT NULL,-->
-<!-- clean_unit_price decimal (18, 2) NOT NULL,-->
-<!-- clean_total_price decimal (18, 2) NOT NULL,-->
-<!-- case_community_name nvarchar (500) NULL,-->
-<!-- case_visited_num int NOT NULL,-->
-<!-- case_visited_num_15 int NOT NULL,-->
-<!-- case_visited_num_30 int NOT NULL,-->
-<!-- case_latest_deal_date date NULL,-->
-<!-- case_latest_visited_date date NULL,-->
-<!-- case_first_visited_date date NULL,-->
-<!-- case_url nvarchar (500) NOT NULL,-->
-<!-- case_community_url nvarchar (500) NOT NULL,-->
-<!-- case_get_date date NOT NULL,-->
-<!-- case_provider nvarchar (50) NOT NULL,-->
-<!-- uv_community_name nvarchar (500) NULL,-->
-<!-- uv_community_address nvarchar (1024) NULL,-->
-<!-- uv_community_id nvarchar (20) NULL,-->
-<!-- uv_building_id nvarchar (20) NULL,-->
-<!-- uv_county nvarchar (50) NULL,-->
-<!-- uv_block nvarchar (50) NULL,-->
-<!-- uv_loop nvarchar (50) NULL,-->
-<!-- area_coefficient decimal (18, 6) NULL,-->
-<!-- toward_coefficient decimal (18, 6) NULL,-->
-<!-- floor_coefficient decimal (18, 6) NULL,-->
-<!-- decoration_coefficient int NULL,-->
-<!-- year_coefficient decimal (18, 6) NULL,-->
-<!-- building_coefficient decimal (18, 6) NULL,-->
-<!-- adjust_unit_price decimal (18, 2) NULL,-->
-<!-- clean_project_level nvarchar (50) NULL,-->
-<!-- create_time datetime NOT NULL-->
+<!-- case_id varchar (32) NOT NULL,-->
+<!-- case_lianjia_id nvarchar (50) NOT null primary key,-->
+<!-- case_lianjia_community_id nvarchar (50) NOT NULL,-->
+<!-- case_title nvarchar (500) NOT NULL,-->
+<!-- clean_property_type nvarchar (20) NULL,-->
+<!-- case_apartment_layout nvarchar (500) NOT NULL,-->
+<!-- case_house_structure nvarchar (50) NULL,-->
+<!-- case_area decimal (10, 2) NOT NULL,-->
+<!-- case_underground_area decimal (10, 2) NULL,-->
+<!-- case_toward nvarchar (50) NOT NULL,-->
+<!-- clean_toward nvarchar (50) NULL,-->
+<!-- case_storey nvarchar (20) NOT NULL,-->
+<!-- clean_total_floor int NOT NULL,-->
+<!-- clean_current_floor_desc nvarchar (20) NULL,-->
+<!-- case_elevator nvarchar (20) NULL,-->
+<!-- clean_elevator nvarchar (20) NULL,-->
+<!-- case_tihu nvarchar (20) NULL,-->
+<!-- case_decoration nvarchar (20) NULL,-->
+<!-- clean_decoration nvarchar (50) NULL,-->
+<!-- case_year int NOT NULL,-->
+<!-- clean_year int NOT NULL,-->
+<!-- case_address nvarchar (500) NULL,-->
+<!-- case_vid nvarchar (500) NULL,-->
+<!-- case_chan_quan_xing_zhi nvarchar (200) NULL,-->
+<!-- case_price decimal (18, 2) NOT NULL,-->
+<!-- clean_unit_price decimal (18, 2) NOT NULL,-->
+<!-- clean_total_price decimal (18, 2) NOT NULL,-->
+<!-- case_community_name nvarchar (500) NULL,-->
+<!-- case_visited_num int NOT NULL,-->
+<!-- case_visited_num_15 int NOT NULL,-->
+<!-- case_visited_num_30 int NOT NULL,-->
+<!-- case_latest_deal_date date NULL,-->
+<!-- case_latest_visited_date date NULL,-->
+<!-- case_first_visited_date date NULL,-->
+<!-- case_url nvarchar (500) NOT NULL,-->
+<!-- case_community_url nvarchar (500) NOT NULL,-->
+<!-- case_get_date date NOT NULL,-->
+<!-- case_provider nvarchar (50) NOT NULL,-->
+<!-- uv_community_name nvarchar (500) NULL,-->
+<!-- uv_community_address nvarchar (1024) NULL,-->
+<!-- uv_community_id nvarchar (20) NULL,-->
+<!-- uv_building_id nvarchar (20) NULL,-->
+<!-- uv_county nvarchar (50) NULL,-->
+<!-- uv_block nvarchar (50) NULL,-->
+<!-- uv_loop nvarchar (50) NULL,-->
+<!-- area_coefficient decimal (18, 6) NULL,-->
+<!-- toward_coefficient decimal (18, 6) NULL,-->
+<!-- floor_coefficient decimal (18, 6) NULL,-->
+<!-- decoration_coefficient int NULL,-->
+<!-- year_coefficient decimal (18, 6) NULL,-->
+<!-- building_coefficient decimal (18, 6) NULL,-->
+<!-- adjust_unit_price decimal (18, 2) NULL,-->
+<!-- clean_project_level nvarchar (50) NULL,-->
+<!-- create_time datetime NOT NULL-->
<!-- );-->
<!-- </update>-->
<!--清洗表-->
diff --git a/ruoyi/src/test/java/com/ruoyi/GenerateTableTests.java b/ruoyi/src/test/java/com/ruoyi/GenerateTableTests.java
index 93b435b16..273a72578 100644
--- a/ruoyi/src/test/java/com/ruoyi/GenerateTableTests.java
+++ b/ruoyi/src/test/java/com/ruoyi/GenerateTableTests.java
@@ -93,7 +93,7 @@ public class GenerateTableTests {
@Test
public void generateBatchGuoHaoInsertSqL() {
- Class targetClass = OriginalResidenceSaleClosingCase .class;
+ Class targetClass = OriginalResidenceSaleOpeningCase .class;
List<Field> fieldList = new ArrayList<>();
while (targetClass != null) {
diff --git a/ruoyi/src/test/java/com/ruoyi/compute/DownloadOriginalResidenceSaleClosingCaseServiceImplTests.java b/ruoyi/src/test/java/com/ruoyi/compute/DownloadOriginalResidenceSaleClosingCaseServiceImplTests.java
index 8533c7ab5..2e4de4bd8 100644
--- a/ruoyi/src/test/java/com/ruoyi/compute/DownloadOriginalResidenceSaleClosingCaseServiceImplTests.java
+++ b/ruoyi/src/test/java/com/ruoyi/compute/DownloadOriginalResidenceSaleClosingCaseServiceImplTests.java
@@ -27,17 +27,16 @@ public class DownloadOriginalResidenceSaleClosingCaseServiceImplTests {
@Test
public void testLoopDownload() {
// , 201912
-// Arrays.asList(201901, 201902, 201903, 201904, 201905, 201906, 201907, 201908, 201909, 201910, 201911).parallelStream().forEach(i -> {
-// downloadOriginalResidenceSaleClosingCaseService.download(i + 1, i);
-// });
-// downloadOriginalResidenceSaleClosingCaseService.download(202001, 201912);
- downloadOriginalResidenceSaleClosingCaseService.download(202001, 201911);
- downloadOriginalResidenceSaleClosingCaseService.download(202002, 201912);
- downloadOriginalResidenceSaleClosingCaseService.download(202003, 202001);
- downloadOriginalResidenceSaleClosingCaseService.download(202004, 202002);
- downloadOriginalResidenceSaleClosingCaseService.download(202005, 202003);
- downloadOriginalResidenceSaleClosingCaseService.download(202006, 202004);
- downloadOriginalResidenceSaleClosingCaseService.download(202007, 202005);
- downloadOriginalResidenceSaleClosingCaseService.download(202008, 202006);
+ Arrays.asList(201901, 201902, 201903, 201904, 201905, 201906, 201907, 201908, 201909, 201910).parallelStream().forEach(i -> {
+ downloadOriginalResidenceSaleClosingCaseService.download(i + 2, i);
+ });
+// downloadOriginalResidenceSaleClosingCaseService.download(202001, 201911);
+// downloadOriginalResidenceSaleClosingCaseService.download(202002, 201912);
+// downloadOriginalResidenceSaleClosingCaseService.download(202003, 202001);
+// downloadOriginalResidenceSaleClosingCaseService.download(202004, 202002);
+// downloadOriginalResidenceSaleClosingCaseService.download(202005, 202003);
+// downloadOriginalResidenceSaleClosingCaseService.download(202006, 202004);
+// downloadOriginalResidenceSaleClosingCaseService.download(202007, 202005);
+// downloadOriginalResidenceSaleClosingCaseService.download(202008, 202006);
}
}