Changes in roadwar register form

gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/WhatsappController.java

@@ -92,7 +92,7 @@ public class WhatsappController {
 			
 	        if("COMPLETED".equalsIgnoreCase(returnedAction)) {
 	      		 
-				urlString="https://sendapiv1.pinbot.ai/pinwa/sendMessage?apikey=5c995535-6244-11f0-98fc-02c8a5e042bd&from=919445061913&to="+mobile+"&templateid=3304034&type=template&placeholders="+placeholders;
+				urlString="https://sendapiv1.pinbot.ai/pinwa/sendMessage?apikey=5c995535-6244-11f0-98fc-02c8a5e042bd&from=919445061913&to="+mobile+"&templateid=3310383&type=template&placeholders="+placeholders;
 				
 	    	}
         	

gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/Maincontroller.java

@@ -27,4 +27,16 @@ public class Maincontroller {
 		return "modules/roadwar/regform";
 	}
 	
+	
+	@GetMapping("/updateform")
+	public String updateForm(Model model) {
+		String LoginUserId = LoginUserInfo.getLoginUserId();
+		model.addAttribute("LoginUserId", LoginUserId);
+
+		String UserRole = LoginUserInfo.getUserRole();
+		model.addAttribute("UserRole", UserRole);
+
+		return "modules/roadwar/updateform";
+	}
+	
 }

gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/RegisterApiController.java

@@ -6,7 +6,11 @@ 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.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -61,4 +65,129 @@ public class RegisterApiController {
 
 	    return response;
 	}
+	
+	
+	
+	@GetMapping("/getRoadNamesByWard")
+	public Map<String, Object> getRoadNamesByWard(@RequestParam String ward) {
+		Map<String, Object> response = new HashMap<>();
+		List<Map<String, Object>> roads = registerService.getRoadNamesByWard(ward);
+		if (!roads.isEmpty()) {
+			response.put("status", true);
+			response.put("message", "Road names fetched successfully");
+			response.put("data", roads);
+		} else {
+			response.put("status", false);
+			response.put("message", "No roads found for ward: " + ward);
+			response.put("data", Collections.emptyList());
+		}
+		return response;
+	}
+	
+	
+	@GetMapping("/getRoadType")
+	public Map<String, Object> getRoadType() {
+		Map<String, Object> response = new HashMap<>();
+		List<Map<String, Object>> roadTypes = registerService.getRoadType();
+		if (!roadTypes.isEmpty()) {
+			response.put("status", true);
+			response.put("message", "Road types fetched successfully");
+			response.put("data", roadTypes);
+		} else {
+			response.put("status", false);
+			response.put("message", "No road types found");
+			response.put("data", Collections.emptyList());
+		}
+		return response;
+	}
+	
+	
+	
+	@GetMapping("/getMonthList")
+	public Map<String, Object> getMonthList() {
+		Map<String, Object> response = new HashMap<>();
+		List<Map<String, Object>> months = registerService.getMonthList();
+		if (!months.isEmpty()) {
+			response.put("status", true);
+			response.put("message", "Month list fetched successfully");
+			response.put("data", months);
+		} else {
+			response.put("status", false);
+			response.put("message", "No months found");
+			response.put("data", Collections.emptyList());
+		}
+		return response;
+	}
+	
+	
+	
+	@GetMapping("/getYearList")
+	public Map<String, Object> getYearList() {
+		Map<String, Object> response = new HashMap<>();
+		List<Map<String, Object>> years = registerService.getYearList();
+		if (!years.isEmpty()) {
+			response.put("status", true);
+			response.put("message", "Year list fetched successfully");
+			response.put("data", years);
+		} else {
+			response.put("status", false);
+			response.put("message", "No Year found");
+			response.put("data", Collections.emptyList());
+		}
+		return response;
+	}
+	
+	
+	@PostMapping("/saveRoadWarDetails")
+	public Map<String, Object> saveRoadWarDetails(@RequestBody Map<String, Object> payload) {
+		return registerService.saveRoadWarDetails(payload);
+	}
+	
+	
+	@GetMapping("/getAllRoadWarDetails")
+	public ResponseEntity<?> getAllRoadWarDetails(
+	        @RequestParam(required = false) String zone,
+	        @RequestParam(required = false) String ward,
+	        @RequestParam(required = false) String roadName) {
+
+	    try {
+
+	        List<Map<String, Object>> response =
+	        		registerService.getAllRoadWarDetails(zone, ward, roadName);
+
+	        return ResponseEntity.ok(response);
+
+	    } catch (Exception e) {
+
+	        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+	                .body(Collections.singletonMap("error",
+	                        "Failed to fetch data : " + e.getMessage()));
+	    }
+	}
+	
+	
+	
+	@GetMapping("/getRoadWarDetailsById")
+	public ResponseEntity<?> getRoadWarDetailsById(
+	        @RequestParam String refid) {
+
+	    try {
+
+	        Map<String, Object> response =
+	                registerService.getRoadWarDetailsById(refid);
+
+	        return ResponseEntity.ok(response);
+
+	    } catch (Exception e) {
+
+	        Map<String, Object> error = new HashMap<>();
+	        error.put("status", false);
+	        error.put("message", "Failed to fetch data : " + e.getMessage());
+
+	        return ResponseEntity
+	                .status(HttpStatus.INTERNAL_SERVER_ERROR)
+	                .body(error);
+	    }
+	}
+	
 }

gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/service/RegisterService.java

@@ -1,6 +1,13 @@
 package in.gov.chennaicorporation.gccoffice.roadwar.service;
 
+import java.net.URI;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -10,7 +17,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementCreator;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Service
 public class RegisterService {
@@ -21,6 +35,8 @@ public class RegisterService {
 	@Autowired
 	private  Environment environment;
 	
+	 
+	
 	@Autowired
 	public void setDataSource(@Qualifier("mysqlRoadWarDataSource") DataSource dataSource) {
 		this.jdbcTemplate = new JdbcTemplate(dataSource);
@@ -54,5 +70,249 @@ public class RegisterService {
 	}
 	
 	
+	public List<Map<String, Object>> getRoadNamesByWard(String ward) {
+		try {
+			String encodedWard = URLEncoder.encode("'" + ward + "'", StandardCharsets.UTF_8.toString());
+			String url = "https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/FeatureServer/0/query"
+					+ "?where=new_ward%3D" + encodedWard
+					+ "&outFields=road_id%2Croad_name"
+					+ "&returnGeometry=false"
+					+ "&f=geojson";
+
+			RestTemplate restTemplate = new RestTemplate();
+			String responseBody = restTemplate.getForObject(URI.create(url), String.class);
+
+			ObjectMapper objectMapper = new ObjectMapper();
+			JsonNode root = objectMapper.readTree(responseBody);
+			JsonNode features = root.path("features");
+
+			List<Map<String, Object>> roadList = new ArrayList<>();
+			if (features.isArray()) {
+				for (JsonNode feature : features) {
+					JsonNode props = feature.path("properties");
+					Map<String, Object> roadInfo = new HashMap<>();
+					roadInfo.put("road_id",   props.path("road_id").asText());
+					roadInfo.put("road_name", props.path("road_name").asText());
+					roadList.add(roadInfo);
+				}
+			}
+			return roadList;
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Collections.emptyList();
+		}
+	}
+	
+	
+	
+	public List<Map<String, Object>> getRoadType() {
+		String sql = "Select id,road_type as roadType from road_type_master where is_active = 1 and is_delete = 0";
+		try {
+			return jdbcTemplate.queryForList(sql);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Collections.emptyList();
+		}
+	}
+	
+	
+	public List<Map<String, Object>> getMonthList() {
+		String sql = "SELECT id, month_name FROM month_master WHERE is_active = 1 AND is_delete = 0 ORDER BY id";
+		try {
+			return jdbcTemplate.queryForList(sql);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Collections.emptyList();
+		}
+	}
+	
+	
+	public List<Map<String, Object>> getYearList() {
+		String sql = "SELECT id, year_name FROM year_master WHERE is_active = 1 AND is_delete = 0 ORDER BY id DESC";
+		try {
+			return jdbcTemplate.queryForList(sql);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Collections.emptyList();
+		}
+	}
+	
+	
+	public Map<String, Object> saveRoadWarDetails(Map<String, Object> payload) {
+		Map<String, Object> result = new HashMap<>();
+		try {
+
+			String insertRoad = "INSERT INTO road_details_master "
+					+ "(zone, ward, road_name, road_type,  road_length, road_avg_width, road_area, "
+					+ " footpath_material, footpath_length, footpath_width, footpath_from_location, footpath_to_location, "
+					+ " is_swd, swd_from, swd_to, swd_length, swd_size, "
+					+ " is_scp, scp_count, is_manhole, manhole_count, manhole_location, "
+					+ " is_cpipe, cpipe_count, is_rwh, rwh_count, "
+					+ " sewer_length, sewer_size, "
+					+ " is_electric_poles, ep_count, is_hml, culvert_bridge_count, details, "
+					+ " is_busshelter, busshelter_count, is_centermedian, erp_asset_code, cby,road_id) "
+					+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+			KeyHolder keyHolder = new GeneratedKeyHolder();
+
+			jdbcTemplate.update((PreparedStatementCreator) con -> {
+				var ps = con.prepareStatement(insertRoad, new String[] { "id" });
+				ps.setObject(1, payload.get("zone"));
+				ps.setObject(2, payload.get("ward"));
+				ps.setObject(3, payload.get("road_name"));
+				ps.setObject(4, payload.get("road_type"));
+//				ps.setObject(5, payload.get("highway_ans"));
+				ps.setObject(5, payload.get("road_length"));
+				ps.setObject(6, payload.get("road_avg_width"));
+				ps.setObject(7, payload.get("road_area"));
+				ps.setObject(8, payload.get("footpath_material"));
+				ps.setObject(9, payload.get("footpath_length"));
+				ps.setObject(10, payload.get("footpath_width"));
+				ps.setObject(11, payload.get("footpath_from_location"));
+				ps.setObject(12, payload.get("footpath_to_location"));
+				ps.setObject(13, payload.get("is_swd"));
+				ps.setObject(14, payload.get("swd_from"));
+				ps.setObject(15, payload.get("swd_to"));
+				ps.setObject(16, payload.get("swd_length"));
+				ps.setObject(17, payload.get("swd_size"));
+				ps.setObject(18, payload.get("is_scp"));
+				ps.setObject(19, payload.get("scp_count"));
+				ps.setObject(20, payload.get("is_manhole"));
+				ps.setObject(21, payload.get("manhole_count"));
+				ps.setObject(22, payload.get("manhole_location"));
+				ps.setObject(23, payload.get("is_cpipe"));
+				ps.setObject(24, payload.get("cpipe_count"));
+				ps.setObject(25, payload.get("is_rwh"));
+				ps.setObject(26, payload.get("rwh_count"));
+				ps.setObject(27, payload.get("sewer_length"));
+				ps.setObject(28, payload.get("sewer_size"));
+				ps.setObject(29, payload.get("is_electric_poles"));
+				ps.setObject(30, payload.get("ep_count"));
+				ps.setObject(31, payload.get("is_hml"));
+				ps.setObject(32, payload.get("culvert_bridge_count"));
+				ps.setObject(33, payload.get("details"));
+				ps.setObject(34, payload.get("is_busshelter"));
+				ps.setObject(35, payload.get("busshelter_count"));
+				ps.setObject(36, payload.get("is_centermedian"));
+				ps.setObject(37, payload.get("erp_asset_code"));
+				ps.setObject(38, payload.get("cby"));
+				ps.setObject(39, payload.get("road_id"));
+				return ps;
+			}, keyHolder);
+
+			long generatedId = keyHolder.getKey().longValue();
+			String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("ddMMYYYY"));
+			String refId = datePrefix + generatedId;
+
+			jdbcTemplate.update(
+					"UPDATE road_details_master SET ref_id = ? WHERE id = ?",
+					refId, generatedId);
+
+			List<Map<String, Object>> relayingList = (List<Map<String, Object>>) payload.get("relaying_details");
+
+			if (relayingList != null && !relayingList.isEmpty()) {
+				String insertRelay = "INSERT INTO relaying_details "
+						+ "(road_ref_id, relay_month, relay_year, cr_value, road_type, remarks, cby) "
+						+ "VALUES (?,?,?,?,?,?,?)";
+
+				for (Map<String, Object> relay : relayingList) {
+					jdbcTemplate.update(insertRelay,
+							refId,
+							relay.get("relay_month"),
+							relay.get("relay_year"),
+							relay.get("cr_value"),
+							relay.get("road_type"),
+							relay.get("remarks"),
+							payload.get("cby"));
+				}
+			}
+
+			result.put("status", true);
+			result.put("message", "Road war details saved successfully");
+			result.put("ref_id", refId);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			result.put("status", false);
+			result.put("message", "Failed to save road war details: " + e.getMessage());
+		}
+		return result;
+	}
+	
+	
+	
+	public List<Map<String, Object>> getAllRoadWarDetails(
+	        String zone,
+	        String ward,
+	        String roadName) {
+
+	    StringBuilder sql = new StringBuilder(" SELECT rdm.*,rtm.road_type as road_type_name  FROM road_details_master rdm " +
+	    										" LEFT JOIN road_type_master rtm ON rtm.id= rdm.road_type " +
+	    										" WHERE 1=1 ");
+
+	    List<Object> params = new ArrayList<>();
+
+	    if (zone != null && !zone.isEmpty()) {
+	        sql.append(" AND rdm.zone = ?");
+	        params.add(zone);
+	    }
+
+	    if (ward != null && !ward.isEmpty()) {
+	        sql.append(" AND rdm.ward = ?");
+	        params.add(ward);
+	    }
+
+	    if (roadName != null && !roadName.isEmpty()) {
+	        sql.append(" AND rdm.road_name = ?");
+	        params.add(roadName);
+	    }
+	    
+	    sql.append(" AND rdm.is_active=1 AND rdm.is_delete=0 ");
+
+	    sql.append(" ORDER BY rdm.id DESC");
+
+	    return jdbcTemplate.queryForList(sql.toString(), params.toArray());
+	}
+
+	
+	public Map<String, Object> getRoadWarDetailsById(String refid) {
+
+	    Map<String, Object> result = new HashMap<>();
+
+	    try {
+
+	        String sql =
+	                "SELECT rdm.*, rtm.road_type As road_type_name " +
+	                "FROM road_details_master rdm " +
+	                "LEFT JOIN road_type_master rtm ON rtm.id = rdm.road_type " +
+	                "WHERE rdm.ref_id = ? AND rdm.is_active=1 AND rdm.is_delete=0  ";
+
+	        Map<String, Object> road =
+	                jdbcTemplate.queryForMap(sql, refid);
+
+	        result.putAll(road);
+
+	        List<Map<String, Object>> relayingDetails =
+	                jdbcTemplate.queryForList(
+	                        " SELECT rd.*,mm.month_name,ym.year_name "
+	                        + " FROM relaying_details rd "
+	                        + " LEFT JOIN month_master mm on mm.id = rd.relay_month "
+	                        + " LEFT JOIN year_master ym on ym.id = rd.relay_year "
+	                        + " WHERE rd.road_ref_id = ? AND rd.is_active=1 AND rd.is_delete=0  ",
+	                        refid);
+
+	        result.put("relayingDetails", relayingDetails);
+	        result.put("status", true);
+
+	    } catch (Exception e) {
+
+	        result.put("status", false);
+	        result.put("message", e.getMessage());
+
+	    }
+
+	    return result;
+	}
 	
 }

gcc_officer_portal/src/main/resources/templates/modules/callcenterqaqc/agentqaqccalls.html

@@ -781,9 +781,9 @@
             	    	$('.submitid').prop('disabled', false).text('Submit');
             	    	// Trigger WhatsApp message functions based on action
            	               	              	    	
-/*                 	    if (action === "UNATTENDED" || action === "COMPLETED" ) {               	    	
+                 	    if (action === "UNATTENDED" || action === "COMPLETED" ) {               	    	
                 	    	checkforUnattendedwhatsappmsg(complaintNumber,action,complaintTypeName,cellnumber,name);               	    	
-                	    } */           	    	
+                	    }           	    	
                 	    
             	    }            	   
             	    else{