diff --git a/.DS_Store b/.DS_Store
index fa161f9..03a2b26 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/mobileservice/.DS_Store b/mobileservice/.DS_Store
index 363c90b..70b7800 100644
Binary files a/mobileservice/.DS_Store and b/mobileservice/.DS_Store differ
diff --git a/mobileservice/gcc_mobile_service_uploads/.DS_Store b/mobileservice/gcc_mobile_service_uploads/.DS_Store
deleted file mode 100644
index 20de68f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/.DS_Store and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/.DS_Store b/mobileservice/gcc_mobile_service_uploads/app_icon/.DS_Store
deleted file mode 100644
index f78d987..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/.DS_Store and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/15.png b/mobileservice/gcc_mobile_service_uploads/app_icon/15.png
deleted file mode 100644
index 63698d4..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/15.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/30.png b/mobileservice/gcc_mobile_service_uploads/app_icon/30.png
deleted file mode 100644
index 2d5d8ee..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/30.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/31.png b/mobileservice/gcc_mobile_service_uploads/app_icon/31.png
deleted file mode 100644
index 2816a65..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/31.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/32.png b/mobileservice/gcc_mobile_service_uploads/app_icon/32.png
deleted file mode 100644
index f9c500c..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/32.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/5_25092024174715_dog.jpg b/mobileservice/gcc_mobile_service_uploads/app_icon/5_25092024174715_dog.jpg
deleted file mode 100644
index b9bb7a3..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/5_25092024174715_dog.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/D_18.png b/mobileservice/gcc_mobile_service_uploads/app_icon/D_18.png
deleted file mode 100644
index 1a179f6..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/D_18.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_42.png b/mobileservice/gcc_mobile_service_uploads/app_icon/MI_42.png
deleted file mode 100644
index 746a99b..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_42.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_43.png b/mobileservice/gcc_mobile_service_uploads/app_icon/MI_43.png
deleted file mode 100644
index 415bd78..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_43.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_44.png b/mobileservice/gcc_mobile_service_uploads/app_icon/MI_44.png
deleted file mode 100644
index 4bced05..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_44.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_45.png b/mobileservice/gcc_mobile_service_uploads/app_icon/MI_45.png
deleted file mode 100644
index 6678b50..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_45.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_46.png b/mobileservice/gcc_mobile_service_uploads/app_icon/MI_46.png
deleted file mode 100644
index 0e52ee5..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_46.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_47.png b/mobileservice/gcc_mobile_service_uploads/app_icon/MI_47.png
deleted file mode 100644
index 85c9197..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_47.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_63.png b/mobileservice/gcc_mobile_service_uploads/app_icon/MI_63.png
deleted file mode 100644
index ec9185d..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_63.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_64.png b/mobileservice/gcc_mobile_service_uploads/app_icon/MI_64.png
deleted file mode 100644
index 8958d37..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/MI_64.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_54.png b/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_54.png
deleted file mode 100644
index b75c4be..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_54.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_55.png b/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_55.png
deleted file mode 100644
index 144c6c7..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_55.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_56.png b/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_56.png
deleted file mode 100644
index 5852876..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_56.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_57.png b/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_57.png
deleted file mode 100644
index bc8027f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_57.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_58.png b/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_58.png
deleted file mode 100644
index 4e9e6b2..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_58.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_59.png b/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_59.png
deleted file mode 100644
index 3e8ebb2..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_59.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_60.png b/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_60.png
deleted file mode 100644
index f78e017..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_60.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_61.png b/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_61.png
deleted file mode 100644
index 250c26b..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/icons/MI_61.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/.DS_Store b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/.DS_Store
deleted file mode 100644
index b0404d5..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/.DS_Store and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/1.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/1.png
deleted file mode 100644
index 21a4535..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/1.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/1_1.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/1_1.png
deleted file mode 100644
index 9a4be42..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/1_1.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/1_2.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/1_2.png
deleted file mode 100644
index d864e9a..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/1_2.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/2.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/2.png
deleted file mode 100644
index 0642f24..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/2.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/2_3.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/2_3.png
deleted file mode 100644
index 5b6391b..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/2_3.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/2_4.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/2_4.png
deleted file mode 100644
index 22d1a8e..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/2_4.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/2_5.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/2_5.png
deleted file mode 100644
index 3d50adb..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/2_5.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/3.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/3.png
deleted file mode 100644
index 98c5564..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/3.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/3_1.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/3_1.png
deleted file mode 100644
index f8b5435..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/3_1.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/3_2.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/3_2.png
deleted file mode 100644
index 22d1a8e..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/3_2.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/3_3.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/3_3.png
deleted file mode 100644
index 3d50adb..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/3_3.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_1.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_1.png
deleted file mode 100644
index 0be5caa..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_1.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_10.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_10.png
deleted file mode 100644
index 9455582..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_10.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_11.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_11.png
deleted file mode 100644
index 3e5b10f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_11.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_12.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_12.png
deleted file mode 100644
index 2315e4e..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_12.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_13.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_13.png
deleted file mode 100644
index 44988b6..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_13.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_14.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_14.png
deleted file mode 100644
index 24a9578..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_14.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_15.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_15.png
deleted file mode 100644
index 74d490f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_15.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_16.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_16.png
deleted file mode 100644
index 21a4535..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_16.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_17.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_17.png
deleted file mode 100644
index 9a6577b..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_17.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_3.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_3.png
deleted file mode 100644
index bc67ac9..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_3.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_5.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_5.png
deleted file mode 100644
index 2a61fbb..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_5.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_6.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_6.png
deleted file mode 100644
index 53d8bcc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_6.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_7.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_7.png
deleted file mode 100644
index ce42bdc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_7.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_8.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_8.png
deleted file mode 100644
index 3f35028..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_8.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_9.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_9.png
deleted file mode 100644
index 6c6097b..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/D_9.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep.zip b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep.zip
deleted file mode 100644
index 06908b0..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep.zip and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/ACCOUNTS CENTRAL CELL.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/ACCOUNTS CENTRAL CELL.png
deleted file mode 100644
index a2c2dc4..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/ACCOUNTS CENTRAL CELL.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/BRIDGES.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/BRIDGES.png
deleted file mode 100644
index 2315e4e..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/BRIDGES.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/BUILDINGS.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/BUILDINGS.png
deleted file mode 100644
index 24a9578..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/BUILDINGS.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/BUS ROUTE ROADS.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/BUS ROUTE ROADS.png
deleted file mode 100644
index 44988b6..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/BUS ROUTE ROADS.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/CHIEF ENGINEER OFFICE.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/CHIEF ENGINEER OFFICE.png
deleted file mode 100644
index e55d3f1..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/CHIEF ENGINEER OFFICE.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/COUNCIL.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/COUNCIL.png
deleted file mode 100644
index cfa10f8..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/COUNCIL.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/DISTRICT FAMILY WELFARE.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/DISTRICT FAMILY WELFARE.png
deleted file mode 100644
index 51883eb..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/DISTRICT FAMILY WELFARE.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_1.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_1.png
deleted file mode 100644
index 0be5caa..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_1.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_10.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_10.png
deleted file mode 100644
index 9455582..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_10.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_11.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_11.png
deleted file mode 100644
index 3e5b10f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_11.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_6.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_6.png
deleted file mode 100644
index 53d8bcc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_6.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_7.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_7.png
deleted file mode 100644
index ce42bdc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/D_7.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/ELECTRICAL.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/ELECTRICAL.png
deleted file mode 100644
index bc67ac9..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/ELECTRICAL.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/ELEMENTARY EDUCATION.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/ELEMENTARY EDUCATION.png
deleted file mode 100644
index 13676de..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/ELEMENTARY EDUCATION.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/HEALTH.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/HEALTH.png
deleted file mode 100644
index 2a61fbb..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/HEALTH.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/LEGAL CELL.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/LEGAL CELL.png
deleted file mode 100644
index 6526d59..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/LEGAL CELL.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/PLANNING AND TRAINING.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/PLANNING AND TRAINING.png
deleted file mode 100644
index 9a6577b..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/PLANNING AND TRAINING.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/REVENUE.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/REVENUE.png
deleted file mode 100644
index 74d490f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/REVENUE.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/SOLID WASTE MANAGEMENT.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/SOLID WASTE MANAGEMENT.png
deleted file mode 100644
index 3f35028..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/SOLID WASTE MANAGEMENT.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/STORM WATER DRAINS.png b/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/STORM WATER DRAINS.png
deleted file mode 100644
index 6c6097b..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/app_icon/menu/icons Dep/STORM WATER DRAINS.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/.DS_Store b/mobileservice/gcc_mobile_service_uploads/asset_activity/.DS_Store
deleted file mode 100644
index 166de2f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/.DS_Store and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_5_08082024115517_1-login.png b/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_5_08082024115517_1-login.png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_5_08082024115517_1-login.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_6_08082024140752_1-login (1).png b/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_6_08082024140752_1-login (1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_6_08082024140752_1-login (1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_after_3_09082024100121_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_after_3_09082024100121_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_after_3_09082024100121_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_10_08082024145025_1-login.png b/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_10_08082024145025_1-login.png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_10_08082024145025_1-login.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_11_08082024150552_1-login.png b/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_11_08082024150552_1-login.png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_11_08082024150552_1-login.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_1_08082024153444_1-login.png b/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_1_08082024153444_1-login.png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_1_08082024153444_1-login.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_1_08082024173336_1-login.png b/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_1_08082024173336_1-login.png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_1_08082024173336_1-login.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_2_08082024161158_1-login.png b/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_2_08082024161158_1-login.png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_2_08082024161158_1-login.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_2_09082024092735_1-login.png b/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_2_09082024092735_1-login.png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_2_09082024092735_1-login.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_3_08082024161506_1-login.png b/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_3_08082024161506_1-login.png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_3_08082024161506_1-login.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_7_08082024142341_1-login.png b/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_7_08082024142341_1-login.png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_7_08082024142341_1-login.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_8_08082024144658_1-login.png b/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_8_08082024144658_1-login.png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_8_08082024144658_1-login.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_9_08082024144748_1-login.png b/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_9_08082024144748_1-login.png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_activity/1/1_before_9_08082024144748_1-login.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_images/.DS_Store b/mobileservice/gcc_mobile_service_uploads/asset_images/.DS_Store
deleted file mode 100644
index 166de2f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_images/.DS_Store and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_images/1/1_08082024220731_1-login_(1).png b/mobileservice/gcc_mobile_service_uploads/asset_images/1/1_08082024220731_1-login_(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_images/1/1_08082024220731_1-login_(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_images/1/1_08082024223052_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/asset_images/1/1_08082024223052_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_images/1/1_08082024223052_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/asset_images/1/1_09082024000023_box1.png b/mobileservice/gcc_mobile_service_uploads/asset_images/1/1_09082024000023_box1.png
deleted file mode 100644
index ae265a2..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/asset_images/1/1_09082024000023_box1.png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/.DS_Store b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/.DS_Store
deleted file mode 100644
index 267a97d..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/.DS_Store and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/1_16082024175625_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/1_16082024175625_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/1_16082024175625_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024202939_CCTNSHitsDB-APP.jpg b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024202939_CCTNSHitsDB-APP.jpg
deleted file mode 100644
index 0bbb2dc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024202939_CCTNSHitsDB-APP.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024203001_CCTNSHitsDB-APP.jpg b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024203001_CCTNSHitsDB-APP.jpg
deleted file mode 100644
index 0bbb2dc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024203001_CCTNSHitsDB-APP.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024203015_CCTNSHitsDB-APP.jpg b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024203015_CCTNSHitsDB-APP.jpg
deleted file mode 100644
index 0bbb2dc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024203015_CCTNSHitsDB-APP.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024230717_CCTNSHitsDB-APP.jpg b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024230717_CCTNSHitsDB-APP.jpg
deleted file mode 100644
index 0bbb2dc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024230717_CCTNSHitsDB-APP.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024230856_CCTNSHitsDB-APP.jpg b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024230856_CCTNSHitsDB-APP.jpg
deleted file mode 100644
index 0bbb2dc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024230856_CCTNSHitsDB-APP.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024230911_CCTNSHitsDB-APP.jpg b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024230911_CCTNSHitsDB-APP.jpg
deleted file mode 100644
index 0bbb2dc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024230911_CCTNSHitsDB-APP.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024230941_CCTNSHitsDB-APP.jpg b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024230941_CCTNSHitsDB-APP.jpg
deleted file mode 100644
index 0bbb2dc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024230941_CCTNSHitsDB-APP.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024231147_CCTNSHitsDB-APP.jpg b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024231147_CCTNSHitsDB-APP.jpg
deleted file mode 100644
index 0bbb2dc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024231147_CCTNSHitsDB-APP.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024231152_CCTNSHitsDB-APP.jpg b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024231152_CCTNSHitsDB-APP.jpg
deleted file mode 100644
index 0bbb2dc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024231152_CCTNSHitsDB-APP.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024231219_CCTNSHitsDB-APP.jpg b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024231219_CCTNSHitsDB-APP.jpg
deleted file mode 100644
index 0bbb2dc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024231219_CCTNSHitsDB-APP.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024231300_CCTNSHitsDB-APP.jpg b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024231300_CCTNSHitsDB-APP.jpg
deleted file mode 100644
index 0bbb2dc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/after_16082024231300_CCTNSHitsDB-APP.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024175756_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024175756_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024175756_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024175759_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024175759_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024175759_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024175846_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024175846_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024175846_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024180233_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024180233_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024180233_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024180305_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024180305_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024180305_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024180341_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024180341_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024180341_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024181228_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024181228_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024181228_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024181235_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024181235_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024181235_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024193720_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024193720_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024193720_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024194322_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024194322_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024194322_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024194348_1-login(1).png b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024194348_1-login(1).png
deleted file mode 100644
index dc4cf5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_16082024194348_1-login(1).png and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_19082024015425_OverAllPending.jpg b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_19082024015425_OverAllPending.jpg
deleted file mode 100644
index 2a4d905..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_19082024015425_OverAllPending.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_19082024015459_OverAllPending.jpg b/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_19082024015459_OverAllPending.jpg
deleted file mode 100644
index 2a4d905..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/brr_activity_images/2024/08/before_19082024015459_OverAllPending.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/default b/mobileservice/gcc_mobile_service_uploads/default
deleted file mode 100644
index 7326c4f..0000000
--- a/mobileservice/gcc_mobile_service_uploads/default
+++ /dev/null
@@ -1,316 +0,0 @@
-##
-# You should look at the following URL's in order to grasp a solid understanding
-# of Nginx configuration files in order to fully unleash the power of Nginx.
-# https://www.nginx.com/resources/wiki/start/
-# https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/
-# https://wiki.debian.org/Nginx/DirectoryStructure
-#
-# In most cases, administrators will remove this file from sites-enabled/ and
-# leave it as reference inside of sites-available where it will continue to be
-# updated by the nginx packaging team.
-#
-# This file will automatically load configuration files provided by other
-# applications, such as Drupal or Wordpress. These applications will be made
-# available underneath a path with that package name, such as /drupal8.
-#
-# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples.
-##
-
-# Default server configuration
-#
-server {
- #listen 80 default_server;
- #listen [::]:80 default_server;
-
- # SSL configuration
- #
- listen 443 ssl;
- listen [::]:443 ssl;
- ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
- ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
- ssl_protocols TLSv1.2 TLSv1.3;
- # listen 443 ssl default_server;
- # listen [::]:443 ssl default_server;
- #
- # Note: You should disable gzip for SSL traffic.
- # See: https://bugs.debian.org/773332
- #
- # Read up on ssl_ciphers to ensure a secure configuration.
- # See: https://bugs.debian.org/765782
- #
- # Self signed certs generated by the ssl-cert package
- # Don't use them in a production server!
- #
- # include snippets/snakeoil.conf;
-
- root /var/www/html;
-
- # Add index.php to the list if you are using PHP
- index index.php index.html index.htm index.nginx-debian.html;
-
- server_name _;
-
- location / {
-
- if ($server_port = 8061) {
- return 301 http://localhost/maintenance.html;
- }
- # First attempt to serve request as file, then
- # as directory, then fall back to displaying a 404.
- try_files $uri $uri/ =404;
- }
-
-# PHPMyadmin
- location /phpmyadmin {
- proxy_pass http://localhost/phpmyadmin;
- proxy_buffering off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Port $server_port;
- }
-
-#MyPortal
-
-location /myportal {
- proxy_pass http://localhost/myportal/public/index.php;
- proxy_buffering off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Port $server_port;
-
-location /myportal/public/css {
- alias /var/www/html/myportal/public/css;
- }
- location /myportal/public/vendor {
- alias /var/www/html/myportal/public/vendor;
- }
- location /myportal/public/index.php/user-uploads {
- alias /var/www/html/myportal/public/user-uploads;
- }
-
- }
-
- location /myportal/public/css {
- # alias /var/www/html/myportal/public/css;
- }
- location /myportal/public/vendor {
- # alias /var/www/html/myportal/public/vendor;
- }
- location /myportal/public/index.php/user-uploads {
- # alias /var/www/html/myportal/public/user-uploads;
- }
-
-# Pet reg
- location /pet {
- proxy_pass http://localhost:8061;
- proxy_buffering off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Port $server_port;
- }
-
-
-# Define a location block to serve files from the /home/mm/projects directory
- # location /files/ {
- # alias /home/mm/projects/;
- # autoindex on; # Enable directory listing if needed
- # }
-
-# Block access to files in /home/mm/projects directory
- location /files/ {
- deny all;
- return 403;
- }
-
- # Allow your web application to serve files from /home/mm/projects directory
- location /gcc/upload_files/ {
- alias /home/mm/projects/;
- }
-
-# Makkaludan Mudhalvar
- location /mm {
- proxy_pass http://localhost:8070;
- proxy_buffering off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Port $server_port;
-
- location /mm/assets/ {
- #proxy_pass http://localhost:8070/assets/;
- }
- }
-
-# CM Dashboard
- location /cm {
- proxy_pass http://localhost:8066;
- proxy_buffering off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Port $server_port;
- }
-
-# GCC PlayStore Support
- location /support {
- proxy_pass http://localhost:8069;
- proxy_buffering off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Port $server_port;
- location /support/assets/ {
- proxy_pass http://localhost:8069/assets/;
- }
- location /support/feedback/ {
- proxy_pass http://localhost:8069/feedback/;
- }
- }
-
-# GCC Official App Mobile (gccofficialapp)
- location /gccofficialapp {
- proxy_pass http://localhost:8067;
- proxy_buffering off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Port $server_port;
- location /gccofficialapp/assets/ {
- proxy_pass http://localhost:8067/assets/;
- }
- location /gccofficialapp/feedback/ {
- proxy_pass http://localhost:8067/feedback/;
- }
- }
-
-
-# Makkalai Thedi Mayor
- location /mtm {
- proxy_pass http://localhost:8060;
- proxy_buffering off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Port $server_port;
- location /mtm/assets/ {
- proxy_pass http://localhost:8060/assets/;
- }
- location /mtm/login {
- proxy_pass http://localhost:8060/login;
- }
- location /mtm/api/ {
- proxy_pass http://localhost:8060/api/;
- }
- }
-# QR Service - GCC Asset Feedback
- location /qrfeedback {
- proxy_pass http://localhost:8065/public-feedback;
- proxy_buffering off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Port $server_port;
- location /qrfeedback/assets/ {
- proxy_pass http://localhost:8065/assets/;
- }
- location /qrfeedback/api/ {
- proxy_pass http://localhost:8065/api/;
- }
- }
-
-# GCC Portal
- location /gcc {
- proxy_pass http://localhost:8064/gcc;
- proxy_connect_timeout 120s;
- proxy_read_timeout 240s;
- proxy_send_timeout 10s;
- proxy_buffering off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Port $server_port;
- location /gcc/assets/ {
- proxy_pass http://localhost:8064/assets/;
- }
- #For Upload file
- location /gcc/uploads/ {
- alias /home/mm/projects/gccoffice_uploads/;
- #autoindex on; # Enable directory listing if needed
- }
- }
-
-# Election Portal
- location /election {
- proxy_pass http://localhost:8065/election;
- proxy_connect_timeout 120s;
- proxy_read_timeout 240s;
- proxy_send_timeout 10s;
- proxy_buffering off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Port $server_port;
- location /election/assets/ {
- proxy_pass http://localhost:8065/assets/;
- }
- #For Upload file
- location /election/uploads/ {
- alias /home/mm/projects/election_uploads/;
- #autoindex on; # Enable directory listing if needed
- }
- }
-
-# Hall Booking
- location /communityhall {
- proxy_pass http://localhost:8062;
- proxy_buffering off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Port $server_port;
-
- location /communityhall/assets/ {
- proxy_pass http://localhost:8062/assets/;
- }
- #For Upload file
- location /communityhall/images/ {
- alias /home/mm/projects/communityHallDocuments/;
- #autoindex on; # Enable directory listing if needed
- }
- }
-#location /support/assets/ {
- # proxy_pass http://localhost:8069/assets/;
- # proxy_buffering off;
- # proxy_set_header X-Real-IP $remote_addr;
- # proxy_set_header X-Forwarded-Host $host;
- # proxy_set_header X-Forwarded-Port $server_port;
- #}
- # pass PHP scripts to FastCGI server
- #
- #location ~ \.php$ {
- # include snippets/fastcgi-php.conf;
- #
- # # With php-fpm (or other unix sockets):
- # fastcgi_pass unix:/var/run/php/php7.4-fpm.sock;
- # # With php-cgi (or other tcp sockets):
- # fastcgi_pass 127.0.0.1:9000;
- #}
-
- # deny access to .htaccess files, if Apache's document root
- # concurs with nginx's one
- #
- #location ~ /\.ht {
- # deny all;
- #}
-}
-
-
-# Virtual Host configuration for example.com
-#
-# You can move that to a different file under sites-available/ and symlink that
-# to sites-enabled/ to enable it.
-#
-#server {
-# listen 80;
-# listen [::]:80;
-#
-# server_name example.com;
-#
-# root /var/www/example.com;
-# index index.html;
-#
-# location / {
-# try_files $uri $uri/ =404;
-# }
-#}
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2/2_04092024201313_CCTNSHitsDB-APP.jpg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2/2_04092024201313_CCTNSHitsDB-APP.jpg
deleted file mode 100644
index 0bbb2dc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2/2_04092024201313_CCTNSHitsDB-APP.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2/2_05092024084212_CCTNSHitsDB-APP.jpg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2/2_05092024084212_CCTNSHitsDB-APP.jpg
deleted file mode 100644
index 0bbb2dc..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2/2_05092024084212_CCTNSHitsDB-APP.jpg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024141630_WhatsAppImage2024-08-30at12.49.03(2).jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024141630_WhatsAppImage2024-08-30at12.49.03(2).jpeg
deleted file mode 100644
index 23d6d08..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024141630_WhatsAppImage2024-08-30at12.49.03(2).jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024141759_WhatsAppImage2024-08-30at12.49.03(2).jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024141759_WhatsAppImage2024-08-30at12.49.03(2).jpeg
deleted file mode 100644
index 23d6d08..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024141759_WhatsAppImage2024-08-30at12.49.03(2).jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024141932_WhatsAppImage2024-08-30at12.49.03(2).jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024141932_WhatsAppImage2024-08-30at12.49.03(2).jpeg
deleted file mode 100644
index 23d6d08..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024141932_WhatsAppImage2024-08-30at12.49.03(2).jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024141949_WhatsAppImage2024-08-30at12.49.03(2).jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024141949_WhatsAppImage2024-08-30at12.49.03(2).jpeg
deleted file mode 100644
index 23d6d08..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024141949_WhatsAppImage2024-08-30at12.49.03(2).jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024142024_WhatsAppImage2024-08-30at12.49.03(2).jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024142024_WhatsAppImage2024-08-30at12.49.03(2).jpeg
deleted file mode 100644
index 23d6d08..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/challan_2_06092024142024_WhatsAppImage2024-08-30at12.49.03(2).jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/close_3_06092024145251_WhatsAppImage2024-08-30at12.49.03(2).jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/close_3_06092024145251_WhatsAppImage2024-08-30at12.49.03(2).jpeg
deleted file mode 100644
index 23d6d08..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/close_3_06092024145251_WhatsAppImage2024-08-30at12.49.03(2).jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/close_3_06092024145350_WhatsAppImage2024-08-30at12.49.03(2).jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/close_3_06092024145350_WhatsAppImage2024-08-30at12.49.03(2).jpeg
deleted file mode 100644
index 23d6d08..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/close_3_06092024145350_WhatsAppImage2024-08-30at12.49.03(2).jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/close_3_06092024145558_WhatsAppImage2024-08-30at12.49.03(2).jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/close_3_06092024145558_WhatsAppImage2024-08-30at12.49.03(2).jpeg
deleted file mode 100644
index 23d6d08..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/close_3_06092024145558_WhatsAppImage2024-08-30at12.49.03(2).jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_1_05092024154815_pan-card.jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_1_05092024154815_pan-card.jpeg
deleted file mode 100644
index 267dd5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_1_05092024154815_pan-card.jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_1_05092024154847_pan-card.jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_1_05092024154847_pan-card.jpeg
deleted file mode 100644
index 267dd5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_1_05092024154847_pan-card.jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_1_05092024154857_pan-card.jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_1_05092024154857_pan-card.jpeg
deleted file mode 100644
index 267dd5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_1_05092024154857_pan-card.jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_3_05092024155003_pan-card.jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_3_05092024155003_pan-card.jpeg
deleted file mode 100644
index 267dd5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_3_05092024155003_pan-card.jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_3_05092024155206_pan-card.jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_3_05092024155206_pan-card.jpeg
deleted file mode 100644
index 267dd5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_3_05092024155206_pan-card.jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_3_05092024155229_pan-card.jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_3_05092024155229_pan-card.jpeg
deleted file mode 100644
index 267dd5f..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/2024/09/fine_3_05092024155229_pan-card.jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175449_WhatsAppImage2024-09-21at18.40.47.jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175449_WhatsAppImage2024-09-21at18.40.47.jpeg
deleted file mode 100644
index 7da9ce8..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175449_WhatsAppImage2024-09-21at18.40.47.jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175541_WhatsAppImage2024-09-21at18.40.47.jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175541_WhatsAppImage2024-09-21at18.40.47.jpeg
deleted file mode 100644
index 7da9ce8..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175541_WhatsAppImage2024-09-21at18.40.47.jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175630_WhatsAppImage2024-09-21at18.40.47.jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175630_WhatsAppImage2024-09-21at18.40.47.jpeg
deleted file mode 100644
index 7da9ce8..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175630_WhatsAppImage2024-09-21at18.40.47.jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175742_WhatsAppImage2024-09-21at18.40.47.jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175742_WhatsAppImage2024-09-21at18.40.47.jpeg
deleted file mode 100644
index 7da9ce8..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175742_WhatsAppImage2024-09-21at18.40.47.jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175839_WhatsAppImage2024-09-21at18.40.47.jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175839_WhatsAppImage2024-09-21at18.40.47.jpeg
deleted file mode 100644
index 7da9ce8..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024175839_WhatsAppImage2024-09-21at18.40.47.jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024180236_WhatsAppImage2024-09-21at18.40.47.jpeg b/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024180236_WhatsAppImage2024-09-21at18.40.47.jpeg
deleted file mode 100644
index 7da9ce8..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/penalty_activity/pos/2024/09/challan_1_30092024180236_WhatsAppImage2024-09-21at18.40.47.jpeg and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/sos_rescue_activity_images/.DS_Store b/mobileservice/gcc_mobile_service_uploads/sos_rescue_activity_images/.DS_Store
deleted file mode 100644
index 267a97d..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/sos_rescue_activity_images/.DS_Store and /dev/null differ
diff --git a/mobileservice/gcc_mobile_service_uploads/sos_rescue_activity_images/2024/08/24/1_24082024131015_300000-Page1-16884680450038429284263760162296.jpg b/mobileservice/gcc_mobile_service_uploads/sos_rescue_activity_images/2024/08/24/1_24082024131015_300000-Page1-16884680450038429284263760162296.jpg
deleted file mode 100644
index 1df2782..0000000
Binary files a/mobileservice/gcc_mobile_service_uploads/sos_rescue_activity_images/2024/08/24/1_24082024131015_300000-Page1-16884680450038429284263760162296.jpg and /dev/null differ
diff --git a/mobileservice/pom.xml b/mobileservice/pom.xml
index e1cfa2f..23308bc 100644
--- a/mobileservice/pom.xml
+++ b/mobileservice/pom.xml
@@ -109,6 +109,12 @@
1.5.7
+
+ org.apache.poi
+ poi-ooxml
+ 5.2.3
+
+
diff --git a/mobileservice/src/.DS_Store b/mobileservice/src/.DS_Store
index 3fa9e7e..41362cc 100644
Binary files a/mobileservice/src/.DS_Store and b/mobileservice/src/.DS_Store differ
diff --git a/mobileservice/src/main/.DS_Store b/mobileservice/src/main/.DS_Store
index b9a0adb..44b9c1e 100644
Binary files a/mobileservice/src/main/.DS_Store and b/mobileservice/src/main/.DS_Store differ
diff --git a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/1_approved.jpg b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/1_approved.jpg
new file mode 100644
index 0000000..1c44c29
Binary files /dev/null and b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/1_approved.jpg differ
diff --git a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/1_rejected.jpg b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/1_rejected.jpg
new file mode 100644
index 0000000..dbe75ba
Binary files /dev/null and b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/1_rejected.jpg differ
diff --git a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/configuration/AppConfig.java b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/configuration/AppConfig.java
index 95b0ab7..2dc6828 100644
--- a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/configuration/AppConfig.java
+++ b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/configuration/AppConfig.java
@@ -7,16 +7,15 @@ import org.springframework.web.client.RestTemplate;
@Configuration
public class AppConfig {
- public String qrAssetFeedback = "http://localhost:8063";
- public String mtm = "http://localhost:8060";
- public String petRegistration = "http://localhost:8061";
- public String garbageCollection = "http://localhost:8067"; //117.232.67.158
+ public String qrAssetFeedback = "http://117.232.67.158:8063";
+ public String mtm = "http://117.232.67.158:8060";
+ public String petRegistration = "http://117.232.67.158:8061";
+ public String garbageCollection = "http://117.232.67.158:8067"; //117.232.67.158
public String gccappsMysqlPassword = "";
@Bean
public RestTemplate restTemplate() {
return new RestTemplate();
- }
-
+ }
}
\ No newline at end of file
diff --git a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/configuration/DataSourceConfig.java b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/configuration/DataSourceConfig.java
index 3b89a47..d06d9b3 100644
--- a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/configuration/DataSourceConfig.java
+++ b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/configuration/DataSourceConfig.java
@@ -74,11 +74,11 @@ public class DataSourceConfig {
//////////////////////////////(For GCC Activity Master) ////////////////////////
@Bean(name = "mysqlActivityDataSource")
public DataSource mysqlActivityDataSource() {
- DriverManagerDataSource dataSource = new DriverManagerDataSource();
- dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
- dataSource.setUrl("jdbc:mysql://"+host+"/gcc_activity");
- dataSource.setUsername("root");
- dataSource.setPassword(dbpassword);
+ DriverManagerDataSource dataSource = new DriverManagerDataSource();
+ dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+ dataSource.setUrl("jdbc:mysql://"+host+"/gcc_activity");
+ dataSource.setUsername("root");
+ dataSource.setPassword(dbpassword);
return dataSource;
}
@@ -93,81 +93,92 @@ public class DataSourceConfig {
return dataSource;
}
+ //////////////////////////////(For Cattle Catch Master) ////////////////////////
+ @Bean(name = "mysqlCattleCatchDataSource")
+ public DataSource mysqlCattleCatchDataSource() {
+ DriverManagerDataSource dataSource = new DriverManagerDataSource();
+ dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+ dataSource.setUrl("jdbc:mysql://"+host+"/gcc_penalty");
+ dataSource.setUsername("root");
+ dataSource.setPassword(dbpassword);
+ return dataSource;
+ }
+
+
//////////////////////////////(For PGR Master) ////////////////////////
@Bean(name = "mysqlPGRMasterDataSource")
public DataSource mysqlPGRMasterDataSource() {
- DriverManagerDataSource dataSource = new DriverManagerDataSource();
- dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
- dataSource.setUrl("jdbc:mysql://"+host+"/erp_pgr");
- dataSource.setUsername("root");
- dataSource.setPassword(dbpassword);
+ DriverManagerDataSource dataSource = new DriverManagerDataSource();
+ dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+ dataSource.setUrl("jdbc:mysql://"+host+"/erp_pgr");
+ dataSource.setUsername("root");
+ dataSource.setPassword(dbpassword);
return dataSource;
}
//////////////////////////////(For PGR Master) ////////////////////////
@Bean(name = "mysqlGCCUserDataSource")
public DataSource mysqlGCCUserDataSource() {
- DriverManagerDataSource dataSource = new DriverManagerDataSource();
- dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
- dataSource.setUrl("jdbc:mysql://"+host+"/gcc_users");
- dataSource.setUsername("root");
- dataSource.setPassword(dbpassword);
+ DriverManagerDataSource dataSource = new DriverManagerDataSource();
+ dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+ dataSource.setUrl("jdbc:mysql://"+host+"/gcc_users");
+ dataSource.setUsername("root");
+ dataSource.setPassword(dbpassword);
return dataSource;
}
-
//////////////////////////////(For PGR Master) ////////////////////////
@Bean(name = "mysqlGccSOSDataSource")
public DataSource mysqlGccSOSDataSource() {
- DriverManagerDataSource dataSource = new DriverManagerDataSource();
- dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
- dataSource.setUrl("jdbc:mysql://"+host+"/gcc_sos");
- dataSource.setUsername("root");
- dataSource.setPassword(dbpassword);
+ DriverManagerDataSource dataSource = new DriverManagerDataSource();
+ dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+ dataSource.setUrl("jdbc:mysql://"+host+"/gcc_sos");
+ dataSource.setUsername("root");
+ dataSource.setPassword(dbpassword);
return dataSource;
}
//////////////////////////////(For NULM Staff) ////////////////////////
@Bean(name = "mysqlNulmDataSource")
public DataSource mysqlNulmDataSource() {
- DriverManagerDataSource dataSource = new DriverManagerDataSource();
- dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
- dataSource.setUrl("jdbc:mysql://"+host+"/gcc_nulm");
- dataSource.setUsername("root");
- dataSource.setPassword(dbpassword);
+ DriverManagerDataSource dataSource = new DriverManagerDataSource();
+ dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+ dataSource.setUrl("jdbc:mysql://"+host+"/gcc_nulm");
+ dataSource.setUsername("root");
+ dataSource.setPassword(dbpassword);
return dataSource;
}
//////////////////////////////(For Stray Dog (veterinary)) ////////////////////////
@Bean(name = "mysqlGccStraydogsDataSource")
public DataSource mysqlGccStraydogsDataSource() {
- DriverManagerDataSource dataSource = new DriverManagerDataSource();
- dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
- dataSource.setUrl("jdbc:mysql://"+host+"/gcc_stray_dogs");
- dataSource.setUsername("root");
- dataSource.setPassword(dbpassword);
+ DriverManagerDataSource dataSource = new DriverManagerDataSource();
+ dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+ dataSource.setUrl("jdbc:mysql://"+host+"/gcc_stray_dogs");
+ dataSource.setUsername("root");
+ dataSource.setPassword(dbpassword);
return dataSource;
}
//////////////////////////////(For Schools) ////////////////////////
@Bean(name = "mysqlGccSchoolsDataSource")
public DataSource mysqlGccSchoolsDataSource() {
- DriverManagerDataSource dataSource = new DriverManagerDataSource();
- dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
- dataSource.setUrl("jdbc:mysql://"+host+"/gcc_schools");
- dataSource.setUsername("root");
- dataSource.setPassword(dbpassword);
+ DriverManagerDataSource dataSource = new DriverManagerDataSource();
+ dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+ dataSource.setUrl("jdbc:mysql://"+host+"/gcc_schools");
+ dataSource.setUsername("root");
+ dataSource.setPassword(dbpassword);
return dataSource;
}
//////////////////////////////(For Parks and Playground) ////////////////////////
@Bean(name = "mysqlGccParksDataSource")
public DataSource mysqlGccParksDataSource() {
- DriverManagerDataSource dataSource = new DriverManagerDataSource();
- dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
- dataSource.setUrl("jdbc:mysql://"+host+"/gcc_parks_playground");
- dataSource.setUsername("root");
- dataSource.setPassword(dbpassword);
+ DriverManagerDataSource dataSource = new DriverManagerDataSource();
+ dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+ dataSource.setUrl("jdbc:mysql://"+host+"/gcc_parks_playground");
+ dataSource.setUsername("root");
+ dataSource.setPassword(dbpassword);
return dataSource;
}
diff --git a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/controller/APIOfficialController.java b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/controller/APIOfficialController.java
index f7b5d9c..3cfe2d6 100644
--- a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/controller/APIOfficialController.java
+++ b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/controller/APIOfficialController.java
@@ -35,6 +35,11 @@ public class APIOfficialController {
return officialAPIService.versionCheck();
}
+ @GetMapping({"/nammaVersionCheck"}) // Template
+ public List nammaVersionCheck() {
+ return officialAPIService.nammaVersionCheck();
+ }
+
// API FOR TOTHER APP
@GetMapping(value="/sendOTP")
public List sendOTP(HttpServletRequest request,
diff --git a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/controller/ParksController.java b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/controller/ParksController.java
index 9ba9015..9112fe1 100644
--- a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/controller/ParksController.java
+++ b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/controller/ParksController.java
@@ -1,31 +1,38 @@
package in.gov.chennaicorporation.mobileservice.gccparks.controller;
+import java.io.IOException;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.util.MultiValueMap;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
+import in.gov.chennaicorporation.mobileservice.gccparks.service.NoDataException;
import in.gov.chennaicorporation.mobileservice.gccparks.service.ParksService;
-@Controller@RequestMapping("/gccofficialapp/api/parks")
+@RequestMapping("/gccofficialapp/api/parks")
@RestController("gccofficalapparksrest")
public class ParksController {
-
+
@Autowired
private ParksService parksService;
-
+
@GetMapping("/saveAssets")
public List saveAssets(@RequestParam MultiValueMap formData,
@RequestParam(value = "categoryId", required = false) String categoryId,
- @RequestParam(value = "assetTypeId", required = false) String assetTypeId,
- @RequestParam(value = "latitude", required = false) String latitude,
+ @RequestParam(value = "assetTypeId", required = false) String assetTypeId,
+ @RequestParam(value = "latitude", required = false) String latitude,
@RequestParam(value = "longitude", required = false) String longitude,
@RequestParam(value = "zone", required = false) String zone,
@RequestParam(value = "ward", required = false) String ward,
@@ -33,21 +40,870 @@ public class ParksController {
@RequestParam(value = "streetName", required = false) String streetName,
@RequestParam(value = "loginId", required = false) String loginId,
@RequestParam(value = "name", required = false) String name,
- @RequestParam(value = "file", required = false) MultipartFile file
- ) {
- return parksService.saveAsset(formData, categoryId, assetTypeId, latitude,
- longitude, zone, ward, streeId, streetName, loginId, name, file);
+ @RequestParam(value = "file", required = false) MultipartFile file) {
+ return parksService.saveAsset(formData, categoryId, assetTypeId, latitude, longitude, zone, ward, streeId,
+ streetName, loginId, name, file);
}
-
+
@GetMapping("/filterAssets")
public List getAssets(@RequestParam MultiValueMap formData,
@RequestParam(value = "categoryId", required = false) String categoryId,
- @RequestParam(value = "assetTypeId", required = false) String assetTypeId,
- @RequestParam(value = "latitude", required = false) String latitude,
- @RequestParam(value = "longitude", required = false) String longitude
- ) {
- return parksService.loadAssetByFilter(categoryId, assetTypeId, latitude,
- longitude);
+ @RequestParam(value = "assetTypeId", required = false) String assetTypeId,
+ @RequestParam(value = "latitude", required = false) String latitude,
+ @RequestParam(value = "longitude", required = false) String longitude) {
+ return parksService.loadAssetByFilter(categoryId, assetTypeId, latitude, longitude);
+ }
+
+ // ----------------------------------------------Enumeration
+ // API------------------------------------------------
+ @PostMapping("/centerMedianEnumeration")
+ public ResponseEntity centerMedianEnumeration(@RequestParam("EnterParkName") String EnterParkName,
+ @RequestParam("maintained_By") int maintained_By, @RequestParam("Enu_Area_Meters") Double Enu_Area_Meters,
+ @RequestParam("TypeofCenterMedian") int TypeofCenterMedian, // ask
+ @RequestParam("latitude") String latitude, @RequestParam("longitude") String longitude,
+ @RequestParam("zone") String zone, @RequestParam("ward") String ward,
+ @RequestParam(value = "location", required = false) String location, @RequestParam("UserId") String UserId,
+ @RequestParam("Enumeration_Image") MultipartFile photo,
+ @RequestParam("enumeration_type") String enumeration_type
+
+ ) throws Exception {
+
+ int centerMedianEnumeration = parksService.centerMedianEnumeration(EnterParkName, maintained_By,
+ Enu_Area_Meters, TypeofCenterMedian, latitude, longitude, zone, ward, location, UserId, photo,
+ enumeration_type);
+
+ if (centerMedianEnumeration == 0 || centerMedianEnumeration == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+
+ @PostMapping("/trafficIslandEnumeration")
+ public ResponseEntity trafficIslandEnumeration(
+ @RequestParam("maintained_By") int maintained_By, @RequestParam("Enu_Area_Meters") Double Enu_Area_Meters,
+ @RequestParam("TypeofCenterMedian") int Type_of_Traffic_Island, // ask
+ @RequestParam("latitude") String latitude, @RequestParam("longitude") String longitude,
+ @RequestParam("zone") String zone, @RequestParam("ward") String ward,
+ @RequestParam(value = "location", required = false) String location, @RequestParam("UserId") String UserId,
+ @RequestParam("Enumeration_Image") MultipartFile photo,
+ @RequestParam("enumeration_type") String enumeration_type) throws Exception {
+
+ int trafficIslandEnumeration = parksService.trafficIslandEnumeration(maintained_By, Enu_Area_Meters,
+ Type_of_Traffic_Island, latitude, longitude, zone, ward, location, UserId, photo, enumeration_type);
+ if (trafficIslandEnumeration == 0 || trafficIslandEnumeration == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+
+ @PostMapping("/parkEnumeration")
+ public ResponseEntity parkEnumeration(@RequestParam("EnterParkName") String EnterParkName,
+ @RequestParam("maintained_By") int maintained_By, @RequestParam("latitude") String latitude,
+ @RequestParam("longitude") String longitude, @RequestParam("zone") String zone,
+ @RequestParam("ward") String ward, @RequestParam(value = "location", required = false) String location,
+ @RequestParam("UserId") String UserId, @RequestParam("Zone_Available") String Zone_Available, // reading zone
+ @RequestParam("Enumeration_Image") MultipartFile photo,
+ @RequestParam("enumeration_type") String enumeration_type) throws Exception {
+
+ int parkEnumeration = parksService.parkEnumeration(EnterParkName, maintained_By, latitude, longitude, zone,
+ ward, location, UserId, photo, Zone_Available, enumeration_type);
+
+ if (parkEnumeration == 0 || parkEnumeration == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+
+ @PostMapping("/beautificationRoadEnumeration")
+ public ResponseEntity beautificationRoad(
+// @RequestParam("Area") String Area,//location
+ @RequestParam("latitude") String latitude, @RequestParam("longitude") String longitude,
+ @RequestParam("zone") String zone, @RequestParam("ward") String ward,
+ @RequestParam(value = "location", required = false) String location, @RequestParam("UserId") String UserId,
+ @RequestParam("Enumeration_Image") MultipartFile photo,
+ @RequestParam("enumeration_type") String enumeration_type) throws Exception {
+
+ int beautificationRoad = parksService.beautificationRoad(latitude, longitude, zone, ward, location, UserId,
+ photo, enumeration_type);
+
+ if (beautificationRoad == 0 || beautificationRoad == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+
+ @PostMapping("/readingZoneEnumeration")
+ public ResponseEntity readingZone(
+ @RequestParam("latitude") String latitude, @RequestParam("longitude") String longitude,
+ @RequestParam("zone") String zone, @RequestParam("ward") String ward,
+ @RequestParam(value = "location", required = false) String location, @RequestParam("UserId") String UserId,
+ // @RequestParam("Zone_Available_name") String Zone_Available_name,//reading zone
+ @RequestParam("Enumeration_Image") MultipartFile photo,
+ @RequestParam("enumeration_type") String enumeration_type, @RequestParam("park_name") String park_name // name
+ ) throws Exception {
+
+ int readingZone = parksService.readingZone(latitude, longitude, zone, ward, location, UserId, photo,
+ enumeration_type, park_name);
+
+ if (readingZone == 0 || readingZone == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+
+ @PostMapping("/miyawakiNewEnumeration")
+ public ResponseEntity miyawakiNew(@RequestParam("latitude") String latitude,
+ @RequestParam("longitude") String longitude, @RequestParam("zone") String zone,
+ @RequestParam("ward") String ward, @RequestParam(value = "location", required = false) String location,
+ @RequestParam("UserId") String UserId, @RequestParam("Type_of_place") String Type_of_place, // reading zone
+ @RequestParam("Enumeration_Image") MultipartFile photo,
+ @RequestParam("enumeration_type") String enumeration_type) throws Exception {
+
+ int miyawakiNew = parksService.miyawakiNew(Type_of_place, latitude, longitude, zone, ward, location, UserId,
+ photo, enumeration_type);
+
+ if (miyawakiNew == 0 || miyawakiNew == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+
+ @PostMapping("/miyawakiExistingEnumeration")
+ public ResponseEntity miyawakiExisting(@RequestParam("latitude") String latitude,
+ @RequestParam("longitude") String longitude, @RequestParam("zone") String zone,
+ @RequestParam("ward") String ward, @RequestParam(value = "location", required = false) String location,
+ @RequestParam("UserId") String UserId, @RequestParam("maintained_By") int maintained_By,
+ @RequestParam("Enumeration_Image") MultipartFile photo,
+ @RequestParam("enumeration_type") String enumeration_type) throws Exception {
+
+ int miyawakiExisting = parksService.miyawakiExisting(maintained_By, latitude, longitude, zone, ward, location,
+ UserId, photo, enumeration_type);
+
+ if (miyawakiExisting == 0 || miyawakiExisting == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+
+ // To fetch park name within 500 meter radius
+ @GetMapping("/location")
+ public ResponseEntity>> location(@RequestParam("latitude") String latitude,
+ @RequestParam("longitude") String longitude, @RequestParam("enumeration_type") String enumeration_type) throws Exception {
+ List> dataByLocation = parksService.getDateByLocation(latitude, longitude,enumeration_type);
+
+ if (dataByLocation == null || dataByLocation.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(dataByLocation);
+
+ }
+
+ /*
+ * // To fetch park name with reading zone available
+ *
+ * @PostMapping("/parkname") public ResponseEntity>>
+ * parkname() throws Exception { List> parkName =
+ * parksService.parkName();
+ *
+ * return ResponseEntity.ok(parkName); }
+ */
+
+ @GetMapping("/parkname")
+ public ResponseEntity>> parkname(@RequestParam("latitude") String latitude,
+ @RequestParam("longitude") String longitude) throws Exception {
+
+ List> dataByLocation = parksService.getReadingZoneParkByLocation(latitude, longitude,
+ latitude);
+
+ return ResponseEntity.ok(dataByLocation);
+
+ }
+
+ // -----------------------------------------------Feedback
+ // API-----------------------------------------------------------------
+
+ @PostMapping("/centerMedianFeedback")
+ public ResponseEntity centerMedian(@RequestParam("irrigationProperlyQa") String irrigationProperlyQa,
+ @RequestParam("irrigationProperlyAns") String irrigationProperlyAns,
+ @RequestParam("trimmingProperlyQa") String trimmingProperlyQa,
+ @RequestParam("trimmingProperlyAns") String trimmingProperlyAns,
+ @RequestParam("weedingQa") String weedingQa, @RequestParam("weedingans") String weedingAns,
+ @RequestParam("HandRailingQa") String HandRailingQa, @RequestParam("HandRailingAns") String HandRailingAns,
+ @RequestParam("latitude") String latitude, @RequestParam("longitude") String longitude,
+ @RequestParam("zone") String zone, @RequestParam("ward") String ward,
+ @RequestParam("location") String location, @RequestParam("enumeration_id") String enumeration_id,
+ @RequestParam("enumeration_type") String enumeration_type, @RequestParam("userId") String userId,
+ @RequestParam("centerMedian_Image") MultipartFile photo) throws Exception {
+
+ int centerMedian = parksService.centerMedian(irrigationProperlyQa, irrigationProperlyAns, trimmingProperlyQa,
+ trimmingProperlyAns, weedingQa, weedingAns, HandRailingQa, HandRailingAns, latitude, longitude, zone,
+ ward, location, enumeration_type, userId, enumeration_id, photo);
+
+ if (centerMedian == 0 || centerMedian == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+/*// Patch 23-11-2024
+ @PostMapping("/trafficIslandFeedback")
+ public ResponseEntity trafficIsland(
+ // gap filling meter
+ @RequestParam("irrigationProperlyQa") String irrigationProperlyQa,
+ @RequestParam("irrigationProperlyAns") String irrigationProperlyAns,
+ @RequestParam("trimmingProperlyQa") String trimmingProperlyQa,
+ @RequestParam("trimmingProperlyAns") String trimmingProperlyAns,
+ @RequestParam("weedingQa") String weedingQa, @RequestParam("weedingans") String weedingans,
+ @RequestParam("HandRailingQa") String HandRailingQa, @RequestParam("HandRailingAns") String HandRailingAns,
+ @RequestParam("latitude") String latitude, @RequestParam("longitude") String longitude,
+ @RequestParam("zone") String zone, @RequestParam("ward") String ward,
+ @RequestParam("location") String location, @RequestParam("userId") String userId,
+ @RequestParam("enumerationi_id") String enumerationi_id,
+ @RequestParam("enumeration_type") String enumeration_type, @RequestParam("gapFilingQa") String gapFillingQa,
+ @RequestParam("gapFilingAns") String gapFilingAns, @RequestParam("improvementQa") String improvementQa, // ask
+ @RequestParam("improvementAns") String improvementAns, // ask
+ @RequestParam("trafficIsland_Image") MultipartFile photo
+
+ ) throws Exception {
+
+ int trafficIsland = parksService.trafficIsland(irrigationProperlyQa, irrigationProperlyAns, trimmingProperlyQa,
+ trimmingProperlyAns, weedingQa, weedingans, HandRailingQa, HandRailingAns, latitude, longitude, zone,
+ ward, location, userId, enumeration_type, enumerationi_id, gapFillingQa, gapFilingAns, improvementQa,
+ improvementAns, photo);
+
+ if (trafficIsland == 0 || trafficIsland == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+*/
+ @PostMapping("/trafficIslandFeedback")
+ public ResponseEntity trafficIsland(
+ // gap filling meter
+ @RequestParam("irrigationProperlyQa") String irrigationProperlyQa,
+ @RequestParam("irrigationProperlyAns") String irrigationProperlyAns,
+ @RequestParam("trimmingProperlyQa") String trimmingProperlyQa,
+ @RequestParam("trimmingProperlyAns") String trimmingProperlyAns,
+ @RequestParam("weedingQa") String weedingQa, @RequestParam("weedingans") String weedingans,
+ @RequestParam("HandRailingQa") String HandRailingQa, @RequestParam("HandRailingAns") String HandRailingAns,
+ @RequestParam("latitude") String latitude, @RequestParam("longitude") String longitude,
+ @RequestParam("zone") String zone, @RequestParam("ward") String ward,
+ @RequestParam("location") String location, @RequestParam("userId") String userId,
+ @RequestParam("enumerationi_id") String enumerationi_id,
+ @RequestParam("enumeration_type") String enumeration_type, @RequestParam("gapFilingQa") String gapFillingQa,
+ @RequestParam("gapFilingAns") String gapFilingAns, @RequestParam("improvementQa") String improvementQa, // ask
+ @RequestParam("improvementAns") String improvementAns, // ask
+ @RequestParam("fountainAvailableQa") String fountainAvailableQa,
+ @RequestParam("fountainAvailableAns") String fountainAvailableAns,
+ @RequestParam("fountainWorkingQa") String fountainWorkingQa, // ask
+ @RequestParam("fountainWorkingAns") String fountainWorkingAns,
+ @RequestParam("trafficIsland_Image") MultipartFile photo
+
+ ) throws Exception {
+
+ int trafficIsland = parksService.trafficIsland(irrigationProperlyQa, irrigationProperlyAns, trimmingProperlyQa,
+ trimmingProperlyAns, weedingQa, weedingans, HandRailingQa, HandRailingAns, latitude, longitude, zone,
+ ward, location, userId, enumeration_type, enumerationi_id, gapFillingQa, gapFilingAns, improvementQa,
+ improvementAns, fountainAvailableQa, fountainAvailableAns,fountainWorkingQa,fountainWorkingAns, photo);
+
+ if (trafficIsland == 0 || trafficIsland == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+
+ @PostMapping("/beautificationFeedback")
+ public ResponseEntity beautification(
+ @RequestParam("irrigationProperlyQa") String irrigationProperlyQa,
+ @RequestParam("irrigationProperlyAns") String irrigationProperlyAns,
+ @RequestParam("trimmingProperlyQa") String trimmingProperlyQa,
+ @RequestParam("trimmingProperlyAns") String trimmingProperlyAns,
+ @RequestParam("weedingQa") String weedingQa, @RequestParam("weedingans") String weedingans,
+ @RequestParam("gapFillingQa") String gapFillingQa, @RequestParam("gapFillingAns") String gapFillingAns,
+ @RequestParam("improvementQa") String improvementQa, @RequestParam("improvementAns") String improvementAns,
+ @RequestParam("latitude") String latitude, @RequestParam("longitude") String longitude,
+ @RequestParam("zone") String zone, @RequestParam("ward") String ward,
+ @RequestParam("location") String location, @RequestParam("beautification_Image") MultipartFile photo, // image
+ @RequestParam("enumerationi_id") String enumerationi_id, @RequestParam("userId") String userId,
+ @RequestParam("enumeration_type") String enumeration_type) throws Exception {
+
+ int beautification = parksService.beautification(irrigationProperlyQa, irrigationProperlyAns,
+ trimmingProperlyQa, trimmingProperlyAns, weedingQa, weedingans, gapFillingQa, gapFillingAns,
+ improvementQa, improvementAns, latitude, longitude, zone, ward, location, enumerationi_id, userId,
+ enumeration_type, photo);
+
+ if (beautification == 0 || beautification == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+
+ @PostMapping("/parkInspectionFeedback")
+ public ResponseEntity prakInspection(@RequestParam("openedQa") String openedQa,
+ @RequestParam("openedAns") String openedAns,
+ @RequestParam("irrigationProperlyQa") String irrigationProperlyQa,
+ @RequestParam("irrigationProperlyAns") String irrigationProperlyAns,
+ @RequestParam("trimmingProperlyQa") String trimmingProperlyQa,
+ @RequestParam("trimmingProperlyAns") String trimmingProperlyAns,
+ @RequestParam("weedingQa") String weedingQa, @RequestParam("weedingans") String weedingans,
+ @RequestParam("gapFillingQa") String gapFillingQa, @RequestParam("gapFillingAns") String gapFillingAns,
+ @RequestParam("playandGymQa") String playandGymQa, @RequestParam("playandGymAns") String playandGymAns,
+ @RequestParam("overAllQa") String overAllQa, @RequestParam("overAllans") String overAllAns,
+ @RequestParam("properLightQa") String properLightQa, @RequestParam("properLightAns") String properLightAns,
+ @RequestParam("debrisRemovalQa") String debrisRemovalQa,
+ @RequestParam("debrisRemovalAns") String debrisRemovalAns, @RequestParam("ToiletQA") String ToiletAQA,
+ @RequestParam("ToiletAns") String ToiletAns, @RequestParam("latitude") String latitude,
+ @RequestParam("longitude") String longitude, @RequestParam("zone") String zone,
+ @RequestParam("ward") String ward, @RequestParam("location") String location,
+ @RequestParam("enumerationi_id") String enumerationi_id, @RequestParam("userId") String userId,
+ @RequestParam("enumeration_type") String enumeration_type,
+ @RequestParam("prakInspection_Image") MultipartFile photo, @RequestParam("CivilWorkQa") String CivilWorkQa,
+ @RequestParam("CivilWorkAns") String CivilWorkAns, // type
+ @RequestParam("NoWatchmenQa") String NoWatchmenQa, @RequestParam("NoWatchmenAns") String NoWatchmenAns, // type
+ @RequestParam("NoSweeperQa") String NoSweeperQa, @RequestParam("NoSweeperAns") String NoSweeperAns
+
+ ) throws Exception {
+
+ int prakInspection = parksService.parkInspection(openedQa, openedAns, irrigationProperlyQa,
+ irrigationProperlyAns, trimmingProperlyQa, trimmingProperlyAns, weedingQa, weedingans, gapFillingQa,
+ gapFillingAns, playandGymQa, playandGymAns, overAllQa, overAllAns, properLightQa, properLightAns,
+ debrisRemovalQa, debrisRemovalAns, ToiletAQA, ToiletAns, latitude, longitude, zone, ward, location,
+ userId, enumeration_type, enumerationi_id, CivilWorkQa, CivilWorkAns, NoWatchmenQa, NoWatchmenAns,
+ NoSweeperQa, NoSweeperAns, photo);
+
+ if (prakInspection == 0 || prakInspection == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+
+ @PostMapping("/readingZoneFeedback")
+ public ResponseEntity readingZone(
+ @RequestParam("openedOrNotQa") String openedOrNotQa, @RequestParam("openedOrNotAns") String openedOrNotAns,
+ @RequestParam("bookAvailableQa") String bookAvailableQa,
+ @RequestParam("bookAvailableAns") String bookAvailableAns,
+ @RequestParam("NewsapaperAvailableQa") String NewsapaperAvailableQa,
+ @RequestParam("NewsapaperAvailableAns") String NewsapaperAvailableAns,
+ @RequestParam("latitude") String latitude, @RequestParam("longitude") String longitude,
+ @RequestParam("zone") String zone, @RequestParam("ward") String ward,
+ @RequestParam("location") String location, @RequestParam("enumerationi_id") String enumerationi_id,
+ @RequestParam("userId") String userId, @RequestParam("enumeration_type") String enumeration_type,
+ @RequestParam("readingZone_Image") MultipartFile photo,
+ @RequestParam("improvementQa") String improvementQa, // type
+ @RequestParam("improvementAns") String improvementAns// type
+
+ ) throws Exception {
+
+ int readingZone = parksService.readingZone(openedOrNotQa, openedOrNotAns, bookAvailableQa, bookAvailableAns,
+ NewsapaperAvailableQa, NewsapaperAvailableAns, latitude, longitude, zone, ward, location, userId,
+ enumeration_type, enumerationi_id, improvementQa, improvementAns, photo);
+
+ if (readingZone == 0 || readingZone == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+
+ @PostMapping("/miyawakiNewFeedback")
+ public ResponseEntity miyawakiNew(
+ @RequestParam("debrisCleaningQa") String debrisCleaningQa,
+ @RequestParam("debrisCleaningAns") String debrisCleaningAns,
+ @RequestParam("landpreprarationQa") String landpreprarationQa,
+ @RequestParam("landpreprarationAns") String landpreprarationAns,
+ @RequestParam("plantingDoneQa") String plantingDoneQa,
+ @RequestParam("plantingDoneAns") String plantingDoneAns, @RequestParam("cctvQa") String cctvQa,
+ @RequestParam("cctvAns") String cctvAns, @RequestParam("latitude") String latitude,
+ @RequestParam("longitude") String longitude, @RequestParam("zone") String zone,
+ @RequestParam("ward") String ward, @RequestParam("location") String location,
+ @RequestParam("enumerationi_id") String enumerationi_id, @RequestParam("userId") String userId,
+ @RequestParam("enumeration_type") String enumeration_type,
+ @RequestParam("SaplingAvailbilityQa") String saplingAvailQa,
+ @RequestParam("SaplingAvailbilityAns") String saplingAvailAns,
+ @RequestParam("fencingAvailbilityQa") String fencingAvailbilityQa,
+ @RequestParam("fencingAvailbilityAns") String fencingAvailbilityAns,
+ @RequestParam("sourcaOfIrrigationQa") String sourcaOfIrrigationQa, // type
+ @RequestParam("sourcaOfIrrigationAns") String sourcaOfIrrigationAns, // type
+
+ @RequestParam("miyawakiNew_Image") MultipartFile photo) throws Exception {
+
+ int miyawakiNew = parksService.miyawakiNew(debrisCleaningQa, debrisCleaningAns, landpreprarationQa,
+ landpreprarationAns, plantingDoneQa, plantingDoneAns, cctvQa, cctvAns, latitude, longitude, zone, ward,
+ location, userId, enumeration_type, enumerationi_id, saplingAvailQa, saplingAvailAns,
+ fencingAvailbilityQa, fencingAvailbilityAns, sourcaOfIrrigationQa, sourcaOfIrrigationAns, photo);
+
+ if (miyawakiNew == 0 || miyawakiNew == -1) {
+ return ResponseEntity.ok("Failed to save the detailse");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+
+ @PostMapping("/miyawakiExisitingFeedback")
+ public ResponseEntity miyawakiExisiting(
+ @RequestParam("weedingQa") String weedingQa, @RequestParam("weedingAns") String weedingAns,
+ @RequestParam("purningQa") String purningQa, @RequestParam("purningans") String purningans,
+ @RequestParam("gapFillingQa") String gapFillingQa, @RequestParam("gapFillingAns") String gapFillingAns,
+ @RequestParam("latitude") String latitude, @RequestParam("longitude") String longitude,
+ @RequestParam("zone") String zone, @RequestParam("ward") String ward,
+ @RequestParam("location") String location, @RequestParam("enumerationi_id") String enumerationi_id,
+ @RequestParam("userId") String userId, @RequestParam("enumeration_type") String enumeration_type,
+ @RequestParam("improvmetReqQa") String improvmetReqQa,
+ @RequestParam("improvmetReqAns") String improvmetReqAns,
+ @RequestParam("sourceOfirrigationQa") String sourceOfirrigationQa,
+ @RequestParam("sourceOfirrigationAns") String sourceOfirrigationAns,
+ @RequestParam("miyawakiExisiting_Image") MultipartFile photo) throws Exception {
+
+ int miyawakiExisiting = parksService.miyawakiExisiting(weedingQa, weedingAns, purningQa, purningans,
+ gapFillingQa, gapFillingAns, latitude, longitude, zone, ward, location, userId, enumeration_type,
+ enumerationi_id, improvmetReqQa, improvmetReqAns, sourceOfirrigationQa, sourceOfirrigationAns, photo);
+
+ if (miyawakiExisiting == 0 || miyawakiExisiting == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+ }
+
+ // To fetch Category ID and Name for reports
+
+ @GetMapping("/enuumerationType")
+ public ResponseEntity>> enuumerationType() {
+ List> parkName = parksService.categoryType();
+ return ResponseEntity.ok(parkName);
+ }
+
+ // To fetch master category type based on enumeration type
+ @GetMapping("/masterCategoryType")
+ public ResponseEntity>> masterCategoryType(
+ @RequestParam("enumeration_type_id") String Cat_enumeration_id) {
+ List> parkName = parksService.masterCategoryType(Cat_enumeration_id);
+ return ResponseEntity.ok(parkName);
+ }
+
+ // To fetch sub category type based on master category type
+ @GetMapping("/subCategoryType")
+ public ResponseEntity>> subCategoryType(
+ @RequestParam("master_category_id") String masterCategory) {
+
+ List> parkName = parksService.subCategoryType(masterCategory);
+ return ResponseEntity.ok(parkName);
+ }
+
+ // ------------------------------------------Tree Feedback
+ // API-----------------------------------------------------
+
+ @PostMapping("/treeDetails")
+ public ResponseEntity> SaveTreeDetailes(
+ @RequestParam("No_of_trees_required") int No_of_trees_required,
+ @RequestParam("enumeration_type") String enumeration_type, @RequestParam("tree_Image") MultipartFile tree_Image,
+ @RequestParam("latitude") String latitude, @RequestParam("longitude") String longitude,
+ @RequestParam("zone") String zone, @RequestParam("ward") String ward,
+ @RequestParam("location") String location, @RequestParam("parkname") String parkname,
+ // @RequestParam(value = "painting_status", required = false) String painting_status,
+ @RequestParam("userId") String userId) throws IOException {
+
+ Map saveTreeDetailes = parksService.SaveTreeDetailes(No_of_trees_required, enumeration_type,
+ latitude, longitude, zone, ward, location, parkname, userId, tree_Image);
+ return ResponseEntity.ok(saveTreeDetailes);
+
+ }
+
+ @PostMapping("/SaveTreeimage")
+ public ResponseEntity> SaveTreeimage(@RequestParam("tree_id") int tree_id,
+ @RequestParam("enumeration_type") String enumeration_type, @RequestParam("tree_Image") MultipartFile tree_Image,
+ @RequestParam("latitude") String latitude, @RequestParam("longitude") String longitude,
+ // @RequestParam("enumeration_type") String enumeration_type,
+ @RequestParam("userId") String userId) throws Exception {
+
+ Map saveTreeDetailes = parksService.SaveimageDetailes(enumeration_type, latitude, longitude,
+ userId, tree_Image, tree_id);
+ return ResponseEntity.ok(saveTreeDetailes);
+
+ }
+
+ // ------------------------------------------Enumeration Report
+ // API-----------------------------------------------------
+
+ @GetMapping("/zoneCount")
+ public ResponseEntity>> getZoneCount(@RequestParam("fromdate") String fromdate,
+ @RequestParam("todate") String todate, @RequestParam("enumeration_type") String enumeration_type,
+ @RequestParam("userId") String userId) throws Exception {
+
+ List> zoneCountData = parksService.getZoneCount(fromdate, todate, enumeration_type, userId);
+ if (zoneCountData == null || zoneCountData.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(zoneCountData);
+
+ }
+
+ @GetMapping("/wardCount")
+ public ResponseEntity>> getwardCount(@RequestParam("zone") String zone,
+ @RequestParam("userId") String userId, @RequestParam("fromdate") String fromdate,
+ @RequestParam("todate") String todate, @RequestParam("enumeration_type") String enumeration_type)
+ throws Exception {
+
+ List> wardCountData = parksService.getwardCount(zone, fromdate, todate, enumeration_type, userId);
+ if (wardCountData == null || wardCountData.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(wardCountData);
+
+ }
+
+ @GetMapping("/activityCount")
+ public ResponseEntity>> getActivityCount(@RequestParam("ward") String ward,
+ @RequestParam("fromdate") String fromdate, @RequestParam("todate") String todate,
+ @RequestParam("enumeration_type") String enumeration_type) throws Exception {
+
+ List> activityByWard = parksService.getActivityCount(ward, fromdate, todate,
+ enumeration_type);
+ if (activityByWard == null || activityByWard.isEmpty()) {
+ throw new NoDataException("No Activity is performed ");
+ }
+ return ResponseEntity.ok(activityByWard);
+
+ }
+
+ @GetMapping("/activityDetails")
+ public ResponseEntity>> getActivityDetails(@RequestParam("ward") String ward,
+ @RequestParam("fromdate") String fromdate, @RequestParam("todate") String todate,
+ @RequestParam("enumeration_type") String enumeration_type,
+ @RequestParam("enumerationId") String enumerationId) throws Exception {
+
+ List> activityDetailsByWard = parksService.getActivityDetails(ward, fromdate, todate,
+ enumeration_type, enumerationId);
+ if (activityDetailsByWard == null || activityDetailsByWard.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(activityDetailsByWard);
+
+ }
+
+ @GetMapping("/getInspectionDetails")
+ public ResponseEntity>>> getInspectionDetails(
+ @RequestParam("activityId") String activityId, @RequestParam("fromdate") String fromdate,
+ @RequestParam("todate") String todate, @RequestParam("enumerationId") String enumerationId)
+ throws Exception {
+
+ List>> activityDetailsByWard = parksService.getInspectionDetails(activityId, fromdate,
+ todate, enumerationId);
+ if (activityDetailsByWard == null || activityDetailsByWard.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(activityDetailsByWard);
+
+ }
+
+ // tofxcvbn
+ @GetMapping("/getParkCount")
+ public ResponseEntity>> getParkCount(@RequestParam("fromdate") String fromdate,
+ @RequestParam("todate") String todate, @RequestParam("ward") String ward,
+ @RequestParam("userId") String userId, @RequestParam("enumeration_type") String enumeration_type)
+ throws Exception {
+
+ try {
+ List> dateByLocation = parksService.getParkCount(ward, fromdate, todate,
+ enumeration_type);
+
+ if (dateByLocation == null || dateByLocation.isEmpty()) {
+ throw new NoDataException("no data ");
+ } else {
+ return ResponseEntity.ok(dateByLocation);
+ }
+ } catch (NoDataException e) {
+ // TODO Auto-generated catch block
+ throw new NoDataException("no data");
+ }
+
+ }
+
+ @GetMapping("/getParkDetails")
+ public ResponseEntity>>> getParkDetails(
+ @RequestParam(value = "enumeration_type", required = false) String enumeration_type,
+ @RequestParam("userId") String userId, @RequestParam("fromdate") String fromdate,
+ @RequestParam("todate") String todate) throws Exception {
+
+ List>> dateByLocation = parksService.getParkDetails(enumeration_type, fromdate, todate, userId);
+ if (dateByLocation == null || dateByLocation.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(dateByLocation);
+
+ }
+
+ //////////////////// ------------------------------tree-------------------///////////////////////////
+
+ @GetMapping("/treeWishZoneCount")
+ public ResponseEntity>> getWishtreeZoneCount(@RequestParam("fromdate") String fromdate,
+ @RequestParam("todate") String todate, @RequestParam("enumeration_type") String enumeration_type,
+ @RequestParam("userId") String userId) throws Exception {
+
+ List> dateByLocation = parksService.getWishtreeZoneCount(fromdate, todate,
+ enumeration_type);
+ if (dateByLocation == null || dateByLocation.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(dateByLocation);
+
+ }
+
+ // to
+ @GetMapping("/treeWardCount")
+ public ResponseEntity>> getTreewardCount(@RequestParam("fromdate") String fromdate,
+ @RequestParam("todate") String todate, @RequestParam("zone") String zone,
+ @RequestParam("userId") String userId, @RequestParam("enumeration_type") String enumeration_type)
+ throws Exception {
+
+ List> dateByLocation = parksService.getTreewardCount(zone, fromdate, todate,
+ enumeration_type);
+ if (dateByLocation == null || dateByLocation.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(dateByLocation);
+
+ }
+
+ @GetMapping("/wardWishTreedata")
+ public ResponseEntity>> getwardWishTreedata(@RequestParam("ward") String ward,
+ @RequestParam("userId") String userId) throws Exception {
+
+ List> dateByLocation = parksService.getwardWishTreedata(ward);
+ if (dateByLocation == null || dateByLocation.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(dateByLocation);
+
+ }
+
+ @GetMapping("/getTreeWardWiseCountDetails")
+ public ResponseEntity>> getTreeWardWiseCountDetails(@RequestParam("ward") String ward,
+ @RequestParam("enumeration_type") String enumeration_type,@RequestParam("fromdate") String fromdate,
+ @RequestParam("todate") String todate) throws Exception {
+
+ List> treeCountByWard = parksService.getTreeWardWiseCountDetails(ward,enumeration_type,fromdate,todate);
+ if (treeCountByWard == null || treeCountByWard.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(treeCountByWard);
+
+ }
+
+ @GetMapping("/getTreeImageDetails")
+ public ResponseEntity>> getTreeImageDetails(@RequestParam("tree_Id") String tree_Id,
+ @RequestParam("enumeration_type") String enumeration_type, @RequestParam("fromdate") String fromdate,
+ @RequestParam("todate") String todate) throws Exception {
+
+ List> treeImageDetails = parksService.getTreeImageDetails(tree_Id,enumeration_type, fromdate, todate);
+ if (treeImageDetails == null || treeImageDetails.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(treeImageDetails);
+
+ }
+
+ @GetMapping("/getTreeDetails")
+ public ResponseEntity>> getTreeDetails(@RequestParam("tree_Id") String tree_Id,
+ @RequestParam("userId") String userId) throws Exception {
+
+ List> dateByLocation = parksService.getTreeDetails(tree_Id);
+ if (dateByLocation == null || dateByLocation.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(dateByLocation);
+
+ }
+
+ // feedback
+
+ @GetMapping("/enumerationFeedback")
+ public ResponseEntity>> getEnumerationFeedback(
+ @RequestParam("enumerationId") String enumerationId,
+ @RequestParam("enumeration_type") String enumeration_type) throws Exception {
+
+ List> feedbackData = parksService.getEnumeration_feedback(enumerationId, enumeration_type);
+
+ if (feedbackData == null || feedbackData.isEmpty()) {
+ throw new NoDataException("No feedback data found.");
+ }
+
+ return ResponseEntity.ok(feedbackData);
}
+ // To Get Brief Report
+ @GetMapping("/getBriefReport")
+ public ResponseEntity>> getBriefReport(@RequestParam("fromdate") String fromdate,
+ @RequestParam("todate") String todate, @RequestParam("enumeration_type") String category,
+ @RequestParam("division") String divison, @RequestParam("zone") String zone,
+ @RequestParam("park_name") String park_name) throws Exception {
+
+ List> briefReport = parksService.getBriefReport(fromdate, todate, category, divison, zone,
+ park_name);
+ if (briefReport == null || briefReport.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(briefReport);
+
+ }
+
+ @GetMapping("/getUserBasedEnumAndStatus")
+ public ResponseEntity>> getUserBasedEnum(@RequestParam("userId") String tree_user_id,
+ @RequestParam("latitude") String tree_latitude, @RequestParam("longitude") String tree_longitude,
+ @RequestParam("Status") String tree_Status, @RequestParam("enumeration_type") String enumeration_type) throws Exception {
+
+ List> userBasedEnum = parksService.getUserBasedEnum(tree_user_id, tree_latitude,
+ tree_longitude, tree_Status, enumeration_type);
+ if (userBasedEnum == null || userBasedEnum.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(userBasedEnum);
+ }
+
+// @GetMapping("/getEnumByRadiusAndStatus")
+// public ResponseEntity>> getUserBasedEnum(
+// @RequestParam("latitude") String tree_latitude,@RequestParam("longitude") String tree_longitude,@RequestParam("Status") String tree_Status
+// )
+// {
+//
+// List> userBasedEnum = parksService.getUserBasedEnum(tree_latitude,tree_longitude,tree_Status);
+//
+// if (userBasedEnum == null || userBasedEnum.isEmpty()) {
+// throw new NoDataException("no data ");
+// }
+// return ResponseEntity.ok(userBasedEnum);
+// }
+
+ @GetMapping("/getparkNameByRadius")
+ public ResponseEntity>> getparkNameByRadius(@RequestParam("latitude") String tree_latitude,
+ @RequestParam("longitude") String tree_longitude) {
+
+ List> getparkNameByRadius = parksService.getparkNameByRadius(tree_latitude, tree_longitude);
+ if (getparkNameByRadius == null || getparkNameByRadius.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(getparkNameByRadius);
+
+ }
+
+ @GetMapping("/getTreeDetailsBasedonLocation")
+ public ResponseEntity>> getTreeDetailsBasedonLocation(
+ @RequestParam("parkName") String parkName, @RequestParam("location") String location,
+ @RequestParam("ward") String ward) throws Exception {
+
+ List> treeDataByLocation = parksService.getTreeDetailsBasedonLocation(parkName, location,
+ ward);
+ if (treeDataByLocation == null || treeDataByLocation.isEmpty()) {
+ throw new NoDataException("no data ");
+ }
+ return ResponseEntity.ok(treeDataByLocation);
+
+ }
+
+ // flowering and Non Flowering API
+
+ @GetMapping("/getparkNameByEnumType")
+ public ResponseEntity>> getparkNameByEnumType(@RequestParam("enum_Type") int enum_Type,
+ @RequestParam("latitude") String latitude, @RequestParam("longitude") String longitude){
+
+ List> parkNameByEnum = parksService.getparkNameByEnumType(enum_Type,latitude,longitude);
+
+ if(parkNameByEnum == null || parkNameByEnum.isEmpty())
+ {
+ throw new NoDataException("No Data found");
+ }else {
+ return ResponseEntity.ok(parkNameByEnum);
+ }
+
+ }
+
+
+ @PostMapping("/saveFloweringandNonFlowering")
+ public ResponseEntity saveFloweringandNonFlowering(
+ @RequestParam("enumType") String enumType,@RequestParam("parkname") String parkname, @RequestParam("userId") String userId,
+ @RequestParam("enumerationId") int enumerationId, @RequestParam(value="floweringPlantCount", required = false) int floweringPlantCount,
+ @RequestParam(value="nonFloweringPlantCount", required = false) int nonFloweringPlantCount,
+ @RequestParam(value="floweringImage", required = false) MultipartFile floweringImg,
+ @RequestParam(value="nonFloweringImage", required = false) MultipartFile nonFloweringImg) throws Exception {
+
+ int flowringData = parksService.saveFlowringandNonFlowringDetails(enumerationId, enumType,parkname, floweringPlantCount, floweringImg,
+ nonFloweringPlantCount, nonFloweringImg, userId);
+
+ if (flowringData == 0 || flowringData == -1) {
+ return ResponseEntity.ok("Failed to save the details");
+ }
+
+ return ResponseEntity.ok("Details were saved successfully");
+
+ }
+
+
+ @GetMapping("/getFlowringZoneCount")
+ public ResponseEntity>> getFlowringZoneData(@RequestParam("enumeration_type") String enumeration_type,
+ @RequestParam("fromdate") String fromdate, @RequestParam("todate") String todate,
+ @RequestParam(value="userId", required = false) String userId){
+
+ List> floweringZoneCount = parksService.getFloweringZoneCount(enumeration_type,fromdate,todate,userId);
+
+ if(floweringZoneCount == null || floweringZoneCount.isEmpty()) {
+ throw new NoDataException("No data found");
+ }
+
+ return ResponseEntity.ok(floweringZoneCount);
+ }
+
+
+ @GetMapping("/getFlowringWardCount")
+ public ResponseEntity>> getFlowringWardData(@RequestParam("enumeration_type") String enumeration_type,
+ @RequestParam("fromdate") String fromdate, @RequestParam("todate") String todate,
+ @RequestParam(value="userId", required = false) String userId, @RequestParam("zone") String zone){
+
+ List> floweringWardCount = parksService.getFloweringWardCount(zone, fromdate, todate, enumeration_type, userId);
+
+ if (floweringWardCount == null || floweringWardCount.isEmpty()) {
+ throw new NoDataException("No data found");
+ }
+ return ResponseEntity.ok(floweringWardCount);
+ }
+
+
+ @GetMapping("/getFloweringDetails")
+ public ResponseEntity>> getFloweringDetails(@RequestParam("enumeration_type") String enumeration_type,
+ @RequestParam("zone") String zone, @RequestParam("ward") String ward, @RequestParam("fromdate") String fromdate,
+ @RequestParam("todate") String todate, @RequestParam(value="userId" , required = false) String userId,
+ @RequestParam("parkname") String parkname){
+
+ List> floweringDetails = parksService.getFloweringDetails(enumeration_type, zone, ward, fromdate, todate, userId, parkname);
+ if(floweringDetails == null || floweringDetails.isEmpty())
+ {
+ throw new NoDataException( "No data found");
+ }
+ return ResponseEntity.ok(floweringDetails);
+
+ }
+
+ @GetMapping("/getParkwiseFloweringCount")
+ public ResponseEntity>> getParkwiseFloweringCount(@RequestParam("enumeration_type") String enumeration_type,
+ @RequestParam("zone") String zone, @RequestParam("ward") String ward, @RequestParam("fromdate") String fromdate,
+ @RequestParam("todate") String todate, @RequestParam(value="userId", required = false) String userId){
+
+
+ List> parkwiseCount = parksService.getParkwiseFloweringCount(enumeration_type, zone, ward, fromdate, todate, userId);
+
+ if(parkwiseCount == null || parkwiseCount.isEmpty())
+ {
+ throw new NoDataException( "No data found");
+ }
+ return ResponseEntity.ok(parkwiseCount);
+
+ }
}
diff --git a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/service/ErrorResponse.java b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/service/ErrorResponse.java
new file mode 100644
index 0000000..6a7cd29
--- /dev/null
+++ b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/service/ErrorResponse.java
@@ -0,0 +1,30 @@
+package in.gov.chennaicorporation.mobileservice.gccparks.service;
+
+public class ErrorResponse {
+ private int statusCode;
+ private String message;
+
+ // Constructor, getters, and setters
+
+ public ErrorResponse(int statusCode, String message) {
+ this.statusCode = statusCode;
+ this.message = message;
+ }
+
+ public int getStatusCode() {
+ return statusCode;
+ }
+
+ public void setStatusCode(int statusCode) {
+ this.statusCode = statusCode;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
+
diff --git a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/service/GlobalExceptionHandler.java b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/service/GlobalExceptionHandler.java
new file mode 100644
index 0000000..5d6c052
--- /dev/null
+++ b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/service/GlobalExceptionHandler.java
@@ -0,0 +1,45 @@
+package in.gov.chennaicorporation.mobileservice.gccparks.service;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.servlet.NoHandlerFoundException;
+
+@ControllerAdvice
+public class GlobalExceptionHandler {
+ @ExceptionHandler(NoHandlerFoundException.class)
+ public ResponseEntity handlePageNotFoundException(NoHandlerFoundException ex) {
+ // Log the exception
+ ex.printStackTrace();
+
+ // Get the requested URL from the exception
+ String requestedUrl = ex.getRequestURL();
+
+ // Create an error message with the requested URL
+ String errorMessage = "Page not found: " + requestedUrl;
+
+ // Return a ResponseEntity with a 404 Not Found status code and error message
+ return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorMessage);
+ }
+ @ExceptionHandler(Exception.class)
+ public ResponseEntity handleException(Exception ex) {
+ // Log the exception
+ ex.printStackTrace();
+
+ // Create an error response object
+ ErrorResponse errorResponse = new ErrorResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), "An error occurred: " + ex.getMessage());
+
+ // Return a ResponseEntity with an appropriate HTTP status code and error response object
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
+ }
+
+ @ExceptionHandler(NoDataException.class)
+ public ResponseEntity noDataException(NoDataException ex){
+
+ ErrorResponse errorResponse = new ErrorResponse(HttpStatus.NOT_FOUND.value(),ex.getMessage());
+ return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorResponse);
+
+
+ }
+}
diff --git a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/service/NoDataException.java b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/service/NoDataException.java
new file mode 100644
index 0000000..5712128
--- /dev/null
+++ b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/service/NoDataException.java
@@ -0,0 +1,8 @@
+package in.gov.chennaicorporation.mobileservice.gccparks.service;
+
+public class NoDataException extends RuntimeException {
+
+ public NoDataException(String msg){
+ super(msg);
+ }
+}
diff --git a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/service/ParksService.java b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/service/ParksService.java
index cd3e292..f0bec74 100644
--- a/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/service/ParksService.java
+++ b/mobileservice/src/main/java/in/gov/chennaicorporation/mobileservice/gccparks/service/ParksService.java
@@ -16,6 +16,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
+import java.util.ArrayList;
import javax.imageio.ImageIO;
import javax.imageio.ImageWriteParam;
@@ -43,207 +44,1957 @@ import in.gov.chennaicorporation.mobileservice.gccactivity.service.DateTimeUtil;
public class ParksService {
private JdbcTemplate jdbcParkseTemplate;
-
+
private final Environment environment;
private String fileBaseUrl;
-
+
private static final String CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
- private static final int STRING_LENGTH = 15;
- private static final Random RANDOM = new SecureRandom();
-
+ private static final int STRING_LENGTH = 15;
+ private static final Random RANDOM = new SecureRandom();
+
@Autowired
public void setDataSource(@Qualifier("mysqlGccParksDataSource") DataSource parksDataSource) {
this.jdbcParkseTemplate = new JdbcTemplate(parksDataSource);
}
-
+
@Autowired
public ParksService(Environment environment) {
this.environment = environment;
- this.fileBaseUrl=environment.getProperty("fileBaseUrl");
+ this.fileBaseUrl = environment.getProperty("fileBaseUrl");
}
-
+
public static String generateRandomString() {
- StringBuilder result = new StringBuilder(STRING_LENGTH);
- for (int i = 0; i < STRING_LENGTH; i++) {
- result.append(CHARACTERS.charAt(RANDOM.nextInt(CHARACTERS.length())));
- }
- return result.toString();
- }
-
+ StringBuilder result = new StringBuilder(STRING_LENGTH);
+ for (int i = 0; i < STRING_LENGTH; i++) {
+ result.append(CHARACTERS.charAt(RANDOM.nextInt(CHARACTERS.length())));
+ }
+ return result.toString();
+ }
+
private byte[] compressImage(BufferedImage image, float quality) throws IOException {
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- ImageOutputStream imageOutputStream = ImageIO.createImageOutputStream(byteArrayOutputStream);
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ ImageOutputStream imageOutputStream = ImageIO.createImageOutputStream(byteArrayOutputStream);
- ImageWriter writer = ImageIO.getImageWritersByFormatName("jpg").next();
- writer.setOutput(imageOutputStream);
+ ImageWriter writer = ImageIO.getImageWritersByFormatName("jpg").next();
+ writer.setOutput(imageOutputStream);
- ImageWriteParam param = writer.getDefaultWriteParam();
- if (param.canWriteCompressed()) {
- param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
- param.setCompressionQuality(quality);
- }
+ ImageWriteParam param = writer.getDefaultWriteParam();
+ if (param.canWriteCompressed()) {
+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+ param.setCompressionQuality(quality);
+ }
- writer.write(null, new javax.imageio.IIOImage(image, null, null), param);
+ writer.write(null, new javax.imageio.IIOImage(image, null, null), param);
- writer.dispose();
- imageOutputStream.close();
+ writer.dispose();
+ imageOutputStream.close();
+
+ return byteArrayOutputStream.toByteArray();
+ }
- return byteArrayOutputStream.toByteArray();
- }
-
public String fileUpload(String name, String id, MultipartFile file) {
-
+
int lastInsertId = 0;
// Set the file path where you want to save it
- String uploadDirectory = environment.getProperty("file.upload.directory");
- String serviceFolderName = environment.getProperty("parks_playground_foldername");
- var year =DateTimeUtil.getCurrentYear();
- var month =DateTimeUtil.getCurrentMonth();
-
- uploadDirectory = uploadDirectory + serviceFolderName + year +"/"+month;
-
- try {
- // Create directory if it doesn't exist
- Path directoryPath = Paths.get(uploadDirectory);
- if (!Files.exists(directoryPath)) {
- Files.createDirectories(directoryPath);
- }
-
- // Datetime string
- String datetimetxt = DateTimeUtil.getCurrentDateTime();
- // File name
- String fileName = name+ "_" + id + "_" + datetimetxt + "_" + file.getOriginalFilename();
- fileName = fileName.replaceAll("\\s+", ""); // Remove space on filename
-
- String filePath = uploadDirectory + "/" + fileName;
-
- String filepath_txt = "/"+serviceFolderName + year +"/"+month+"/"+fileName;
-
- // Create a new Path object
- Path path = Paths.get(filePath);
-
- // Get the bytes of the file
- byte[] bytes = file.getBytes();
-
- // Compress the image
- BufferedImage image = ImageIO.read(new ByteArrayInputStream(bytes));
- byte[] compressedBytes = compressImage(image, 0.5f); // Compress with 50% quality
-
- // Write the bytes to the file
- Files.write(path, bytes);
-
- System.out.println(filePath);
- return filepath_txt;
-
- } catch (IOException e) {
- e.printStackTrace();
- return "Failed to save file " + file.getOriginalFilename();
- }
+ String uploadDirectory = environment.getProperty("file.upload.directory");
+ String serviceFolderName = environment.getProperty("parks_playground_foldername");
+ var year = DateTimeUtil.getCurrentYear();
+ var month = DateTimeUtil.getCurrentMonth();
+
+ uploadDirectory = uploadDirectory + serviceFolderName + year + "/" + month;
+
+ try {
+ // Create directory if it doesn't exist
+ Path directoryPath = Paths.get(uploadDirectory);
+ if (!Files.exists(directoryPath)) {
+ Files.createDirectories(directoryPath);
+ }
+
+ // Datetime string
+ String datetimetxt = DateTimeUtil.getCurrentDateTime();
+ // File name
+ String fileName = name + "_" + id + "_" + datetimetxt + "_" + file.getOriginalFilename();
+ fileName = fileName.replaceAll("\\s+", ""); // Remove space on filename
+
+ String filePath = uploadDirectory + "/" + fileName;
+
+ String filepath_txt = "/" + serviceFolderName + year + "/" + month + "/" + fileName;
+
+ // Create a new Path object
+ Path path = Paths.get(filePath);
+
+ // Get the bytes of the file
+ byte[] bytes = file.getBytes();
+
+ // Compress the image
+ BufferedImage image = ImageIO.read(new ByteArrayInputStream(bytes));
+ byte[] compressedBytes = compressImage(image, 0.5f); // Compress with 50% quality
+
+ // Write the bytes to the file
+ Files.write(path, compressedBytes);
+
+ System.out.println(filePath);
+ return filepath_txt;
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ return "Failed to save file " + file.getOriginalFilename();
+ }
}
-
+
@Transactional
- public List> saveAsset(
- MultiValueMap formData,
- String categoryId,
- String assetTypeId,
- String latitude,
- String longitude,
- String zone,
- String ward,
- String streeId,
- String streetName,
- String loginId,
- String name,
- MultipartFile file) {
- List> result=null;
+ public List> saveAsset(MultiValueMap formData, String categoryId,
+ String assetTypeId, String latitude, String longitude, String zone, String ward, String streeId,
+ String streetName, String loginId, String name, MultipartFile file) {
+ List> result = null;
Map response = new HashMap<>();
int lastInsertId = 0;
-
- String image = fileUpload(categoryId,assetTypeId,file);
-
+
+ String image = fileUpload(categoryId, assetTypeId, file);
+
String sqlQuery = "INSERT INTO `asset_list`(`category_id`, `assettype_id`, `name`, `image`, `latitude`, `longitude`, "
- + "`zone`, `ward`, `streetid`, `streetname`, `cby`) "
- + "VALUES (?,?,?,?,?,?,?,?,?,?,?)";
-
+ + "`zone`, `ward`, `streetid`, `streetname`, `cby`) " + "VALUES (?,?,?,?,?,?,?,?,?,?,?)";
+
KeyHolder keyHolder = new GeneratedKeyHolder();
-
+
try {
- int affectedRows = jdbcParkseTemplate.update(new PreparedStatementCreator() {
- @Override
- public PreparedStatement createPreparedStatement(Connection connection) throws SQLException {
- PreparedStatement ps = connection.prepareStatement(sqlQuery, new String[]{"id"});
- ps.setString(1, categoryId);
- ps.setString(2, assetTypeId);
- ps.setString(3, name);
- ps.setString(4, image);
- ps.setString(5, latitude);
- ps.setString(6, longitude);
- ps.setString(7, zone);
- ps.setString(8, ward);
- ps.setString(9, streeId);
- ps.setString(10, streetName);
- ps.setString(11, loginId);
- return ps;
- }
- }, keyHolder);
-
- if (affectedRows > 0) {
- Number generatedId = keyHolder.getKey();
- lastInsertId = (generatedId != null) ? generatedId.intValue() : 0;
- response.put("insertId", lastInsertId);
- response.put("status", "success");
- response.put("message", "A new asset was inserted successfully!");
- System.out.println("A new asset was inserted successfully! Insert ID: " + generatedId);
- } else {
- response.put("status", "error");
- response.put("message", "Failed to insert a new asset.");
- }
- } catch (DataAccessException e) {
- System.out.println("Data Access Exception:");
- Throwable rootCause = e.getMostSpecificCause();
- if (rootCause instanceof SQLException) {
- SQLException sqlException = (SQLException) rootCause;
- System.out.println("SQL State: " + sqlException.getSQLState());
- System.out.println("Error Code: " + sqlException.getErrorCode());
- System.out.println("Message: " + sqlException.getMessage());
- response.put("status", "error");
- response.put("message", sqlException.getMessage());
- response.put("sqlState", sqlException.getSQLState());
- response.put("errorCode", sqlException.getErrorCode());
- } else {
- System.out.println("Message: " + rootCause.getMessage());
- response.put("status", "error");
- response.put("message", rootCause.getMessage());
- }
- }
-
- return Collections.singletonList(response);
- }
-
+ int affectedRows = jdbcParkseTemplate.update(new PreparedStatementCreator() {
+ @Override
+ public PreparedStatement createPreparedStatement(Connection connection) throws SQLException {
+ PreparedStatement ps = connection.prepareStatement(sqlQuery, new String[] { "id" });
+ ps.setString(1, categoryId);
+ ps.setString(2, assetTypeId);
+ ps.setString(3, name);
+ ps.setString(4, image);
+ ps.setString(5, latitude);
+ ps.setString(6, longitude);
+ ps.setString(7, zone);
+ ps.setString(8, ward);
+ ps.setString(9, streeId);
+ ps.setString(10, streetName);
+ ps.setString(11, loginId);
+ return ps;
+ }
+ }, keyHolder);
+
+ if (affectedRows > 0) {
+ Number generatedId = keyHolder.getKey();
+ lastInsertId = (generatedId != null) ? generatedId.intValue() : 0;
+ response.put("insertId", lastInsertId);
+ response.put("status", "success");
+ response.put("message", "A new asset was inserted successfully!");
+ System.out.println("A new asset was inserted successfully! Insert ID: " + generatedId);
+ } else {
+ response.put("status", "error");
+ response.put("message", "Failed to insert a new asset.");
+ }
+ } catch (DataAccessException e) {
+ System.out.println("Data Access Exception:");
+ Throwable rootCause = e.getMostSpecificCause();
+ if (rootCause instanceof SQLException) {
+ SQLException sqlException = (SQLException) rootCause;
+ System.out.println("SQL State: " + sqlException.getSQLState());
+ System.out.println("Error Code: " + sqlException.getErrorCode());
+ System.out.println("Message: " + sqlException.getMessage());
+ response.put("status", "error");
+ response.put("message", sqlException.getMessage());
+ response.put("sqlState", sqlException.getSQLState());
+ response.put("errorCode", sqlException.getErrorCode());
+ } else {
+ System.out.println("Message: " + rootCause.getMessage());
+ response.put("status", "error");
+ response.put("message", rootCause.getMessage());
+ }
+ }
+
+ return Collections.singletonList(response);
+ }
+
@Transactional
- public List> loadAssetByFilter(String categoryId, String assetTypeId, String latitude, String longitude ){
-
+ public List> loadAssetByFilter(String categoryId, String assetTypeId, String latitude,
+ String longitude) {
+
String sqlWhere = "1=1";
-
- if(categoryId!=null && !categoryId.isBlank() && !categoryId.isEmpty()){
- sqlWhere += " AND ai.category_id='"+categoryId+"'";
+
+ if (categoryId != null && !categoryId.isBlank() && !categoryId.isEmpty()) {
+ sqlWhere += " AND ai.category_id='" + categoryId + "'";
}
-
- if(categoryId!=null && !assetTypeId.isBlank() && !assetTypeId.isEmpty()){
- sqlWhere += " AND ai.assettype_id='"+assetTypeId+"'";
- }
- if(latitude!=null && longitude!=null && !latitude.isBlank() && !latitude.isEmpty() && !longitude.isBlank() && !longitude.isEmpty()){
- sqlWhere += " AND ((6371008.8 * acos(ROUND(cos(radians("+latitude+")) * cos(radians(al.latitude)) * cos(radians(al.longitude) - radians("+longitude+")) + sin(radians("+latitude+")) * sin(radians(al.latitude)), 9))) < 500) ";
+
+ if (categoryId != null && !assetTypeId.isBlank() && !assetTypeId.isEmpty()) {
+ sqlWhere += " AND ai.assettype_id='" + assetTypeId + "'";
}
-
- String sqlQuery="SELECT al.`id`, al.`category_id`, al.`assettype_id`, al.`name`, al.`latitude`, al.`longitude`, al.`zone`, "
- + "al.`ward`, al.`streetid`, al.`streetname`, "
- + "CONCAT('"+fileBaseUrl+"/gccofficialapp/files/', al.image) AS imageUrl "
- + "FROM asset_list al WHERE "+sqlWhere;
-
+ if (latitude != null && longitude != null && !latitude.isBlank() && !latitude.isEmpty() && !longitude.isBlank()
+ && !longitude.isEmpty()) {
+ sqlWhere += " AND ((6371008.8 * acos(ROUND(cos(radians(" + latitude
+ + ")) * cos(radians(al.latitude)) * cos(radians(al.longitude) - radians(" + longitude
+ + ")) + sin(radians(" + latitude + ")) * sin(radians(al.latitude)), 9))) < 500) ";
+ }
+
+ String sqlQuery = "SELECT al.`id`, al.`category_id`, al.`assettype_id`, al.`name`, al.`latitude`, al.`longitude`, al.`zone`, "
+ + "al.`ward`, al.`streetid`, al.`streetname`, " + "CONCAT('" + fileBaseUrl
+ + "/gccofficialapp/files', al.image) AS imageUrl " + "FROM asset_list al WHERE " + sqlWhere;
+
List> result = jdbcParkseTemplate.queryForList(sqlQuery);
return result;
}
+
+ // ----------------------------------------------Enumeration
+ // API------------------------------------------------
+
+ public int centerMedianEnumeration(String enterParkName, int maintained_By, Double enu_Area_Meters,
+ int typeofCenterMedian, String latitude, String longitude, String zone, String ward, String location,
+ String userId, MultipartFile photo, String enumeration_type) throws Exception {
+ int enumerationImg_Id_master = centerMedianEnum(enterParkName, maintained_By, enu_Area_Meters,
+ typeofCenterMedian, latitude, longitude, zone, ward, location, userId, enumeration_type);
+ String name = "centerMedian " + enumerationImg_Id_master;
+ String imgId = Integer.toString(enumerationImg_Id_master);
+ try {
+ String ImageUrl = fileUpload(name, imgId, photo);
+ // System.out.println("===========................" + ImageUrl);
+ saveImageForEnumeration(enumerationImg_Id_master, ImageUrl);
+ return enumerationImg_Id_master;
+ } catch (Exception e) {
+ throw new Exception("Error in image saving" + e);
+ }
+ }
+
+ private String saveImageForEnumeration(int enumerationImg_Id_master, String imageUrl) {
+ String sql = "INSERT INTO enumertion_images (photos_enu, enumerationImg_Id_master)" + "VALUES (?, ?)";
+ // Execute SQL query to save feedback for the provided question
+ jdbcParkseTemplate.update(sql, imageUrl, enumerationImg_Id_master);
+
+ return "success";
+ }
+
+ private int centerMedianEnum(String enterParkName, int maintained_By, Double enu_Area_Meters,
+ int typeofCenterMedian, String latitude, String longitude, String zone, String ward, String location,
+ String userId, String enumeration_type) {
+
+ String sql = "INSERT INTO enumeration_master (park_name, maintained_By, Enu_Area_Meters, Cen_tra_Median_Type, latitude, longitude, zone, ward, location, userId, enumeration_type, cdate, is_Active, is_Delete) "
+ + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP, TRUE, FALSE)";
+
+ KeyHolder keyHolder = new GeneratedKeyHolder();
+
+ try {
+ jdbcParkseTemplate.update(connection -> {
+ PreparedStatement ps = connection.prepareStatement(sql, new String[] { "enumeration_Id" });
+ ps.setString(1, enterParkName); // park_name
+ ps.setInt(2, maintained_By); // maintained_by_id
+ ps.setDouble(3, enu_Area_Meters); // Enu_Area_Meters
+ ps.setInt(4, typeofCenterMedian); // center_median_type_id
+ ps.setString(5, latitude); // latitude
+ ps.setString(6, longitude); // longitude
+ ps.setString(7, zone); // zone
+ ps.setString(8, ward); // ward
+ ps.setString(9, location); // loction
+ ps.setString(10, userId); // userId
+ ps.setString(11, enumeration_type); // enumeration_type
+ return ps;
+ }, keyHolder);
+ System.out.println("img id master:" + keyHolder.getKey().intValue());
+ // Retrieve the auto-generated ID and return it
+ return keyHolder.getKey().intValue();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return -1; // Return error indicator
+ }
+
+ public int trafficIslandEnumeration(int maintainedById, Double enu_Area_Meters, int Type_of_Traffic_Island,
+ String latitude, String longitude, String zone, String ward, String location, String userId,
+ MultipartFile photo, String enumeration_type) throws Exception {
+ int enumerationImg_Id_master = trafficIslandEnum(maintainedById, enu_Area_Meters, Type_of_Traffic_Island,
+ latitude, longitude, zone, ward, location, userId, enumeration_type);
+ String name = "trafficIsland " + enumerationImg_Id_master;
+ String imgId = Integer.toString(enumerationImg_Id_master);
+ try {
+ String ImageUrl = fileUpload(name, imgId, photo);
+ // System.out.println("===========................" + ImageUrl);
+ saveImageForEnumeration(enumerationImg_Id_master, ImageUrl);
+ return enumerationImg_Id_master;
+ } catch (Exception e) {
+ throw new Exception("Error in image saving " + e);
+ }
+
+ }
+
+ private int trafficIslandEnum(int maintainedById, Double enu_Area_Meters, int type_of_Traffic_Island,
+ String latitude, String longitude, String zone, String ward, String location, String userId,
+ String enumeration_type) {
+
+ String sql = "INSERT INTO enumeration_master (maintained_By, Enu_Area_Meters, Cen_tra_Median_Type, latitude, longitude, zone, ward, location, userId, enumeration_type, cdate, is_Active, is_Delete) "
+ + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP, TRUE, FALSE)";
+
+ KeyHolder keyHolder = new GeneratedKeyHolder();
+
+ try {
+ jdbcParkseTemplate.update(connection -> {
+ PreparedStatement ps = connection.prepareStatement(sql, new String[] { "enumeration_Id" });
+ ps.setInt(1, maintainedById); // maintained_by_id
+ ps.setDouble(2, enu_Area_Meters); // Enu_Area_Meters
+ ps.setInt(3, type_of_Traffic_Island); // center_median_type_id
+ ps.setString(4, latitude); // latitude
+ ps.setString(5, longitude); // longitude
+ ps.setString(6, zone); // zone
+ ps.setString(7, ward); // ward
+ ps.setString(8, location); // loction
+ ps.setString(9, userId); // userId
+ ps.setString(10, enumeration_type); // enumeration_type
+ return ps;
+
+ }, keyHolder);
+ // System.out.println("img id master:"+keyHolder.getKey().intValue());
+ // Retrieve the auto-generated ID and return it
+ return keyHolder.getKey().intValue();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return -1; // Return error indicator
+ }
+
+ public int parkEnumeration(String enterParkName, int maintained_By, String latitude, String longitude, String zone,
+ String ward, String location, String userId, MultipartFile photo, String zone_Available,
+ String enumeration_type) throws Exception {
+
+ int enumerationImg_Id_master = parkEnum(enterParkName, maintained_By, latitude, longitude, zone, ward, location,
+ userId, photo, zone_Available, enumeration_type);
+ // System.out.println("enumerationImg_Id_master"+enumerationImg_Id_master);
+ String name = "parkEnumeration " + enumerationImg_Id_master;
+ String imgId = Integer.toString(enumerationImg_Id_master);
+ // String imgId = enumerationImg_Id_master+"";
+
+ try {
+ String ImageUrl = fileUpload(name, imgId, photo);
+ // System.out.println("===========................" + ImageUrl);
+ saveImageForEnumeration(enumerationImg_Id_master, ImageUrl);
+ return enumerationImg_Id_master;
+ } catch (Exception e) {
+ throw new Exception("Error in image saving" + e);
+ }
+
+ }
+
+ private int parkEnum(String enterParkName, int maintained_By, String latitude, String longitude, String zone,
+ String ward, String location, String userId, MultipartFile photo, String zone_Available,
+ String enumeration_type) {
+ // System.out.println("Check1");
+ String sql = "INSERT INTO enumeration_master (maintained_By, latitude, longitude, zone, ward, location, userId,park_name, Zone_Available,enumeration_type, cdate, is_Active, is_Delete) "
+ + "VALUES (?, ?, ?, ?, ?, ?, ?, ?,?,?, CURRENT_TIMESTAMP, TRUE, FALSE)";
+
+ KeyHolder keyHolder = new GeneratedKeyHolder();
+ System.out.println("Check2");
+
+ try {
+
+ jdbcParkseTemplate.update(connection -> {
+ PreparedStatement ps = connection.prepareStatement(sql, new String[] { "enumeration_Id" }); // Primary
+ // key
+ // column
+
+ // Set the parameters in the correct order (index starts at 1)
+ ps.setInt(1, maintained_By); // maintained_By
+ ps.setString(2, latitude); // latitude
+ ps.setString(3, longitude); // longitude
+ ps.setString(4, zone); // zone
+ ps.setString(5, ward); // ward
+ ps.setString(6, location); // loction
+ ps.setString(7, userId); // userId
+ ps.setString(8, enterParkName);
+ ps.setString(9, zone_Available);
+ ps.setString(10, enumeration_type);// park_name
+ return ps;
+ }, keyHolder);
+
+ // Retrieve the auto-generated ID (primary key) and return it
+ return keyHolder.getKey().intValue();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return -1; // Return error indicator
+ }
+
+ public int beautificationRoad(String latitude, String longitude, String zone, String ward, String location,
+ String userId, MultipartFile photo, String enumeration_type) throws Exception {
+
+ int enumerationImg_Id_master = beautifiRoad(latitude, longitude, zone, ward, location, userId, photo,
+ enumeration_type);
+ String name = "beautificationRoad " + enumerationImg_Id_master;
+ String imgId = Integer.toString(enumerationImg_Id_master);
+ try {
+ String ImageUrl = fileUpload(name, imgId, photo);
+ // System.out.println("===========................" + ImageUrl);
+ saveImageForEnumeration(enumerationImg_Id_master, ImageUrl);
+ return enumerationImg_Id_master;
+ } catch (Exception e) {
+ throw new Exception("Error in image saving");
+ }
+ }
+
+ private int beautifiRoad(String latitude, String longitude, String zone, String ward, String location,
+ String userId, MultipartFile photo, String enumeration_type) {
+
+ // SQL query with placeholders for parameters
+ String sql = "INSERT INTO enumeration_master ( latitude, longitude, zone, ward, location, userId,enumeration_type, cdate, is_Active, is_Delete) "
+ + "VALUES ( ?, ?, ?, ?, ?, ?,?, CURRENT_TIMESTAMP, TRUE, FALSE)";
+
+ KeyHolder keyHolder = new GeneratedKeyHolder();
+
+ try {
+ jdbcParkseTemplate.update(connection -> {
+ PreparedStatement ps = connection.prepareStatement(sql, new String[] { "enumeration_Id" }); // Primary
+ // key
+ // column
+
+ // Set the parameters in the correct order (index starts at 1)
+// ps.setString(1, area); // Area
+ ps.setString(1, latitude); // latitude
+ ps.setString(2, longitude); // longitude
+ ps.setString(3, zone); // zone
+ ps.setString(4, ward); // ward
+ ps.setString(5, location); // loction
+ ps.setString(6, userId);
+ ps.setString(7, enumeration_type); // userId
+ return ps;
+ }, keyHolder);
+
+ // Retrieve the auto-generated ID (primary key) and return it
+ return keyHolder.getKey().intValue();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return -1; // Return error indicator
+ }
+
+ public int readingZone(String latitude, String longitude, String zone, String ward, String location, String userId,
+ MultipartFile photo, String enumeration_type, String park_name) throws Exception {
+
+ int enumerationImg_Id_master = parkEnumReadingZone(latitude, longitude, zone, ward, location, userId, photo,
+ enumeration_type, park_name);
+ String name = "readingZone " + enumerationImg_Id_master;
+ String imgId = Integer.toString(enumerationImg_Id_master);
+ try {
+ String ImageUrl = fileUpload(name, imgId, photo);
+ // System.out.println("===========................" + ImageUrl);
+ saveImageForEnumeration(enumerationImg_Id_master, ImageUrl);
+ return enumerationImg_Id_master;
+ } catch (Exception e) {
+ throw new Exception("Error in image saving");
+ }
+
+ }
+
+ private int parkEnumReadingZone(String latitude, String longitude, String zone, String ward, String location,
+ String userId, MultipartFile photo, String enumeration_type, String park_name) {
+
+ String sql = "INSERT INTO enumeration_master ( latitude, longitude, zone, ward, location, userId,enumeration_type,park_name, cdate, is_Active, is_Delete) "
+ + "VALUES ( ?, ?, ?, ?, ?, ?,?,?, CURRENT_TIMESTAMP, TRUE, FALSE)";
+
+ KeyHolder keyHolder = new GeneratedKeyHolder();
+
+ try {
+ jdbcParkseTemplate.update(connection -> {
+ PreparedStatement ps = connection.prepareStatement(sql, new String[] { "enumeration_Id" }); // Primary
+ // key
+ // column
+
+ // Set the parameters in the correct order (index starts at 1)
+// ps.setString(1, zone_Available_name); // Area
+ ps.setString(1, latitude); // latitude
+ ps.setString(2, longitude); // longitude
+ ps.setString(3, zone); // zone
+ ps.setString(4, ward); // ward
+ ps.setString(5, location); // loction
+ ps.setString(6, userId); // userId
+ ps.setString(7, enumeration_type);
+ ps.setString(8, park_name);
+ return ps;
+ }, keyHolder);
+
+ // Retrieve the auto-generated ID (primary key) and return it
+ return keyHolder.getKey().intValue();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return -1; // Return error indicator
+
+ }
+
+ public int miyawakiNew(String type_of_place, String latitude, String longitude, String zone, String ward,
+ String location, String userId, MultipartFile photo, String enumeration_type) throws Exception {
+
+ int enumerationImg_Id_master = miyawakiNeww(type_of_place, latitude, longitude, zone, ward, location, userId,
+ photo, enumeration_type);
+ String name = "miyawakiNew " + enumerationImg_Id_master;
+ String imgId = Integer.toString(enumerationImg_Id_master);
+ try {
+ String ImageUrl = fileUpload(name, imgId, photo);
+ // System.out.println("===========................" + ImageUrl);
+ saveImageForEnumeration(enumerationImg_Id_master, ImageUrl);
+ return enumerationImg_Id_master;
+ } catch (Exception e) {
+ throw new Exception("Error in image saving");
+ }
+ }
+
+ private int miyawakiNeww(String type_of_place, String latitude, String longitude, String zone, String ward,
+ String location, String userId, MultipartFile photo, String enumeration_type) {
+ String sql = "INSERT INTO enumeration_master ( Type_of_place, latitude, longitude, zone, ward, location, userId,enumeration_type, cdate, is_Active, is_Delete) "
+ + "VALUES (?, ?, ?, ?, ?, ?, ?,?, CURRENT_TIMESTAMP, TRUE, FALSE)";
+
+ KeyHolder keyHolder = new GeneratedKeyHolder();
+
+ try {
+ jdbcParkseTemplate.update(connection -> {
+ PreparedStatement ps = connection.prepareStatement(sql, new String[] { "enumeration_Id" }); // Primary
+ // key
+ // column
+
+ // Set the parameters in the correct order (index starts at 1)
+ ps.setString(1, type_of_place); // Area
+ ps.setString(2, latitude); // latitude
+ ps.setString(3, longitude); // longitude
+ ps.setString(4, zone); // zone
+ ps.setString(5, ward); // ward
+ ps.setString(6, location); // loction
+ ps.setString(7, userId);
+ ps.setString(8, enumeration_type);// userId
+ return ps;
+ }, keyHolder);
+
+ // Retrieve the auto-generated ID (primary key) and return it
+ return keyHolder.getKey().intValue();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return -1; // Return error indicator
+ }
+
+ public int miyawakiExisting(int maintained_By, String latitude, String longitude, String zone, String ward,
+ String location, String userId, MultipartFile photo, String enumeration_type) throws Exception {
+ int enumerationImg_Id_master = miyawakiExistingSer(maintained_By, latitude, longitude, zone, ward, location,
+ userId, photo, enumeration_type);
+ String name = "miyawakiExisting " + enumerationImg_Id_master;
+ String imgId = Integer.toString(enumerationImg_Id_master);
+ try {
+ String ImageUrl = fileUpload(name, imgId, photo);
+ // System.out.println("===========................" + ImageUrl);
+ saveImageForEnumeration(enumerationImg_Id_master, ImageUrl);
+ return enumerationImg_Id_master;
+ } catch (Exception e) {
+ throw new Exception("Error in image saving");
+ }
+ }
+
+ private int miyawakiExistingSer(int maintained_By, String latitude, String longitude, String zone, String ward,
+ String location, String userId, MultipartFile photo, String enumeration_type) {
+ String sql = "INSERT INTO enumeration_master ( maintained_By, latitude, longitude, zone, ward, location, userId,enumeration_type, cdate, is_Active, is_Delete) "
+ + "VALUES (?, ?, ?, ?, ?, ?, ?,?, CURRENT_TIMESTAMP, TRUE, FALSE)";
+
+ KeyHolder keyHolder = new GeneratedKeyHolder();
+
+ try {
+ jdbcParkseTemplate.update(connection -> {
+ PreparedStatement ps = connection.prepareStatement(sql, new String[] { "enumeration_Id" }); // Primary
+ // key
+ // column
+
+ // Set the parameters in the correct order (index starts at 1)
+ ps.setInt(1, maintained_By); // Area
+ ps.setString(2, latitude); // latitude
+ ps.setString(3, longitude); // longitude
+ ps.setString(4, zone); // zone
+ ps.setString(5, ward); // ward
+ ps.setString(6, location); // loction
+ ps.setString(7, userId); // userId
+ ps.setString(8, enumeration_type);
+ return ps;
+ }, keyHolder);
+
+ // Retrieve the auto-generated ID (primary key) and return it
+ return keyHolder.getKey().intValue();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return -1; // Return error indicator
+ }
+
+ // -----------------------------------------------Feedback
+ // API-----------------------------------------------------------------
+
+ public int centerMedian(String irrigationProperlyQa, String irrigationProperlyAns, String trimmingProperlyQa,
+ String trimmingProperlyAns, String weedingQa, String weedingAns, String handRailingQa,
+ String handRailingAns, String latitude, String longitude, String zone, String ward, String location,
+ String enumeration_type, String userId, String enumeration_id, MultipartFile photo) throws Exception {
+ String saveImage;
+ try {
+ saveImage = fileUpload("CenterMedianFeedback", enumeration_id, photo);
+ } catch (Exception e) {
+ throw new Exception(" check photo");
+ }
+ centerMedian(saveImage, enumeration_id);
+ centerMedian("test_cen", enumeration_id);
+ int activity_Id = saveActivity(zone, location, latitude, longitude, ward, userId, enumeration_type,
+ enumeration_id);
+ // System.out.println(activity_Id);
+ SaveFeedBack(irrigationProperlyQa, irrigationProperlyAns, activity_Id);
+ //SaveFeedBack(irrigationProperlyQa, irrigationProperlyAns, activity_Id);
+ SaveFeedBack(trimmingProperlyQa, trimmingProperlyAns, activity_Id);
+ SaveFeedBack(weedingQa, weedingAns, activity_Id);
+ int saveFeedBackId = SaveFeedBack(handRailingQa, handRailingAns, activity_Id);
+
+ return saveFeedBackId;
+
+ }
+
+ private int saveActivity(String zone, String division, String latitude, String longitude, String ward,
+ String userId, String enumeration_type, String enumeration_id) {
+
+ // SQL query to insert activity details into the activity table
+ String sql = "INSERT INTO activity (feedback_zone, feedback_location, feedback_latitude, feedback_longitude, cdate, ward,user_Id, feedback_enumeration_Type, feedback_enumeration_Id) "
+ + "VALUES (?, ?, ?, ?, CURRENT_TIMESTAMP, ?, ?,?,?)";
+
+ KeyHolder keyHolder = new GeneratedKeyHolder();
+
+ try {
+ // Use JdbcTemplate's update method to execute the insert operation
+ jdbcParkseTemplate.update(connection -> {
+ PreparedStatement ps = connection.prepareStatement(sql, new String[] { "activity_id" }); // Assuming
+ // "activity_id"
+ // is the
+ // primary
+ // key
+
+ // Set the parameters for the activity table in the correct order (index starts
+ // at 1)
+ ps.setString(1, zone); // feedback_zone
+ ps.setString(2, division); // feedback_division
+ ps.setString(3, latitude); // feedback_latitude
+ ps.setString(4, longitude);// feedback_longitude
+ ps.setString(5, ward); // user_Id
+ ps.setString(6, userId);
+ ps.setString(7, enumeration_type);
+ ps.setString(8, enumeration_id);// feedback_enumeration_Type
+
+ return ps;
+ }, keyHolder);
+
+ // Retrieve the auto-generated activity_id and return it
+ return keyHolder.getKey().intValue();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return -1; // Return -1 in case of any error
+ }
+
+ private int SaveFeedBack(String qaId, String qaName, int activityId) {
+
+ String sql = "INSERT INTO feedback (feedback_Name, feedback_qa_id, activity_id) " + "VALUES (?, ?, ?)";
+
+ KeyHolder keyHolder = new GeneratedKeyHolder();
+
+ try {
+ jdbcParkseTemplate.update(connection -> {
+ PreparedStatement ps = connection.prepareStatement(sql, new String[] { "feed_id" }); // Primary key
+ // column
+
+ // Set the parameters in the correct order (index starts at 1)
+ ps.setString(1, qaName); // feedback_Name
+ ps.setString(2, qaId); // feedback_qa_id
+ ps.setInt(3, activityId); // feedback_enumeration_Id
+ return ps;
+ }, keyHolder);
+
+ // Retrieve the auto-generated ID (primary key) and return it
+ return keyHolder.getKey().intValue();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return -1; // Return error indicator
+ }
+
+ private List> centerMedian(String saveImage, String enumeration_id) {
+ // Update SQL query
+// String updateSql = "UPDATE enumeration_master SET centerMedian_image = ? WHERE enumeration_Id = ?";
+
+ try {
+ // Perform the update operation
+// jdbcParkseTemplate.update( saveImage, enumeration_id);
+
+ // After the update, fetch the updated row
+ String selectSql = "SELECT * FROM enumeration_master WHERE enumeration_Id = ?"; // Added '='
+
+ // Return the updated data as a list of maps (each map corresponds to a row)
+ return jdbcParkseTemplate.queryForList(selectSql, enumeration_id);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyList(); // Return an empty list in case of an error
+ }
+ }
+/* Patch 23-11-2024
+ public int trafficIsland(String irrigationProperlyQa, String irrigationProperlyAns, String trimmingProperlyQa,
+ String trimmingProperlyAns, String weedingQa, String weedingans, String handRailingQa,
+ String handRailingAns, String latitude, String longitude, String zone, String ward, String location,
+ String userId, String enumeration_type, String enumeration_id, String gapFillingQa, String gapFilingAns,
+ String improvementQa, String improvementAns, MultipartFile photo) throws Exception {
+
+ String saveImage;
+ try {
+ saveImage = fileUpload("TrafficIslandFeedback", enumeration_id, photo);
+ } catch (Exception e) {
+ throw new Exception(" check photo");
+ }
+
+ trafficIslandSave(saveImage, enumeration_id);
+ int activity_Id = saveActivity(zone, location, latitude, longitude, ward, userId, enumeration_type,
+ enumeration_id);
+
+ SaveFeedBack(improvementQa, improvementAns, activity_Id);
+ SaveFeedBack(irrigationProperlyQa, irrigationProperlyAns, activity_Id);
+ SaveFeedBack(trimmingProperlyQa, trimmingProperlyAns, activity_Id);
+ SaveFeedBack(weedingQa, weedingans, activity_Id);
+
+ int saveFeedBackId = SaveFeedBack(handRailingQa, handRailingAns, activity_Id);
+ return saveFeedBackId;
+
+ }
+*/
+ public int trafficIsland(String irrigationProperlyQa, String irrigationProperlyAns, String trimmingProperlyQa,
+ String trimmingProperlyAns, String weedingQa, String weedingans, String handRailingQa,
+ String handRailingAns, String latitude, String longitude, String zone, String ward, String location,
+ String userId, String enumeration_type, String enumeration_id, String gapFillingQa, String gapFilingAns,
+ String improvementQa, String improvementAns,String fountainAvailableQa, String fountainAvailableAns,
+ String fountainWorkingQa, String fountainWorkingAns,MultipartFile photo) throws Exception {
+
+ String saveImage;
+ try {
+ saveImage = fileUpload("TrafficIslandFeedback", enumeration_id, photo);
+ } catch (Exception e) {
+ throw new Exception(" check photo");
+ }
+
+ trafficIslandSave(saveImage, enumeration_id);
+ int activity_Id = saveActivity(zone, location, latitude, longitude, ward, userId, enumeration_type,enumeration_id);
+
+ SaveFeedBack(irrigationProperlyQa, irrigationProperlyAns, activity_Id);
+ SaveFeedBack(trimmingProperlyQa, trimmingProperlyAns, activity_Id);
+ SaveFeedBack(weedingQa, weedingans, activity_Id);
+ SaveFeedBack(improvementQa, improvementAns, activity_Id);
+ SaveFeedBack(fountainAvailableQa, fountainAvailableAns, activity_Id);
+ SaveFeedBack(fountainWorkingQa, fountainWorkingAns, activity_Id);
+
+
+ int saveFeedBackId = SaveFeedBack(handRailingQa, handRailingAns, activity_Id);
+ return saveFeedBackId;
+ }
+ private List> trafficIslandSave(String saveImage, String enumeration_id) {
+ // Update SQL query
+// String updateSql = "UPDATE enumeration_master SET traffic_image = ? WHERE enumeration_Id = ?";
+
+ try {
+ // Perform the update operation
+// jdbcParkseTemplate.update(saveImage, enumeration_id);
+
+ // After the update, fetch the updated row
+ String selectSql = "SELECT * FROM enumeration_master WHERE enumeration_Id = ?"; // Added '='
+
+ // Return the updated data as a list of maps (each map corresponds to a row)
+ return jdbcParkseTemplate.queryForList(selectSql, enumeration_id);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyList(); // Return an empty list in case of an error
+ }
+ }
+
+ public int beautification(String irrigationProperlyQa, String irrigationProperlyAns, String trimmingProperlyQa,
+ String trimmingProperlyAns, String weedingQa, String weedingans, String gapFillingQa, String gapFillingAns,
+ String improvementQa, String improvementAns, String latitude, String longitude, String zone, String ward,
+ String location, String enumeration_id, String userId, String enumeration_type, MultipartFile photo)
+ throws Exception {
+ String saveImage;
+ try {
+ saveImage = fileUpload("beautificationFeedback", enumeration_id, photo);
+ } catch (Exception e) {
+ throw new Exception(" check photo");
+ }
+
+ saveBeautification(saveImage, enumeration_id);
+ int activity_Id = saveActivity(zone, location, latitude, longitude, ward, userId, enumeration_type,
+ enumeration_id);
+
+ SaveFeedBack(irrigationProperlyQa, irrigationProperlyAns, activity_Id);
+ SaveFeedBack(trimmingProperlyQa, trimmingProperlyAns, activity_Id);
+ SaveFeedBack(weedingQa, weedingans, activity_Id);
+ SaveFeedBack(improvementQa, improvementAns, activity_Id);
+ int saveFeedBackId = SaveFeedBack(gapFillingQa, gapFillingAns, activity_Id);
+ return saveFeedBackId;
+
+ }
+
+ private List> saveBeautification(String saveImage, String enumeration_id) {
+// String updateSql = "UPDATE enumeration_master SET feed_beautificat = ? WHERE enumeration_Id = ?";
+
+ try {
+ // Perform the update operation
+// jdbcParkseTemplate.update(saveImage, enumeration_id);
+
+ // After the update, fetch the updated row
+ String selectSql = "SELECT * FROM enumeration_master WHERE enumeration_Id = ?"; // Added '='
+
+ // Return the updated data as a list of maps (each map corresponds to a row)
+ return jdbcParkseTemplate.queryForList(selectSql, enumeration_id);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyList(); // Return an empty list in case of an error
+ }
+ }
+
+ public int parkInspection(String openedQa, String openedAns, String irrigationProperlyQa,
+ String irrigationProperlyAns, String trimmingProperlyQa, String trimmingProperlyAns, String weedingQa,
+ String weedingans, String gapFillingQa, String gapFillingAns, String playandGymQa, String playandGymAns,
+ String overAllQa, String overAllAns, String properLightQa, String properLightAns, String debrisRemovalQa,
+ String debrisRemovalAns, String toiletAQA, String toiletAns, String latitude, String longitude, String zone,
+ String ward, String location, String userId, String enumeration_type, String enumeration_id,
+ String civilWorkQa, String civilWorkAns, String noWatchmenQa, String noWatchmenAns, String noSweeperQa,
+ String noSweeperAns, MultipartFile photo) throws Exception {
+
+ String saveImage;
+ try {
+ saveImage = fileUpload("ParkInspectionFeedback", enumeration_id, photo);
+ } catch (Exception e) {
+ throw new Exception(" check photo");
+ }
+
+ saveParkInspection(saveImage, enumeration_id);
+ int activity_Id = saveActivity(zone, location, latitude, longitude, ward, userId, enumeration_type,
+ enumeration_id);
+
+ SaveFeedBack(civilWorkQa, civilWorkAns, activity_Id);
+ SaveFeedBack(noWatchmenQa, noWatchmenAns, activity_Id);
+ SaveFeedBack(noSweeperQa, noSweeperAns, activity_Id);
+
+ SaveFeedBack(openedQa, openedAns, activity_Id);
+ SaveFeedBack(irrigationProperlyQa, irrigationProperlyAns, activity_Id);
+ SaveFeedBack(trimmingProperlyQa, trimmingProperlyAns, activity_Id);
+ SaveFeedBack(weedingQa, weedingans, activity_Id);
+ SaveFeedBack(gapFillingQa, gapFillingAns, activity_Id);
+
+ SaveFeedBack(playandGymQa, playandGymAns, activity_Id);
+ SaveFeedBack(overAllQa, overAllAns, activity_Id);
+ SaveFeedBack(properLightQa, properLightAns, activity_Id);
+ SaveFeedBack(debrisRemovalQa, debrisRemovalAns, activity_Id);
+
+ int saveFeedBackId = SaveFeedBack(toiletAQA, toiletAns, activity_Id);
+ return saveFeedBackId;
+
+ }
+
+ private List> saveParkInspection(String saveImage, String enumeration_id) {
+// String updateSql = "UPDATE enumeration_master SET feed_prak_Inspe_image = ? WHERE enumeration_id = ?";
+ try {
+ // Perform the update operation
+// jdbcParkseTemplate.update(saveImage, enumeration_id);
+
+ // After the update, fetch the updated row
+ String selectSql = "SELECT * FROM enumeration_master WHERE enumeration_Id = ?"; // Added '='
+
+ // Return the updated data as a list of maps (each map corresponds to a row)
+ return jdbcParkseTemplate.queryForList(selectSql, enumeration_id);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyList(); // Return an empty list in case of an error
+ }
+ }
+
+ public int readingZone(String openedOrNotQa, String openedOrNotAns, String bookAvailableQa, String bookAvailableAns,
+ String newsapaperAvailableQa, String newsapaperAvailableAns, String latitude, String longitude, String zone,
+ String ward, String location, String userId, String enumeration_type, String enumeration_id,
+ String improvementQa, String improvementAns, MultipartFile photo) throws Exception {
+ // TODO Auto-generated method
+
+ String saveImage;
+ try {
+ saveImage = fileUpload("readinZoneFeedback", enumeration_id, photo);
+ } catch (Exception e) {
+ throw new Exception(" check photo");
+ }
+
+ saveReadingZone(saveImage, enumeration_id);
+ int activity_Id = saveActivity(zone, location, latitude, longitude, ward, userId, enumeration_type,
+ enumeration_id);
+
+ SaveFeedBack(openedOrNotQa, openedOrNotAns, activity_Id);
+ SaveFeedBack(bookAvailableQa, bookAvailableAns, activity_Id);
+ SaveFeedBack(improvementQa, improvementAns, activity_Id);
+ int saveFeedBackId = SaveFeedBack(newsapaperAvailableQa, newsapaperAvailableAns, activity_Id);
+
+ return saveFeedBackId;
+
+ }
+
+ private List> saveReadingZone(String saveImage, String enumeration_id) {
+// String updateSql = "UPDATE enumeration_master SET feed_readingZone = ? WHERE enumeration_id = ?";
+ try {
+ // Perform the update operation
+// jdbcParkseTemplate.update(saveImage, enumeration_id);
+
+ // After the update, fetch the updated row
+ String selectSql = "SELECT * FROM enumeration_master WHERE enumeration_Id = ?"; // Added '='
+
+ // Return the updated data as a list of maps (each map corresponds to a row)
+ return jdbcParkseTemplate.queryForList(selectSql, enumeration_id);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyList(); // Return an empty list in case of an error
+ }
+ }
+
+ public int miyawakiNew(String debrisCleaningQa, String debrisCleaningAns, String landpreprarationQa,
+ String landpreprarationAns, String plantingDoneQa, String plantingDoneAns, String cctvQa, String cctvAns,
+ String latitude, String longitude, String zone, String ward, String location, String userId,
+ String enumeration_type, String enumeration_id, String saplingAvailQa, String saplingAvailAns,
+ String fencingAvailbilityQa, String fencingAvailbilityAns, String sourcaOfIrrigationQa,
+ String sourcaOfIrrigationAns, MultipartFile photo) throws Exception {
+
+ String saveImage;
+ try {
+ saveImage = fileUpload("miyawakiNewFeedback", enumeration_id, photo);
+ } catch (Exception e) {
+ throw new Exception(" check photo");
+ }
+
+ saveMiyawakiNew(saveImage, enumeration_id);
+ int activity_Id = saveActivity(zone, location, latitude, longitude, ward, userId, enumeration_type,
+ enumeration_id);
+
+ SaveFeedBack(saplingAvailQa, saplingAvailAns, activity_Id);
+ SaveFeedBack(fencingAvailbilityQa, fencingAvailbilityAns, activity_Id);
+ SaveFeedBack(sourcaOfIrrigationQa, sourcaOfIrrigationAns, activity_Id);
+
+ SaveFeedBack(debrisCleaningQa, debrisCleaningAns, activity_Id);
+ SaveFeedBack(landpreprarationQa, landpreprarationAns, activity_Id);
+ SaveFeedBack(plantingDoneQa, plantingDoneAns, activity_Id);
+
+ int saveFeedBackId = SaveFeedBack(cctvQa, cctvAns, activity_Id);
+ return saveFeedBackId;
+ }
+
+ private List> saveMiyawakiNew(String saveImage, String enumeration_id) {
+// String updateSql = "UPDATE enumeration_master SET feed_miyawakiNew = ? WHERE enumeration_id = ?";
+
+ try {
+ // Perform the update operation
+// jdbcParkseTemplate.update(saveImage, enumeration_id);
+ // After the update, fetch the updated row
+ String selectSql = "SELECT * FROM enumeration_master WHERE enumeration_Id = ?"; // Added '='
+
+ // Return the updated data as a list of maps (each map corresponds to a row)
+ return jdbcParkseTemplate.queryForList(selectSql, enumeration_id);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyList(); // Return an empty list in case of an error
+ }
+ }
+
+ public int miyawakiExisiting(String weedingQa, String weedingAns, String purningQa, String purningans,
+ String gapFillingQa, String gapFillingAns, String latitude, String longitude, String zone, String ward,
+ String location, String userId, String enumeration_type, String enumeration_id, String improvmetReqQa,
+ String improvmetReqAns, String sourceOfirrigationQa, String sourceOfirrigationAns, MultipartFile photo)
+ throws Exception {
+
+ String saveImage;
+ try {
+ saveImage = fileUpload("miywakiExistingFeedback", enumeration_id, photo);
+ } catch (Exception e) {
+ throw new Exception(" check photo");
+ }
+
+ saveMiyawakiExisiting(saveImage, enumeration_id);
+ int activity_Id = saveActivity(zone, location, latitude, longitude, ward, userId, enumeration_type,
+ enumeration_id);
+
+ SaveFeedBack(improvmetReqQa, improvmetReqAns, activity_Id);
+ SaveFeedBack(sourceOfirrigationQa, sourceOfirrigationAns, activity_Id);
+
+ SaveFeedBack(weedingQa, weedingAns, activity_Id);
+ SaveFeedBack(purningQa, purningans, activity_Id);
+ int saveFeedBackId = SaveFeedBack(gapFillingQa, gapFillingAns, activity_Id);
+
+ return saveFeedBackId;
+ }
+
+ private List> saveMiyawakiExisiting(String saveImage, String enumeration_id) {
+
+// String updateSql = "UPDATE enumeration_master SET feed_miyawaki_Exit = ? WHERE enumeration_id = ?";
+
+ try {
+ // Perform the update operation
+// jdbcParkseTemplate.update(saveImage, enumeration_id);
+ // After the update, fetch the updated row
+ String selectSql = "SELECT * FROM enumeration_master WHERE enumeration_Id = ?"; // Added '='
+
+ // Return the updated data as a list of maps (each map corresponds to a row)
+ return jdbcParkseTemplate.queryForList(selectSql, enumeration_id);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyList(); // Return an empty list in case of an error
+ }
+ }
+
+ public List> categoryType() {
+ String sql = "SELECT enumeration_type_id, enumerationName FROM enumerationtype where is_Active = 1 and is_Delete =0 ";
+
+ try {
+ // Use query to get a list of park names
+ List> parkDetails = jdbcParkseTemplate.queryForList(sql);
+ return parkDetails;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyList(); // Return an empty list in case of an error
+ }
+ }
+
+ public List> masterCategoryType(String cat_enumeration_id) {
+ String sql = "SELECT master_category_id, categoryName FROM mastercategory WHERE Cat_enumeration_id = ? and is_Active = 1 and is_Delete = 0";
+
+ try {
+ // Execute the query and pass the parameter
+ List> categoryDetails = jdbcParkseTemplate.queryForList(sql,
+ new Object[] { cat_enumeration_id });
+ return categoryDetails;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyList(); // Return an empty list in case of an error
+ }
+ }
+
+ public List> subCategoryType(String masterCategory) {
+ String sql = "SELECT sub_category_id, categoryName FROM subcategory WHERE masterCategory = ? and is_Active = 1 and is_Delete = 0";
+ try {
+ // Execute the query and pass the parameter
+ List> categoryDetails = jdbcParkseTemplate.queryForList(sql,
+ new Object[] { masterCategory });
+ return categoryDetails;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyList(); // Return an empty list in case of an error
+ }
+ }
+
+ public List> getDateByLocation(String latitude, String longitude, String enumeration_type) throws Exception {
+ String latitude1 = latitude;
+
+ List> parkByLocation = getParkByLocation(latitude, longitude, latitude1, enumeration_type);
+ if (parkByLocation == null) {
+ throw new NoDataException("No data in database");
+ }
+ return parkByLocation;
+ }
+
+ public List> getReadingZoneParkByLocation(String latitude, String longitude, String latitude1)
+ throws Exception {
+// String sql = "SELECT enutype.enumeration_type_id , enutype.enumerationName, COALESCE(ac.park_name, ac.location) AS park_name, ac.enumeration_Id "
+// + "FROM enumeration_master ac left join enumerationtype enutype on enutype.enumeration_type_id = ac.enumeration_type WHERE "
+// + " ((6371008.8 * acos( ROUND(cos(radians(?)) * cos(radians(ac.latitude)) * cos(radians(ac.longitude) - radians(?)) + sin(radians(?)) * sin(radians(ac.latitude)), 9) )) < 500)"
+// + " AND Zone_Available='yes' "
+// + " GROUP BY enutype.enumeration_type_id,enutype.enumerationName, ac.park_name, ac.location ";
+ String sql = "SELECT enutype.enumeration_type_id , enutype.enumerationName, COALESCE(ac.park_name, ac.location) AS park_name,ac.enumeration_Id "
+ + "FROM enumeration_master ac left join enumerationtype enutype on enutype.enumeration_type_id = ac.enumeration_type WHERE "
+ + " ((6371008.8 * acos( ROUND(cos(radians(?)) * cos(radians(ac.latitude)) * cos(radians(ac.longitude) - radians(?)) + sin(radians(?)) * sin(radians(ac.latitude)), 9) )) < 500)"
+ + " AND ac.Zone_Available='yes' "
+ + " GROUP BY enutype.enumeration_type_id,enutype.enumerationName, ac.park_name, ac.location,ac.enumeration_Id ";
+
+ // Use latitude, longitude, and schoolType as positional parameters
+ List> parkByLocation = jdbcParkseTemplate.queryForList(sql,
+ new Object[] { latitude, longitude, latitude1 });
+
+ if (parkByLocation == null) {
+ throw new NoDataException("No data in database");
+ }
+ return parkByLocation;
+ }
+
+ private List> getParkByLocation(String latitude, String longitude, String latitude1, String enumeration_type) {
+ String sql = "SELECT ac.enumeration_Id,enutype.enumeration_type_id , enutype.enumerationName, COALESCE(ac.park_name, ac.location) AS park_name "
+ + "FROM enumeration_master ac left join enumerationtype enutype on enutype.enumeration_type_id = ac.enumeration_type WHERE "
+ + " ((6371008.8 * acos( ROUND(cos(radians(?)) * cos(radians(ac.latitude)) * cos(radians(ac.longitude) - radians(?)) + sin(radians(?)) * sin(radians(ac.latitude)), 9) )) < 500) "
+ + "and (ac.park_name is not null or ac.location is not null) and (ac.enumeration_type is not null and ac.enumeration_type =?) "
+ + " GROUP BY ac.enumeration_Id, enutype.enumeration_type_id,enutype.enumerationName, ac.park_name, ac.location ";
+
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { latitude, longitude, latitude1, enumeration_type });
+ }
+
+ public List> parkName() throws Exception {
+
+ List> parkName = getParkName();
+
+ if (parkName == null) {
+ throw new NoDataException("The is no park");
+ }
+ return parkName;
+
+ }
+
+ public List> getParkName() {
+ String sql = "SELECT enumeration_Id, COALESCE(park_name, location) AS park_name FROM enumeration_master WHERE Zone_Available = 'yes'";
+
+ try {
+
+ List> parkDetails = jdbcParkseTemplate.queryForList(sql);
+ return parkDetails;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyList(); // Return an empty list in case of an error
+ }
+ }
+
+ // ------------------------------------------Tree Feedback
+ // API-----------------------------------------------------
+
+ public Map SaveTreeDetailes(int No_of_trees_required, String enumeration_type, String latitude,
+ String longitude, String zone, String ward, String location, String parkname, String userId,
+ MultipartFile tree_Image) {
+
+ int No_of_trees = 0;
+ String tree_Status;
+ int treeId;
+ int treeflag = 0;
+
+ if (No_of_trees_required == No_of_trees) {
+ tree_Status = "completed";
+ }
+ tree_Status = "pending";
+ Map saveTreeDetailes = SaveTreeDetails(No_of_trees_required, enumeration_type, No_of_trees,
+ tree_Status, latitude, longitude, zone, ward, location, parkname, userId);
+
+ if (saveTreeDetailes.containsKey("tree_Id")) {
+
+ treeId = (int) saveTreeDetailes.get("tree_Id");
+
+ try {
+ Random random = new Random();
+ // Generate a random number between 1000 and 9999
+ int treeId1 = 1000 + random.nextInt(9000);
+
+ String saveImage = fileUpload("TreeFeedback", Integer.toString(treeId1), tree_Image); // FileUpload
+ SaveTreeImage(treeId, saveImage, userId, zone, ward, latitude, longitude, treeflag);
+ } catch (Exception e) {
+ throw new NoDataException("check the tree_id ");
+ }
+
+ } else {
+ // Handle error case if tree_Id is missing
+ System.out.println("Error: tree_Id not found in saved data.");
+ }
+ return saveTreeDetailes;
+
+ }
+
+ private int SaveTreeImage(int treeId, String saveImage, String userId, String zone, String ward, String latitude,
+ String longitude, int treeflag) {
+
+ String sql = "INSERT INTO tree_image (tr_image, tree_enumeration_id, tree_user_id, "
+ + "tree_zone, tree_ward, tree_latitude, tree_longitude, tree_cdate,tree_flag) "
+ + "VALUES (?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP,?)";
+
+ KeyHolder keyHolder = new GeneratedKeyHolder();
+
+ try {
+ jdbcParkseTemplate.update(connection -> {
+ PreparedStatement ps = connection.prepareStatement(sql, new String[] { "tree_Image_Id" }); // Auto-generated
+ // primary
+ // key
+ ps.setString(1, saveImage); // tr_image
+ ps.setInt(2, treeId); // tree_enumeration_id
+ ps.setString(3, userId); // tree_user_id
+ ps.setString(4, zone); // tree_zone
+ ps.setString(5, ward); // tree_ward
+ ps.setString(6, latitude); // tree_latitude
+ ps.setString(7, longitude);
+ ps.setInt(8, treeflag);
+// ps.setString(8, treeFlag);
+ // tree_longitude
+ return ps;
+ }, keyHolder);
+
+ // Retrieve and return the auto-generated ID
+ return keyHolder.getKey().intValue();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return -1; // Return error code
+ }
+
+ }
+
+ private Map SaveTreeDetails(int no_of_trees_required, String enumeration_type, int no_of_trees,
+ String tree_Status, String latitude, String longitude, String zone, String ward, String location,
+ String parkname, String userId) {
+ String locationtxt = location.isEmpty() ? null : location;
+ String parknametxt = parkname.isEmpty() ? null : parkname;
+
+ String sql = "INSERT INTO treeplaintandpruning (No_of_trees, No_of_trees_required, tree_Status, "
+ + "tree_enumeration_id, tree_user_id,tree_location, tr_parkname, tree_zone, tree_ward, tree_latitude, tree_longitude, "
+ + "tree_cdate, tree_is_Active, tree_is_Delete) "
+ + "VALUES (?, ?, ?, ?,?,?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP, TRUE, FALSE)";
+
+ KeyHolder keyHolder = new GeneratedKeyHolder();
+
+ try {
+ jdbcParkseTemplate.update(connection -> {
+ PreparedStatement ps = connection.prepareStatement(sql, new String[] { "tree_Id" }); // Auto-generated
+ // primary key
+ ps.setInt(1, no_of_trees);
+ ps.setInt(2, no_of_trees_required);
+ ps.setString(3, tree_Status);
+ ps.setString(4, enumeration_type);
+ ps.setString(5, userId);
+ ps.setString(6, locationtxt);
+ ps.setString(7, parknametxt);
+ ps.setString(8, zone);
+ ps.setString(9, ward);
+ ps.setString(10, latitude);
+ ps.setString(11, longitude);
+ return ps;
+ }, keyHolder);
+
+ int treeId = keyHolder.getKey().intValue();
+
+ String selectSql = "SELECT * FROM treeplaintandpruning WHERE tree_Id = ?";
+ return jdbcParkseTemplate.queryForMap(selectSql, treeId);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyMap(); // Return an empty map if there's an error
+ }
+ }
+
+ public Map SaveimageDetailes(String enumeration_type, String latitude, String longitude,
+ String userId, MultipartFile tree_Image, int tree_id) throws Exception {
+
+ List> treeDetailes = getTreeDetails(tree_id);
+
+ if (treeDetailes == null || treeDetailes.isEmpty()) {
+ throw new NoDataException("check the tree_id ");
+ }
+
+ Map mapTReeDetailes = treeDetailes.get(0);
+
+ if (mapTReeDetailes.containsKey("No_of_trees_required")) {
+ int treeId1 = (int) mapTReeDetailes.get("tree_Id");
+ int treeNumber = (int) mapTReeDetailes.get("No_of_trees_required"); // total
+ int trerequired = (int) mapTReeDetailes.get("No_of_trees"); // add tree count
+ String zone = (String) mapTReeDetailes.get("tree_zone");
+ String ward = (String) mapTReeDetailes.get("tree_ward");
+ int treeflag = 1;
+
+ // System.out.println("Tree ID: " + treeId1);
+ // System.out.println("Number of Trees Planted: " + treeNumber);
+ // System.out.println("Number of Trees Required: " + trerequired);
+
+ int trerequired1 = ((Number) mapTReeDetailes.get("No_of_trees")).intValue();
+ String treeStatus = null;
+
+ if (treeNumber > trerequired) {
+
+ try {
+ Random random = new Random();
+ // Generate a random number between 1000 and 9999
+ int treeId2 = 1000 + random.nextInt(9000);
+ String saveImage = fileUpload("TreeImage", Integer.toString(treeId2), tree_Image);
+ SaveTreeImage(treeId1, saveImage, userId, zone, ward, latitude, longitude, treeflag);
+ updateTreeRequired(treeId1, trerequired1 + 1);
+
+ if (treeNumber - 1 == trerequired) {
+ treeStatus = "completed";
+ } else {
+ treeStatus = "pending";
+ }
+ return updateTreeStatusAndGetDetails(treeId1, treeStatus);
+ } catch (Exception e) {
+ throw new NoDataException("Error in Saving image");
+ }
+
+ }
+// if (treeNumber == trerequired -1 ) {
+//
+// treeStatus = "completed";
+// return updateTreeStatusAndGetDetails(treeId1, treeStatus);
+// }
+
+ }
+ return null;
+ }
+
+ private Map updateTreeStatusAndGetDetails(int treeId1, String treeStatus) {
+ String updateSql = "UPDATE treeplaintandpruning SET tree_Status = ? WHERE tree_Id = ?";
+ String selectSql = "SELECT * FROM treeplaintandpruning WHERE tree_Id = ?";
+
+ try {
+ // Update the tree status
+ int rowsAffected = jdbcParkseTemplate.update(updateSql, treeStatus, treeId1);
+
+ if (rowsAffected > 0) {
+ // Fetch the updated tree details after the update
+ return jdbcParkseTemplate.queryForMap(selectSql, treeId1);
+ } else {
+ return null; // Return null if no row was updated
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null; // Return null in case of an error
+ }
+ }
+
+ private Map updateTreeRequired(int treeId1, int i) {
+ String updateSql = "UPDATE treeplaintandpruning SET No_of_trees = ? WHERE tree_Id = ?";
+ String selectSql = "SELECT * FROM treeplaintandpruning WHERE tree_Id = ?";
+
+ try {
+ // Update the tree status
+ int rowsAffected = jdbcParkseTemplate.update(updateSql, i, treeId1);
+
+ if (rowsAffected > 0) {
+ // Fetch the updated tree details after the update
+ return jdbcParkseTemplate.queryForMap(selectSql, treeId1);
+ } else {
+ return null; // Return null if no row was updated
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null; // Return null in case of an error
+ }
+ }
+
+ private List> getTreeDetails(int tree_id) {
+ String sql = "SELECT * FROM treeplaintandpruning WHERE tree_Id = ?";
+
+ try {
+ // Query for list with parameter treeId
+ return jdbcParkseTemplate.queryForList(sql, tree_id);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Collections.emptyList(); // Return an empty list in case of an error
+ }
+ }
+
+ // ------------------------------------------Enumeration Report
+ // API-----------------------------------------------------
+ /* 23-11-2024 Patch
+ public List> getZoneCount(String fromdate, String todate, String enumeration_type)
+ throws Exception {
+ String sql = "SELECT zone,count(enumeration_Id) as count FROM enumeration_master"
+ + " where enumeration_type=(?) and DATE(cdate) BETWEEN STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') "
+ + "AND STR_TO_DATE('" + todate + "', '%d-%m-%Y') group by zone ";
+
+
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { enumeration_type});
+
+ }
+ */
+ public List> getZoneCount(String fromdate, String todate, String enumeration_type, String userId )
+ throws Exception {
+ String sql = "SELECT zone,count(enumeration_Id) as count FROM enumeration_master"
+ + " where enumeration_type=(?) and UserId = ? and DATE(cdate) BETWEEN STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') "
+ + "AND STR_TO_DATE('" + todate + "', '%d-%m-%Y') group by zone ";
+
+
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { enumeration_type, userId});
+
+ }
+ /* 23-11-2024 Patch
+ public List> getwardCount(String zone, String fromdate, String todate,
+ String enumeration_type) {
+ String sql = " SELECT ward,count(enumeration_Id) as count FROM enumeration_master "
+ + "where zone=(?) and date(cdate) between STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') "
+ + "and STR_TO_DATE('" + todate + "', '%d-%m-%Y') And enumeration_type =(?) group by ward ";
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { zone, enumeration_type });
+
+ }
+ */
+
+ public List> getwardCount(String zone, String fromdate, String todate, String enumeration_type,
+ String userId) {
+ String sql = " SELECT ward,count(enumeration_Id) as count FROM enumeration_master "
+ + "where zone=(?) and UserId = ? and date(cdate) between STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') "
+ + "and STR_TO_DATE('" + todate + "', '%d-%m-%Y') And enumeration_type =(?) group by ward ";
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { zone, enumeration_type, userId });
+
+ }
+
+ public List> getActivityCount(String ward, String fromdate, String todate,
+ String enumeration_type) {
+ /*String sql = "select act.feedback_enumeration_Id, act.ward,coalesce(em.park_name,em.location) AS location_Park,"
+ + "count(act.feedback_enumeration_Id) as count from activity act left join enumeration_master em on "
+ + "em.enumeration_Id = act.feedback_enumeration_Id where act.ward=? and act.feedback_enumeration_Type= ? "
+ + "and date(act.cdate) between STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') and "
+ + "STR_TO_DATE('" + todate + "', '%d-%m-%Y') group by act.feedback_enumeration_Id, act.ward, location_Park";*/
+
+ String sql = "select em.enumeration_Id as feedback_enumeration_Id, em.ward, coalesce(em.park_name,em.location) AS location_Park, count(act.feedback_enumeration_Id) as count "
+ + "from enumeration_master em "
+ + "left join activity act on act.feedback_enumeration_Id = em.enumeration_Id "
+ + "where act.ward = ? and act.feedback_enumeration_Type = ? "
+ + "and date(act.cdate) between STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') and STR_TO_DATE('" + todate + "', '%d-%m-%Y') "
+ + "group by em.enumeration_Id, em.ward";
+
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { ward, enumeration_type});
+
+ }
+
+ public List> getActivityDetails(String ward, String fromdate, String todate,
+ String enumeration_type, String enumerationId) {
+ String sql = "SELECT act.feedback_enumeration_Id,act.activity_id, DATE_FORMAT(act.cdate, '%d-%m-%Y %l:%i %p') AS date, "
+ + "act.feedback_latitude, act.feedback_longitude, et.enumerationName " + "FROM activity act "
+ + "LEFT JOIN enumerationtype et ON et.enumeration_type_id = act.feedback_enumeration_Type "
+ + "WHERE act.ward = ? " + "AND act.feedback_enumeration_Type = ? "
+ + "AND DATE(act.cdate) BETWEEN STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') AND STR_TO_DATE('" + todate + "', '%d-%m-%Y') "
+ + "and act.feedback_enumeration_Id = ?"
+ + "GROUP BY act.feedback_enumeration_Id,act.activity_id, act.feedback_latitude, act.feedback_longitude, et.enumerationName";
+
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { ward, enumeration_type, enumerationId });
+
+ }
+
+ public List>> getInspectionDetails(String activityId, String fromdate, String todate,
+ String enumerationId) {
+
+ // Initialize the list that will hold all park details
+ List>> getEnumDetails1 = new ArrayList<>();
+
+ // Initialize a list to hold individual park details
+ List> getParkDetails = new ArrayList<>();
+
+ // Fetch images and feedback
+ List> feedback = getEnumfeedback(activityId, fromdate, todate);
+ List> image = getEnumImage(enumerationId, fromdate, todate);
+
+ // Prepare maps for images and feedback
+ Map imageMap = new HashMap<>();
+ imageMap.put("images", image);
+
+ Map feedbackMap = new HashMap<>();
+ feedbackMap.put("feedbacks", feedback);
+
+ // Add ward details, images, and feedback to the park details list
+ getParkDetails.add(feedbackMap);
+ getParkDetails.add(imageMap);
+
+ // Add this park's details to the final list
+ getEnumDetails1.add(getParkDetails);
+
+ return getEnumDetails1;
+ }
+
+ private List> getEnumfeedback(String activityId, String fromdate, String todate) {
+ String sql = "select eqm.qa_name, fb.feedback_Name from feedback fb "
+ + "left join enu_question_master eqm on eqm.qa_id = fb.feedback_qa_id "
+ + "left join activity act on act.activity_id = fb.activity_id "
+ + "where fb.activity_id =? and date(act.cdate) between STR_TO_DATE(' "+ fromdate + " ','%Y-%m-%d') and STR_TO_DATE('"+todate+"','%Y-%m-%d')";
+
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { activityId });
+ }
+
+ private List> getEnumImage(String enumerationId, String fromdate, String todate) {
+
+ String sql = "select *,coalesce(em.park_name,em.location) as parkName, " + "CONCAT('" + fileBaseUrl
+ + "/gccofficialapp/files', eimg.photos_enu) AS imageUrl, em.latitude, em.longitude from enumertion_images eimg "
+ + "left join enumeration_master em on em.enumeration_Id = eimg.enumerationImg_Id_master "
+ + "where eimg.enumerationImg_Id_master = ? and date(eimg.cdate) between STR_TO_DATE(' "+ fromdate + " ','%Y-%m-%d') and STR_TO_DATE('"+todate+"','%Y-%m-%d')";
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { enumerationId });
+ }
+
+ public List> getParkCount(String ward, String fromdate, String todate,
+ String enumeration_type) {
+ String sql = "SELECT CASE WHEN park_name IS NULL THEN location ELSE park_name END AS named, "
+ + "COUNT(enumeration_Id) AS count, " + "DATE_FORMAT(cdate, '%d-%m-%Y') AS formatted_date "
+ + "FROM enumeration_master "
+ + "WHERE ward = ? AND DATE(cdate) BETWEEN STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') AND "
+ + "STR_TO_DATE('" + todate + "', '%d-%m-%Y') And enumeration_type =(?) GROUP BY named, cdate, ward";
+
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { ward, enumeration_type });
+ }
+
+ public List> getWishtreeZoneCount(String fromdate, String todate, String enumeration_type) {
+
+ String sql = "SELECT tree_zone,count(tree_Id) as count FROM treeplaintandpruning "
+ + " where tree_enumeration_id=(?) and DATE(tree_cdate) between STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') "
+ + "and STR_TO_DATE('" + todate + "', '%d-%m-%Y') group by tree_zone ";
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { enumeration_type});
+
+ }
+
+ public List> getTreewardCount(String zone, String fromdate, String todate,
+ String enumeration_type) {
+ String sql = "SELECT tree_ward, COUNT(tree_Id) AS count " + "FROM treeplaintandpruning "
+ + "WHERE tree_zone = ? AND DATE(tree_cdate) BETWEEN STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') AND "
+ + "STR_TO_DATE('" + todate + "', '%d-%m-%Y')and tree_enumeration_id=(?) GROUP BY tree_ward";
+
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { zone, enumeration_type });
+ }
+
+ public List> getwardWishTreedata(String ward) {
+ String sql = "SELECT tree.tree_Id,tree.No_of_trees_required,tree.No_of_trees,tree.tree_enumeration_id,tree.tree_zone,tree.tree_ward,"
+ + "CONCAT('" + fileBaseUrl
+ + "/gccofficialapp/files', image.tr_image) AS imageUrl FROM treeplaintandpruning AS tree "
+ + "LEFT JOIN tree_image AS image ON image.tree_enumeration_id = tree.tree_Id WHERE tree.tree_ward =? ";
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { ward });
+ }
+
+ public List> getTreeWardWiseCountDetails(String ward, String enumeration_type, String fromdate,String todate) {
+ String sql = "select tree_Id, tree_ward, coalesce(tr_parkname,tree_location) as location, count(tree_Id) as count from treeplaintandpruning "
+ + "where tree_ward=? and tree_enumeration_id = ? and date(tree_cdate) between STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') and "
+ + "STR_TO_DATE('" + todate + "', '%d-%m-%Y') group by tree_Id, tree_ward, location";
+
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { ward, enumeration_type, });
+ }
+
+ public List> getTreeImageDetails(String tree_Id, String enumeration_type, String fromdate, String todate) {
+ String sql = "SELECT timg.tree_latitude, timg.tree_longitude, DATE_FORMAT(timg.tree_cdate, '%d-%m-%Y %l:%i %p') AS Date, "
+ + "tpp.No_of_trees_required AS total, tpp.No_of_trees AS Completed_Count, "
+ + "CONCAT('" + fileBaseUrl + "/gccofficialapp/files', timg.tr_image) AS imageUrl "
+ + "FROM tree_image timg LEFT JOIN treeplaintandpruning tpp ON tpp.tree_id = timg.tree_enumeration_id "
+ + "WHERE tpp.tree_Id = ? AND tpp.tree_enumeration_id = ? AND DATE(timg.tree_cdate) BETWEEN STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') "
+ + "AND STR_TO_DATE('" + todate + "', '%d-%m-%Y') and timg.tree_flag = 1";
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { tree_Id, enumeration_type });
+ }
+
+
+ public List> getTreeDetails(String tree_Id) {
+ String sql = "SELECT * FROM treeplaintandpruning WHERE tree_Id = ?";
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { tree_Id });
+ }
+
+ public List> getTreeDetailsBasedonLocation(String parkName, String location, String ward) {
+ String sql = "SELECT *," + "CONCAT('" + fileBaseUrl + "/gccofficialapp/files/', image.tr_image) AS imageUrl "
+ + "FROM treeplaintandpruning treep left join tree_image image on image.tree_enumeration_id=treep.tree_Id "
+ + "WHERE treep.tree_ward=? and treep.tr_parkname=? or treep.tree_location =? ";
+
+ try {
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { ward, parkName, location });
+ } catch (Exception e) {
+ throw new NoDataException("Exception" + e);
+ }
+
+ }
+
+ public List> getEnumeration_feedback(String enumerationId, String enumeration_type) {
+ String sql = "SELECT qa.qa_name,feed.feedback_Name, feed.activity_id, act.feedback_enumeration_Id, act.feedback_enumeration_Type "
+ + "FROM feedback feed " + "LEFT JOIN activity act ON act.activity_id = feed.activity_id "
+ + "LEFT JOIN enu_question_master qa ON feed.feedback_qa_id = qa.qa_id "
+ + "WHERE act.feedback_enumeration_Id = ? AND act.feedback_enumeration_Type = ?";
+
+ try {
+ return jdbcParkseTemplate.queryForList(sql, enumerationId, enumeration_type);
+ } catch (Exception e) {
+ throw new NoDataException("No enumeration feedback found for enumeration_Id: " + enumerationId);
+ }
+ }
+
+ /* 23-11-2024 Patch
+ public List>> getParkDetails(String enumeration_type, String fromdate, String todate)
+ throws Exception {
+ // Fetch park data based on the given date range
+ List> parkData = getParkData(fromdate, todate, enumeration_type);
+
+ // Initialize the list that will hold all park details
+ List>> getParkDetails1 = new ArrayList<>();
+
+ // Loop through the parkData list (each map represents a row)
+ for (Map row : parkData) {
+ // Extract the enumeration_Id from the row
+ Object enumId = row.get("enumeration_Id"); // Use the correct key from parkData
+ System.out.println("enumId: " + enumId);
+ if (enumId == null) {
+ System.out.println("No enumeration_Id found in row.");
+ continue;
+ }
+
+ // Initialize a list to hold individual park details
+ List> getParkDetails = new ArrayList<>();
+
+ // Fetch ward count based on the enumeration_Id
+ Map getwardCount = getEnumeration_master(enumId.toString(), enumeration_type);
+ getwardCount.replaceAll((key, value) -> value == null ? "" : value);
+ // System.out.println(getwardCount);
+
+ // Fetch images and feedback
+ List> image = getEnumeration_image(enumId.toString(), enumeration_type);
+ List> feedback = getEnumeration_feedback(enumId.toString(), enumeration_type);
+
+ // Prepare maps for images and feedback
+ Map imageMap = new HashMap<>();
+ imageMap.put("images", image);
+
+ Map feedbackMap = new HashMap<>();
+ feedbackMap.put("feedbacks", feedback);
+
+ // Add ward details, images, and feedback to the park details list
+ getParkDetails.add(getwardCount);
+ getParkDetails.add(imageMap);
+ getParkDetails.add(feedbackMap);
+
+ // Add this park's details to the final list
+ getParkDetails1.add(getParkDetails);
+ }
+
+ return getParkDetails1;
+ }
+*/
+ public List>> getParkDetails(String enumeration_type, String fromdate, String todate, String userId)
+ throws Exception {
+ // Fetch park data based on the given date range
+ Map parkData = getParkData(fromdate, todate, enumeration_type, userId);
+
+ // Initialize the list that will hold all park details
+ List>> getParkDetails1 = new ArrayList<>();
+
+ // Loop through the parkData list (each map represents a row)
+
+ // Extract the enumeration_Id from the row
+ Object enumId = parkData.get("enumeration_Id"); // Use the correct key from parkData
+ //System.out.println("enumId: " + enumId);
+ if (enumId == null) {
+ System.out.println("No enumeration_Id found in row.");
+ //continue;
+ }
+
+ // Initialize a list to hold individual park details
+ List> getParkDetails = new ArrayList<>();
+
+ // Fetch ward count based on the enumeration_Id
+ Map getwardCount = getEnumeration_master(enumId.toString(), enumeration_type);
+ getwardCount.replaceAll((key, value) -> value == null ? "" : value);
+ // System.out.println(getwardCount);
+
+ // Fetch images and feedback
+ List> image = getEnumeration_image(enumId.toString(), enumeration_type);
+ //System.out.println("image: "+image.size());
+ List> feedback = getEnumeration_feedback(enumId.toString(), enumeration_type);
+ //System.out.println("feedback: "+feedback.get(0));
+
+ // Prepare maps for images and feedback
+ Map imageMap = new HashMap<>();
+ imageMap.put("images", image);
+
+ Map feedbackMap = new HashMap<>();
+ feedbackMap.put("feedbacks", feedback);
+
+ // Add ward details, images, and feedback to the park details list
+ getParkDetails.add(getwardCount);
+ getParkDetails.add(imageMap);
+ getParkDetails.add(feedbackMap);
+
+ // Add this park's details to the final list
+ getParkDetails1.add(getParkDetails);
+
+ return getParkDetails1;
+ }
+
+ private Map getEnumeration_master(Object enumeration_Id, String enumeration_type) throws Exception {
+ String sql = "SELECT * FROM enumeration_master WHERE enumeration_Id = ? and enumeration_type =?";
+
+ try {
+ return jdbcParkseTemplate.queryForMap(sql, new Object[] { enumeration_Id, enumeration_type });
+ } catch (Exception e) {
+ throw new NoDataException("No enumeration data found for enumeration_Id: " + enumeration_Id);
+ }
+ }
+
+ public List> getEnumeration_image(Object enumeration_Id, String enumeration_type)
+ throws Exception {
+ String sql = "SELECT *, CONCAT('" + fileBaseUrl + "/gccofficialapp/files/', photos_enu) AS imageUrl "
+ + "FROM enumertion_images WHERE enumerationImg_Id_master = ?";
+ try {
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { enumeration_Id });
+ } catch (Exception e) {
+ throw new NoDataException("No enumeration image found for enumeration_Id: " + enumeration_Id);
+ }
+ }
+ /* 23-11-2024 Patch
+ private List> getParkData(String fromdate, String todate, String enumeration_type) {
+ String sql = "SELECT enumeration_Id "
+ + "FROM enumeration_master WHERE enumeration_type=? and DATE(cdate) BETWEEN STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') AND "
+ + "STR_TO_DATE('" + todate + "', '%d-%m-%Y') and park_name IS NOT NULL";
+
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { enumeration_type});
+ }
+ */
+ private Map getParkData(String fromdate, String todate, String enumeration_type, String userId) {
+ String sql = "SELECT enumeration_Id "
+ + "FROM enumeration_master WHERE enumeration_type=? and UserId =? "
+ + "and DATE(cdate) BETWEEN STR_TO_DATE(? , '%d-%m-%Y') AND "
+ + "STR_TO_DATE(? , '%d-%m-%Y') and park_name IS NOT NULL";
+
+ return jdbcParkseTemplate.queryForMap(sql, enumeration_type, userId, fromdate, todate);
+ }
+
+ public List> getBriefReport(String fromdate, String todate, String category, String divison,
+ String zone, String park_name) {
+ String sql = "select park_name, latitude, longitude, location, zone from enumeration_master em "
+ + "where DATE(em.cdate) between STR_TO_DATE('" + fromdate + "', '%d-%m-%Y') and STR_TO_DATE('" + todate + "', '%d-%m-%Y') "
+ + "and enumeration_type =? and ward = ? and zone = ? and park_name = ? order by em.cdate ";
+
+ return jdbcParkseTemplate.queryForList(sql, category, divison, zone, park_name);
+ }
+
+ public List> getUserBasedEnum(String tree_user_id, String tree_latitude, String tree_longitude,
+ String tree_Status, String enumeration_type) {
+ String sql = "SELECT *,date_format(treep.tree_cdate, '%d-%m-%Y %l:%i %p')as tree_date, COALESCE(treep.tr_parkname,treep.tree_location) AS tr_location,"
+ + "CONCAT('" + fileBaseUrl + "/gccofficialapp/files', image.tr_image) AS imageUrl "
+ + " FROM treeplaintandpruning treep left join tree_image image on image.tree_enumeration_id=treep.tree_Id WHERE tree_flag=0 and tree_Status = ? and "
+ + " ((6371008.8 * acos( ROUND(cos(radians(?)) * cos(radians(treep.tree_latitude)) * cos(radians(treep.tree_longitude) - radians(?)) + sin(radians(?)) * sin(radians(treep.tree_latitude)), 9) )) < 500) "
+ + " and treep.tree_user_id = ? and treep.tree_enumeration_id=?";
+
+ return jdbcParkseTemplate.queryForList(sql,
+ new Object[] { tree_Status, tree_latitude, tree_longitude, tree_latitude, tree_user_id, enumeration_type });
+
+ }
+
+ private List> getByLocation(String latitude, String longitude, String latitude1) {
+ String sql = "SELECT enutype.enumeration_type_id , enutype.enumerationName, COALESCE(ac.park_name, ac.location) AS park_name "
+ + "FROM treeplaintandpruning WHERE tree_Status = 'pending' and "
+ + " ((6371008.8 * acos( ROUND(cos(radians(?)) * cos(radians(ac.latitude)) * cos(radians(ac.longitude) - radians(?)) + sin(radians(?)) * sin(radians(ac.latitude)), 9) )) < 500)"
+ + " GROUP BY enutype.enumeration_type_id,enutype.enumerationName, ac.park_name, ac.location ";
+
+ // Use latitude, longitude, and schoolType as positional parameters
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { latitude, longitude, latitude1 });
+ }
+
+ public List> getUserBasedEnum(String tree_latitude, String tree_longitude, String tree_Status) {
+ String sql = "SELECT * "
+ + " FROM treeplaintandpruning treep left join tree_image image on image.tree_enumeration_id = treep.tree_Id WHERE tree_flag = 0 and tree_Status = ? and "
+ + " ((6371008.8 * acos( ROUND(cos(radians(?)) * cos(radians(treep.tree_latitude)) * cos(radians(treep.tree_longitude) - radians(?)) + sin(radians(?)) * sin(radians(treep.tree_latitude)), 9) )) < 500) ";
+
+ // Use latitude, longitude, and schoolType as positional parameters
+ return jdbcParkseTemplate.queryForList(sql,
+ new Object[] { tree_Status, tree_latitude, tree_longitude, tree_latitude });
+
+ }
+
+ public List> getparkNameByRadius(String tree_latitude, String tree_longitude) {
+ String sql = " SELECT enumeration_Id, park_name\n" + " FROM enumeration_master WHERE\n"
+ + " ((6371008.8 * acos( ROUND(cos(radians(?)) * cos(radians(latitude)) * cos(radians(longitude) - radians(?)) +\n"
+ + " sin(radians(?)) * sin(radians(latitude)), 9) )) < 500) and park_name is not null";
+ return jdbcParkseTemplate.queryForList(sql, new Object[] { tree_latitude, tree_longitude, tree_latitude });
+
+ }
+
+ // Added for Flowering and Non-Flowering enumeration
+
+ public List> getparkNameByEnumType(int EnumType, String tree_latitude, String tree_longitude) {
+ String sql = " SELECT enumeration_Id, COALESCE(park_name, location) AS park_name FROM enumeration_master WHERE enumeration_type = ? and "
+ + " ((6371008.8 * acos( ROUND(cos(radians(?)) * cos(radians(latitude)) * cos(radians(longitude) - radians(?)) +\n"
+ + " sin(radians(?)) * sin(radians(latitude)), 9) )) < 500)";
+ return jdbcParkseTemplate.queryForList(sql, EnumType, tree_latitude, tree_longitude, tree_latitude);
+
+ }
+
+ public int saveFlowringandNonFlowringDetails(int enumerationId, String enumType, String parkname, int floweringPlantCount,
+ MultipartFile floweringImg, int nonFloweringPlantCount, MultipartFile nonFloweringImg, String userId) throws Exception {
+
+ int floweringImg_Id = saveFloweringandNonFloweringData(enumerationId, enumType,parkname, floweringPlantCount, nonFloweringPlantCount, userId);
+
+ String name = "floweringImages " + floweringImg_Id;
+ String imgId = Integer.toString(floweringImg_Id);
+
+
+ try {
+ if(floweringImg != null && !floweringImg.isEmpty())
+ {
+ String floweringImageUrl = fileUpload(name, imgId, floweringImg);
+ saveFloweringandNonFloweringImage(floweringImg_Id, floweringImageUrl, "Flowering", userId);
+ System.out.println("===========................" + floweringImageUrl);
+ }
+ if(nonFloweringImg != null && !nonFloweringImg.isEmpty())
+ {
+ String nonFloweringImageUrl = fileUpload(name, imgId, nonFloweringImg);
+ saveFloweringandNonFloweringImage(floweringImg_Id, nonFloweringImageUrl, "NonFlowering", userId );
+ System.out.println("===========................" + nonFloweringImageUrl );
+ }
+ return floweringImg_Id;
+
+ } catch (Exception e) {
+ throw new Exception("Error in image saving " + e);
+ }
+
+ }
+
+ private int saveFloweringandNonFloweringData(int enumerationId, String enumType, String parkname,int floweringPlantCount,
+ int nonFloweringPlantCount, String userId) {
+
+ String sql ="Insert into floweringandnonflowering (enumeration_Id, flowering_enumtype, enumeration_type, park_name, flowering_plant_count, "
+ + "nonflowering_plant_count, userId) values(?, ?, ?, ?, ?, ?, ?)";
+
+ KeyHolder keyHolder = new GeneratedKeyHolder();
+
+ try {
+ jdbcParkseTemplate.update(connection -> {
+ PreparedStatement ps = connection.prepareStatement(sql, new String[] { "Id" });
+ ps.setInt(1, enumerationId);
+ ps.setInt(2, 12);
+ ps.setString(3, enumType);
+ ps.setString(4, parkname);
+ ps.setInt(5, floweringPlantCount);
+ ps.setInt(6, nonFloweringPlantCount);
+ ps.setString(7, userId);
+ return ps;
+
+ }, keyHolder);
+ // System.out.println("img id master:"+keyHolder.getKey().intValue());
+ // Retrieve the auto-generated ID and return it
+ return keyHolder.getKey().intValue();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return -1; // Return error indicator
+ }
+
+ private String saveFloweringandNonFloweringImage(int floweringImg_Id, String floweringImageUrl, String status, String userId ) {
+
+ try {
+ String sqlQuery = "insert into flower_image (flowering_id, flowering_img, flower_status, userid) values (?, ?, ?, ?)";
+ jdbcParkseTemplate.update(sqlQuery,floweringImg_Id, floweringImageUrl, status, userId);
+
+ return "Success";
+ }catch(Exception e) {
+ System.out.println("Exception:"+e);
+ return null;
+ }
+ }
+
+
+ public List> getFloweringZoneCount(String enumeration_type, String fromdate, String todate,
+ String userId) {
+
+ StringBuilder sql = new StringBuilder("SELECT en.zone,COUNT(distinct(ff.enumeration_Id)) AS count, sum(ff.flowering_plant_count) as floweringCount, "
+ + "sum(ff.nonflowering_plant_count) as non_floweringCount FROM floweringandnonflowering ff "
+ + "LEFT JOIN enumeration_master en ON ff.enumeration_Id = en.enumeration_Id "
+ + "WHERE ff.enumeration_type = ? "
+ + "AND DATE(ff.created_date) BETWEEN STR_TO_DATE(?, '%d-%m-%Y') AND STR_TO_DATE(?, '%d-%m-%Y')");
+
+ if (userId != null && !userId.isEmpty()) {
+ sql.append("AND ff.userId = ? ");
+ }
+ sql.append("GROUP BY en.zone");
+
+ List