Browse Source

getDrainReport Query changed

master
KaNi-04 2 months ago
parent
commit
20bdcd7826
  1. 1324
      src/main/java/in/gov/chennaicorporation/mobileservice/manhole/service/ManHoleActivity.java
  2. 88
      src/main/java/in/gov/chennaicorporation/mobileservice/penalty/controller/APIPenaltyControllerPOS.java

1324
src/main/java/in/gov/chennaicorporation/mobileservice/manhole/service/ManHoleActivity.java
File diff suppressed because it is too large
View File

88
src/main/java/in/gov/chennaicorporation/mobileservice/penalty/controller/APIPenaltyControllerPOS.java

@ -20,44 +20,42 @@ import in.gov.chennaicorporation.mobileservice.penalty.service.PenaltyServicePOS
public class APIPenaltyControllerPOS { public class APIPenaltyControllerPOS {
@Autowired @Autowired
private PenaltyServicePOS penaltyServicePOS; private PenaltyServicePOS penaltyServicePOS;
@GetMapping(value="/getPenaltyDepartment")
@GetMapping(value = "/getPenaltyDepartment")
public List<Map<String, Object>> getPenaltyDepartment( public List<Map<String, Object>> getPenaltyDepartment(
@RequestParam(value = "loginId", required = false) String loginId
) {
return penaltyServicePOS.getPenaltyDepartment();
}
@GetMapping(value="/getPenaltytypes")
@RequestParam(value = "loginId", required = false) String loginId) {
return penaltyServicePOS.getPenaltyDepartment();
}
@GetMapping(value = "/getPenaltytypes")
public List<Map<String, Object>> getPenaltyTypes( public List<Map<String, Object>> getPenaltyTypes(
@RequestParam(value = "departmentId", required = false) String departmentId, @RequestParam(value = "departmentId", required = false) String departmentId,
@RequestParam(value = "loginId", required = false) String loginId) { @RequestParam(value = "loginId", required = false) String loginId) {
return penaltyServicePOS.getPenaltyTypeList(departmentId);
}
@GetMapping(value="/getPenaltyAmount")
return penaltyServicePOS.getPenaltyTypeList(departmentId);
}
@GetMapping(value = "/getPenaltyAmount")
public List<Map<String, Object>> getPenaltyAmount( public List<Map<String, Object>> getPenaltyAmount(
@RequestParam(value = "categoryId", required = false) String categoryId, @RequestParam(value = "categoryId", required = false) String categoryId,
@RequestParam(value = "ton", required = false) String ton, @RequestParam(value = "ton", required = false) String ton,
@RequestParam(value = "loginId", required = false) String loginId
) {
return penaltyServicePOS.getPenaltyAmount(categoryId,ton);
}
@GetMapping(value="/getOfflineModeTypes")
@RequestParam(value = "loginId", required = false) String loginId) {
return penaltyServicePOS.getPenaltyAmount(categoryId, ton);
}
@GetMapping(value = "/getOfflineModeTypes")
public List<Map<String, Object>> getOfflineModeTypes() { public List<Map<String, Object>> getOfflineModeTypes() {
return penaltyServicePOS.getOfflineModeTypes();
}
@GetMapping(value="/getBankList")
return penaltyServicePOS.getOfflineModeTypes();
}
@GetMapping(value = "/getBankList")
public List<Map<String, Object>> getBankList() { public List<Map<String, Object>> getBankList() {
return penaltyServicePOS.getBankList();
}
@PostMapping(value="/generateChallanPOS")
return penaltyServicePOS.getBankList();
}
@PostMapping(value = "/generateChallanPOS")
public List<?> generateChallan(@RequestParam MultiValueMap<String, String> formData, public List<?> generateChallan(@RequestParam MultiValueMap<String, String> formData,
@RequestParam(value = "categoryId", required = false) String categoryId,
@RequestParam(value = "latitude", required = false) String latitude,
@RequestParam(value = "categoryId", required = false) String categoryId,
@RequestParam(value = "latitude", required = false) String latitude,
@RequestParam(value = "longitude", required = false) String longitude, @RequestParam(value = "longitude", required = false) String longitude,
@RequestParam(value = "zone", required = false) String zone, @RequestParam(value = "zone", required = false) String zone,
@RequestParam(value = "ward", required = false) String ward, @RequestParam(value = "ward", required = false) String ward,
@ -70,26 +68,25 @@ public class APIPenaltyControllerPOS {
@RequestParam(value = "tid", required = false) String tid, @RequestParam(value = "tid", required = false) String tid,
@RequestParam(value = "mid", required = false) String mid, @RequestParam(value = "mid", required = false) String mid,
@RequestParam(value = "serialNumber", required = false) String serialNumber, @RequestParam(value = "serialNumber", required = false) String serialNumber,
@RequestParam(value = "file", required = false) MultipartFile file
) {
@RequestParam(value = "file", required = false) MultipartFile file) {
return penaltyServicePOS.generateChallanPOS(formData, categoryId, latitude, longitude, zone, ward, return penaltyServicePOS.generateChallanPOS(formData, categoryId, latitude, longitude, zone, ward,
loginId, violatorName, violatorPhone, violatorCompany, ton, amount, tid, mid, serialNumber, file); loginId, violatorName, violatorPhone, violatorCompany, ton, amount, tid, mid, serialNumber, file);
} }
@PostMapping("/storeBankTransaction") @PostMapping("/storeBankTransaction")
public List<?> storeBankTransaction(@RequestBody Map<String, Object> transactionData) {
return penaltyServicePOS.storeBankTransaction(transactionData);
}
public List<?> storeBankTransaction(@RequestBody Map<String, Object> transactionData) {
return penaltyServicePOS.storeBankTransaction(transactionData);
}
@PostMapping("/storeFailedBankTransaction") @PostMapping("/storeFailedBankTransaction")
public List<?> storeFailedBankTransaction(@RequestBody Map<String, Object> transactionData) {
return penaltyServicePOS.storeFailedBankTransaction(transactionData);
}
@PostMapping(value="/storeOfflineTransaction")
public List<?> storeFailedBankTransaction(@RequestBody Map<String, Object> transactionData) {
return penaltyServicePOS.storeFailedBankTransaction(transactionData);
}
@PostMapping(value = "/storeOfflineTransaction")
public List<?> generateOfflineChallan(@RequestParam MultiValueMap<String, String> formData, public List<?> generateOfflineChallan(@RequestParam MultiValueMap<String, String> formData,
@RequestParam(value = "transactionResponseStatus", required = false) String transactionResponseStatus,
@RequestParam(value = "bankName", required = false) String bankName,
@RequestParam(value = "transactionResponseStatus", required = false) String transactionResponseStatus,
@RequestParam(value = "bankName", required = false) String bankName,
@RequestParam(value = "transactionAmount", required = false) String transactionAmount, @RequestParam(value = "transactionAmount", required = false) String transactionAmount,
@RequestParam(value = "txnDate", required = false) String txnDate, @RequestParam(value = "txnDate", required = false) String txnDate,
@RequestParam(value = "txnTime", required = false) String txnTime, @RequestParam(value = "txnTime", required = false) String txnTime,
@ -99,8 +96,9 @@ public class APIPenaltyControllerPOS {
@RequestParam(value = "extraInfo3", required = false) String extraInfo3, @RequestParam(value = "extraInfo3", required = false) String extraInfo3,
@RequestParam(value = "txnMode", required = false) String txnMode, @RequestParam(value = "txnMode", required = false) String txnMode,
@RequestParam(value = "txnId", required = false) String txnId, @RequestParam(value = "txnId", required = false) String txnId,
@RequestParam(value = "file", required = false) MultipartFile file
) {
return penaltyServicePOS.storeOfflineTransaction(formData, transactionResponseStatus, bankName, transactionAmount, txnDate, txnTime,branchname,extraInfo,extraInfo2,extraInfo3,txnMode,txnId,file);
@RequestParam(value = "file", required = false) MultipartFile file) {
return penaltyServicePOS.storeOfflineTransaction(formData, transactionResponseStatus, bankName,
transactionAmount, txnDate, txnTime, branchname, extraInfo, extraInfo2, extraInfo3, txnMode, txnId,
file);
} }
} }
Loading…
Cancel
Save