muadzmi02
/
sipadu_mbip
複製自 SwissLink/sipadu_mbip
關注 1
收藏 0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 0 Wiki 活動
瀏覽代碼

latest

master
Siti Rahayu 5 年之前
父節點
79f738203a
當前提交
6436217327
共有 8 個檔案被更改，包括 2560 行新增 和 35 行删除
分割檢視 顯示文件統計
  1. 13
    0
      app/Http/Controllers/Api/CompoundResourceController.php
  2. 59
    0
      app/Http/Controllers/Api/EpbtController.php
  3. 39
    0
      app/Http/Controllers/Main/TaskController.php
  4. 61
    35
      app/Jobs/StoreCompoundEPBT.php
  5. 17
    0
      app/Model/Module/CodeMukim.php
  6. 2360
    0
      public/mukim_kawasan_jalan_mbip.json
  7. 6
    0
      routes/api.php
  8. 5
    0
      routes/web.php

+ 13
- 0
app/Http/Controllers/Api/CompoundResourceController.php 查看文件

@@ -398,6 +398,9 @@ class CompoundResourceController extends BaseController
'alamat' => $request->alamat,
"no_plate" => $request->no_plate,
"no_cukai_jalan" => $request->no_cukai_jalan,
"nama_kawasan" => $request->namaKawasan,
"nama_taman" => $request->namaTaman,
"nama_jalan" => $request->namaJalan,
"catatan" => $request->catatan,
"lokasi_kejadian" => '-',
'latlong' => $request->Latlong,
@@ -427,6 +430,9 @@ class CompoundResourceController extends BaseController
'alamat' => $request->alamat,
"no_plate" => $request->no_plate,
"no_cukai_jalan" => $request->no_cukai_jalan,
"nama_kawasan" => $request->namaKawasan,
"nama_taman" => $request->namaTaman,
"nama_jalan" => $request->namaJalan,
"catatan" => $request->catatan,
"lokasi_kejadian" => '-',
'latlong' => $request->Latlong,
@@ -456,6 +462,9 @@ class CompoundResourceController extends BaseController
'alamat' => $request->alamat,
"no_plate" => $request->no_plate,
"no_cukai_jalan" => $request->no_cukai_jalan,
"nama_kawasan" => $request->namaKawasan,
"nama_taman" => $request->namaTaman,
"nama_jalan" => $request->namaJalan,
"catatan" => $request->catatan,
"lokasi_kejadian" => '-',
'latlong' => $request->Latlong,
@@ -486,6 +495,9 @@ class CompoundResourceController extends BaseController
'alamat' => $request->alamat,
"no_plate" => $request->no_plate,
"no_cukai_jalan" => $request->no_cukai_jalan,
"nama_kawasan" => $request->namaKawasan,
"nama_taman" => $request->namaTaman,
"nama_jalan" => $request->namaJalan,
"catatan" => $request->catatan,
"lokasi_kejadian" => '-',
'latlong' => $request->Latlong,
@@ -725,6 +737,7 @@ class CompoundResourceController extends BaseController
// }
$this->dispatch(new StoreCompound($request->all(), $kpd, $staff->_id, $no_siri));
array_push($data, array('kpd' => $kpd));
$this->dispatch(new StoreCompoundEPBT($request->all(), $kpd, $staff->StaffDetail->full_name, $staff->StaffDetail->no_badan, $faulty->nama));

return $this->sendResponse($data, 'Berjaya simpan rekod notis!');
// }

+ 59
- 0
app/Http/Controllers/Api/EpbtController.php 查看文件

@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
use App\Http\Controllers\Api\BaseController;
use App\Model\Database\EPBT;
use App\Model\Module\CodeMukim;
use Carbon\Carbon;
use Config;
@@ -35,4 +36,62 @@ class EpbtController extends BaseController
}
}
public function getcodeBandar()
{
$bandar = CodeMukim::select('JLN_MKKOD', 'MKM_MNAMA')->orderBy('JLN_MKKOD', 'ASC')->get();
$bandar_detail = [];
foreach($bandar as $i)
{
array_push($bandar_detail, array(
"JLN_MKKOD" => $i->JLN_MKKOD. " - " .$i->MKM_MNAMA,
));
}
return $this->sendResponse($bandar_detail, 'Senarai Bandar');
}
public function getcodeTaman(Request $request)
{
$tmpD = explode(" - ",$request->code_bandar);
$kawasan_detail = array();
$mukim = $tmpD[0];
$data = CodeMukim::where('JLN_MKKOD', $mukim)->orderBy('JLN_KWKOD', 'ASC')->get();
foreach($data as $i)
{
array_push($kawasan_detail, array(
"JLN_KWKOD" => $i->JLN_KWKOD. " - " .$i->KWS_KNAMA,
));
}
return $this->sendResponse($kawasan_detail, 'Senarai Kawasan');
}
public function getCodeJalan(Request $request)
{
$tmpE = explode(" - ",$request->code_mukim);
$mukim = $tmpE[0];
$tmpF = explode(" - ",$request->code_kawasan);
$kawasan = $tmpF[0];
$jalan_detail = array();
$data = CodeMukim::where('JLN_KWKOD', $kawasan)->where('JLN_MKKOD', $mukim)->orderBy('JLN_JLKOD', 'ASC')->get();
foreach($data as $i)
{
array_push($jalan_detail, array(
"JLN_JLKOD" => $i->JLN_JLKOD. " - " .$i->JLN_JNAMA,
"JLN_JNAMA" => $i->JLN_JNAMA
));
}
return $this->sendResponse($jalan_detail, 'Berjaya dapatkan rekod');
}
}

+ 39
- 0
app/Http/Controllers/Main/TaskController.php 查看文件

@@ -29,6 +29,7 @@ use App\Model\Module\History;
use App\Model\Module\SubHistory;
use App\Model\Module\Memo;
use App\Model\Module\Attachment;
use App\Model\Module\CodeMukim;
use App\Jobs\UpdateCompoundPrice;
@@ -346,4 +347,42 @@ class TaskController extends Controller
return response()->json($response->message);
}
}
public function insertdata()
{
$roads = CodeMukim::all()->toArray();
$response = json_decode(file_get_contents(public_path(). '/mukim_kawasan_jalan_mbip.json'));
$temp = [];
if($response->success == true){
foreach ($response->data as $key => $r)
{
// search value in db COde Mukim, if none, add to array
if(!in_array($r->_id, array_column($roads, '_id')))
{
$com = new CodeMukim();
$com->_id = new \MongoDB\BSON\ObjectID($r->_id);
$com->JLN_MKKOD = $r->JLN_MKKOD;
$com->MKM_MNAMA = $r->MKM_MNAMA;
$com->JLN_KWKOD = $r->JLN_KWKOD;
$com->KWS_KNAMA = $r->KWS_KNAMA;
$com->JLN_JNAMA = $r->JLN_JNAMA;
$com->save();
if(!$com)
{
$temp[] = $r;
}
}
}
return 'data not inserted : ' . json_encode($temp);
}
}
}

+ 61
- 35
app/Jobs/StoreCompoundEPBT.php 查看文件

@@ -2,6 +2,8 @@

namespace App\Jobs;

use Carbon\Carbon;

use Illuminate\Bus\Queueable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
@@ -57,7 +59,9 @@ class StoreCompoundEPBT implements ShouldQueue
$client = new \GuzzleHttp\Client();
$result = $client->request('GET', 'http://218.208.81.239:81/appsepbtkompaun_ws/getinfokompaun/infokompaun?infokompaun[]=352405067769401&infokompaun[]=ekpn_kesalahan');
$response = json_decode($result->getBody()->getContents());
dd($compound->created_at->toDateString());
$now = Carbon::now()->toDateTimeString();
if(!empty($response))
{
$k = [];
@@ -70,28 +74,28 @@ class StoreCompoundEPBT implements ShouldQueue
if($compound->jenis == 'Parkir')
{
array_push($k,
$this->kpd, //no kompaun
$this->kpd, //no kompaun
'KPD', //jenis kompaun
$r->fk_akta, //kod akta
strtoupper($r->kesalahan), //keterangan kesalahan
$compound->created_at->toDateString(), //tarikh
$compound->created_at->toTimeString(), //masa
14, //tempoh
//namajalan, namataman
//kodbandar
$compound->nama_jalan .' , '. $compound->nama_taman,//namajalan, namataman
10,//kodbandar
'K',//jenis
strtoupper($compound->plate_no), //no plat
$compound->jumlah_asal_kompaun, //jumlah kompaun
strtoupper($this->no_badan), //no badan
'-', //no pembantu penguatkuasa
strtoupper($this->enf_nama), //nama enforcer
Carbon::now('YYYY-MM_DD hh:mm:ss'), //time created epbt
$now, //time created epbt
$r->kod, //kod kesalahan
$compound->nama, //nama pesalah
//nama jalan - alamat pesalah
//nama taman - alamat pesalah
$compound->nama_jalan,//nama jalan - alamat pesalah
$compound->nama_taman,//nama taman - alamat pesalah
'81300', //postcode
//bandar
$compound->nama_kawasan,//bandar
'JOHOR', //negeri
'B', //notis
'NULL', //notisamaran
@@ -118,21 +122,21 @@ class StoreCompoundEPBT implements ShouldQueue
$compound->created_at->toDateString(), //tarikh
$compound->created_at->toTimeString(), //masa
14, //tempoh
//namajalan, namataman
//kodbandar
$compound->nama_jalan .' , '. $compound->nama_taman,//namajalan, namataman
10,//kodbandar
'K',//jenis
strtoupper($compound->plate_no), //no plat
$compound->jumlah_asal_kompaun, //jumlah kompaun
strtoupper($this->no_badan), //no badan
'-', //no pembantu penguatkuasa
strtoupper($this->enf_nama), //nama enforcer
Carbon::now('YYYY-MM_DD hh:mm:ss'), //time created epbt
$now, //time created epbt
$r->kod, //kod kesalahan
$compound->nama, //nama pesalah
//nama jalan - alamat pesalah
//nama taman - alamat pesalah
$compound->nama_jalan,//nama jalan - alamat pesalah
$compound->nama_taman,//nama taman - alamat pesalah
'81300', //postcode
'ISKANDAR PUTERI'//bandar
$compound->nama_kawasan,//bandar
'JOHOR', //negeri
'B', //notis
'NULL', //notisamaran
@@ -152,28 +156,28 @@ class StoreCompoundEPBT implements ShouldQueue
elseif($compound->jenis == 'Pelbagai_JPB')
{
array_push($k,
$this->kpd, //no kompaun
$this->kpd, //no kompaun
'KPD', //jenis kompaun
$r->fk_akta, //kod akta
strtoupper($r->kesalahan), //keterangan kesalahan
$compound->created_at->toDateString(), //tarikh
$compound->created_at->toTimeString(), //masa
14, //tempoh
//namajalan, namataman
//kodbandar
$compound->nama_jalan .' , '. $compound->nama_taman,//namajalan, namataman
10,//kodbandar
'K',//jenis
strtoupper($compound->plate_no), //no plat
$compound->jumlah_asal_kompaun, //jumlah kompaun
strtoupper($this->no_badan), //no badan
'-', //no pembantu penguatkuasa
strtoupper($this->enf_nama), //nama enforcer
Carbon::now('YYYY-MM_DD hh:mm:ss'), //time created epbt
$now, //time created epbt
$r->kod, //kod kesalahan
$compound->nama, //nama pesalah
//nama jalan - alamat pesalah
//nama taman - alamat pesalah
$compound->nama_jalan,//nama jalan - alamat pesalah
$compound->nama_taman,//nama taman - alamat pesalah
'81300', //postcode
'ISKANDAR PUTERI'//bandar
$compound->nama_kawasan,//bandar
'JOHOR', //negeri
'B', //notis
'NULL', //notisamaran
@@ -193,28 +197,28 @@ class StoreCompoundEPBT implements ShouldQueue
elseif($compound->jenis == 'Pelbagai_PA')
{
array_push($k,
$this->kpd, //no kompaun
$this->kpd, //no kompaun
'KPD', //jenis kompaun
$r->fk_akta, //kod akta
strtoupper($r->kesalahan), //keterangan kesalahan
$compound->created_at->toDateString(), //tarikh
$compound->created_at->toTimeString(), //masa
14, //tempoh
//namajalan, namataman
//kodbandar
$compound->nama_jalan .' , '. $compound->nama_taman,//namajalan, namataman
10,//kodbandar
'K',//jenis
strtoupper($compound->plate_no), //no plat
$compound->jumlah_asal_kompaun, //jumlah kompaun
strtoupper($this->no_badan), //no badan
'-', //no pembantu penguatkuasa
strtoupper($this->enf_nama), //nama enforcer
Carbon::now('YYYY-MM_DD hh:mm:ss'), //time created epbt
$now, //time created epbt
$r->kod, //kod kesalahan
$compound->nama, //nama pesalah
//nama jalan - alamat pesalah
//nama taman - alamat pesalah
$compound->nama_jalan,//nama jalan - alamat pesalah
$compound->nama_taman,//nama taman - alamat pesalah
'81300', //postcode
'ISKANDAR PUTERI'//bandar
$compound->nama_kawasan,//bandar
'JOHOR', //negeri
'B', //notis
'NULL', //notisamaran
@@ -234,28 +238,28 @@ class StoreCompoundEPBT implements ShouldQueue
elseif($compound->jenis == 'Pelbagai_LESEN')
{
array_push($k,
$this->kpd, //no kompaun
$this->kpd, //no kompaun
'KPD', //jenis kompaun
$r->fk_akta, //kod akta
strtoupper($r->kesalahan), //keterangan kesalahan
$compound->created_at->toDateString(), //tarikh
$compound->created_at->toTimeString(), //masa
14, //tempoh
//namajalan, namataman
//kodbandar
$compound->nama_jalan .' , '. $compound->nama_taman,//namajalan, namataman
10,//kodbandar
'K',//jenis
strtoupper($compound->plate_no), //no plat
$compound->jumlah_asal_kompaun, //jumlah kompaun
strtoupper($this->no_badan), //no badan
'-', //no pembantu penguatkuasa
strtoupper($this->enf_nama), //nama enforcer
Carbon::now('YYYY-MM_DD hh:mm:ss'), //time created epbt
$now, //time created epbt
$r->kod, //kod kesalahan
$compound->nama, //nama pesalah
//nama jalan - alamat pesalah
//nama taman - alamat pesalah
$compound->nama_jalan,//nama jalan - alamat pesalah
$compound->nama_taman,//nama taman - alamat pesalah
'81300', //postcode
'ISKANDAR PUTERI'//bandar
$compound->nama_kawasan,//bandar
'JOHOR', //negeri
'B', //notis
'NULL', //notisamaran
@@ -272,6 +276,28 @@ class StoreCompoundEPBT implements ShouldQueue

);
}

$urlQueryString = '';

for ($i=0; $i < count($k); $i++) {

if($i == 0)
{
$urlQueryString = $urlQueryString . '?';
}
else
{
$urlQueryString = $urlQueryString . '&';
}

$urlQueryString = $urlQueryString . 'KompaunDetails[]=' . $k[$i];
// bla/bla/my/registerkompaunDetails?KompaunDetails[]=KP45&KompaunDetails[]=ayu
}

$client = new \GuzzleHttp\Client();
$result = $client->request('GET', 'http://218.208.81.239:81/appsepbtkompaun_ws/registerkompaun/registerkompaunDetails' . $urlQueryString);

}
else
{

+ 17
- 0
app/Model/Module/CodeMukim.php 查看文件

@@ -0,0 +1,17 @@
<?php

namespace App\Model\Module;

use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
use Jenssegers\Mongodb\Eloquent\SoftDeletes;

class CodeMukim extends Eloquent
{
//
use SoftDeletes;
protected $connection = 'mongodb';
protected $collection = 'area_roads';
protected $guarded = ['_id'];
}

+ 2360
- 0
public/mukim_kawasan_jalan_mbip.json
文件差異過大導致無法顯示
查看文件


+ 6
- 0
routes/api.php 查看文件

@@ -157,5 +157,11 @@ Route::group(['middleware' => 'mobileapps'], function() {
Route::post('/update/compound/payment', 'Api\RestfulapiController@updatePaymentIntegrasi');
Route::get('/get/compound-for/epbt', 'Api\RestfulapiController@compoundToEPBT');
Route::get('/store/external/summon', 'Api\ImportDataController@storeExternalCompound');
/*--------------------------------------------------------------------------
| EPBT
|---------------------------------------------------------------------------*/
Route::get('/code/bandar', 'Api\EpbtController@getCodeBandar');
Route::get('/code/taman', 'Api\EpbtController@getCodeTaman');
Route::post('/code/jalan', 'Api\EpbtController@getCodeJalan');
});


+ 5
- 0
routes/web.php 查看文件

@@ -20,6 +20,8 @@ Route::post('/compound/make/payment', 'PaymentController@makeWebPayment');

Route::get('/responsive/compound/{ic}/list', ['uses' => 'ResponsiveController@showCompoundPage']);
Route::get('/responsive/compound/{kpd}/{ic}/view/details', ['uses' => 'ResponsiveController@requestCompoundPaymentPdf']);
Route::get('/main/insert/roads', 'Main\TaskController@insertdata');


/*-------------------------------------------------------------------------
| Export Data
@@ -158,6 +160,9 @@ Route::group(['middleware' => 'sysadminauth'], function () {
Route::post('/main/add-api-key', ['uses' => 'Main\SettingController@addApiKey']);
Route::post('/main/add-api-integration', ['uses' => 'Main\SettingController@addIntegrasi']);




});

/*

Write Preview
Loading…
取消
儲存