Skip to content

Commit

Permalink
DONE
Browse files Browse the repository at this point in the history
  • Loading branch information
@stehlika
stehlika committed May 15, 2018
1 parent 0e14b95 commit 9270a76
Show file tree
Hide file tree
Showing 10 changed files with 76 additions and 234 deletions.
3 changes: 1 addition & 2 deletions src/dk/via/Tier1/Model/ModelManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ public void dismantleTheCar(Car car) throws NoSuchElementException {
}

public Car getCar(String licensePlate) {
System.out.println("som v getCar a prislo mi sem " + licensePlate);
System.out.println(cars.size());

for (int i = 0; i < cars.size(); i++) {

if (cars.get(i).getVinNO().equals(licensePlate)) {
Expand Down
38 changes: 0 additions & 38 deletions src/dk/via/Tier2/Controller/API/CarsAPIService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,6 @@

public class CarsAPIService extends APIService {

public void testAPI(String VIN) {
try {
String url = SmallModels.BASE_URL + "Cars/" + VIN + "/Parts";

RequestBody formBody = new FormBody.Builder()
.add("Id", String.valueOf(123))
.add("Name", "Spojka")
.add("Weight", String.valueOf(456))
.build();

request = new Request.Builder()
.url(url)
.post(formBody)
.build();

Response response = null;

try {
response = client.newCall(request).execute();
} catch (IOException e) {
e.printStackTrace();
}

System.out.println(response.body().string());
} catch (IOException e) {
e.printStackTrace();
}
}

// GET api/Cars
public Car[] getAllCars() {
Car[] cars = null;
Expand All @@ -59,16 +30,10 @@ public Car[] getAllCars() {
}

String jsonData = responses.body().string();

Gson gson = new Gson();
gson.toJson(jsonData);

cars = gson.fromJson(jsonData, Car[].class);

for (Car car : cars) {
System.out.println(car.toString());
}

} catch (IOException e) {
e.printStackTrace();
}
Expand All @@ -91,11 +56,9 @@ public Car getCar(String VIN) {
}

String jsonData = responses.body().string();
System.out.println("JSON reply:" + jsonData);
Gson gson = new Gson();
gson.toJson(jsonData);
car = gson.fromJson(jsonData, Car.class);
System.out.println(car.toString());

} catch (IOException e) {
e.printStackTrace();
Expand Down Expand Up @@ -129,7 +92,6 @@ public void updateCar(Car car) {

// POST api/Cars VIN:string, Model:string, Weight: decimal number, Parts:Collection of Part
public void addCar(Car car) {
//TODO treba dorobit parts
String url = SmallModels.BASE_URL + "Cars/";
try {
RequestBody formBody = new FormBody.Builder()
Expand Down
94 changes: 51 additions & 43 deletions src/dk/via/Tier2/Controller/API/PackagesAPIService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
import okhttp3.Response;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

public class PackagesAPIService extends APIService {

Expand All @@ -31,14 +34,8 @@ public Package[] getAllPackages() {
String jsonData = responses.body().string();
Gson gson = new Gson();
gson.toJson(jsonData);

packages = gson.fromJson(jsonData, Package[].class);

for (Package pack : packages) {
System.out.println(pack.toString());

}

} catch (IOException e) {
e.printStackTrace();
}
Expand Down Expand Up @@ -75,7 +72,6 @@ public Package getPackage(int id) {

// PUT api/Packages/{id}
public void updatePackage(Package pack) {
//TODO treba spravit parts
String url = SmallModels.BASE_URL + "Packages/" + pack.getId();
try {
RequestBody formBody = new FormBody.Builder()
Expand All @@ -98,10 +94,11 @@ public void updatePackage(Package pack) {
// POST api/Packages Id:Integer, Repacking:Bool, Parts: Collection of Part
public void addPackage(Package pack) {
//TODO treba dorobit parts a id
String url = SmallModels.BASE_URL + "Packages/";
String url = SmallModels.BASE_URL + "Packages";
try {
RequestBody formBody = new FormBody.Builder()
.add("Repacking", String.valueOf(pack.getRepacking()))
.add("Content", "TODO")
.build();

request = new Request.Builder()
Expand All @@ -121,30 +118,57 @@ public void addPackage(Package pack) {

// make model Package mala by brat number of parts and string of model a urobit package z volnych partov dan0ho typu
public void makeModelPackage(int numberOfParts, String model) {
// Part[] parts = getAllFreeParts();

PartsAPIService partsAPI = new PartsAPIService();

// for (Part part: parts) {
// transferPartFromPalletToPackage(part, );
// }
List<Part> allParts = new ArrayList<>();
allParts.addAll(Arrays.asList(partsAPI.getAllParts()));
List<Part> suitableParts = new ArrayList<>();

/*
ArrayList<Part> allLegitObjects = getAllLegitObjectsFromPalletes(whatType);
if (allLegitObjects != null) {
if (!(allLegitObjects.size() < noOfObjects)) {
for (int i = 0; i < noOfObjects; i++) {
transferPartFromPaletToPackage(allLegitObjects.get(i), aPackage, allLegitObjects.get(i).getPallet());
for (Part part : allParts) {
if (part.getName().equals(model)) {
if (part.getPackageId() == 0 || part.getPreviousPalletId() == 0) {
suitableParts.add(part);
}
} else throw new NoPermissionException("There are not enough parts in the warehouse to form this package");
}
*/
}

}

if (numberOfParts <= suitableParts.size()) {
Package pack = new Package(999, true);
addPackage(pack);
for (int i = 0; i < numberOfParts; i++) {
transferPartFromPalletToPackage(suitableParts.get(i), pack);
}
} else {
System.out.println("Not enough parts for packaging");
}
}

// make system package mala by brat number of parts and mode
public void makeSystemPackage(int numberOfParts, String partType) {
PartsAPIService partsAPI = new PartsAPIService();

List<Part> allParts = new ArrayList<>();
allParts.addAll(Arrays.asList(partsAPI.getAllParts()));
List<Part> suitableParts = new ArrayList<>();

for (Part part : allParts) {
if (part.getName().equals(partType)) {
if (part.getPackageId() == 0 || part.getPreviousPalletId() == 0) {
suitableParts.add(part);
}
}
}

if (numberOfParts <= suitableParts.size()) {
Package pack = new Package(999, false);
addPackage(pack);
for (int i = 0; i < numberOfParts; i++) {
transferPartFromPalletToPackage(suitableParts.get(i), pack);
}
} else {
System.out.println("Not enough parts for packaging");
}

}

Expand All @@ -154,29 +178,13 @@ public void deletePackage(Package pack) {
}

private void transferPartFromPalletToPackage(Part part, Package pack) {
part.setPreviousPalletId(part.getPalletId());
part.setPalletId(0);
part.setPalletId(pack.getId());
part.setPackageId(pack.getId());

PartsAPIService partsAPI = new PartsAPIService();
partsAPI.updatePart(part);

//TODO upload this to server
}

// private Part[] getAllFreeParts(boolean modelParts, String value) {
// List<Part> freeParts = new ArrayList<Part>();
// Part[] allParts = new PartsAPIService().getAllParts();
//
// for (Part part : allParts) {
// if (part.getPackageId() == 0 || part.getPreviousPalletId() == 0) {
// if () {
// if (part.getName())
// }
// freeParts.add(part);
// }
// }
//
//
// return (Part[]) freeParts.toArray();
//
// }

}
25 changes: 4 additions & 21 deletions src/dk/via/Tier2/Controller/API/PalletsAPIService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ public Pallet[] getAllPallets() {

try {
String url = SmallModels.BASE_URL + "Pallets";

request = new Request.Builder().url(url).build();

Response responses = null;

try {
Expand All @@ -31,16 +29,10 @@ public Pallet[] getAllPallets() {
}

String jsonData = responses.body().string();

Gson gson = new Gson();
gson.toJson(jsonData);

pallets = gson.fromJson(jsonData, Pallet[].class);

for (Pallet pallet : pallets) {
System.out.println(pallet.getId());
}

} catch (IOException e) {
e.printStackTrace();
}
Expand Down Expand Up @@ -130,36 +122,27 @@ public Pallet getSuitablePalletForPart(Part part) {

for (Pallet pallet : allPallets) {
Part[] parts = partsAPI.getPartsForPallet(pallet.getId());
System.out.println("Party: " + parts.length);
try {
pallet.setParts(parts);
} catch (NullPointerException e) {
System.out.println("Palleta je prazdna");
e.printStackTrace();
}

}

for (Pallet pallet : allPallets) {
if (pallet.getParts() == null) {
return pallet;
}
if (pallet.getParts().get(0).getName() == part.getName()) {
if (pallet.getParts().get(0).getName().equals(part.getName())) {
if ((pallet.getMaximumCapacity() - pallet.currentCapacity()) >= part.getWeight()) {
return pallet;
} else
System.out.println("Palle is not suitable");
}
}
}

Pallet newPallet = new Pallet(44, 1000);
Pallet newPallet = new Pallet(999, 1000);
addPallet(newPallet);

System.out.println("Should create new pallet");


return newPallet;
}



}
Loading

0 comments on commit 9270a76

Please sign in to comment.