" + subMenuItem.getName() + "";
} else {
- subSubMenuHTML = subSubMenuHTML + "";
}
@@ -151,7 +151,7 @@ public class MenuController {
+ "\" class=\"menu-item\"" + target + ">
" + subMenuItem.getName() + "";
} else {
- subSubMenuHTML = subSubMenuHTML + "";
}
@@ -169,7 +169,7 @@ public class MenuController {
} else {
if (menuItem.getOrderby() > 0) {
- subMenuHTML = subMenuHTML + "";
}
diff --git a/src/main/java/com/gcc/swm_services/controller/login.java b/src/main/java/com/gcc/flagpoles_services/controller/login.java
similarity index 72%
rename from src/main/java/com/gcc/swm_services/controller/login.java
rename to src/main/java/com/gcc/flagpoles_services/controller/login.java
index 67ec929..b391296 100644
--- a/src/main/java/com/gcc/swm_services/controller/login.java
+++ b/src/main/java/com/gcc/flagpoles_services/controller/login.java
@@ -1,12 +1,12 @@
-package com.gcc.swm_services.controller;
+package com.gcc.flagpoles_services.controller;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-@RequestMapping("/swm")
-@Controller("swmLoginController")
+@RequestMapping("/flagpoles")
+@Controller("flagpolesLoginController")
public class login {
@GetMapping("/login")
diff --git a/src/main/java/com/gcc/swm_services/entity/AppModuleAccessEntity.java b/src/main/java/com/gcc/flagpoles_services/entity/AppModuleAccessEntity.java
similarity index 98%
rename from src/main/java/com/gcc/swm_services/entity/AppModuleAccessEntity.java
rename to src/main/java/com/gcc/flagpoles_services/entity/AppModuleAccessEntity.java
index fa27e9c..587cf70 100644
--- a/src/main/java/com/gcc/swm_services/entity/AppModuleAccessEntity.java
+++ b/src/main/java/com/gcc/flagpoles_services/entity/AppModuleAccessEntity.java
@@ -1,4 +1,4 @@
-package com.gcc.swm_services.entity;
+package com.gcc.flagpoles_services.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/src/main/java/com/gcc/swm_services/entity/AppModuleEntity.java b/src/main/java/com/gcc/flagpoles_services/entity/AppModuleEntity.java
similarity index 98%
rename from src/main/java/com/gcc/swm_services/entity/AppModuleEntity.java
rename to src/main/java/com/gcc/flagpoles_services/entity/AppModuleEntity.java
index 3ff7aaf..76b1036 100644
--- a/src/main/java/com/gcc/swm_services/entity/AppModuleEntity.java
+++ b/src/main/java/com/gcc/flagpoles_services/entity/AppModuleEntity.java
@@ -1,4 +1,4 @@
-package com.gcc.swm_services.entity;
+package com.gcc.flagpoles_services.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/src/main/java/com/gcc/swm_services/entity/AppUserEntity.java b/src/main/java/com/gcc/flagpoles_services/entity/AppUserEntity.java
similarity index 98%
rename from src/main/java/com/gcc/swm_services/entity/AppUserEntity.java
rename to src/main/java/com/gcc/flagpoles_services/entity/AppUserEntity.java
index da2146d..56b65ed 100644
--- a/src/main/java/com/gcc/swm_services/entity/AppUserEntity.java
+++ b/src/main/java/com/gcc/flagpoles_services/entity/AppUserEntity.java
@@ -1,4 +1,4 @@
-package com.gcc.swm_services.entity;
+package com.gcc.flagpoles_services.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/src/main/java/com/gcc/swm_services/entity/AppUserGroupEntity.java b/src/main/java/com/gcc/flagpoles_services/entity/AppUserGroupEntity.java
similarity index 97%
rename from src/main/java/com/gcc/swm_services/entity/AppUserGroupEntity.java
rename to src/main/java/com/gcc/flagpoles_services/entity/AppUserGroupEntity.java
index 1e1309d..aa2ef32 100644
--- a/src/main/java/com/gcc/swm_services/entity/AppUserGroupEntity.java
+++ b/src/main/java/com/gcc/flagpoles_services/entity/AppUserGroupEntity.java
@@ -1,4 +1,4 @@
-package com.gcc.swm_services.entity;
+package com.gcc.flagpoles_services.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/src/main/java/com/gcc/swm_services/entity/MenuItemAccessEntity.java b/src/main/java/com/gcc/flagpoles_services/entity/MenuItemAccessEntity.java
similarity index 98%
rename from src/main/java/com/gcc/swm_services/entity/MenuItemAccessEntity.java
rename to src/main/java/com/gcc/flagpoles_services/entity/MenuItemAccessEntity.java
index 05ad0e4..8cb919d 100644
--- a/src/main/java/com/gcc/swm_services/entity/MenuItemAccessEntity.java
+++ b/src/main/java/com/gcc/flagpoles_services/entity/MenuItemAccessEntity.java
@@ -1,4 +1,4 @@
-package com.gcc.swm_services.entity;
+package com.gcc.flagpoles_services.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/src/main/java/com/gcc/swm_services/entity/MenuItemEntity.java b/src/main/java/com/gcc/flagpoles_services/entity/MenuItemEntity.java
similarity index 98%
rename from src/main/java/com/gcc/swm_services/entity/MenuItemEntity.java
rename to src/main/java/com/gcc/flagpoles_services/entity/MenuItemEntity.java
index 446413d..4ba55cd 100644
--- a/src/main/java/com/gcc/swm_services/entity/MenuItemEntity.java
+++ b/src/main/java/com/gcc/flagpoles_services/entity/MenuItemEntity.java
@@ -1,4 +1,4 @@
-package com.gcc.swm_services.entity;
+package com.gcc.flagpoles_services.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/src/main/java/com/gcc/swm_services/entity/SubMenuItemAccessEntity.java b/src/main/java/com/gcc/flagpoles_services/entity/SubMenuItemAccessEntity.java
similarity index 98%
rename from src/main/java/com/gcc/swm_services/entity/SubMenuItemAccessEntity.java
rename to src/main/java/com/gcc/flagpoles_services/entity/SubMenuItemAccessEntity.java
index ebe8e59..e94b69a 100644
--- a/src/main/java/com/gcc/swm_services/entity/SubMenuItemAccessEntity.java
+++ b/src/main/java/com/gcc/flagpoles_services/entity/SubMenuItemAccessEntity.java
@@ -1,4 +1,4 @@
-package com.gcc.swm_services.entity;
+package com.gcc.flagpoles_services.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/src/main/java/com/gcc/swm_services/entity/SubMenuItemEntity.java b/src/main/java/com/gcc/flagpoles_services/entity/SubMenuItemEntity.java
similarity index 98%
rename from src/main/java/com/gcc/swm_services/entity/SubMenuItemEntity.java
rename to src/main/java/com/gcc/flagpoles_services/entity/SubMenuItemEntity.java
index a569131..6887c8c 100644
--- a/src/main/java/com/gcc/swm_services/entity/SubMenuItemEntity.java
+++ b/src/main/java/com/gcc/flagpoles_services/entity/SubMenuItemEntity.java
@@ -1,4 +1,4 @@
-package com.gcc.swm_services.entity;
+package com.gcc.flagpoles_services.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/src/main/java/com/gcc/swm_services/entity/UserActivityLog.java b/src/main/java/com/gcc/flagpoles_services/entity/UserActivityLog.java
similarity index 95%
rename from src/main/java/com/gcc/swm_services/entity/UserActivityLog.java
rename to src/main/java/com/gcc/flagpoles_services/entity/UserActivityLog.java
index c2d0308..fa90c52 100644
--- a/src/main/java/com/gcc/swm_services/entity/UserActivityLog.java
+++ b/src/main/java/com/gcc/flagpoles_services/entity/UserActivityLog.java
@@ -1,4 +1,4 @@
-package com.gcc.swm_services.entity;
+package com.gcc.flagpoles_services.entity;
import java.time.LocalDateTime;
import javax.persistence.Entity;
diff --git a/src/main/java/com/gcc/swm_services/entity/UserInfoEntity.java b/src/main/java/com/gcc/flagpoles_services/entity/UserInfoEntity.java
similarity index 97%
rename from src/main/java/com/gcc/swm_services/entity/UserInfoEntity.java
rename to src/main/java/com/gcc/flagpoles_services/entity/UserInfoEntity.java
index aedfe70..ce686d5 100644
--- a/src/main/java/com/gcc/swm_services/entity/UserInfoEntity.java
+++ b/src/main/java/com/gcc/flagpoles_services/entity/UserInfoEntity.java
@@ -1,4 +1,4 @@
-package com.gcc.swm_services.entity;
+package com.gcc.flagpoles_services.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/FlagPoleApiController.java b/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/FlagPoleApiController.java
new file mode 100644
index 0000000..c813574
--- /dev/null
+++ b/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/FlagPoleApiController.java
@@ -0,0 +1,425 @@
+package com.gcc.flagpoles_services.flagpoles.controller;
+
+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.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.client.RestTemplate;
+
+import com.gcc.flagpoles_services.configuration.AppConfig;
+import com.gcc.flagpoles_services.flagpoles.service.FlagpoleSMSService;
+import com.gcc.flagpoles_services.flagpoles.service.RdoService;
+
+@RestController
+@RequestMapping("/flagpoles/api/flagpoleregistration")
+public class FlagPoleApiController {
+
+ @Autowired
+ private RdoService rdoService;
+
+ @Autowired
+ private FlagpoleSMSService flagpoleSMSService;
+
+ private final RestTemplate restTemplate;
+ private final AppConfig appConfig;
+
+ @Autowired
+ public FlagPoleApiController(RestTemplate restTemplate, AppConfig appConfig) {
+ this.restTemplate = restTemplate;
+ this.appConfig = appConfig;
+ }
+
+ // new
+ // @GetMapping("/getAllDetails")
+ // public ResponseEntity getAllRequestDetails(
+ // @RequestParam String userLogin,
+ // @RequestParam(required = false) String startDate,
+ // @RequestParam(required = false) String endDate) {
+
+ // try {
+ // List
> result =
+ // rdoService.getAllRequestDetailsByUserLogin(
+ // userLogin, startDate, endDate);
+
+ // // 🔥 Attach HISTORY per refid
+ // for (Map record : result) {
+ // String refid = (String) record.get("refid");
+
+ // // List> history =
+ // // rdoService.getRequestHistoryByRefId(refid);
+ // List> history =
+ // rdoService.getOfficerFeedbackHistoryByRefId(refid,
+ // userLogin);
+
+ // record.put("history", history);
+ // }
+
+ // return ResponseEntity.ok(
+ // Map.of(
+ // "status", "success",
+ // "count", result.size(),
+ // "data", result));
+
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+ // .body(Map.of(
+ // "status", "error",
+ // "message", "Failed to fetch data",
+ // "error", e.getMessage()));
+ // }
+ // }
+
+ // @GetMapping("/getAllDetails")
+ // public ResponseEntity getAllRequestDetails(
+ // @RequestParam String gccUserId,
+ // @RequestParam(required = false) String startDate,
+ // @RequestParam(required = false) String endDate) {
+
+ // try {
+
+ // // 🔥 Resolve username ONCE (backend trust)
+ // String username = rdoService.getUsernameByUserId(gccUserId);
+ // if (username == null) {
+ // throw new RuntimeException("Invalid gccUserId : " + gccUserId);
+ // }
+
+ // List> result =
+ // rdoService.getAllRequestDetailsByUserLogin(
+ // gccUserId, startDate, endDate);
+
+ // // 🔥 Attach HISTORY per refid (dept-wise)
+ // for (Map record : result) {
+ // String refid = (String) record.get("refid");
+
+ // List> history =
+ // rdoService.getOfficerFeedbackHistoryByRefId(
+ // refid, username);
+
+ // record.put("history", history);
+ // }
+
+ // return ResponseEntity.ok(
+ // Map.of(
+ // "status", "success",
+ // "count", result.size(),
+ // "data", result));
+
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+ // .body(Map.of(
+ // "status", "error",
+ // "message", "Failed to fetch data",
+ // "error", e.getMessage()));
+ // }
+ // }
+
+ @GetMapping("/getAllDetails")
+ public ResponseEntity getAllRequestDetails(
+ @RequestParam String gccUserId,
+ @RequestParam(required = false) String startDate,
+ @RequestParam(required = false) String endDate) {
+
+ try {
+
+ /* 🔥 Normalize input (username OR id → gccuserid) */
+ gccUserId = rdoService.resolveGccUserId(gccUserId);
+
+ List> result = rdoService.getAllRequestDetailsByUserLogin(gccUserId,
+ startDate, endDate);
+
+ /* 🔥 Attach HISTORY per refid */
+ for (Map record : result) {
+
+ String refid = (String) record.get("refid");
+
+ List> history = rdoService.getOfficerFeedbackHistoryByRefId(refid,
+ gccUserId);
+
+ record.put("history", history);
+ }
+
+ return ResponseEntity.ok(
+ Map.of(
+ "status", "success",
+ "count", result.size(),
+ "data", result));
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+ .body(Map.of(
+ "status", "error",
+ "message", "Failed to fetch data",
+ "error", e.getMessage()));
+ }
+ }
+
+ // old
+ // @PostMapping("/rdo/updateDecision")
+ // public ResponseEntity updateRdoDecision(
+ // @RequestParam String refid,
+ // @RequestParam String status,
+ // @RequestParam String remarks,
+ // @RequestParam String approvedBy) {
+
+ // int count = rdoService.updateRdoDecision(refid, status, remarks, approvedBy);
+
+ // if (count > 0) {
+ // return ResponseEntity.ok(Map.of(
+ // "status", "SUCCESS",
+ // "message", "Decision updated successfully"));
+ // } else {
+ // return ResponseEntity.badRequest().body(Map.of(
+ // "status", "FAILED",
+ // "message", "Unable to update decision"));
+ // }
+ // }
+
+ // @PostMapping("/rdo/updateDecision")
+ // public ResponseEntity updateRdoDecision(
+ // @RequestParam String refid,
+ // @RequestParam String status,
+ // @RequestParam String remarks,
+ // @RequestParam String gccUserId) {
+
+ // try {
+
+ // /* 🔥 Normalize username OR id → gccuserid */
+ // gccUserId = rdoService.resolveGccUserId(gccUserId);
+
+ // int count = rdoService.updateRdoDecision(
+ // refid, status, remarks, gccUserId);
+
+ // if (count > 0) {
+ // return ResponseEntity.ok(Map.of(
+ // "status", "SUCCESS",
+ // "message", "Decision updated successfully"));
+ // } else {
+ // return ResponseEntity.badRequest().body(Map.of(
+ // "status", "FAILED",
+ // "message", "Unable to update decision"));
+ // }
+
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+ // .body(Map.of(
+ // "status", "ERROR",
+ // "message", e.getMessage()));
+ // }
+ // }
+
+ @PostMapping("/officer/updateDecision")
+ public ResponseEntity updateOfficerDecision(
+ @RequestParam String refid,
+ @RequestParam String status,
+ @RequestParam String remarks,
+ @RequestParam String gccUserId,
+ @RequestParam String username) {
+
+ try {
+
+ /* 🔥 Normalize username OR id → gccuserid */
+ gccUserId = rdoService.resolveGccUserId(gccUserId);
+
+ int count = rdoService.updateOfficerDecision(
+ refid,
+ status,
+ remarks,
+ gccUserId,
+ username);
+
+ if (count > 0) {
+ return ResponseEntity.ok(Map.of(
+ "status", "SUCCESS",
+ "message", "Decision updated successfully"));
+ } else {
+ return ResponseEntity.badRequest().body(Map.of(
+ "status", "FAILED",
+ "message", "Unable to update decision"));
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+ .body(Map.of(
+ "status", "ERROR",
+ "message", e.getMessage()));
+ }
+ }
+
+ // old
+ // @GetMapping("/getApprovedAndRejectedDetails")
+ // public ResponseEntity getApprovedRequestDetails(
+ // @RequestParam String userLogin,
+ // @RequestParam(required = false) String startDate,
+ // @RequestParam(required = false) String endDate,
+ // @RequestParam(required = false) String status) {
+
+ // try {
+ // List> result =
+ // rdoService.getRdoApprovedRequestDetailsByUserLogin(
+ // userLogin, startDate, endDate, status);
+
+ // return ResponseEntity.ok(
+ // Map.of(
+ // "status", "success",
+ // "count", result.size(),
+ // "data", result));
+
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+ // .body(
+ // Map.of(
+ // "status", "error",
+ // "message", "Failed to fetch data",
+ // "error", e.getMessage()));
+ // }
+ // }
+
+ // new
+ // @GetMapping("/getApprovedAndRejectedDetails")
+ // public ResponseEntity getApprovedRequestDetails(
+ // @RequestParam String userLogin,
+ // @RequestParam(required = false) String startDate,
+ // @RequestParam(required = false) String endDate,
+ // @RequestParam(required = false) String status) {
+
+ // try {
+ // List> result =
+ // rdoService.getRdoApprovedRequestDetailsByUserLogin(
+ // userLogin, startDate, endDate, status);
+
+ // // 🔥 Attach HISTORY per refid
+ // for (Map record : result) {
+ // String refid = (String) record.get("refid");
+
+ // List> history =
+ // rdoService.getRequestHistoryByRefId(refid);
+
+ // record.put("history", history);
+ // }
+
+ // return ResponseEntity.ok(
+ // Map.of(
+ // "status", "success",
+ // "count", result.size(),
+ // "data", result));
+
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+ // .body(Map.of(
+ // "status", "error",
+ // "message", "Failed to fetch data",
+ // "error", e.getMessage()));
+ // }
+ // }
+
+ // @GetMapping("/getApprovedAndRejectedDetails")
+ // public ResponseEntity getApprovedRequestDetails(
+ // @RequestParam String userLogin,
+ // @RequestParam(required = false) String startDate,
+ // @RequestParam(required = false) String endDate) {
+
+ // try {
+ // List> result =
+ // rdoService.getRdoApprovedRequestDetailsByUserLogin(
+ // userLogin, startDate, endDate, null);
+
+ // for (Map record : result) {
+ // String refid = (String) record.get("refid");
+
+ // // 🔥 NEW: officer feedback history
+ // List> history =
+ // rdoService.getOfficerFeedbackHistoryByRefId(refid,
+ // userLogin);
+
+ // record.put("history", history);
+ // }
+
+ // return ResponseEntity.ok(Map.of(
+ // "status", "success",
+ // "count", result.size(),
+ // "data", result));
+
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+ // .body(Map.of(
+ // "status", "error",
+ // "message", "Failed to fetch data",
+ // "error", e.getMessage()));
+ // }
+ // }
+
+ @GetMapping("/getApprovedAndRejectedDetails")
+ public ResponseEntity getApprovedRequestDetails(
+ @RequestParam String gccUserId,
+ @RequestParam(required = false) String startDate,
+ @RequestParam(required = false) String endDate) {
+
+ try {
+
+ /* 🔥 Normalize username OR id → gccuserid */
+ gccUserId = rdoService.resolveGccUserId(gccUserId);
+
+ /* 🔥 Fetch approved & rejected records */
+ List> result = rdoService.getRdoApprovedRequestDetailsByUserLogin(
+ gccUserId, startDate, endDate, null);
+
+ /* 🔥 Attach officer feedback history per refid */
+ for (Map record : result) {
+
+ String refid = (String) record.get("refid");
+
+ List> history = rdoService.getOfficerFeedbackHistoryByRefId(refid,
+ gccUserId);
+
+ record.put("history", history);
+ }
+
+ return ResponseEntity.ok(Map.of(
+ "status", "success",
+ "count", result.size(),
+ "data", result));
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+ .body(Map.of(
+ "status", "error",
+ "message", "Failed to fetch approved/rejected data",
+ "error", e.getMessage()));
+ }
+ }
+
+ @GetMapping("/sendApprovedMessage")
+ public String sendApprovedMessage(@RequestParam String mobileNo,
+ @RequestParam String refid) {
+
+ return flagpoleSMSService.userrequestApprovedsms(mobileNo, refid);
+ }
+
+ @GetMapping("/sendRejectMessage")
+ public String sendRejectMessage(@RequestParam String mobileNo, @RequestParam String refid) {
+ return flagpoleSMSService.userrequestRejectedsms(mobileNo, refid);
+ }
+
+ @GetMapping("/sendUnauthorizedMessage")
+ public String sendUnauthorizedMessage(@RequestParam String mobileNo, @RequestParam String location,
+ @RequestParam String fineAmount, @RequestParam String refid) {
+ return flagpoleSMSService.unauthorizedFlagPoleSms(mobileNo, location, fineAmount, refid);
+ }
+
+}
diff --git a/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/MainController.java b/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/MainController.java
new file mode 100644
index 0000000..b52886b
--- /dev/null
+++ b/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/MainController.java
@@ -0,0 +1,53 @@
+package com.gcc.flagpoles_services.flagpoles.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.gcc.flagpoles_services.service.LoginUserInfo;
+
+@RequestMapping("/flagpoles/list")
+@Controller("flagpolesController")
+public class MainController {
+
+ @GetMapping("/requestlist")
+ public String home(Model model) {
+
+ String LoginUserId = LoginUserInfo.getLoginUserId();
+ model.addAttribute("LoginUserId", LoginUserId);
+
+ String officer_name = LoginUserInfo.getCurrentUserDetails().getUsername();
+ model.addAttribute("officer_name", officer_name);
+
+ String UserRole = LoginUserInfo.getUserRole(); // rdo_north / rdo_central
+ model.addAttribute("UserRole", UserRole);
+
+ return "modules/flagpole/requestlist";
+ }
+
+ @GetMapping("/approvedandrejectedlist")
+ public String batches(Model model) {
+ String LoginUserId = LoginUserInfo.getLoginUserId();
+ model.addAttribute("LoginUserId", LoginUserId);
+ String officer_name = LoginUserInfo.getCurrentUserDetails().getUsername();
+ model.addAttribute("officer_name", officer_name);
+
+ String UserRole = LoginUserInfo.getUserRole();
+ model.addAttribute("UserRole", UserRole);
+ return "modules/flagpole/approvedandrejectedlist";
+ }
+
+ @GetMapping("/reports")
+ public String dataentry(Model model) {
+ String LoginUserId = LoginUserInfo.getLoginUserId();
+ model.addAttribute("LoginUserId", LoginUserId);
+
+ String officer_name = LoginUserInfo.getCurrentUserDetails().getUsername();
+ model.addAttribute("officer_name", officer_name);
+
+ String UserRole = LoginUserInfo.getUserRole();
+ model.addAttribute("UserRole", UserRole);
+ return "modules/flagpole/reports";
+ }
+}
diff --git a/src/main/java/com/gcc/flagpoles_services/flagpoles/service/FlagpoleSMSService.java b/src/main/java/com/gcc/flagpoles_services/flagpoles/service/FlagpoleSMSService.java
new file mode 100644
index 0000000..7b88954
--- /dev/null
+++ b/src/main/java/com/gcc/flagpoles_services/flagpoles/service/FlagpoleSMSService.java
@@ -0,0 +1,248 @@
+package com.gcc.flagpoles_services.flagpoles.service;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.gcc.flagpoles_services.configuration.AppConfig;
+import com.gcc.flagpoles_services.flagpoles.util.MessageUtility;
+
+@Service
+public class FlagpoleSMSService {
+
+ @Autowired
+ private AppConfig appConfig;
+
+ @Autowired
+ private MessageUtility messageUtility;
+
+ private final String key = "pfTEYN6H";
+
+ public String sendBookingSuccesssms(String mobileNo, String requestId) {
+
+ String message = "Your Flag Pole permission request has been submitted successfully. "
+ + "Request ID: " + requestId
+ + ". You will be notified once the status is updated. By GCC";
+
+ // Encode message and fix colon issue (gateway not decoding %3A)
+ String encodedMsg = URLEncoder.encode(message, StandardCharsets.UTF_8)
+ .replace("%3A", ":");
+
+ String urlString = appConfig.getOtpUrl()
+ + "from=GCCCRP"
+ + "&key=" + key
+ + "&sender=GCCCRP"
+ + "&to=" + mobileNo
+ + "&body=" + encodedMsg
+ + "&entityid=1401572690000011081"
+ + "&templateid=1407176959297472163";
+
+ System.out.println("SMS URL:- " + urlString);
+
+ String response = messageUtility.sendSMS(urlString);
+ System.out.println("SMS RESPONSE:- " + response);
+
+ return response;
+ }
+
+ public String userrequestApprovedsms(String mobileNo, String requestId) {
+
+ String message = "Your Flag Pole permission request has been approved. "
+ + "Request ID: " + requestId
+ + ". Please proceed as per the permitted guidelines. By GCC";
+
+ // Encode message and fix colon issue (gateway not decoding %3A)
+ String encodedMsg = URLEncoder.encode(message, StandardCharsets.UTF_8)
+ .replace("%3A", ":");
+
+ String urlString = appConfig.getOtpUrl()
+ + "from=GCCCRP"
+ + "&key=" + key
+ + "&sender=GCCCRP"
+ + "&to=" + mobileNo
+ + "&body=" + encodedMsg
+ + "&entityid=1401572690000011081"
+ + "&templateid=1407176959304753543";
+
+ System.out.println("SMS URL:- " + urlString);
+
+ String response = messageUtility.sendSMS(urlString);
+ System.out.println("SMS RESPONSE:- " + response);
+
+ return response;
+ }
+
+ // public String userrequestRejectedsms(String mobileNo, String requestId) {
+
+ // String message = "Your Flag Pole permission request has been rejected. "
+ // + "Request ID: " + requestId + ". "
+ // + "Review the details in the portal
+ // https://gccservices.in/flagpolesregistration/status\n"
+ // + "By GCC";
+
+ // // ONLY encode. Do NOT replace %3A
+ // String encodedMsg = URLEncoder.encode(message, StandardCharsets.UTF_8);
+
+ // String urlString = appConfig.getOtpUrl()
+ // + "from=GCCCRP"
+ // + "&key=" + key
+ // + "&sender=GCCCRP"
+ // + "&to=" + mobileNo
+ // + "&body=" + encodedMsg
+ // + "&entityid=1401572690000011081"
+ // + "&templateid=1407176959315374790";
+
+ // System.out.println("SMS URL:- " + urlString);
+
+ // String response = messageUtility.sendSMS(urlString);
+ // System.out.println("SMS RESPONSE:- " + response);
+
+ // return response;
+ // }
+
+ public String userrequestRejectedsms(String mobileNo, String requestId) {
+
+ try {
+
+ String url = "https://gccservices.in/flagpolesregistration/status";
+
+ String message = "Your Flag Pole permission request has been rejected. Request ID: " + requestId
+ + ". Review the details in the portal " + url + "\r\nBy GCC";
+
+ String encodedMsg = URLEncoder.encode(message, StandardCharsets.UTF_8);
+
+ String urlString = appConfig.getOtpUrl()
+ + "from=GCCCRP"
+ + "&key=" + key
+ + "&sender=GCCCRP"
+ + "&to=" + mobileNo
+ + "&body=" + encodedMsg
+ + "&entityid=1401572690000011081"
+ + "&templateid=1407176959315374790";
+
+ System.out.println("FINAL SMS URL:- " + urlString);
+
+ URL apiUrl = new URL(urlString);
+ HttpURLConnection conn = (HttpURLConnection) apiUrl.openConnection();
+ conn.setRequestMethod("GET");
+ conn.setConnectTimeout(15000);
+ conn.setReadTimeout(15000);
+
+ BufferedReader in = new BufferedReader(
+ new InputStreamReader(conn.getInputStream()));
+ String inputLine;
+ StringBuilder content = new StringBuilder();
+
+ while ((inputLine = in.readLine()) != null) {
+ content.append(inputLine);
+ }
+
+ in.close();
+ conn.disconnect();
+
+ System.out.println("DIRECT SMS RESPONSE:- " + content.toString());
+
+ return content.toString();
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "FAILED";
+ }
+ }
+
+ // public String unauthorizedFlagPoleSms(String mobileNo,
+ // String location,
+ // String fineAmount,
+ // String requestId) {
+
+ // String message = "An unauthorized flag pole installation was found at " +
+ // location + ". "
+ // + "Fine amount: Rs. " + fineAmount
+ // + " to be paid at
+ // https://gccservices.in/flagpolesregistration/paymentform?requestId="
+ // + requestId + " to avoid further action.\n"
+ // + "By GCC";
+
+ // // Encode full message
+ // String encodedMsg = URLEncoder.encode(message, StandardCharsets.UTF_8);
+
+ // String urlString = appConfig.getOtpUrl()
+ // + "from=GCCCRP"
+ // + "&key=" + key
+ // + "&sender=GCCCRP"
+ // + "&to=" + mobileNo
+ // + "&body=" + encodedMsg
+ // + "&entityid=1401572690000011081"
+ // + "&templateid=1407176959335259899"; // replace with actual template id
+
+ // System.out.println("SMS URL:- " + urlString);
+
+ // String response = messageUtility.sendSMS(urlString);
+ // System.out.println("SMS RESPONSE:- " + response);
+
+ // return response;
+ // }
+
+ public String unauthorizedFlagPoleSms(String mobileNo,
+ String location,
+ String fineAmount,
+ String requestId) {
+
+ try {
+
+ String paymentUrl = "https://gccservices.in/flagpolesregistration/paymentform?requestId="
+ + requestId;
+
+ String message = "An unauthorized flag pole installation was found at " + location + ". "
+ + "Fine amount: Rs. " + fineAmount
+ + " to be paid at " + paymentUrl
+ + " to avoid further action.\r\n"
+ + "By GCC";
+
+ String encodedMsg = URLEncoder.encode(message, StandardCharsets.UTF_8);
+
+ String urlString = appConfig.getOtpUrl()
+ + "from=GCCCRP"
+ + "&key=" + key
+ + "&sender=GCCCRP"
+ + "&to=" + mobileNo
+ + "&body=" + encodedMsg
+ + "&entityid=1401572690000011081"
+ + "&templateid=1407176959335259899";
+
+ System.out.println("FINAL SMS URL:- " + urlString);
+
+ URL apiUrl = new URL(urlString);
+ HttpURLConnection conn = (HttpURLConnection) apiUrl.openConnection();
+ conn.setRequestMethod("GET");
+ conn.setConnectTimeout(15000);
+ conn.setReadTimeout(15000);
+
+ BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+ String inputLine;
+ StringBuilder content = new StringBuilder();
+
+ while ((inputLine = in.readLine()) != null) {
+ content.append(inputLine);
+ }
+
+ in.close();
+ conn.disconnect();
+
+ System.out.println("DIRECT SMS RESPONSE:- " + content.toString());
+
+ return content.toString();
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "FAILED";
+ }
+ }
+
+}
diff --git a/src/main/java/com/gcc/flagpoles_services/flagpoles/service/RdoService.java b/src/main/java/com/gcc/flagpoles_services/flagpoles/service/RdoService.java
new file mode 100644
index 0000000..9fd958b
--- /dev/null
+++ b/src/main/java/com/gcc/flagpoles_services/flagpoles/service/RdoService.java
@@ -0,0 +1,1356 @@
+package com.gcc.flagpoles_services.flagpoles.service;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+import javax.transaction.Transactional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RdoService {
+
+ private JdbcTemplate mysqlAppJdbcTemplate;
+
+ // @Autowired
+ // private WhatsappServiceFlagPole whatsappService;
+
+ @Autowired
+ private FlagpoleSMSService smsService;
+
+ @Autowired
+ public void setMysqlAppJdbcTemplate(
+ @Qualifier("mysqlAppDataSource") DataSource dataSource) {
+ this.mysqlAppJdbcTemplate = new JdbcTemplate(dataSource);
+ }
+
+ private JdbcTemplate mysqlFlagPoleJdbcTemplate;
+
+ @Autowired
+ public void setMysqlFlagPoleJdbcTemplate(
+ @Qualifier("mysqlFlagPoleManagerSystemDataSource") DataSource dataSource) {
+ this.mysqlFlagPoleJdbcTemplate = new JdbcTemplate(dataSource);
+ }
+
+ public Long getAppUserIdByGccUserId(String gccUserId) {
+
+ String sql = """
+ SELECT id
+ FROM appusers
+ WHERE userid = ?
+ AND isactive = 1
+ AND isdelete = 0
+ LIMIT 1
+ """;
+
+ List list = mysqlAppJdbcTemplate.queryForList(sql, Long.class, gccUserId);
+
+ return list.isEmpty() ? null : list.get(0);
+ }
+
+ public Long getAppUserIdByUsername(String username) {
+
+ String sql = """
+ SELECT id
+ FROM appusers
+ WHERE username = ?
+ """;
+
+ return mysqlAppJdbcTemplate.queryForObject(sql, Long.class, username);
+ }
+
+ public String getDepartmentNameByUsername(String username) {
+
+ String sql = """
+ SELECT department_name
+ FROM department_login
+ WHERE user_name = ?
+ AND is_active = 1
+ AND is_delete = 0
+ """;
+
+ List list = mysqlFlagPoleJdbcTemplate.queryForList(sql, String.class, username);
+ return list.isEmpty() ? null : list.get(0);
+ }
+
+ public Integer getDepartmentIdByUsername(String username) {
+
+ String sql = """
+ SELECT dpid
+ FROM department_login
+ WHERE user_name = ?
+ AND is_active = 1
+ AND is_delete = 0
+ """;
+
+ List list = mysqlFlagPoleJdbcTemplate.queryForList(sql, Integer.class, username);
+ return list.isEmpty() ? null : list.get(0);
+ }
+
+ // public List> getOfficerFeedbackHistoryByRefId(
+ // String refid,
+ // String username) {
+
+ // Integer deptId = getDepartmentIdByUsername(username);
+ // String departmentName = getDepartmentNameByUsername(username);
+ // boolean isRdo = isRdoDepartment(departmentName);
+
+ // StringBuilder sql = new StringBuilder("""
+ // SELECT
+ // ofb.refid,
+ // dl.department_name,
+ // ofb.status,
+ // ofb.remarks,
+ // ofb.cby,
+ // DATE_FORMAT(ofb.cdate, '%d-%m-%Y %h:%i %p') AS action_date
+ // FROM officer_feedback ofb
+ // JOIN department_login dl
+ // ON ofb.dept_id = dl.dpid
+ // WHERE ofb.refid = ?
+ // AND ofb.is_active = 1
+ // AND ofb.is_delete = 0
+ // """);
+
+ // List 
\n"
+ "