feature (住宅销售挂牌案例上传到CALC)： 推送住宅销售挂牌案例到CALC库

1. 推送住宅销售挂牌案例到CALC库
2. 修改dialog弹窗，点击其他地方自动消失问题

ruoyi-ui/nginx/default.conf

@@ -10,8 +10,8 @@ server {
     }
 
     location /prod-api/ {
-        # proxy_set_header Host $http_host;
+        proxy_set_header Host $http_host;
-        # proxy_set_header X-Real-IP $remote_addr;
+        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/;

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"

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);
         });
     }

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,6 +35,60 @@
             , 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"/>-->

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) {

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 -> {
+        Arrays.asList(201901, 201902, 201903, 201904, 201905, 201906, 201907, 201908, 201909, 201910).parallelStream().forEach(i -> {
-//            downloadOriginalResidenceSaleClosingCaseService.download(i + 1, i);
+            downloadOriginalResidenceSaleClosingCaseService.download(i + 2, i);
-//        });
+        });
-//        downloadOriginalResidenceSaleClosingCaseService.download(202001, 201912);
+//        downloadOriginalResidenceSaleClosingCaseService.download(202001, 201911);
-        downloadOriginalResidenceSaleClosingCaseService.download(202001, 201911);
+//        downloadOriginalResidenceSaleClosingCaseService.download(202002, 201912);
-        downloadOriginalResidenceSaleClosingCaseService.download(202002, 201912);
+//        downloadOriginalResidenceSaleClosingCaseService.download(202003, 202001);
-        downloadOriginalResidenceSaleClosingCaseService.download(202003, 202001);
+//        downloadOriginalResidenceSaleClosingCaseService.download(202004, 202002);
-        downloadOriginalResidenceSaleClosingCaseService.download(202004, 202002);
+//        downloadOriginalResidenceSaleClosingCaseService.download(202005, 202003);
-        downloadOriginalResidenceSaleClosingCaseService.download(202005, 202003);
+//        downloadOriginalResidenceSaleClosingCaseService.download(202006, 202004);
-        downloadOriginalResidenceSaleClosingCaseService.download(202006, 202004);
+//        downloadOriginalResidenceSaleClosingCaseService.download(202007, 202005);
-        downloadOriginalResidenceSaleClosingCaseService.download(202007, 202005);
+//        downloadOriginalResidenceSaleClosingCaseService.download(202008, 202006);
-        downloadOriginalResidenceSaleClosingCaseService.download(202008, 202006);
     }
 }