Merge branch 'script_gj' into 'master'

融合楼栋修改

See merge request !442
This commit is contained in:
2022-11-11 19:14:08 +08:00
5 changed files with 55 additions and 41 deletions
-8
View File
@@ -242,13 +242,5 @@
<version>1.0.0</version> <version>1.0.0</version>
<classifier>jdk18</classifier> <classifier>jdk18</classifier>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-devtools</artifactId>-->
<!-- &lt;!&ndash; optional 表示依赖是否向下传递 true表示不向下传递 默认值是false向下传递 &ndash;&gt;-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
</dependencies> </dependencies>
</project> </project>
@@ -23,7 +23,7 @@ class BigdataBuildingBatch extends BaseBatch{
@Override @Override
public void process(Object args) { public void process(Object args) {
def citys = CcbCommonUtils.citys_all; def citys = CcbCommonUtils.getRunningCitys(args)
def rows = [] def rows = []
def headers = [] def headers = []
for (def city : citys) { for (def city : citys) {
@@ -42,37 +42,37 @@ class ExportOracleAllDataTest {
def lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") def lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM")
def new_dists = [] def new_dists = []
//不会变 10.25 //不会变 10.25
exportEvaluationRateData() // exportEvaluationRateData()
exportBigdataPoiData()// // exportBigdataPoiData()//
exportBigdataDistrictData()// // exportBigdataDistrictData()//
exportGuidedPrice()//随人工改变// exportGuidedPrice()//随人工改变//
exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策// // exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策//
//
//处理小区情况 // //处理小区情况
exportBigdataCommunity()// // exportBigdataCommunity()//
exportCommunityStaging()//没cityid // exportCommunityStaging()//没cityid
exportCommunityBuileType()// // exportCommunityBuileType()//
//
exportThirdPartyPrice2(new_dists)// // exportThirdPartyPrice2(new_dists)//
exportBigdataForsale(new_dists) //2022-07-19 // exportBigdataForsale(new_dists) //2022-07-19
exportBigdataDeal( new_dists) //2022-07-01 // exportBigdataDeal( new_dists) //2022-07-01
//
//第三方网站权重表 // //第三方网站权重表
exportWebsiteRate(); // exportWebsiteRate();
//
//计算结果相关 // //计算结果相关
exportAvmEvaluationGJNB()// // exportAvmEvaluationGJNB()//
exportAVMEvaluationItemGJNB()// // exportAVMEvaluationItemGJNB()//
//
exportCityPrice()// // exportCityPrice()//
exportRegionPrice()// // exportRegionPrice()//
//
exportCommunityBasePriceGj()// // exportCommunityBasePriceGj()//
exportCommunityBasePrice()// // exportCommunityBasePrice()//
//
exportCommunityPdescribeGj()// // exportCommunityPdescribeGj()//
exportCommCaseDetailGj()// // exportCommCaseDetailGj()//
def curDate = curMonth.toString()+"28" def curDate = curMonth.toString()+"28"
// ok文件 // ok文件
@@ -44,7 +44,7 @@ class GuiDingPriceBatch extends BaseBatch{
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
//添加自己库中的人工指导价 //添加自己库中的人工指导价
def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-09") def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-11")
if(prices){ if(prices){
def distMap = getDistrictMap(city) def distMap = getDistrictMap(city)
def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices) def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices)
@@ -447,8 +447,30 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business
////},0) ////},0)
// //
ExcelUtils.modify("D:\\数据\\建行\\二期\\重庆无效小区_3159.xlsx",{d-> //ExcelUtils.multiThreadingModify("D:\\数据\\建行\\二期\\11.11\\删除小区(2).xlsx",{d->
},0) // if(d['A']){
// def dbo = CommonDatautils.findDistrictById(d['C'])
// if(dbo){
// def udata = new BasicDBObject()
// udata.put("name_cat", 11)
// udata.put("status", 1)
// udata.put("m_date",new Date())
//
// def q = new BasicDBObject()
// q.put("_id", dbo._id)
// DbUtils.seaweed.update(q, new BasicDBObject('$set', udata))
// }else{
// println dbo._id.toString() +" 没找到"
// }
// }
//},0)
def citys = ["海口","三亚","三沙","五指山","琼海","儋州","文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中"]
for(def c : citys){
def districts = CommonDatautils.findAllDistrictByCity(c, "district", ["city","name"])
println c +" "+districts.size()
}
// //
// //