diff --git a/ruoyi/Dockerfile b/ruoyi/Dockerfile index 78cc83304..cb8aab2d2 100644 --- a/ruoyi/Dockerfile +++ b/ruoyi/Dockerfile @@ -1,5 +1,8 @@ FROM 172.16.30.92:5000/uv:jdk-1.8.0 +# 设置时区 +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + VOLUME /tmp # 将jar包添加到容器中并更名为app.jar diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalOfficeCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalOfficeCaseMapper.java index e188c6f2b..a21fe66e6 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalOfficeCaseMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalOfficeCaseMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.project.data.cases.mapper.sync; import com.baomidou.dynamic.datasource.annotation.DS; import com.ruoyi.project.data.cases.domain.OriginalOfficeCase; +import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; @@ -20,5 +21,5 @@ public interface DownloadOriginalOfficeCaseMapper { * @param endDate * @return */ - List download(Date startDate, Date endDate); + List download(@Param("startDate") Date startDate,@Param("endDate") Date endDate); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/DownloadOriginalResidenceSaleClosingCaseServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/DownloadOriginalResidenceSaleClosingCaseServiceImpl.java index d7e58f458..62c438ac5 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/DownloadOriginalResidenceSaleClosingCaseServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/DownloadOriginalResidenceSaleClosingCaseServiceImpl.java @@ -65,7 +65,7 @@ public class DownloadOriginalResidenceSaleClosingCaseServiceImpl { running(tableRoute, originalResidenceSaleClosingCases); after(tableRoute); - copy2UVData(tableRoute, remoteTableRoute); +// copy2UVData(tableRoute, remoteTableRoute); } diff --git a/ruoyi/src/test/java/com/ruoyi/GenerateTableTests.java b/ruoyi/src/test/java/com/ruoyi/GenerateTableTests.java index 409ada2e2..7fd0f41f0 100644 --- a/ruoyi/src/test/java/com/ruoyi/GenerateTableTests.java +++ b/ruoyi/src/test/java/com/ruoyi/GenerateTableTests.java @@ -17,7 +17,7 @@ public class GenerateTableTests { @Test public void testLastYearMonth() { - Integer lastYearMonth = DateUtils.getLastYearMonth(); + Integer lastYearMonth = DateUtils.getLastYearMonth(); Assert.assertTrue(202007 == lastYearMonth); } @@ -179,4 +179,50 @@ public class GenerateTableTests { Assert.assertTrue(Objects.equals(202006, lastYearMonth)); } + + /** + * + */ + @Test + public void testPrintLoop() { + + /** + * 成交案例总数 + * 成交套数 + * 成交价格 + */ + List list = new LinkedList<>(); + list.add("425280"); + list.add("428770"); + list.add("427490"); + list.add("428790"); + list.add("427780"); + list.add("430050"); + list.add("425028"); + list.add("429710"); + list.add("425700"); + for (int j = 0; j < list.size(); j++) { + + System.out.println("select " + list.get(j) + " as community_id , sum(count) as count,sum(total_price) as " + + "total_price," + + "avg" + + "(avg_price) as avg_price ,sum(total_area) as total_area,avg(avg_area) as avg_area from ("); + + for (int i = 201901; i <= 201906; i++) { + System.out.println("select COUNT(1) " + + "as count" + + " ,sum" + + "(PriceTotal) as total_price ,avg" + + "(PriceTotal) as avg_price," + + "sum(Area) as total_area ,avg" + + "(Area) as avg_area from " + + "ODS_HOUSINGCASE_DEAL_" + i + " where ProjectID=" + list.get(j)); + if (i != 201906) + System.out.println("union"); + } + System.out.println(") as t;\n"); + } + + } + } diff --git a/ruoyi/src/test/java/com/ruoyi/compute/DownloadOriginalResidenceSaleClosingCaseServiceImplTests.java b/ruoyi/src/test/java/com/ruoyi/compute/DownloadOriginalResidenceSaleClosingCaseServiceImplTests.java index 2e4de4bd8..65a4dae14 100644 --- a/ruoyi/src/test/java/com/ruoyi/compute/DownloadOriginalResidenceSaleClosingCaseServiceImplTests.java +++ b/ruoyi/src/test/java/com/ruoyi/compute/DownloadOriginalResidenceSaleClosingCaseServiceImplTests.java @@ -27,9 +27,9 @@ public class DownloadOriginalResidenceSaleClosingCaseServiceImplTests { @Test public void testLoopDownload() { // , 201912 - Arrays.asList(201901, 201902, 201903, 201904, 201905, 201906, 201907, 201908, 201909, 201910).parallelStream().forEach(i -> { - downloadOriginalResidenceSaleClosingCaseService.download(i + 2, i); - }); +// 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);