From b2a313e0d274b1e34497830125e5ec5212f4855f Mon Sep 17 00:00:00 2001 From: aswinsundar Date: Wed, 21 Dec 2022 15:36:50 +0530 Subject: [PATCH] As of 21-12-2022 --- .../com/asset/master/MasterController.java | 20 ++- .../java/com/asset/test/testController.java | 15 --- .../com/asset/test/testRestController.java | 124 ------------------ .../templates/asset-master-entry.html | 10 +- 4 files changed, 18 insertions(+), 151 deletions(-) delete mode 100644 src/main/java/com/asset/test/testController.java delete mode 100644 src/main/java/com/asset/test/testRestController.java diff --git a/src/main/java/com/asset/master/MasterController.java b/src/main/java/com/asset/master/MasterController.java index 894cb3b..76048e2 100644 --- a/src/main/java/com/asset/master/MasterController.java +++ b/src/main/java/com/asset/master/MasterController.java @@ -33,11 +33,11 @@ public class MasterController { @GetMapping(value = "entry") public String masterEntry(Model model, Master master, MasterQuestion masterQuestion, MasterParameters masterParameters) { //model.addAttribute("masterObj", new MasterView()); - model.addAttribute("masterList", new Master()); + model.addAttribute("masterListObj", new Master()); - //model.addAttribute("masterParametersList", new MasterParameters()); - model.addAttribute("masterParametersList", masterParameters.getMasterParameters()); - model.addAttribute("masterDetailList", new MasterQuestion()); + model.addAttribute("masterParametersListObj", new MasterParameters()); + //model.addAttribute("masterParametersListObj", masterParameters.getMasterParameters()); + model.addAttribute("masterQuestionListObj", new MasterQuestion()); return "asset-master-entry"; } @@ -45,10 +45,16 @@ public class MasterController { public String masterEntrySubmit(@ModelAttribute Master master, MasterQuestion masterQuestion, MasterParameters masterParameters) { + System.out.println("-master-:"+master); + System.out.println("-masterQuestion-:"+masterQuestion); + System.out.println("-masterParameters-:"+masterParameters); + Master obj = new Master(); obj.setMasterId(master.getMasterId()); obj.setMasterName(master.getMasterName()); - masterRepo.saveAndFlush(obj); + masterRepo.save(obj); + + System.out.println("-master-obj-:"+obj); MasterQuestion obj2 = new MasterQuestion(); obj2.setMasterId(master.getMasterId()); @@ -76,10 +82,10 @@ public class MasterController { obj3.setMasterName(master.getMasterName()); obj3.setMasterParameters(masterParameters.getMasterParameters()); masterParametersRepo.saveAndFlush(obj3); - + return "redirect:/qr-feedback/master/entry"; } - + @GetMapping(value = "/list") public String masterList(Model model) { diff --git a/src/main/java/com/asset/test/testController.java b/src/main/java/com/asset/test/testController.java deleted file mode 100644 index 4e72639..0000000 --- a/src/main/java/com/asset/test/testController.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.asset.test; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -@Controller -@RequestMapping(value = "/qr-feedback") -public class testController { - - @RequestMapping(value = "/test", method = RequestMethod.GET) - public String test() { - return "z-test"; - } -} diff --git a/src/main/java/com/asset/test/testRestController.java b/src/main/java/com/asset/test/testRestController.java deleted file mode 100644 index c5bc872..0000000 --- a/src/main/java/com/asset/test/testRestController.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.asset.test; - -import java.math.BigDecimal; -import java.net.URLEncoder; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.json.JSONObject; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.client.RestTemplate; - -@RestController -@RequestMapping(value = "/qr-feedback") -public class testRestController { - - @RequestMapping(value = "/test/map", method = RequestMethod.GET) - public Map testMap(HttpServletRequest request, @RequestParam String locationName) { - - String sSearchLocation =""; - //String sTmp = request.getParameter("locname"); - String sTmp = locationName; - String sLATITUDE = ""; - String sLONGITUDE = ""; - if ( sTmp != null && !sTmp.equals("") ) sSearchLocation = sTmp; - System.out.println("sSearchLocation---: "+ sSearchLocation); - String str=request.getParameter("serviceinput"); - - if (str==null ) - { - } - else - { - - JSONObject lg = new JSONObject(str); - System.out.println("latitude : "+ lg.get("latitude")); - System.out.println("longitude : "+ lg.get("longitude")); - - sLATITUDE =""+ (Double)lg.get("latitude"); - sLONGITUDE = ""+ (Double)lg.get("longitude"); - } - - if ( (sLATITUDE==null || sLATITUDE.equals("")) && ( sLONGITUDE==null || sLONGITUDE.equals("") ) ) - { - if (!sSearchLocation.equals("")) { - try{ - String urlString ="http://10.1.0.122/geocode_api.php?address="+ URLEncoder.encode( sSearchLocation, "UTF-8" ); - System.out.println(urlString); - - ResponseEntity response = null; - RestTemplate restTemplate = new RestTemplate(); - String bodyMessage = ""; - HttpHeaders headers = new HttpHeaders(); - try { - HttpEntity postData = new HttpEntity(headers); - response = restTemplate.exchange(urlString, HttpMethod.POST, postData, String.class); - bodyMessage = response.getBody(); - //System.out.println("\n bodyMessage" + bodyMessage); - - } catch (Exception e) { - e.printStackTrace(); - //System.out.print("\n ERROR---: " + e); - bodyMessage = "Error"; - } - - JSONObject object = new JSONObject(bodyMessage); - - if ( (Boolean)object.get("status")) - { - JSONObject dataObject = (JSONObject) object.get("data"); - System.out.println("latitude 1 : "+ dataObject.get("latitude")); - System.out.println("longitude 1 : "+ dataObject.get("longitude")); - - sLATITUDE = ""+ (BigDecimal)dataObject.get("latitude"); - sLONGITUDE = ""+ (BigDecimal)dataObject.get("longitude"); - } - } - catch(Exception e) - { System.out.println(e); } - - } - else if(request.getParameter("latitude")!=null && request.getParameter("longitude")!=null) - { - sLATITUDE = request.getParameter("latitude"); - sLONGITUDE = request.getParameter("longitude"); - } - else - { - sLATITUDE = "13.0827"; - sLONGITUDE = "80.2707"; - } - } - - if ( sLATITUDE == null || sLATITUDE.equals("") || sLONGITUDE == null || sLONGITUDE.equals("") ) - { - //out.println("

No Data Found
"); - System.out.println("Record Not Found"); - //return; - } - //String bodyMessage = sLATITUDE; - System.out.println("sLATITUDE---:"+sLATITUDE); - System.out.println("sLONGITUDE---:"+sLONGITUDE); - -// JSONObject jsonObj = new JSONObject(); -// jsonObj.put("sLATITUDE", sLATITUDE); -// jsonObj.put("sLONGITUDE", sLONGITUDE); -// -// System.out.println("jsonObj :"+jsonObj); - - Map hasMap = new HashMap(); - hasMap.put("sLATITUDE", sLATITUDE); - hasMap.put("sLONGITUDE", sLONGITUDE); - - return hasMap; - } -} diff --git a/src/main/resources/templates/asset-master-entry.html b/src/main/resources/templates/asset-master-entry.html index d312696..b52d6d4 100644 --- a/src/main/resources/templates/asset-master-entry.html +++ b/src/main/resources/templates/asset-master-entry.html @@ -34,7 +34,7 @@ $("#addParameters").click(function(){ //alert("#masterParameters_"+size+""); $("#appendParameters").append("
"+ ""+ - "" + + "" + "
"); } else{ @@ -105,7 +105,7 @@ $('#assetMasterEntryFormRest').click(function(){
- +
@@ -126,7 +126,7 @@ $('#assetMasterEntryFormRest').click(function(){
- +
@@ -156,10 +156,10 @@ $('#assetMasterEntryFormRest').click(function(){
- + - +