diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/AppConfig.java b/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/AppConfig.java index 8713ac1..afbc28b 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/AppConfig.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/AppConfig.java @@ -10,8 +10,10 @@ import org.springframework.web.client.RestTemplate; public class AppConfig { public String qrAssetFeedback = "http://localhost:8063"; - public String garbageCollection = "http://localhost:8067"; + public String mtm = "http://localhost:8060"; public String petRegistration = "http://117.232.67.158:8061"; + public String garbageCollection = "http://localhost:8067"; + @Bean public RestTemplate restTemplate() { diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/entity/AppUserEntity.java b/src/main/java/in/gov/chennaicorporation/gccoffice/entity/AppUserEntity.java index 0fe197c..3cebdf0 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/entity/AppUserEntity.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/entity/AppUserEntity.java @@ -149,6 +149,5 @@ public class AppUserEntity { public void setcDate(String cDate) { this.cDate = cDate; } - } diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/APIController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/APIController.java new file mode 100644 index 0000000..e477b78 --- /dev/null +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/APIController.java @@ -0,0 +1,108 @@ +package in.gov.chennaicorporation.gccoffice.mtm.controller; + +import javax.servlet.http.HttpSession; + +import org.springframework.beans.factory.annotation.Autowired; +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 org.springframework.web.util.UriComponentsBuilder; + +import in.gov.chennaicorporation.gccoffice.configuration.AppConfig; + +@RequestMapping("/api/mtm") +@RestController("mtmapicontroller") +public class APIController { + private final RestTemplate restTemplate; + private final AppConfig appConfig; + String bodyMessage = ""; + + @Autowired + public APIController(RestTemplate restTemplate, AppConfig appConfig) { + this.restTemplate = restTemplate; + this.appConfig = appConfig; + } + + @GetMapping(value="/setEventId") + public String setEventId(HttpSession session, + @RequestParam("eventid") String eventid){ + if ("0".equals(eventid)) { + session.setAttribute("eventid", null); + }else{ + session.setAttribute("eventid", eventid); + } + + return "success"; + } + + /* + @GetMapping(value = "/dashboard") + public String getFeedbackAssetdetails(@RequestParam String fbId) { + String feedbackId = fbId; + ResponseEntity response = restTemplate.getForEntity(appConfig.qrAssetFeedback+"/api/feedback/{feedbackId}",String.class,feedbackId); + bodyMessage = response.getBody().trim(); + return bodyMessage; + } + */ + + @GetMapping(value = "/getPetitionStatusPublic") + public String getPetitionStatusPublic(@RequestParam String petition_no) { + String baseURL = appConfig.mtm+"/api/getPetitionStatusPublic"; + UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(baseURL) + .queryParam("petition_no", petition_no); + + ResponseEntity response = restTemplate.getForEntity(uriComponentsBuilder.toUriString(),String.class); + bodyMessage = response.getBody().trim(); + return bodyMessage; + } + + @GetMapping(value = "/getComMappingDetailsByPetId") + public String getComMappingDetailsByPetId(@RequestParam String petid) { + String baseURL = appConfig.mtm+"/api/getComMappingDetailsByPetId"; + UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(baseURL) + .queryParam("petid", petid); + + ResponseEntity response = restTemplate.getForEntity(uriComponentsBuilder.toUriString(),String.class); + bodyMessage = response.getBody().trim(); + return bodyMessage; + } + + @GetMapping(value = "/getComMappingActionByMapId") + public String getComMappingActionByMapId(@RequestParam String mapid) { + String baseURL = appConfig.mtm+"/api/getComMappingActionByMapId"; + UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(baseURL) + .queryParam("mapid", mapid); + + ResponseEntity response = restTemplate.getForEntity(uriComponentsBuilder.toUriString(),String.class); + bodyMessage = response.getBody().trim(); + return bodyMessage; + } + + @GetMapping(value = "/petitionFilesBypetitionId") + public String petitionFilesBypetitionId(@RequestParam String pid) { + String baseURL = appConfig.mtm+"/api/petitionFilesBypetitionId"; + UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(baseURL) + .queryParam("pid", pid); + + ResponseEntity response = restTemplate.getForEntity(uriComponentsBuilder.toUriString(),String.class); + bodyMessage = response.getBody().trim(); + return bodyMessage; + } + + + @GetMapping(value = "/viewBlobData") + public String viewBlobData(@RequestParam String id,@RequestParam String table) { + String baseURL = appConfig.mtm+"/api/viewBlobData"; + UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(baseURL) + .queryParam("id", id) + .queryParam("table", table); + + ResponseEntity response = restTemplate.getForEntity(uriComponentsBuilder.toUriString(),String.class); + bodyMessage = response.getBody().trim(); + return bodyMessage; + } + +} diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/MainController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/MainController.java new file mode 100644 index 0000000..271aabc --- /dev/null +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/MainController.java @@ -0,0 +1,46 @@ +package in.gov.chennaicorporation.gccoffice.mtm.controller; + +import java.util.Arrays; +import java.util.List; + +import javax.servlet.http.HttpSession; + +import org.springframework.beans.factory.annotation.Autowired; +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 org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.client.RestTemplate; + +import in.gov.chennaicorporation.gccoffice.configuration.AppConfig; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.Asset; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetCategory; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetCategoryQuestion; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameter; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameterQuestions; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetQuestion; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.Feedback; +import in.gov.chennaicorporation.gccoffice.service.LoginUserInfo; + +@RequestMapping("/mtm") +@Controller("mtmController") +public class MainController { + + private final RestTemplate restTemplate; + private final LoginUserInfo loginUserInfo; + private final AppConfig appConfig; + + @Autowired + public MainController(RestTemplate restTemplate, AppConfig appConfig,LoginUserInfo loginUserInfo) { + this.restTemplate = restTemplate; + this.appConfig = appConfig; + this.loginUserInfo = loginUserInfo; + } + + @GetMapping({"", "/", "/index", "/dashboard"}) + public String home(Model model,HttpSession session) { + session.setAttribute("userName", loginUserInfo.getLoginUserId().toString()); + return "modules/mtm/index"; + } +} \ No newline at end of file diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/MayorController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/MayorController.java new file mode 100644 index 0000000..e54572b --- /dev/null +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/MayorController.java @@ -0,0 +1,163 @@ +package in.gov.chennaicorporation.gccoffice.mtm.controller; + +import java.util.Arrays; +import java.util.List; + +import javax.servlet.http.HttpSession; +import javax.websocket.Session; + +import org.apache.catalina.User; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +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 org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.util.UriComponentsBuilder; + +import in.gov.chennaicorporation.gccoffice.configuration.AppConfig; +import in.gov.chennaicorporation.gccoffice.controller.login; +import in.gov.chennaicorporation.gccoffice.mtm.data.MtmComplaintTypes; +import in.gov.chennaicorporation.gccoffice.mtm.data.MtmEvent; +import in.gov.chennaicorporation.gccoffice.mtm.data.Petition; +import in.gov.chennaicorporation.gccoffice.petregistration.data.RequestList; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.Asset; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetCategory; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetCategoryQuestion; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameter; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameterQuestions; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetQuestion; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.Feedback; +import in.gov.chennaicorporation.gccoffice.service.LoginUserInfo; + +@RequestMapping("/mtm/mayor") +@Controller("mtmMayorController") +public class MayorController { + + private final RestTemplate restTemplate; + private final AppConfig appConfig; + private final LoginUserInfo loginUserInfo; + private final String basePath = "modules/mtm/mayor"; + + @Autowired + public MayorController(RestTemplate restTemplate, AppConfig appConfig, LoginUserInfo loginUserInfo) { + this.restTemplate = restTemplate; + this.loginUserInfo = loginUserInfo; + this.appConfig = appConfig; + } + + @GetMapping({"", "/", "/index", "/dashboard"}) + public String home(Model model) { + return basePath+"/index"; + } + + @GetMapping({"/petition-list"}) + public String showPetitionList(Model model,HttpSession session) { + + String eventid = "0"; + + if(session.getAttribute("eventid")!= null && !session.getAttribute("eventid").equals("0")){ + eventid = session.getAttribute("eventid").toString(); + } + String baseUrl = appConfig.mtm + "/api/mayor/petition-list"; + UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUrl) + .queryParam("mtmid",eventid); + + Petition[] petitionList = restTemplate.getForObject(builder.toUriString(), Petition[].class); + model.addAttribute("petitionlist",petitionList); + + baseUrl = appConfig.mtm + "/api/event-list"; + MtmEvent[] mtmEventsList = restTemplate.getForObject(baseUrl, MtmEvent[].class); + model.addAttribute("mtmEventsList",mtmEventsList); + + baseUrl = appConfig.mtm + "/api/complainttypes"; + MtmComplaintTypes[] mtmComplaintTypesList = restTemplate.getForObject(baseUrl, MtmComplaintTypes[].class); + model.addAttribute("complaintTypesList",mtmComplaintTypesList); + + //System.out.println("Length: "+mtmComplaintTypesList.length); + return basePath+"/petition-list"; + } + + @GetMapping({"/completed-petition-list"}) + public String showCompletedPetitionList(Model model,HttpSession session) { + + String eventid = "0"; + + if(session.getAttribute("eventid")!= null && !session.getAttribute("eventid").equals("0")){ + eventid = session.getAttribute("eventid").toString(); + } + String baseUrl = appConfig.mtm + "/api/mayor/completed-petition-list"; + UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUrl) + .queryParam("mtmid",eventid); + + Petition[] petitionList = restTemplate.getForObject(builder.toUriString(), Petition[].class); + model.addAttribute("petitionlist",petitionList); + + baseUrl = appConfig.mtm + "/api/event-list"; + MtmEvent[] mtmEventsList = restTemplate.getForObject(baseUrl, MtmEvent[].class); + model.addAttribute("mtmEventsList",mtmEventsList); + + baseUrl = appConfig.mtm + "/api/complainttypes"; + MtmComplaintTypes[] mtmComplaintTypesList = restTemplate.getForObject(baseUrl, MtmComplaintTypes[].class); + model.addAttribute("complaintTypesList",mtmComplaintTypesList); + + //System.out.println("Length: "+mtmComplaintTypesList.length); + return basePath+"/completed-petition-list"; + } + + @GetMapping({"/partial-petition-list"}) + public String showPartialPetitionList(Model model,HttpSession session) { + + String eventid = "0"; + + if(session.getAttribute("eventid")!= null && !session.getAttribute("eventid").equals("0")){ + eventid = session.getAttribute("eventid").toString(); + } + String baseUrl = appConfig.mtm + "/api/mayor/partial-petition-list"; + UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUrl) + .queryParam("mtmid",eventid); + + Petition[] petitionList = restTemplate.getForObject(builder.toUriString(), Petition[].class); + model.addAttribute("petitionlist",petitionList); + + baseUrl = appConfig.mtm + "/api/event-list"; + MtmEvent[] mtmEventsList = restTemplate.getForObject(baseUrl, MtmEvent[].class); + model.addAttribute("mtmEventsList",mtmEventsList); + + baseUrl = appConfig.mtm + "/api/complainttypes"; + MtmComplaintTypes[] mtmComplaintTypesList = restTemplate.getForObject(baseUrl, MtmComplaintTypes[].class); + model.addAttribute("complaintTypesList",mtmComplaintTypesList); + + //System.out.println("Length: "+mtmComplaintTypesList.length); + return basePath+"/partial-petition-list"; + } + + @GetMapping({"/pending-petition-list"}) + public String showPendingPetitionList(Model model,HttpSession session) { + + String eventid = "0"; + + if(session.getAttribute("eventid")!= null && !session.getAttribute("eventid").equals("0")){ + eventid = session.getAttribute("eventid").toString(); + } + String baseUrl = appConfig.mtm + "/api/mayor/pending-petition-list"; + UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUrl) + .queryParam("mtmid",eventid); + + Petition[] petitionList = restTemplate.getForObject(builder.toUriString(), Petition[].class); + model.addAttribute("petitionlist",petitionList); + + baseUrl = appConfig.mtm + "/api/event-list"; + MtmEvent[] mtmEventsList = restTemplate.getForObject(baseUrl, MtmEvent[].class); + model.addAttribute("mtmEventsList",mtmEventsList); + + baseUrl = appConfig.mtm + "/api/complainttypes"; + MtmComplaintTypes[] mtmComplaintTypesList = restTemplate.getForObject(baseUrl, MtmComplaintTypes[].class); + model.addAttribute("complaintTypesList",mtmComplaintTypesList); + + //System.out.println("Length: "+mtmComplaintTypesList.length); + return basePath+"/pending-petition-list"; + } +} \ No newline at end of file diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/OfficerController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/OfficerController.java new file mode 100644 index 0000000..59ed38b --- /dev/null +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/OfficerController.java @@ -0,0 +1,46 @@ +package in.gov.chennaicorporation.gccoffice.mtm.controller; + +import java.util.Arrays; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +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 org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.client.RestTemplate; + +import in.gov.chennaicorporation.gccoffice.configuration.AppConfig; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.Asset; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetCategory; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetCategoryQuestion; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameter; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameterQuestions; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetQuestion; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.Feedback; + +@RequestMapping("/mtm/officer") +@Controller("mtmOfficerController") +public class OfficerController { + + private final RestTemplate restTemplate; + private final AppConfig appConfig; + private final String basePath = "modules/mtm/officer"; + + @Autowired + public OfficerController(RestTemplate restTemplate, AppConfig appConfig) { + this.restTemplate = restTemplate; + this.appConfig = appConfig; + } + + @GetMapping({"", "/", "/index", "/dashboard"}) + public String home(Model model) { + return basePath+"/index"; + } + + @GetMapping({"/petition-list"}) + public String showPetitionList(Model model) { + return basePath+"/petition-list"; + } +} \ No newline at end of file diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/package-info.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/package-info.java new file mode 100644 index 0000000..7951d66 --- /dev/null +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/package-info.java @@ -0,0 +1 @@ +package in.gov.chennaicorporation.gccoffice.mtm.controller; \ No newline at end of file diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/MtmComplaintTypes.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/MtmComplaintTypes.java new file mode 100644 index 0000000..895fcd6 --- /dev/null +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/MtmComplaintTypes.java @@ -0,0 +1,83 @@ +package in.gov.chennaicorporation.gccoffice.mtm.data; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameterQuestions.AssetCategory; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameterQuestions.AssetParameter; + +public class MtmComplaintTypes { + private Long complaintTypeId; + private String complaintType; + private Boolean isDelete; + private Boolean isActive; + private Long createdBy; + private String cDate; + + @JsonCreator + public MtmComplaintTypes( + @JsonProperty("complaintTypeId") Long complaintTypeId, + @JsonProperty("complaintType") String complaintType, + @JsonProperty("isDelete") Boolean isDelete, + @JsonProperty("isActive") Boolean isActive, + @JsonProperty("createdBy") Long createdBy, + @JsonProperty("cDate") String cDate + ) { + this.complaintTypeId = complaintTypeId; + this.complaintType = complaintType; + this.isDelete = isDelete; + this.isActive = isActive; + this.createdBy = createdBy; + this.cDate = cDate; + } + + public Long getComplaintTypeId() { + return complaintTypeId; + } + + public void setComplaintTypeId(Long complaintTypeId) { + this.complaintTypeId = complaintTypeId; + } + + public String getComplaintType() { + return complaintType; + } + + public void setComplaintType(String complaintType) { + this.complaintType = complaintType; + } + + public Boolean getIsDelete() { + return isDelete; + } + + public void setIsDelete(Boolean isDelete) { + this.isDelete = isDelete; + } + + public Boolean getIsActive() { + return isActive; + } + + public void setIsActive(Boolean isActive) { + this.isActive = isActive; + } + + public Long getCreatedBy() { + return createdBy; + } + + public void setCreatedBy(Long createdBy) { + this.createdBy = createdBy; + } + + public String getcDate() { + return cDate; + } + + public void setcDate(String cDate) { + this.cDate = cDate; + } + + +} \ No newline at end of file diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/MtmEvent.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/MtmEvent.java new file mode 100644 index 0000000..d1ade56 --- /dev/null +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/MtmEvent.java @@ -0,0 +1,226 @@ +package in.gov.chennaicorporation.gccoffice.mtm.data; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +public class MtmEvent { + private Long mtmId; + private String eventName; + private String eventAddress; + private String eventDate; + private String zone; + private String ackNo; + private Long startPetId; + private Boolean isDelete; + private Boolean isActive; + private Long createdBy; + private String cDate; + private String event_date; + private Long total_petitions; + private Long petitions_completed; + private Long petition_partially_completed; + private Long petitions_pending; + private Long total_compliants; + private Long compliants_completed; + private Long compliants_pending; + + // Constructors, getters, and setters + + @JsonCreator + public MtmEvent( + @JsonProperty("mtmId") Long mtmId, + @JsonProperty("eventName") String eventName, + @JsonProperty("eventAddress") String eventAddress, + @JsonProperty("eventDate") String eventDate, + @JsonProperty("zone") String zone, + @JsonProperty("ackNo") String ackNo, + @JsonProperty("startPetId") Long startPetId, + @JsonProperty("isDelete") Boolean isDelete, + @JsonProperty("isActive") Boolean isActive, + @JsonProperty("createdBy") Long createdBy, + @JsonProperty("cDate") String cDate, + @JsonProperty("event_date") String event_date, + @JsonProperty("total_petitions") Long total_petitions, + @JsonProperty("petitions_completed") Long petitions_completed, + @JsonProperty("petition_partially_completed") Long petition_partially_completed, + @JsonProperty("petitions_pending") Long petitions_pending, + @JsonProperty("total_compliants") Long total_compliants, + @JsonProperty("compliants_completed") Long compliants_completed, + @JsonProperty("compliants_pending") Long compliants_pending + ) { + this.mtmId = mtmId; + this.eventName = eventName; + this.eventAddress = eventAddress; + this.eventDate = eventDate; + this.zone = zone; + this.ackNo = ackNo; + this.startPetId = startPetId; + this.isDelete = isDelete; + this.isActive = isActive; + this.createdBy = createdBy; + this.cDate = cDate; + this.event_date = event_date; + this.total_petitions = total_petitions; + this.petitions_completed = petitions_completed; + this.petition_partially_completed = petition_partially_completed; + this.petitions_pending = petitions_pending; + this.total_compliants = total_compliants; + this.compliants_completed = compliants_completed; + this.compliants_pending = compliants_pending; + } + + public Long getMtmId() { + return mtmId; + } + + public void setMtmId(Long mtmId) { + this.mtmId = mtmId; + } + + public String getEventName() { + return eventName; + } + + public void setEventName(String eventName) { + this.eventName = eventName; + } + + public String getEventAddress() { + return eventAddress; + } + + public void setEventAddress(String eventAddress) { + this.eventAddress = eventAddress; + } + + public String getEventDate() { + return eventDate; + } + + public void setEventDate(String eventDate) { + this.eventDate = eventDate; + } + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public String getAckNo() { + return ackNo; + } + + public void setAckNo(String ackNo) { + this.ackNo = ackNo; + } + + public Long getStartPetId() { + return startPetId; + } + + public void setStartPetId(Long startPetId) { + this.startPetId = startPetId; + } + + public Boolean getIsDelete() { + return isDelete; + } + + public void setIsDelete(Boolean isDelete) { + this.isDelete = isDelete; + } + + public Boolean getIsActive() { + return isActive; + } + + public void setIsActive(Boolean isActive) { + this.isActive = isActive; + } + + public Long getCreatedBy() { + return createdBy; + } + + public void setCreatedBy(Long createdBy) { + this.createdBy = createdBy; + } + + public String getcDate() { + return cDate; + } + + public void setcDate(String cDate) { + this.cDate = cDate; + } + + public String getEvent_date() { + return event_date; + } + + public void setEvent_date(String event_date) { + this.event_date = event_date; + } + + public Long getTotal_petitions() { + return total_petitions; + } + + public void setTotal_petitions(Long total_petitions) { + this.total_petitions = total_petitions; + } + + public Long getPetitions_completed() { + return petitions_completed; + } + + public void setPetitions_completed(Long petitions_completed) { + this.petitions_completed = petitions_completed; + } + + public Long getPetition_partially_completed() { + return petition_partially_completed; + } + + public void setPetition_partially_completed(Long petition_partially_completed) { + this.petition_partially_completed = petition_partially_completed; + } + + public Long getPetitions_pending() { + return petitions_pending; + } + + public void setPetitions_pending(Long petitions_pending) { + this.petitions_pending = petitions_pending; + } + + public Long getTotal_compliants() { + return total_compliants; + } + + public void setTotal_compliants(Long total_compliants) { + this.total_compliants = total_compliants; + } + + public Long getCompliants_completed() { + return compliants_completed; + } + + public void setCompliants_completed(Long compliants_completed) { + this.compliants_completed = compliants_completed; + } + + public Long getCompliants_pending() { + return compliants_pending; + } + + public void setCompliants_pending(Long compliants_pending) { + this.compliants_pending = compliants_pending; + } + + +} + diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/Petition.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/Petition.java new file mode 100644 index 0000000..569ba31 --- /dev/null +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/Petition.java @@ -0,0 +1,475 @@ +package in.gov.chennaicorporation.gccoffice.mtm.data; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameterQuestions.AssetCategory; +import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameterQuestions.AssetParameter; + +public class Petition { + private Long petitionId; + private MtmEvents mtmEvents; + private String petitionNumber; + private String petitionerName; + private String petitionerMobile; + private String petitionerComplaint; + private String petitionerAddress; + private String petitionerPincode; + private String petitionerNatureOfComplaint; + private String tableNo; + private Boolean isDelete; + private Boolean isActive; + private Long createdBy; + private String cDate; + private String status; + private String petitionerComplaint_txt; + + @JsonCreator + public Petition( + @JsonProperty("petitionId") Long petitionId, + @JsonProperty("mtmEvents") MtmEvents mtmEvents, + @JsonProperty("petitionNumber") String petitionNumber, + @JsonProperty("petitionerName") String petitionerName, + @JsonProperty("petitionerMobile") String petitionerMobile, + @JsonProperty("petitionerComplaint") String petitionerComplaint, + @JsonProperty("petitionerAddress") String petitionerAddress, + @JsonProperty("petitionerPincode") String petitionerPincode, + @JsonProperty("petitionerNatureOfComplaint") String petitionerNatureOfComplaint, + @JsonProperty("tableNo") String tableNo, + @JsonProperty("isDelete") Boolean isDelete, + @JsonProperty("isActive") Boolean isActive, + @JsonProperty("createdBy") Long createdBy, + @JsonProperty("cDate") String cDate, + @JsonProperty("status") String status, + @JsonProperty("petitionerComplaint_txt") String petitionerComplaint_txt + ) { + this.petitionId = petitionId; + this.mtmEvents = mtmEvents; + this.petitionNumber = petitionNumber; + this.petitionerName = petitionerName; + this.petitionerMobile = petitionerMobile; + this.petitionerComplaint = petitionerComplaint; + this.petitionerAddress = petitionerAddress; + this.petitionerPincode = petitionerPincode; + this.petitionerNatureOfComplaint = petitionerNatureOfComplaint; + this.tableNo = tableNo; + this.isDelete = isDelete; + this.isActive = isActive; + this.createdBy = createdBy; + this.cDate = cDate; + this.status = status; + this.petitionerComplaint_txt = petitionerComplaint_txt; + } + + + + public Long getPetitionId() { + return petitionId; + } + + + + public void setPetitionId(Long petitionId) { + this.petitionId = petitionId; + } + + + + public MtmEvents getMtmEvents() { + return mtmEvents; + } + + + + public void setMtmEvents(MtmEvents mtmEvents) { + this.mtmEvents = mtmEvents; + } + + + + public String getPetitionNumber() { + return petitionNumber; + } + + + + public void setPetitionNumber(String petitionNumber) { + this.petitionNumber = petitionNumber; + } + + + + public String getPetitionerName() { + return petitionerName; + } + + + + public void setPetitionerName(String petitionerName) { + this.petitionerName = petitionerName; + } + + + + public String getPetitionerMobile() { + return petitionerMobile; + } + + + + public void setPetitionerMobile(String petitionerMobile) { + this.petitionerMobile = petitionerMobile; + } + + + + public String getPetitionerComplaint() { + return petitionerComplaint; + } + + + + public void setPetitionerComplaint(String petitionerComplaint) { + this.petitionerComplaint = petitionerComplaint; + } + + + + public String getPetitionerAddress() { + return petitionerAddress; + } + + + + public void setPetitionerAddress(String petitionerAddress) { + this.petitionerAddress = petitionerAddress; + } + + + + public String getPetitionerPincode() { + return petitionerPincode; + } + + + + public void setPetitionerPincode(String petitionerPincode) { + this.petitionerPincode = petitionerPincode; + } + + + + public String getPetitionerNatureOfComplaint() { + return petitionerNatureOfComplaint; + } + + + + public void setPetitionerNatureOfComplaint(String petitionerNatureOfComplaint) { + this.petitionerNatureOfComplaint = petitionerNatureOfComplaint; + } + + + + public String getTableNo() { + return tableNo; + } + + + + public void setTableNo(String tableNo) { + this.tableNo = tableNo; + } + + + + public Boolean getIsDelete() { + return isDelete; + } + + + + public void setIsDelete(Boolean isDelete) { + this.isDelete = isDelete; + } + + + + public Boolean getIsActive() { + return isActive; + } + + + + public void setIsActive(Boolean isActive) { + this.isActive = isActive; + } + + + + public Long getCreatedBy() { + return createdBy; + } + + + + public void setCreatedBy(Long createdBy) { + this.createdBy = createdBy; + } + + + + public String getcDate() { + return cDate; + } + + + + public void setcDate(String cDate) { + this.cDate = cDate; + } + + + + public String getStatus() { + return status; + } + + + + public void setStatus(String status) { + this.status = status; + } + + + + public String getPetitionerComplaint_txt() { + return petitionerComplaint_txt; + } + + + + public void setPetitionerComplaint_txt(String petitionerComplaint_txt) { + this.petitionerComplaint_txt = petitionerComplaint_txt; + } + + + + // Define the nested classes for mtmEvents + public static class MtmEvents { + private Long mtmId; + private String eventName; + private String eventAddress; + private String eventDate; + private String zone; + private String ackNo; + private Long startPetId; + private Boolean isDelete; + private Boolean isActive; + private Long createdBy; + private String cDate; + private String event_date; + private Long total_petitions; + private Long petitions_completed; + private Long petition_partially_completed; + private Long petitions_pending; + private Long total_compliants; + private Long compliants_completed; + private Long compliants_pending; + + @JsonCreator + public MtmEvents( + @JsonProperty("mtmId") Long mtmId, + @JsonProperty("eventName") String eventName, + @JsonProperty("eventAddress") String eventAddress, + @JsonProperty("eventDate") String eventDate, + @JsonProperty("zone") String zone, + @JsonProperty("ackNo") String ackNo, + @JsonProperty("startPetId") Long startPetId, + @JsonProperty("isDelete") Boolean isDelete, + @JsonProperty("isActive") Boolean isActive, + @JsonProperty("createdBy") Long createdBy, + @JsonProperty("cDate") String cDate, + @JsonProperty("event_date") String event_date, + @JsonProperty("total_petitions") Long total_petitions, + @JsonProperty("petitions_completed") Long petitions_completed, + @JsonProperty("petition_partially_completed") Long petition_partially_completed, + @JsonProperty("petitions_pending") Long petitions_pending, + @JsonProperty("total_compliants") Long total_compliants, + @JsonProperty("compliants_completed") Long compliants_completed, + @JsonProperty("compliants_pending") Long compliants_pending + ) { + this.mtmId = mtmId; + this.eventName = eventName; + this.eventAddress = eventAddress; + this.eventDate = eventDate; + this.zone = zone; + this.ackNo = ackNo; + this.startPetId = startPetId; + this.isDelete = isDelete; + this.isActive = isActive; + this.createdBy = createdBy; + this.cDate = cDate; + this.event_date = event_date; + this.total_petitions = total_petitions; + this.petitions_completed = petitions_completed; + this.petition_partially_completed = petition_partially_completed; + this.petitions_pending = petitions_pending; + this.total_compliants = total_compliants; + this.compliants_completed = compliants_completed; + this.compliants_pending = compliants_pending; + } + + public Long getMtmId() { + return mtmId; + } + + public void setMtmId(Long mtmId) { + this.mtmId = mtmId; + } + + public String getEventName() { + return eventName; + } + + public void setEventName(String eventName) { + this.eventName = eventName; + } + + public String getEventAddress() { + return eventAddress; + } + + public void setEventAddress(String eventAddress) { + this.eventAddress = eventAddress; + } + + public String getEventDate() { + return eventDate; + } + + public void setEventDate(String eventDate) { + this.eventDate = eventDate; + } + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public String getAckNo() { + return ackNo; + } + + public void setAckNo(String ackNo) { + this.ackNo = ackNo; + } + + public Long getStartPetId() { + return startPetId; + } + + public void setStartPetId(Long startPetId) { + this.startPetId = startPetId; + } + + public Boolean getIsDelete() { + return isDelete; + } + + public void setIsDelete(Boolean isDelete) { + this.isDelete = isDelete; + } + + public Boolean getIsActive() { + return isActive; + } + + public void setIsActive(Boolean isActive) { + this.isActive = isActive; + } + + public Long getCreatedBy() { + return createdBy; + } + + public void setCreatedBy(Long createdBy) { + this.createdBy = createdBy; + } + + public String getcDate() { + return cDate; + } + + public void setcDate(String cDate) { + this.cDate = cDate; + } + + public String getEvent_date() { + return event_date; + } + + public void setEvent_date(String event_date) { + this.event_date = event_date; + } + + public Long getTotal_petitions() { + return total_petitions; + } + + public void setTotal_petitions(Long total_petitions) { + this.total_petitions = total_petitions; + } + + public Long getPetitions_completed() { + return petitions_completed; + } + + public void setPetitions_completed(Long petitions_completed) { + this.petitions_completed = petitions_completed; + } + + public Long getPetition_partially_completed() { + return petition_partially_completed; + } + + public void setPetition_partially_completed(Long petition_partially_completed) { + this.petition_partially_completed = petition_partially_completed; + } + + public Long getPetitions_pending() { + return petitions_pending; + } + + public void setPetitions_pending(Long petitions_pending) { + this.petitions_pending = petitions_pending; + } + + public Long getTotal_compliants() { + return total_compliants; + } + + public void setTotal_compliants(Long total_compliants) { + this.total_compliants = total_compliants; + } + + public Long getCompliants_completed() { + return compliants_completed; + } + + public void setCompliants_completed(Long compliants_completed) { + this.compliants_completed = compliants_completed; + } + + public Long getCompliants_pending() { + return compliants_pending; + } + + public void setCompliants_pending(Long compliants_pending) { + this.compliants_pending = compliants_pending; + } + } +} \ No newline at end of file diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/package-info.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/package-info.java new file mode 100644 index 0000000..81f451b --- /dev/null +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/package-info.java @@ -0,0 +1 @@ +package in.gov.chennaicorporation.gccoffice.mtm.data; \ No newline at end of file diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/package-info.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/package-info.java new file mode 100644 index 0000000..a10f360 --- /dev/null +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/package-info.java @@ -0,0 +1 @@ +package in.gov.chennaicorporation.gccoffice.mtm; \ No newline at end of file diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/petregistration/controller/APIController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/petregistration/controller/APIController.java index 030571a..f1ad25d 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/petregistration/controller/APIController.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/petregistration/controller/APIController.java @@ -79,29 +79,4 @@ public class APIController { return bodyMessage; } - // Example Delete after Code complete - @GetMapping(value = "/getFeedbackAssetdetails") - public String getFeedbackAssetdetails(@RequestParam String fbId) { - String feedbackId = fbId; - ResponseEntity response = restTemplate.getForEntity(appConfig.qrAssetFeedback+"/api/feedback/{feedbackId}",String.class,feedbackId); - bodyMessage = response.getBody().trim(); - return bodyMessage; - } - - - @PostMapping(value = "/category/checkbyname") - public int checkByName(@RequestParam("catName") String catName) { - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); - - MultiValueMap params = new LinkedMultiValueMap<>(); - params.add("catName", catName); - - HttpEntity> request = new HttpEntity<>(params, headers); - - ResponseEntity response = restTemplate.postForEntity(appConfig.qrAssetFeedback + "/api/category/checkbyname", request, Integer.class); - - return response.getBody(); - } - } diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/qrassetfeedback/package-info.java b/src/main/java/in/gov/chennaicorporation/gccoffice/qrassetfeedback/package-info.java new file mode 100644 index 0000000..81d46e7 --- /dev/null +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/qrassetfeedback/package-info.java @@ -0,0 +1 @@ +package in.gov.chennaicorporation.gccoffice.qrassetfeedback; \ No newline at end of file