diff --git a/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java b/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java index 3e8ff83798557722823b23e28627bc4aefe45674..a5927d4cd7ff6e4de3c115e6d8ff86bf5adb05ef 100644 --- a/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java +++ b/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java @@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.stereotype.Controller; +import java.util.List; + @Controller public class organisationControllers { @GetMapping("/localauthorities") @@ -23,6 +25,7 @@ public class organisationControllers { @GetMapping("/businesses") public ModelAndView getBusinessPage(){ ModelAndView modelAndView = new ModelAndView("businesses"); + List<business> business = businessRepository.getAllBusinesses(); modelAndView.addObject("busiSub", business); return modelAndView; } diff --git a/src/main/java/Team5/SmartTowns/business/business.java b/src/main/java/Team5/SmartTowns/business/business.java index 4f291feb0c07cd782f951e15c8219febaf1d807c..ccb7db134b882e0d0c8c34de836daac2f9932589 100644 --- a/src/main/java/Team5/SmartTowns/business/business.java +++ b/src/main/java/Team5/SmartTowns/business/business.java @@ -18,15 +18,15 @@ public class business { @Override public String toString(){ - return "business{" + - businessName + '\'' + - address1 + '\'' + - address2 + '\'' + - city + '\'' + - county + '\'' + - postcode + '\'' + + return "Business:" + " " + + businessName + '\'' + " " + + address1 + '\'' + " " + + address2 + '\'' + " " + + city + '\'' + " " + + county + '\'' + " " + + postcode + '\'' + " " + website + - '}'; + " "; } public String getBusinessName() { diff --git a/src/main/java/Team5/SmartTowns/business/businessRepository.java b/src/main/java/Team5/SmartTowns/business/businessRepository.java index 00bcc87952799e645d81af8de6e8d68f324368a4..dc36607c75d01baaf71b574f32d1f6e10259bca7 100644 --- a/src/main/java/Team5/SmartTowns/business/businessRepository.java +++ b/src/main/java/Team5/SmartTowns/business/businessRepository.java @@ -5,6 +5,4 @@ import java.util.List; public interface businessRepository { List<business> getAllBusinesses(); void addBusiness(business bus); - - void addLocalAuthority(business bus); } diff --git a/src/main/java/Team5/SmartTowns/business/businessRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/business/businessRepositoryJDBC.java index cdf4f78be64e99f9ffb31659b02dbc01cb25908f..0e3073504dc2f58248f44fb501d794e7febb9b62 100644 --- a/src/main/java/Team5/SmartTowns/business/businessRepositoryJDBC.java +++ b/src/main/java/Team5/SmartTowns/business/businessRepositoryJDBC.java @@ -27,21 +27,15 @@ public class businessRepositoryJDBC implements businessRepository{ ); } public List<business> getAllBusinesses(){ - String sql = "SELECT * FROM localAuthority"; + String sql = "SELECT * FROM businesses"; return jdbc.query(sql, businessMapper); } @Override public void addBusiness(business bus) { - - } - - @Override - public void addLocalAuthority(business bus){ - String sql = "INSERT INTO business( businessName, address1, address2, city, county, postcode, website) values (?, ?, ?, ?, ?, ?, ?)"; + String sql = "INSERT INTO businesses( businessName, address1, address2, city, county, postcode, website) values (?, ?, ?, ?, ?, ?, ?)"; jdbc.update(sql, bus.getBusinessName(),bus.getAddress1(),bus.getAddress2(),bus.getCity(),bus.getCounty(),bus.getPostcode(),bus.getWebsite()); } - - } +}