feature (办公基价迁移): 完成办公计价迁移

1. 办公案例下载
2. 办公案例清洗
3. 办公基价计算
4. 办公基价导入
5. 物业基价菜单调整
6. 住宅租赁挂牌案例下载
7. 住宅租赁案例清洗
This commit is contained in:
purple
2020-07-06 18:46:13 +08:00
parent 706dddeedd
commit 1c2e15016a
371 changed files with 25749 additions and 24484 deletions

View File

@ -1,12 +1,14 @@
package com.uvaluation;
import com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice;
import com.uvaluation.project.data.cases.domain.OriginalResidenceRentClosingCase;
import com.uvaluation.project.data.price.domain.ComputeResidenceSaleBasePrice;
import org.junit.Test;
import java.math.BigDecimal;
import java.util.Date;
import java.util.stream.Collectors;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Stream;
public class GenerateTableTests {
@ -16,9 +18,9 @@ public class GenerateTableTests {
Class<?> targetClass = ComputeResidenceSaleBasePrice.class;
Stream.of(targetClass.getDeclaredFields()).forEach(x -> {
if (x.isAnnotationPresent(com.ruoyi.framework.aspectj.lang.annotation.Excel.class)) {
com.ruoyi.framework.aspectj.lang.annotation.Excel excel =
x.getAnnotation(com.ruoyi.framework.aspectj.lang.annotation.Excel.class);
if (x.isAnnotationPresent(com.uvaluation.framework.aspectj.lang.annotation.Excel.class)) {
com.uvaluation.framework.aspectj.lang.annotation.Excel excel =
x.getAnnotation(com.uvaluation.framework.aspectj.lang.annotation.Excel.class);
System.out.println(String.format("<el-table-column label=\"%s\" align=\"center\" " +
"prop=\"%s\" />", excel.name(), x.getName()));
}
@ -29,7 +31,7 @@ public class GenerateTableTests {
public void generateUserTableType() {
Class<?> targetClass = ComputeResidenceSaleBasePrice.class;
Stream.of(targetClass.getDeclaredFields()).forEach(x -> {
if (x.isAnnotationPresent(com.ruoyi.framework.aspectj.lang.annotation.Excel.class)) {
if (x.isAnnotationPresent(com.uvaluation.framework.aspectj.lang.annotation.Excel.class)) {
if ("java.lang.String".equals(x.getType().getName()))
System.out.println(String.format("sourceDataTable.addColumnMetadata(\"%s\", java.sql.Types" +
".NVARCHAR);", x.getName()));
@ -50,7 +52,7 @@ public class GenerateTableTests {
public void generateUserTableScript() {
Class<?> targetClass = ComputeResidenceSaleBasePrice.class;
Stream.of(targetClass.getDeclaredFields()).forEach(x -> {
if (x.isAnnotationPresent(com.ruoyi.framework.aspectj.lang.annotation.Excel.class)) {
if (x.isAnnotationPresent(com.uvaluation.framework.aspectj.lang.annotation.Excel.class)) {
System.out.println(x.getName() + ",");
// System.out.println(x.getName() + " nvarchar(200) null ,");
// if ("java.lang.String".equals(x.getType().getName()))
@ -68,4 +70,24 @@ public class GenerateTableTests {
}
});
}
@Test
public void generateBatchInsertSqL() {
Class targetClass = OriginalResidenceRentClosingCase .class;
List<Field> fieldList = new ArrayList<>();
while (targetClass != null) {
fieldList.addAll(new ArrayList<>(Arrays.asList(targetClass.getDeclaredFields())));
targetClass = targetClass.getSuperclass();
}
Field[] fields = new Field[fieldList.size()];
fieldList.toArray(fields);
StringBuilder sb = new StringBuilder();
for (int i = 0; i < fields.length; i++) {
sb.append(":");
sb.append(fields[i].getName());
sb.append(",");
}
System.out.println(sb.toString());
}
}

View File

@ -1,8 +1,7 @@
package com.uvaluation.compute;
import com.ruoyi.project.data.cases.domain.OriginalOfficeCase;
import com.ruoyi.project.data.price.domain.ComputeResidenceRentBasePrice;
import com.ruoyi.project.data.price.domain.UltimateResidenceRentBasePrice;
import com.uvaluation.project.data.cases.domain.OriginalOfficeCase;
import com.uvaluation.project.data.price.domain.UltimateResidenceRentBasePrice;
import org.junit.Assert;
import org.junit.Test;

View File

@ -1,11 +1,7 @@
package com.uvaluation.compute;
import com.ruoyi.RuoYiApplication;
import com.ruoyi.project.data.cases.service.IOriginalOfficeCaseService;
import com.ruoyi.project.data.cases.service.IOriginalResidenceSaleClosingCaseService;
import com.ruoyi.project.data.cases.service.IOriginalResidenceSaleOpeningCaseService;
import com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice;
import com.ruoyi.project.data.price.service.IArtificialResidenceSalePriceService;
import com.uvaluation.RuoYiApplication;
import com.uvaluation.project.data.cases.service.IOriginalOfficeCaseService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@ -13,10 +9,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
import java.math.BigDecimal;
import java.util.LinkedList;
import java.util.List;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = RuoYiApplication.class)
@ActiveProfiles("uat")
@ -25,6 +17,7 @@ public class OfficeBasePriceTests {
@Autowired
private IOriginalOfficeCaseService originalOfficeCaseService;
/**
* 下载案例并且作价
*/
@ -32,4 +25,5 @@ public class OfficeBasePriceTests {
public void testCompute() {
originalOfficeCaseService.compute();
}
}

View File

@ -1,12 +1,8 @@
package com.uvaluation.compute;
import com.ruoyi.RuoYiApplication;
import com.ruoyi.project.data.cases.service.IOriginalResidenceRentClosingCaseService;
import com.ruoyi.project.data.cases.service.IOriginalResidenceRentOpeningCaseService;
import com.ruoyi.project.data.cases.service.IOriginalResidenceSaleClosingCaseService;
import com.ruoyi.project.data.cases.service.IOriginalResidenceSaleOpeningCaseService;
import com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice;
import com.ruoyi.project.data.price.service.IArtificialResidenceSalePriceService;
import com.uvaluation.RuoYiApplication;
import com.uvaluation.project.data.cases.service.IOriginalResidenceRentClosingCaseService;
import com.uvaluation.project.data.cases.service.IOriginalResidenceRentOpeningCaseService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@ -14,10 +10,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
import java.math.BigDecimal;
import java.util.LinkedList;
import java.util.List;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = RuoYiApplication.class)
@ActiveProfiles("uat")
@ -28,11 +20,17 @@ public class ResidenceRentBasePriceTests {
@Autowired
private IOriginalResidenceRentClosingCaseService originalResidenceRentClosingCaseService;
/**
* 住宅租赁挂牌案例下载清洗
*/
@Test
public void testClearOpeningCase() {
originalResidenceRentOpeningCaseService.pullData();
}
/**
* 住宅租赁成交案例下载清洗
*/
@Test
public void testClearClosingCase() {
originalResidenceRentClosingCaseService.pullData();

View File

@ -1,18 +1,16 @@
package com.uvaluation.compute;
import com.ruoyi.RuoYiApplication;
import com.ruoyi.project.data.cases.service.IOriginalResidenceRentClosingCaseService;
import com.ruoyi.project.data.cases.service.IOriginalResidenceSaleClosingCaseService;
import com.ruoyi.project.data.cases.service.IOriginalResidenceSaleOpeningCaseService;
import com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice;
import com.ruoyi.project.data.price.service.IArtificialResidenceSalePriceService;
import com.uvaluation.RuoYiApplication;
import com.uvaluation.project.data.cases.service.IOriginalResidenceSaleClosingCaseService;
import com.uvaluation.project.data.cases.service.IOriginalResidenceSaleOpeningCaseService;
import com.uvaluation.project.data.price.domain.ComputeResidenceSaleBasePrice;
import com.uvaluation.project.data.price.service.IArtificialResidenceSalePriceService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.LinkedList;

View File

@ -1,8 +1,8 @@
package com.uvaluation.longtime;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.ruoyi.RuoYiApplication;
import com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice;
import com.uvaluation.RuoYiApplication;
import com.uvaluation.project.data.price.domain.UltimateOfficeBasePrice;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;