This commit is contained in:
2025-07-15 20:41:10 +08:00
parent 3adff0235d
commit 03a70e98a6
3 changed files with 38 additions and 16 deletions
@@ -57,9 +57,9 @@ class DistrictPriceExportBatch extends BaseBatch{
} }
def sb = appendResult(headers, results) def sb = appendResult(headers, results)
DataHandleUtils.outPutFile(fileName, sb, charset); DataHandleUtils.outPutFile(fileName, sb, charset);
// FzFtpUtils.ftpUpload(fileName) FzFtpUtils.ftpUpload(fileName)
// //生成加密数据文件并上传 //生成加密数据文件并上传
// FzFtpUtils.uploadSha512Data2(fileName, dataCodeFileName, charset); FzFtpUtils.uploadSha512Data2(fileName, dataCodeFileName, charset);
} }
def selectLastResultDatas(def rets){ def selectLastResultDatas(def rets){
@@ -73,6 +73,7 @@ class DistrictPriceExportBatch extends BaseBatch{
def appendResult(def headers, def ret){ def appendResult(def headers, def ret){
def sb = new StringBuffer(); def sb = new StringBuffer();
// sb.append(headers.join("@|@")) // sb.append(headers.join("@|@"))
// sb.append(System.getProperty("line.separator")); // sb.append(System.getProperty("line.separator"));
@@ -121,11 +122,16 @@ class DistrictPriceExportBatch extends BaseBatch{
def day = new Date().getDate() def day = new Date().getDate()
def startMDate = DateUtils.truncateDay(new Date()-1) def startMDate = DateUtils.truncateDay(new Date()-1)
def endMDate = DateUtils.truncateDay(new Date()) def endMDate = DateUtils.truncateDay(new Date())
if(day == 15){ if(CommonDatautils.isWindow()){
districts = getFzDistricts(city, null, null) districts = getFzDistricts(city, null, null)
}else{ } else{
districts = getFzDistricts(city, startMDate, endMDate) if(day == 15){
districts = getFzDistricts(city, null, null)
}else{
districts = getFzDistricts(city, startMDate, endMDate)
}
} }
def curPriceMap = findFzDistrictSellStat("福州",curDate) def curPriceMap = findFzDistrictSellStat("福州",curDate)
def result = [] def result = []
for(def rMap : districts){ for(def rMap : districts){
@@ -29,11 +29,11 @@ class FzDataResultStat {
static main(args) { static main(args) {
def task = new FzDataResultStat() def task = new FzDataResultStat()
task.priceMarkupRun(); // task.priceMarkupRun();
// task.regionPriceTrendRun() // task.regionPriceTrendRun()
//// task.margeExcel() //// task.margeExcel()
// task.saveCsvData() // task.saveCsvData()
// task.testNewPrice() task.testNewPrice()
} }
def margeExcel(){ def margeExcel(){
@@ -119,7 +119,7 @@ class FzDataResultStat {
index++ index++
println row println row
} }
ExcelUtils.write("D:\\数据\\福州\\价格比对4_${curMonth}.xlsx", rows, "数据") ExcelUtils.write("D:\\数据\\福州\\价格比对5_${curMonth}.xlsx", rows, "数据")
def regions = ["鼓楼","仓山","台江","晋安","马尾","长乐"]; def regions = ["鼓楼","仓山","台江","晋安","马尾","长乐"];
@@ -301,16 +301,13 @@ class FzDataResultStat {
} }
def testNewPrice(){ def testNewPrice(){
ExcelUtils.modify("D:\\数据\\福州\\价格比对_20240315 -价格入库.xlsx",{d-> ExcelUtils.modify("D:\\数据\\福州\\福州200个小区抽样价格核验202507.xlsx",{d->
if(d['A']){ if(d['A']){
def q = new BasicDBObject() def q = new BasicDBObject()
q.put("city", d['A']) q.put("comm_id", d['A'])
q.put("region",d['B'])
q.put("name",d['C'])
q.put("month", 202402)
def obj = FZ_DISTRICT_STAT_COLL.findOne(q) def obj = FZ_DISTRICT_STAT_COLL.findOne(q)
if(obj){ if(obj){
d['S'] = obj.avg_price d['D'] = obj.avg_price
} }
} }
}) })
@@ -27,10 +27,29 @@ class SuzouPocTest {
static main(args) { static main(args) {
def task = new SuzouPocTest() def task = new SuzouPocTest()
// task.run() // task.run()
task.newRun() // task.newRun()
task.test()
}
def test(){
ExcelUtils.modify("D:\\数据\\上海联合产权交易所\\第1批拟处置房产清单(长城大厦、台山碧桂园).xlsx", { d ->
if(d['O']){
def floorAdds = d['I'].split("/")
def ret1 = OpenApiClient.addressEvaluation(d['O'], null, d['D'], d['D'], d['K'], floorAdds[0], floorAdds[1])
if (ret1) {
d['N'] = ret1.totalPrice
d['M'] = ret1.avgPrice
d['P'] = ret1.district
d['Q'] = ret1.name
}
}
});
} }
def newRun(){ def newRun(){
println("start:"+new Date().toString()) println("start:"+new Date().toString())
def filePath = "D:\\数据\\江苏农行\\押品填报表_测试数据样例-给公司.xls" def filePath = "D:\\数据\\江苏农行\\押品填报表_测试数据样例-给公司.xls"
newMatch(filePath) newMatch(filePath)