From 14a1a06f0ab8b8f3604ce343db9f90e31aee43a6 Mon Sep 17 00:00:00 2001 From: AJITHKUMAR12 <48044092+AJITHKUMAR12@users.noreply.github.com> Date: Sat, 1 Aug 2026 10:41:33 +0530 Subject: [PATCH] handled null value for strett name for both public and department --- .../gcc/greencommitte/controller/Apicontroller.java | 6 +++--- .../greencommitte/service/Greencommitteeservice.java | 10 ++++++---- src/main/resources/application.properties | 2 +- .../resources/templates/modules/department/form.html | 4 +++- src/main/resources/templates/modules/public/form.html | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/gcc/greencommitte/controller/Apicontroller.java b/src/main/java/com/gcc/greencommitte/controller/Apicontroller.java index 22fc3ef..2140b67 100644 --- a/src/main/java/com/gcc/greencommitte/controller/Apicontroller.java +++ b/src/main/java/com/gcc/greencommitte/controller/Apicontroller.java @@ -196,7 +196,7 @@ public class Apicontroller { @RequestParam MultipartFile c1image, @RequestParam MultipartFile c2image, @RequestParam String comp_details, - @RequestParam String streetName, + @RequestParam(required = false) String streetName, @RequestParam String source) throws JsonMappingException, JsonProcessingException { ObjectMapper mapper = new ObjectMapper(); @@ -490,7 +490,7 @@ public class Apicontroller { @RequestParam MultipartFile c1image, @RequestParam MultipartFile c2image, @RequestParam String comp_details, - @RequestParam String streetName, + @RequestParam(required = false) String streetName, @RequestParam String source) throws JsonMappingException, JsonProcessingException { @@ -508,7 +508,7 @@ public class Apicontroller { c1imagePath = gcservice.fileUpload(c1image, "comp_image1"); c2imagePath = gcservice.fileUpload(c2image, "comp_image1"); - // System.out.println("======="+latitude+","+longitude); + // System.out.println("address=======" + address); String saveStatus = gcservice.savedeptform(dept_id, dept_name, ph_no, designation, govt_type, address, latitude, longitude, zone, ward, remarks, c1imagePath, c2imagePath, compList, totalTreeCount, streetName, source); diff --git a/src/main/java/com/gcc/greencommitte/service/Greencommitteeservice.java b/src/main/java/com/gcc/greencommitte/service/Greencommitteeservice.java index 2eb8e05..4bb2524 100644 --- a/src/main/java/com/gcc/greencommitte/service/Greencommitteeservice.java +++ b/src/main/java/com/gcc/greencommitte/service/Greencommitteeservice.java @@ -141,6 +141,7 @@ public class Greencommitteeservice { String cby = "public"; String remarksVal = (remarks != null && !remarks.isEmpty()) ? remarks : null; + String streetNameval = (streetName != null && !streetName.isEmpty()) ? streetName : null; String sql = "INSERT INTO reg_details (" + "cby,p_name,ph_no,gender,address,zone,ward,total_trees,remarks,latitude,longitude,source,street_name " @@ -163,7 +164,7 @@ public class Greencommitteeservice { ps.setString(10, latitude); ps.setString(11, longitude); ps.setString(12, source); - ps.setString(13, streetName); + ps.setString(13, streetNameval); return ps; }, keyHolder); // return keyHolder.getKey().intValue(); @@ -209,10 +210,11 @@ public class Greencommitteeservice { String cby = "department"; int deptIdInt = Integer.parseInt(dept_id); - System.out.println("address = " + address); - System.out.println("streetName = " + streetName); + // System.out.println("address = " + address); + // System.out.println("streetName = " + streetName); String remarksVal = (remarks != null && !remarks.isEmpty()) ? remarks : null; + String streetNameval = (streetName != null && !streetName.isEmpty()) ? streetName : null; String sql = "INSERT INTO reg_details (" + "cby,dept_id,dept_name,govt_type,designation,ph_no,address,zone,ward,total_trees,remarks,latitude,longitude,street_name,source " @@ -236,7 +238,7 @@ public class Greencommitteeservice { ps.setString(11, remarksVal); ps.setString(12, latitude); ps.setString(13, longitude); - ps.setString(14, streetName); + ps.setString(14, streetNameval); ps.setString(15, source); return ps; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index da16dc0..b55e125 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,3 +1,3 @@ spring.application.name=greencommitte -spring.profiles.active=dev +spring.profiles.active=prod diff --git a/src/main/resources/templates/modules/department/form.html b/src/main/resources/templates/modules/department/form.html index 8756e3e..21021a5 100644 --- a/src/main/resources/templates/modules/department/form.html +++ b/src/main/resources/templates/modules/department/form.html @@ -1309,7 +1309,9 @@ } formData.set("streetName", streetName); let address = $("#address").val().trim(); - formData.append("address", address) + //formData.append("address", address); + console.log("address"); + console.log(address); formData.append("ph_no", mobnumber); //formData.append("designation",designation); diff --git a/src/main/resources/templates/modules/public/form.html b/src/main/resources/templates/modules/public/form.html index c9fdc7d..74ecf65 100644 --- a/src/main/resources/templates/modules/public/form.html +++ b/src/main/resources/templates/modules/public/form.html @@ -1303,7 +1303,7 @@ //formData.append("address", streetName) formData.set("streetName", streetName); let address = $("#address").val().trim(); - formData.append("address", address) + // formData.append("address", address) formData.append("c1image", c1image);