yoganandhank
/
PGR_Complaints
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Updated controller 

Second changes in controller
master
yoganandhank 3 years ago
parent
35d103a619
commit
fdde5ea2d2
1 changed files with 54 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 99
      contoller/Maincontroller.java

99
contoller/Maincontroller.java
View File

@ -1,24 +1,23 @@
package in.gov.chennaicorporation.gccoffice.pgr.contoller;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
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.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.client.RestTemplate;
import ch.qos.logback.core.recovery.ResilientSyslogOutputStream;
import in.gov.chennaicorporation.gccoffice.configuration.AppConfig;
import in.gov.chennaicorporation.gccoffice.pgr.dto.ComplaintGroup;
import in.gov.chennaicorporation.gccoffice.pgr.dto.ComplaintType;
import in.gov.chennaicorporation.gccoffice.pgr.dto.Department;
import in.gov.chennaicorporation.gccoffice.pgr.dto.DtoAgeAnalysis;
import in.gov.chennaicorporation.gccoffice.pgr.dto.DtoAgeAnalysisDaskboard;
import in.gov.chennaicorporation.gccoffice.pgr.dto.Dtoworeopen;
import in.gov.chennaicorporation.gccoffice.pgr.service.AgeAnalysisComplaintDetails;
import in.gov.chennaicorporation.gccoffice.pgr.service.AgeAnalysisComplaintReports;
import in.gov.chennaicorporation.gccoffice.pgr.service.AgeAnalysisDaskboards;
@ -41,10 +40,11 @@ import in.gov.chennaicorporation.gccoffice.pgr.service.ZonewiseReports;
@Controller("pgrController")
public class Maincontroller {
// private final RestTemplate restTemplate;
// private final AppConfig appConfig;
@Autowired
private RestTemplate restTemplate;
private ZoneWiseDaskboards zonewiseDaskboards;
private ReopenZoneWiseDaskboards reopenzonewiseDaskboards;
private AgeAnalysisDaskboards ageanalysisDaskboards;
@ -61,12 +61,12 @@ public class Maincontroller {
private ZonewiseComplaintDetails zonewisecomplaintDetails;
private ReopenZonewiseComplaintDetails reopenzonewisecomplaintDetails;
private AgeAnalysisComplaintDetails ageanalysisComplaintDetails;
private MobileAgeAnalysisComplaintDetails mobileageanalysisComplaintDetails;
//private MobileAgeAnalysisComplaintDetails mobileageanalysisComplaintDetails;
//private ComplaintTypeService complaintTypeService;
@Autowired
public Maincontroller( RestTemplate restTemplate, AppConfig appConfig,
//ComplaintTypeService complaintTypeService,
ZoneWiseDaskboards zonewiseDaskboards,
ReopenZoneWiseDaskboards reopenzonewiseDaskboards,
AgeAnalysisDaskboards ageanalysisDaskboards,
@ -85,6 +85,7 @@ public class Maincontroller {
/*
* this.restTemplate=restTemplate; this.appConfig=appConfig;
*/
//this.complaintTypeService=complaintTypeService;
this.zonewiseDaskboards=zonewiseDaskboards;
this.reopenzonewiseDaskboards=reopenzonewiseDaskboards;
this.ageanalysisDaskboards=ageanalysisDaskboards;
@ -101,7 +102,7 @@ public class Maincontroller {
this.zonewisecomplaintDetails=zonewisecomplaintDetails;
this.reopenzonewisecomplaintDetails=reopenzonewisecomplaintDetails;
this.ageanalysisComplaintDetails=ageanalysisComplaintDetails;
this.mobileageanalysisComplaintDetails=mobileageanalysisComplaintDetails;
//this.mobileageanalysisComplaintDetails=mobileageanalysisComplaintDetails;
}
@ -112,9 +113,6 @@ public class Maincontroller {
}
//This mapping used for viewing bar and piechart
@GetMapping("/dashboard")
@ -123,32 +121,31 @@ public class Maincontroller {
@RequestParam(required = false) String DEPTID) {
System.out.println("ageanalysislist");
System.out.println("reopenzonewiselist");
// Check if DEPTID is provided (assuming DEPT_NAME is optional)
if (StringUtils.isNotBlank(DEPTID)) {
List<Dtoworeopen> complaintdept= reopenzonewiseDaskboards.getAlldtozwreopen();
List<DtoAgeAnalysisDaskboard> complaintdept1 = ageanalysisDaskboards.getAlldtoageanalysisDaskboard();
// DEPTID is provided, call the query method
if( DEPT_NAME!=null && !DEPT_NAME.isEmpty() && DEPTID!=null && !DEPTID.isEmpty() ) {
List<Map<String, Object>> reopenzonewisedashboardList = reopenzonewiseDaskboards.getReopenZonewisedashboardquery(DEPTID);
List<Map<String, Object>> zonewisedashboardList = zonewiseDaskboards.getzonewisedaskboardQuery(DEPTID);
model.addAttribute("reopenzonewisedashboardList", reopenzonewisedashboardList);
model.addAttribute("zonewisedashboardList", zonewisedashboardList);
}
List<Map<String, Object>> ageanalysisdashboardList = ageanalysisDaskboards.getdashboardquery(DEPT_NAME);
// Check if DEPT_NAME is provided
if (StringUtils.isNotBlank(DEPT_NAME)) {
List<Map<String, Object>> ageanalysisdashboardList = ageanalysisDaskboards.getdashboardquery(DEPT_NAME);
model.addAttribute("ageanalysisdashboardList", ageanalysisdashboardList);
}
model.addAttribute("complaintdept",complaintdept);
model.addAttribute("complaintdept1",complaintdept1);
model.addAttribute("DEPT_NAME", DEPT_NAME);
model.addAttribute("DEPTID", DEPTID);
return "modules/pgr/index";
return "modules/pgr/index";
}
//This mapping used for get all public complaints to view
@GetMapping("/allreportlist")
@ -165,19 +162,27 @@ public class Maincontroller {
System.out.println("type : " + sRptType);
System.out.println("status : " + cbCompStatus);
System.out.println("mode : " + mode);
List<Map<String, Object>> pgrreportlist = new ArrayList<>();
List<ComplaintType> complaintTypes = allReports.getAllComplaintTypes();
List<ComplaintGroup> complaintGroups = allReports.getAllComplaintgroups();
System.out.println("complaintypes:" + complaintTypes);
// Pass the additional parameters to the check method
if(sFrDate!=null && !sFrDate.isEmpty() && sToDate!=null && !sToDate.isEmpty() ) {
pgrreportlist= allReports.check(sFrDate, sToDate, sRptGroup, sRptType, cbCompStatus,mode);
complaintTypes = allReports.getAllComplaintTypes();
complaintGroups = allReports.getAllComplaintgroups();
}
model.addAttribute("pgrreportlist", pgrreportlist);
model.addAttribute("complaintTypes", complaintTypes);
model.addAttribute("complaintGroups", complaintGroups);
model.addAttribute("pgrreportlist", pgrreportlist);
model.addAttribute("sFrDate",sFrDate);
model.addAttribute("sToDate",sToDate);
model.addAttribute("sRptGroup",sRptGroup);
model.addAttribute("sRptType",sRptType==null?0:sRptType);
model.addAttribute("cbCompStatus",cbCompStatus==null?0:cbCompStatus);
model.addAttribute("mode",mode==null?0:mode);
model.addAttribute("sRptType",sRptType);
model.addAttribute("cbCompStatus",cbCompStatus);
model.addAttribute("mode",mode);
return "modules/pgr/allreportlist";
}
@ -185,7 +190,6 @@ public class Maincontroller {
//This mapping used for get to view QAQC reports
@GetMapping("/qaqc")
@ -208,10 +212,6 @@ public class Maincontroller {
}
//This mapping used for to see each zone uisng userIDwise withreopen reports for all public complaints
@GetMapping("/useridwisereport/zonewise")
@ -230,14 +230,18 @@ public class Maincontroller {
System.out.println("deptname : " + DEPT_NAME);
List<Map<String, Object>> zonewiseList = new ArrayList<>();
List<Department> complaintdept= zonewiseReports.getAlldeparments();
if(sFrDate!=null && !sFrDate.isEmpty() && sToDate!=null && !sToDate.isEmpty() && DEPT_NAME!=null && !DEPT_NAME.isEmpty()) {
zonewiseList= zonewiseReports.getZonewise(sFrDate, sToDate,DEPT_NAME);
}
complaintdept = zonewiseReports.getAlldeparments();
}
//List<Map<String, Object>> zonewiseList = zonewiseReports.getZonewise(sFrDate, sToDate,DEPT_NAME);
model.addAttribute("zonewiselist", zonewiseList);
model.addAttribute("complaintdept", complaintdept);
model.addAttribute("sFrDate", sFrDate);
model.addAttribute("sToDate", sToDate);
model.addAttribute("DEPT_NAME", DEPT_NAME);
@ -246,9 +250,6 @@ public class Maincontroller {
}
//This mapping used to see a complaints using in popup message with all details of public who complaint for that problem
@GetMapping("/zonecomplaintlist")
@ -296,9 +297,7 @@ public class Maincontroller {
}
//This mapping used for to see each zone uisng userIDwise without reopen reports for all public complaints
//This mapping used for to see each zone using userIDwise without reopen reports for all public complaints
@GetMapping("/useridwisereport/reopenedzonewise")
public String Reopenzone(Model model,
@ -315,13 +314,15 @@ public class Maincontroller {
List<Map<String, Object>> reopenzonewiseList = new ArrayList<>();
List<Dtoworeopen> complaintdept= reopenzonewiseReports.getAlldtoworeopen();
if(sFrDate!=null && !sFrDate.isEmpty() && sToDate!=null && !sToDate.isEmpty() && DEPT_NAME!=null && !DEPT_NAME.isEmpty()) {
reopenzonewiseList= reopenzonewiseReports.getReopenZonewise(sFrDate, sToDate,DEPT_NAME);
}
complaintdept = reopenzonewiseReports.getAlldtoworeopen();
}
//List<Map<String, Object>> reopenzonewiseList = reopenzonewiseReports.getReopenZonewise();
model.addAttribute("reopenzonewiselist", reopenzonewiseList);
model.addAttribute("complaintdept",complaintdept);
model.addAttribute("sFrDate", sFrDate);
model.addAttribute("sToDate", sToDate);
model.addAttribute("DEPT_NAME", DEPT_NAME);
@ -396,15 +397,17 @@ public class Maincontroller {
System.out.println("deptname : " + DEPT_NAME);
List<Map<String, Object>> ageanalysisList = new ArrayList<>();
List<DtoAgeAnalysis> complaintdept= ageanalysisReports.getAllDtoAgeAnalysis();
if(sFrDate!=null && !sFrDate.isEmpty() && sToDate!=null && !sToDate.isEmpty() && DEPT_NAME!=null && !DEPT_NAME.isEmpty()) {
ageanalysisList= reopenzonewiseReports.getReopenZonewise(sFrDate, sToDate,DEPT_NAME);
}
ageanalysisList= ageanalysisReports.getAgeAnalysiswise(sFrDate, sToDate,DEPT_NAME);
complaintdept=ageanalysisReports.getAllDtoAgeAnalysis();
}
// List<Map<String, Object>> ageanalysisList = ageanalysisReports.getAgeAnalysiswise();
model.addAttribute("ageanalysislist", ageanalysisList);
model.addAttribute("complaintdept",complaintdept);
model.addAttribute("sFrDate", sFrDate);
model.addAttribute("sToDate", sToDate);
model.addAttribute("DEPT_NAME", DEPT_NAME);

Write Preview
Loading…
Cancel
Save