diff --git a/src/main/java/com/metro/feedback/controller/FeedbackAPIController.java b/src/main/java/com/metro/feedback/controller/FeedbackAPIController.java deleted file mode 100644 index 64c2315..0000000 --- a/src/main/java/com/metro/feedback/controller/FeedbackAPIController.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.metro.feedback.controller; - -import java.util.List; - -import org.hibernate.mapping.Map; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -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.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; - - -@RestController -@RequestMapping("/feedback/api") -public class FeedbackAPIController { - -// @GetMapping("/user") -// public ResponseEntity getUser(@RequestParam String mobile){ -// System.out.println("1 croce "); -// RestTemplate rest =new RestTemplate(); -// -// String s="https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=getProfileNew&serviceinput={Username:"+mobile+"}"; -// System.out.println(s); -// Object forObject = rest.getForObject(s, Object.class); -// return ResponseEntity.ok(forObject); -// } - -// @GetMapping("/deactive") -// public ResponseEntity getDeactive(@RequestParam String mobile){ -// RestTemplate rest =new RestTemplate(); -// -// String s="https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=profileDeactivate&serviceinput={Username:"+mobile+"}"; -// ResponseEntity forEntity = rest.getForEntity(s, Map.class); -// return ResponseEntity.ok(forEntity); -// } - - @GetMapping("/user") - public ResponseEntity getUser(@RequestParam String mobile) { - StringBuilder content = new StringBuilder(); - - try { - String urlString = "https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=getProfileNew&serviceinput={Username:" + mobile + "}"; - - URL url = new URL(urlString); - - URLConnection urlConnection = url.openConnection(); - - try (BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()))) { - String inputLine; - - while ((inputLine = in.readLine()) != null) { - content.append(inputLine); - } - } - } catch (IOException e) { - e.printStackTrace(); - } - - // Convert the content to a JSON object using Jackson - ObjectMapper objectMapper = new ObjectMapper(); - try { - JsonNode jsonNode = objectMapper.readTree(content.toString()); - if(jsonNode==null) { - return ResponseEntity.ok(""); - } - return ResponseEntity.ok(jsonNode); - } catch (IOException e) { - e.printStackTrace(); - return ResponseEntity.status(500).body("Error parsing JSON response"); - } - } - - @GetMapping("/deactive") - public ResponseEntity getDeactive(@RequestParam String mobile){ - StringBuilder content = new StringBuilder(); - - try { - String urlString = "https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=profileDeactivate&serviceinput={Username:"+mobile+"}"; - - URL url = new URL(urlString); - - URLConnection urlConnection = url.openConnection(); - - try (BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()))) { - String inputLine; - - while ((inputLine = in.readLine()) != null) { - content.append(inputLine); - } - } - } catch (IOException e) { - e.printStackTrace(); - } - - // Convert the content to a JSON object using Jackson - ObjectMapper objectMapper = new ObjectMapper(); - try { - JsonNode jsonNode = objectMapper.readTree(content.toString()); - return ResponseEntity.ok(jsonNode); - } catch (IOException e) { - e.printStackTrace(); - return ResponseEntity.status(500).body("Error parsing JSON response"); - } - } - -} diff --git a/src/main/java/com/metro/feedback/controller/FeedbackController.java b/src/main/java/com/metro/feedback/controller/FeedbackController.java deleted file mode 100644 index 289f919..0000000 --- a/src/main/java/com/metro/feedback/controller/FeedbackController.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.metro.feedback.controller; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -@RequestMapping("/support") -@Controller -public class FeedbackController { - @RequestMapping(value={"/",""}) - public String getmypage(){ - return "feedback/RequestForm"; - } -} diff --git a/src/main/java/com/metro/services/ReportService.java b/src/main/java/com/metro/services/ReportService.java index cd5d0b3..89df146 100644 --- a/src/main/java/com/metro/services/ReportService.java +++ b/src/main/java/com/metro/services/ReportService.java @@ -107,29 +107,47 @@ public class ReportService { // "AND TRUNC(CREATE_TIMESTAMP) BETWEEN TRUNC(TO_DATE('"+ getFromdate() +"','dd/mm/yyyy')) " + // "AND TRUNC(TO_DATE('"+ getTodate() +"','dd/mm/yyyy')) " + // "ORDER BY BILL_NO, CREATE_TIMESTAMP"; +// } +// else if(getDatetype().equals("nameTransfer")){ +// System.out.println("Name Transfer......"); +// query="select " + +// "wm.propertyid, n.noticetype, n.noticeno, n.noticedate, wm.application_no, wm.application_date, wm.deed_no, " + +// "wm.deed_date, wm.mobileno, mm.mutation_name, wm.remarks, wm_concat(distinct wfcit.firstname) newowner, wm_concat( distinct c.firstname) oldowner " + +// "from EGPT_WFMUTATION@erp wm " + +// "left outer join EGPT_MUTATION_MASTER@erp mm on wm.id_mutation=mm.id_mutation " + +// "inner join EGPT_REV_TABLE228@erp wt on wt.mutid=wm.id " + +// "left outer join notice@erp n on (n.id_notice=wt.noticeid and n.noticetype='NOTICE9') " + +// "left outer join EGPT_WFMUTATION_OWNER@erp wfmo on wm.id=wfmo.ID_WFMUTATION " + +// "left outer join EGPT_WFCITIZEN@erp wfcit on wfmo.ownerid=wfcit.id " + +// "left outer join EGPT_PROPERTY_MUTATION@erp a on a.id_prop_mutation = wt.prop_mutation " + +// "left outer join egpt_mutation_owner@erp b on b.id_prop_mutation=a.ID_PROP_MUTATION " + +// "left outer join EG_CITIZEN@erp c on b.ownerid=c.citizenid " + +// "where " + +// " n.noticedate >= to_Date('"+ getFromdate() +"', 'dd/mm/yyyy') " + +// "and n.noticedate < to_Date('"+ getTodate() +"', 'dd/mm/yyyy') " + +// "group by wm.propertyid, n.noticetype, n.noticeno, n.noticedate, wm.application_no, wm.application_date, wm.deed_no, " + +// "wm.deed_date, wm.mobileno, mm.mutation_name, wm.remarks " + +// "order by 1"; // } else if(getDatetype().equals("nameTransfer")){ System.out.println("Name Transfer......"); - query="select " + - "wm.propertyid, n.noticetype, n.noticeno, n.noticedate, wm.application_no, wm.application_date, wm.deed_no, " + - "wm.deed_date, wm.mobileno, mm.mutation_name, wm.remarks, wm_concat(distinct wfcit.firstname) newowner, wm_concat( distinct c.firstname) oldowner " + - "from EGPT_WFMUTATION@erp wm " + - "left outer join EGPT_MUTATION_MASTER@erp mm on wm.id_mutation=mm.id_mutation " + - "inner join EGPT_REV_TABLE228@erp wt on wt.mutid=wm.id " + - "left outer join notice@erp n on (n.id_notice=wt.noticeid and n.noticetype='NOTICE9') " + - "left outer join EGPT_WFMUTATION_OWNER@erp wfmo on wm.id=wfmo.ID_WFMUTATION " + - "left outer join EGPT_WFCITIZEN@erp wfcit on wfmo.ownerid=wfcit.id " + - "left outer join EGPT_PROPERTY_MUTATION@erp a on a.id_prop_mutation = wt.prop_mutation " + - "left outer join egpt_mutation_owner@erp b on b.id_prop_mutation=a.ID_PROP_MUTATION " + - "left outer join EG_CITIZEN@erp c on b.ownerid=c.citizenid " + - "where " + - " n.noticedate >= to_Date('"+ getFromdate() +"', 'dd/mm/yyyy') " + - "and n.noticedate < to_Date('"+ getTodate() +"', 'dd/mm/yyyy') " + - "group by wm.propertyid, n.noticetype, n.noticeno, n.noticedate, wm.application_no, wm.application_date, wm.deed_no, " + - "wm.deed_date, wm.mobileno, mm.mutation_name, wm.remarks " + - "order by 1"; + query="select\n" + + "wm.propertyid, n.noticetype, n.noticeno, n.noticedate, wm.application_no, wm.application_date, wm.deed_no,\n" + + "wm.deed_date, wm.mobileno, mm.mutation_name, wm.remarks, wfmo.newowner newowner, a.oldowner oldowner\n" + + "from EGPT_WFMUTATION@erp wm\n" + + "left outer join EGPT_MUTATION_MASTER@erp mm on wm.id_mutation=mm.id_mutation\n" + + "inner join EGPT_REV_TABLE228@erp wt on wt.mutid=wm.id\n" + + "left outer join notice@erp n on (n.id_notice=wt.noticeid and n.noticetype='NOTICE9')\n" + + "left outer join ptis_mutation_new_owner@erp wfmo on wm.id=wfmo.ID_WFMUTATION\n" + + "left outer join ptis_mutation_old_owner@erp a on a.id_prop_mutation = wt.prop_mutation\n" + + "where\n" + + "n.noticedate >= to_Date('"+ getFromdate() +"', 'dd/mm/yyyy')\n" + + "and n.noticedate < to_Date('"+ getTodate() +"', 'dd/mm/yyyy')\n" + +// "and wm.propertyid='05-058-00524-000'\n" + + "group by wm.propertyid, n.noticetype, n.noticeno, n.noticedate, wm.application_no, wm.application_date, wm.deed_no,\n" + + "wm.deed_date, wm.mobileno, mm.mutation_name, wm.remarks,wfmo.newowner,a.oldowner\n" + + "order by wm.propertyid"; } - else if(getDatetype().equals("entries")){ query="SELECT wfp.id, wfp.propertyid, wfp.zone, wfp.divnum, citizen.firstname || citizen.lastname AS citizen_name, wfp.doornumnew, wfp.bndry_street_dmdcalc, wfp.locality, wfp.area, s.value AS application_status, TO_CHAR(wfp.createtimestamp, 'dd/mm/yyyy') createtimestamp, wfp.remarks FROM egpt_wfproperty@erp wfp, EGPT_WFPROPERTY_OWNER@erp owner, EGPT_WFCITIZEN@erp citizen, eg_wf_states@erp s " + "WHERE " + diff --git a/src/main/resources/static/assets/css/dashmix.css b/src/main/resources/static/assets/css/dashmix.css index 157fbde..be41cda 100644 --- a/src/main/resources/static/assets/css/dashmix.css +++ b/src/main/resources/static/assets/css/dashmix.css @@ -2005,7 +2005,7 @@ progress { border-color: var(--bs-table-border-color); } .table > :not(caption) > * > * { - padding: 0.75rem 0.75rem; + /*padding: 0.75rem 0.75rem;*/ background-color: var(--bs-table-bg); border-bottom-width: 1px; box-shadow: inset 0 0 0 9999px var(--bs-table-accent-bg); diff --git a/src/main/resources/static/assets/media/images/ripon2.jpeg b/src/main/resources/static/assets/media/images/ripon2.jpeg new file mode 100644 index 0000000..50e9735 Binary files /dev/null and b/src/main/resources/static/assets/media/images/ripon2.jpeg differ diff --git a/src/main/resources/static/assets/media/images/ripon_building.jpeg b/src/main/resources/static/assets/media/images/ripon_building.jpeg new file mode 100644 index 0000000..50e9735 Binary files /dev/null and b/src/main/resources/static/assets/media/images/ripon_building.jpeg differ diff --git a/src/main/resources/templates/feedback/RequestForm.html b/src/main/resources/templates/feedback/RequestForm.html deleted file mode 100644 index c2ee606..0000000 --- a/src/main/resources/templates/feedback/RequestForm.html +++ /dev/null @@ -1,342 +0,0 @@ - - - - - - - - - GCC Feedback - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - - - - -
- - -
GREATER
- CHENNAI
- CORPORATION
-
- - -
- - -
- - - -
-
-
- -
-
-
- -
- - - -
- -
-
-
-
-

Government of Tamil Nadu

-

தமிழ்நாடு அரசு பெருநகர சென்னை மாநகராட்சி

-
-

Namma Chennai Support

-
-
-
-
- - - - -
-
-
-
-
-
-

New Request Form

-
- -
- -
-
-
- - -
-
-
-
- - -
-
- -
-
-
- - -
- -
- -
-
-
- -
- - -
-
-
- - - - - - - - - - - - - - - - - -