This commit is contained in:
彭桃 2023-02-08 17:32:05 +08:00
parent 61caa3a66e
commit d8f4004f24
3 changed files with 64 additions and 18 deletions

View File

@ -35,7 +35,7 @@ class Street extends BaseController
if (request()->isAjax()) {
$params= get_params();
$where[]=['status','=',1];
$where[]=['village_id','=',''];
$where[]=['village_id','=',0];
if (isset($params['keywords'])){
$where[]=['title','like','%'.$params['keywords'].'%'];
}
@ -78,8 +78,8 @@ class Street extends BaseController
}
$area_code=Db::table('fa_geo_area')->where('area_code',$params['area_id'])->value('area_name');
$street_code=Db::table('fa_geo_street')->where('street_code',$params['street_id'])->value('street_name');
$village_id=Db::table('fa_geo_village')->where('village_id',$params['village_id'])->value('village_name');
$params['address']='泸州市'.$area_code.$street_code.$village_id;
$params['address']='泸州市'.$area_code.$street_code;
$params['createtime']=time();
$res=Db::table('fa_szxc_village')->strict(false)->field(true)->insertGetId($params);
if ($res){
@ -115,8 +115,8 @@ class Street extends BaseController
}
$area_code=Db::table('fa_geo_area')->where('area_code',$params['area_id'])->value('area_name');
$street_code=Db::table('fa_geo_street')->where('street_code',$params['street_id'])->value('street_name');
$village_id=Db::table('fa_geo_village')->where('village_id',$params['village_id'])->value('village_name');
$params['address']='泸州市'.$area_code.$street_code.$village_id;
$params['address']='泸州市'.$area_code.$street_code;
$res=Db::table('fa_szxc_village')->where('id',$params['id'])->strict(false)->field(true)->update($params);
if ($res){
return to_assign();

View File

@ -35,7 +35,7 @@ class Village extends BaseController
if (request()->isAjax()) {
$params= get_params();
$where[]=['status','=',1];
$where[]=['village_id','<>',''];
$where[]=['village_id','<>',0];
if (isset($params['keywords'])){
$where[]=['title','like','%'.$params['keywords'].'%'];
}

View File

@ -476,19 +476,64 @@ class Village extends BaseController
// $brigade_name = Db::table('fa_geo_brigade')->where('id', $address['brigade_id'])->value('brigade_name');
// }
$address_name = '泸州市'.$area_name . $street_name ;
// 判断redis
if(JWT_UID){
$name = JWT_UID . $address['street_id'];
$is_zan = Cache::store('redis')->get($name);
if($is_zan){
$news['is_dz'] = 1;
}else{
$news['is_dz'] = 0;
}
}else{
$news['is_dz'] = 0;
$www['area_id'] = $address['area_id'];
$www['street_id'] = $address['street_id'];
$www['village_id'] = '0';
$news = Db::table('fa_szxc_village')->where($www)->field('id,title,address,people_num,images,views,likes,createtime,introduce,info,area_id,street_id,village_id')->find();
if ($news) {
$news['dz_num'] = Db::table('fa_szxc_village')->where('street_id',$address['street_id'])->sum('likes');
// 获取天气
// 101271007 纳溪 510503
// 101271002 江阳区 510502
// 101271008 龙马潭区 510504
// 101271003 泸县 510521
// 101271004 合江 510522
// 101271006 古蔺 510525
// 101271005 叙永 510524
// 判断区域
if($news['area_id'] == '510503'){
$name = '101271007';
}
if($news['area_id'] == '510502'){
$name = '101271002';
}
if($news['area_id'] == '510504'){
$name = '101271008';
}
if($news['area_id'] == '510521'){
$name = '101271003';
}
if($news['area_id'] == '510522'){
$name = '101271004';
}
if($news['area_id'] == '510525'){
$name = '101271006';
}
if($news['area_id'] == '510524'){
$name = '101271005';
}
$url = "https://devapi.qweather.com/v7/weather/now?key=b3e94fa75aae4551b6a5db150b409261&location=".$name;
$is_cun = Cache::store('redis')->get($name);
if($is_cun){
$data = json_decode($is_cun,1);
$news['weather'] = $data;
}else{
$data = file_get_contents("compress.zlib://".$url);
Cache::store('redis')->set($name,$data,1800);
$data = json_decode($data,1);
$news['weather'] = $data;
}
// halt($data);die;
$news['people_num'] = Db::table('fa_szxc_information_useraddress')->where('village_id',$news['village_id'])->where('status',1)->count();
// 增加阅读数
Db::table('fa_szxc_village')->where('id',$news['id'])->inc('views', '1')->update();
if ($news['images']) {
$news['images'] = explode(',',$news['images']);
}
$this->apiSuccess('获取成功', $news);
}else{
$news['dz_num'] = Db::table('fa_szxc_village')->where('street_id',$address['street_id'])->sum('likes');
$news['id'] = $address['street_id'];
$news['title'] = $address_name;
@ -541,6 +586,7 @@ class Village extends BaseController
}
// halt($data);die;
$news['people_num'] = Db::table('fa_szxc_information_useraddress')->where('village_id',$news['village_id'])->where('status',1)->count();
}
$this->apiSuccess('获取成功', $news);
}