Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj

This commit is contained in:
2025-11-03 09:55:17 +08:00
6 changed files with 51 additions and 13 deletions
@@ -573,9 +573,6 @@ public class SaleLeadsController {
System.out.println(mobile + " 验证码 【"+ code+"】");
//测试先去掉发短信
smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
if(FangjiaConfig.getConfig().isTestEnvironment()){
DingDingMessageUtil.sendTextMessage("【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
}
resultModel.setResult(Message.RESULT_SUCCESS);
CacheUtils.putValue(CacheUtils.CachePolicyEnum.TINY, FangJiaUserService.class, mobile + "_" + type, code);
CacheUtils.putValue(CacheUtils.CachePolicyEnum.TINY, FangJiaUserService.class, mobile, new Date().getTime());
@@ -168,9 +168,6 @@ public class UserController {
String code = fangJiaUserService.randomCode();
try {
smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
if(FangjiaConfig.getConfig().isTestEnvironment()){
DingDingMessageUtil.sendTextMessage("【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
}
smsSendLog = new SmsSendLog();
smsSendLog.setContent("【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
smsSendLog.setMobile(model.getMobile());
@@ -520,9 +517,6 @@ public class UserController {
CacheUtils.putValue(CachePolicyEnum.TODAY, FangJiaUserService.class, ip, ipVisitCount+1);
smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
if(FangjiaConfig.getConfig().isTestEnvironment()){
DingDingMessageUtil.sendTextMessage("【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
}
resultModel.setResult(Message.RESULT_SUCCESS);
CacheUtils.putValue(CachePolicyEnum.TINY, FangJiaUserService.class, mobile + "_" + type, code);
CacheUtils.putValue(CachePolicyEnum.TINY, FangJiaUserService.class, mobile, new Date().getTime());
@@ -1,6 +1,6 @@
package com.fangjia.script.ccbevaluation
import com.fangjia.script.util.DateUtils
import com.fangjia.script.util.ExcelUtils
import com.fangjia.script.util.MongoUtils
import com.mongodb.BasicDBObject
@@ -9,7 +9,7 @@ import com.mongodb.DBCollection
* 深圳公众号成交数据录入
*/
def datas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\成交\\深圳8月成交数据.xlsx", 0, 1)
def datas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\成交\\深圳9月份成交数据.xlsx", 0, 1)
def lineUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017";
DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl)
@@ -851,7 +851,7 @@ class OpenApiUtils {
static def addrVerifyBase(city, address){
address = URLEncoder.encode(address, "utf-8");
def url = "http://192.168.0.100:32080/FangJiaAddressService/cebEnterpriseVillageIdentify?address=${address}"
def url = "http://192.168.0.100:32080/FangJiaAddressService/enterpriseVillageIdentify?address=${address}"
// def url = "http://localhost:8080/fangjia-open/addrSvc/njcbVillageIdentify?address=${address}&type=${type}&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB"
if(city){
url = url + "&city=${city}"
@@ -0,0 +1,47 @@
package com.fangjia.script.gj.village.ailiyun
import com.fangjia.script.gj.OpenApiUtils
import com.fangjia.script.util.ExcelUtils
class KunlunVillage {
static main(args) {
def task = new KunlunVillage();
task.run()
}
def run(){
ExcelUtils.multiThreadingModify("D:\\数据\\昆仑\\3987户需批量更新涉农信息明细-20251023-结果.xlsx",{ d->
if(!d['R'] && d['B']){
def dto = OpenApiUtils.addrVerifyGuangda(null, d['B'])
if(dto){
// def dto = jsonObj.result
d['F'] = dto.province
d['G'] = dto.provinceCode
d['H'] = dto.city
d['I'] = dto.cityCode;
d['J'] = dto.district
d['K'] = dto.districtCode
d['L'] = dto.town
d['M'] = dto.townCode
d['N'] = dto.committee
d['O'] = dto.committeeCode
d['P'] = dto.typeCode
d['Q'] = dto.typeName
d['R'] = dto.verifyFlag//涉农标识
d['S'] = dto.addrVerify//地址是否有效信息
d['T'] = dto.countyLevelCity//是否为县级市
d['U'] = dto.countyGov//是否为县政府
d['V'] = dto.addrArea //所属区域 农村区域 城市区域 县城城区(对公)
d['W'] = dto.devDistrict//是否为开发区
d['X'] = dto.devDistrictName//开发区
d['Y'] = dto.devLevel//开发区等级
d['Z']= dto.administrativeTowns;//是否市辖建制
d['AA'] = dto.prefectureLevelOrAbove ;// 是否为地级市以上行政区划
d['AB'] = dto.countyGovTown; //县政府所在镇
}
}
})
}
}
@@ -132,7 +132,7 @@ public class CitySellStatServiceImpl implements CitySellStatService {
q.add(new QueryParam("date", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startDate));
List<SortParam> s = new ArrayList<SortParam>();
s.add(new SortParam("date", false));
s.add(new SortParam("date", true));
return citySellStatDao.findAllByParams(q, s, count);
}