From 79fffbf853338425512bfc92ff3443fcb47fb0ae Mon Sep 17 00:00:00 2001 From: Hariprasath S <113695067+Hariprasath4022@users.noreply.github.com> Date: Fri, 31 Jul 2026 17:07:58 +0530 Subject: [PATCH] Changes in Green committee Complaint nature --- .../configuration/DataSourceConfig.java | 8 ++-- .../controller/GreenCommitteeController.java | 47 +++++++++++++++++++ .../service/GreenCommitteeService.java | 21 +++++++++ 3 files changed, 72 insertions(+), 4 deletions(-) diff --git a/src/main/java/in/gov/chennaicorporation/mobileservice/configuration/DataSourceConfig.java b/src/main/java/in/gov/chennaicorporation/mobileservice/configuration/DataSourceConfig.java index a9ea1a1a..c25849fa 100644 --- a/src/main/java/in/gov/chennaicorporation/mobileservice/configuration/DataSourceConfig.java +++ b/src/main/java/in/gov/chennaicorporation/mobileservice/configuration/DataSourceConfig.java @@ -20,13 +20,13 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableTransactionManagement public class DataSourceConfig { - private static String host = "localhost:3306"; - private static String dbpassword = "root"; +// private static String host = "localhost:3306"; +// private static String dbpassword = "root"; // private static String dbpassword = "gccroot"; // AWS -// private static String host = "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306"; -// private static String dbpassword = "gcc-facial-password"; + private static String host = "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306"; + private static String dbpassword = "gcc-facial-password"; ////////////////////////////// (For GCC APP) //////////////////////// @Configuration diff --git a/src/main/java/in/gov/chennaicorporation/mobileservice/greenCommittee/controller/GreenCommitteeController.java b/src/main/java/in/gov/chennaicorporation/mobileservice/greenCommittee/controller/GreenCommitteeController.java index e776ec4c..082a1769 100644 --- a/src/main/java/in/gov/chennaicorporation/mobileservice/greenCommittee/controller/GreenCommitteeController.java +++ b/src/main/java/in/gov/chennaicorporation/mobileservice/greenCommittee/controller/GreenCommitteeController.java @@ -8,6 +8,8 @@ import java.util.HashMap; import java.util.stream.Collectors; 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; @@ -27,6 +29,51 @@ public class GreenCommitteeController { @Autowired GreenCommitteeService greenCommitteeService; + @GetMapping("/getcompnatureforpublic") + public ResponseEntity getCompNatureForPublic() { + try { + List> list = greenCommitteeService.getCompNatureForPublic(); + + Map response = new HashMap<>(); + response.put("status", "success"); + response.put("data", list); + + return ResponseEntity.ok(response); + + } catch (Exception ex) { + ex.printStackTrace(); + + Map error = new HashMap<>(); + error.put("status", "error"); + error.put("message", ex.getMessage()); + + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error); + } + } + + @GetMapping("/getcompnaturefordept") + public ResponseEntity getCompNatureForDept() { + try { + List> list = greenCommitteeService.getCompNatureForDept(); + + Map response = new HashMap<>(); + response.put("status", "success"); + response.put("data", list); + + return ResponseEntity.ok(response); + + } catch (Exception ex) { + ex.printStackTrace(); + + Map error = new HashMap<>(); + error.put("status", "error"); + error.put("message", ex.getMessage()); + + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error); + } + } + + @GetMapping(value = "/getInspectionBy") public List getInspectionBy( @RequestParam(value = "loginId", required = true) String loginId) { diff --git a/src/main/java/in/gov/chennaicorporation/mobileservice/greenCommittee/service/GreenCommitteeService.java b/src/main/java/in/gov/chennaicorporation/mobileservice/greenCommittee/service/GreenCommitteeService.java index fe903a0b..c5686c89 100644 --- a/src/main/java/in/gov/chennaicorporation/mobileservice/greenCommittee/service/GreenCommitteeService.java +++ b/src/main/java/in/gov/chennaicorporation/mobileservice/greenCommittee/service/GreenCommitteeService.java @@ -201,6 +201,27 @@ public class GreenCommitteeService { return "error"; } } + + + public List> getCompNatureForPublic() { + String sql="SELECT * FROM comp_nature WHERE category='public' AND is_active=1 AND is_delete=0 AND is_not_mobileservice=1"; + try { + return jdbcTemplate.queryForList(sql); + } catch (Exception ex) { + ex.printStackTrace(); + return new ArrayList<>(); // return empty list on error + } + } + + public List> getCompNatureForDept() { + String sql="SELECT * FROM comp_nature WHERE category='dept' AND is_active=1 AND is_delete=0 AND is_not_mobileservice=1"; + try { + return jdbcTemplate.queryForList(sql); + } catch (Exception ex) { + ex.printStackTrace(); + return new ArrayList<>(); // return empty list on error + } + } @Transactional(readOnly = true) public List> getInspectionBy(String userid) {