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']"
>文件导入
-
@@ -112,22 +103,6 @@
/>
-
-
-
-
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
);
+
+
+
+ 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()
+ )
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 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);
}
}