Changeset 9ff45d6 for sources/app/src/main/java/parkup/entities
- Timestamp:
- 12/24/21 23:31:23 (3 years ago)
- Branches:
- master
- Children:
- 9dd526f
- Parents:
- 8588fcb
- Location:
- sources/app/src/main/java/parkup/entities
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/entities/Guest.java
r8588fcb r9ff45d6 32 32 @Column(name = "mobile") 33 33 private String mobile; 34 35 @OneToOne 36 private ParkingSession session; 34 37 35 38 public Guest() {} -
sources/app/src/main/java/parkup/entities/ParkingSession.java
r8588fcb r9ff45d6 1 1 package parkup.entities; 2 2 3 import org.springframework.format.annotation.DateTimeFormat; 3 4 import parkup.data.Tablicka; 5 import parkup.data.enumarations.SessionStatus; 4 6 5 7 import javax.persistence.*; 8 import java.time.LocalDateTime; 6 9 7 10 @Entity … … 22 25 private int pssId; 23 26 27 @DateTimeFormat(pattern = "yyyy-MM-dd-HH-mm-ss") 24 28 @Column(name = "time_start") 25 private StringtimeStart;29 private LocalDateTime timeStart; 26 30 31 @DateTimeFormat(pattern = "yyyy-MM-dd-HH-mm-ss") 27 32 @Column(name = "time_end") 28 private StringtimeEnd;33 private LocalDateTime timeEnd; 29 34 30 35 @OneToOne(cascade = {CascadeType.ALL}) … … 32 37 private Tablicka tablica; 33 38 34 public ParkingSession() {} 39 @Column(name="session_status") 40 @Enumerated 41 private SessionStatus status; 35 42 36 public ParkingSession(int pssId, String timeStart, String timeEnd, Tablicka tablica) { 37 this.pssId = pssId; 38 this.timeStart = timeStart; 39 this.timeEnd = timeEnd; 40 this.tablica = tablica; 43 @ManyToOne 44 private ParkingSpace parkingSpace; 45 46 @ManyToOne 47 private ParkingZone parkingZone; 48 49 50 // public ParkingSpace getParkingSpace() { 51 // return parkingSpace; 52 // } 53 // 54 // public void setParkingSpace(ParkingSpace parkingSpace) { 55 // this.parkingSpace = parkingSpace; 56 // } 57 58 public ParkingSession() { 59 41 60 } 42 61 43 public ParkingSession(String timeStart, String timeEnd, Tablicka tablica) { 44 this.timeStart = timeStart; 45 this.timeEnd = timeEnd; 46 this.tablica = tablica; 62 public ParkingSession(Tablicka tablica){ 63 this.timeStart= LocalDateTime.now(); 64 this.timeEnd=null; 65 this.tablica=tablica; 66 this.status=SessionStatus.STARTED_UNVERIFIED; 47 67 } 68 48 69 49 70 public int getPssId() { … … 55 76 } 56 77 57 public StringgetTimeStart() {58 return t his.timeStart;78 public LocalDateTime getTimeStart() { 79 return timeStart; 59 80 } 60 81 61 public void setTimeStart( StringtimeStart) {82 public void setTimeStart(LocalDateTime timeStart) { 62 83 this.timeStart = timeStart; 63 84 } 64 85 65 public StringgetTimeEnd() {66 return t his.timeEnd;86 public LocalDateTime getTimeEnd() { 87 return timeEnd; 67 88 } 68 89 69 public void setTimeEnd( StringtimeEnd) {90 public void setTimeEnd(LocalDateTime timeEnd) { 70 91 this.timeEnd = timeEnd; 71 92 } … … 78 99 this.tablica = tablica; 79 100 } 101 102 public SessionStatus getStatus() { 103 return status; 104 } 105 106 public void setStatus(SessionStatus status) { 107 this.status = status; 108 } 109 110 public ParkingSpace getParkingSpace() { 111 return parkingSpace; 112 } 113 114 public ParkingZone getParkingZone() { 115 return parkingZone; 116 } 117 118 public void setParkingSpace(ParkingSpace parkingSpace) { 119 this.parkingSpace = parkingSpace; 120 } 121 122 public void setParkingZone(ParkingZone parkingZone) { 123 this.parkingZone = parkingZone; 124 } 80 125 } -
sources/app/src/main/java/parkup/entities/ParkingSpace.java
r8588fcb r9ff45d6 2 2 3 3 import javax.persistence.*; 4 import java.util.ArrayList; 5 import java.util.List; 4 6 5 7 @Entity … … 24 26 25 27 @Column(name = "isTaken") 26 private Boolean isTaken; 27 28 @Column(name = "isHandicaped") 29 private Boolean isHandicaped; 28 private boolean taken; 30 29 31 30 @Column(name = "latitude") 32 31 private float lat; 33 <<<<<<< HEAD 32 34 33 35 34 @Column(name = "longitude") … … 39 38 // @JoinColumn(name = "parking_zona") 40 39 // private ParkingZone parkingZone; 40 // @ManyToOne(cascade = {CascadeType.ALL}) 41 // @JoinColumn(name = "parking_zona") 42 // private ParkingZone parkingZone; 43 // 44 // @OneToMany 45 // @Column(name="parking_sessions") 46 // private List<ParkingSession> sessions; 41 47 42 48 public ParkingSpace() { 43 System.out.println("Default ParkingSpace constructor" + lat); 49 44 50 } 45 51 46 ======= 47 48 @Column(name = "longitude") 49 private float lng; 50 51 @OneToOne(cascade = {CascadeType.ALL}) 52 @JoinColumn(name = "parking_zona") 53 private ParkingZone parkingZone; 54 55 public ParkingSpace() {} 56 57 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 58 public ParkingSpace(int psId, String psName, boolean isTaken, boolean isHandicaped, float lat, float lng) { 52 public ParkingSpace(int psId, String psName, boolean isTaken, float lat, float lng) { 59 53 this.psId = psId; 60 54 this.psName = psName; 61 this.isTaken = isTaken; 62 this.isHandicaped = isHandicaped; 55 this.taken = isTaken; 63 56 this.lat = lat; 64 57 this.lng = lng; 65 58 } 66 59 67 public ParkingSpace(String psName, boolean isTaken, boolean isHandicaped,float lat, float lng) {60 public ParkingSpace(String psName, float lat, float lng) { 68 61 this.psName = psName; 69 this.isTaken = isTaken; 70 this.isHandicaped = isHandicaped; 62 this.taken = false; 71 63 this.lat = lat; 72 64 this.lng = lng; … … 76 68 return this.psId; 77 69 } 70 71 // public ParkingZone getParkingZone() { 72 // return parkingZone; 73 // } 74 // 75 // public void setParkingZone(ParkingZone parkingZone) { 76 // this.parkingZone = parkingZone; 77 // } 78 78 79 79 80 public void setPsId(int psId) { … … 90 91 91 92 public boolean isTaken() { 92 return this. isTaken;93 return this.taken; 93 94 } 94 95 95 96 public void setTaken(boolean isTaken) { 96 this.isTaken = isTaken; 97 } 98 99 public boolean isHandicaped() { 100 return this.isHandicaped; 101 } 102 103 public void setHandicaped(boolean isHandicaped) { 104 this.isHandicaped = isHandicaped; 97 this.taken = isTaken; 105 98 } 106 99 … … 120 113 this.lng = lng; 121 114 } 122 <<<<<<< HEAD 115 123 116 124 117 @Override … … 126 119 return "ParkingSpace{" + 127 120 "psName='" + psName + '\'' + 128 ", isTaken=" + isTaken + 129 ", isHandicaped=" + isHandicaped + 121 ", isTaken=" + taken + 130 122 ", lat=" + lat + 131 123 ", lng=" + lng+ 132 124 '}'; 133 125 } 134 =======135 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939136 126 } 137 127 -
sources/app/src/main/java/parkup/entities/ParkingZone.java
r8588fcb r9ff45d6 30 30 private int price; 31 31 32 @Transient 32 33 @Column(name = "capacity") 33 34 private int capacity; 34 35 <<<<<<< HEAD36 35 @Column(name = "time_from") //za rabotni casovi od: 37 36 private int from; 38 37 39 38 @Column(name = "time_to") //za rabotni casovi do: 40 =======41 @Column(name = "vreme_od") //za rabotni casovi od:42 private int from;43 44 @Column(name = "vreme_do") //za rabotni casovi do:45 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e93946 39 private int to; 47 40 48 @Column(name = " lokacija")49 private String location;41 @Column(name = "address") 42 private String address; 50 43 44 @Transient 51 45 @Column(name = "zafateniMesta") 52 private int zafateniMesta;46 private int takenSpaces; 53 47 54 48 @Column(name = "color") 55 49 private String color; 56 50 57 @ManyToMany(cascade = {CascadeType.ALL}) 58 @JoinColumn(name="odgovorniLica",nullable = true) 59 private List<Vraboten> odgovorniLica; 51 // @ManyToMany(cascade = {CascadeType.ALL}) 52 // private List<Vraboten> odgovorniLica; 60 53 61 @OneToMany(cascade = {CascadeType. ALL})54 @OneToMany(cascade = {CascadeType.MERGE}) 62 55 private List<ParkingSpace> parkingSpaces; 56 57 63 58 64 59 @OneToOne(cascade = {CascadeType.ALL}) … … 66 61 67 62 public ParkingZone() { 68 this. zafateniMesta= 0;63 this.takenSpaces = 0; 69 64 this.parkingSpaces = new ArrayList<ParkingSpace>(); 70 65 } … … 72 67 public ParkingZone(String pzName) { 73 68 this.pzName = pzName; 74 this. zafateniMesta= 0;69 this.takenSpaces = 0; 75 70 this.parkingSpaces = new ArrayList<ParkingSpace>(); 76 71 } 77 72 78 public ParkingZone(int pzId, String pzName, int price, int capacity, String location, List<ParkingSpace> parkingSpaces, String color, int from, int to) {73 public ParkingZone(int pzId, String pzName, int price, int capacity, String address, List<ParkingSpace> parkingSpaces, String color, int from, int to) { 79 74 this.pzId = pzId; 80 75 this.pzName = pzName; 81 76 this.price = price; 82 77 this.capacity = capacity; 83 this. location = location;84 this. zafateniMesta= 0;78 this.address = address; 79 this.takenSpaces = 0; 85 80 this.parkingSpaces = parkingSpaces; 86 81 this.color = color; … … 89 84 } 90 85 91 public ParkingZone(String pzName, int price, int capacity, String location, List<ParkingSpace> parkingSpaces, String color, int from, int to) {86 public ParkingZone(String pzName, int price, int capacity, String address, List<ParkingSpace> parkingSpaces, String color, int from, int to) { 92 87 this.pzName = pzName; 93 88 this.price = price; 94 89 this.capacity = capacity; 95 this. location = location;96 this. zafateniMesta= 0;90 this.address = address; 91 this.takenSpaces = 0; 97 92 this.parkingSpaces = parkingSpaces; 98 93 this.color = color; … … 133 128 } 134 129 135 public String get Location() {136 return this. location;130 public String getAddress() { 131 return this.address; 137 132 } 138 133 139 public void set Location(String location) {140 this. location= location;134 public void setAddress(String location) { 135 this.address = location; 141 136 } 142 137 143 public int get ZafateniMesta() {return zafateniMesta;}138 public int getTakenSpaces() {return takenSpaces;} 144 139 145 public void set ZafateniMesta(int zafateniMesta) {this.zafateniMesta = zafateniMesta;}140 public void setTakenSpaces(int takenSpaces) {this.takenSpaces = takenSpaces;} 146 141 147 142 public List<ParkingSpace> getParkingSpaces() {return parkingSpaces;} … … 181 176 } 182 177 183 public List<Vraboten> getOdgovorniLica() {184 return odgovorniLica;185 }186 187 public void setOdgovorniLica(List<Vraboten> odgovorniLica) {188 this.odgovorniLica = odgovorniLica;189 }178 // public List<Vraboten> getOdgovorniLica() { 179 // return odgovorniLica; 180 // } 181 // 182 // public void setOdgovorniLica(List<Vraboten> odgovorniLica) { 183 // this.odgovorniLica = odgovorniLica; 184 // } 190 185 } -
sources/app/src/main/java/parkup/entities/RegistriranParkirac.java
r8588fcb r9ff45d6 51 51 private String role; 52 52 53 @OneToOne 54 private ParkingSession session; 55 53 56 private boolean locked; 54 57 … … 58 61 this.regTablicki = new ArrayList<Tablicka>(); 59 62 this.role = "ROLE_REGISTRIRAN_PARKIRAC"; 63 session=null; 60 64 } 61 65 … … 69 73 this.mobile = mobile; 70 74 this.role = "ROLE_REGISTRIRAN_PARKIRAC"; 75 session=null; 71 76 } 72 77 … … 79 84 this.mobile = mobile; 80 85 this.role = "ROLE_REGISTRIRAN_PARKIRAC"; 86 session=null; 81 87 } 82 88 … … 88 94 this.mobile = mobile; 89 95 this.role = "ROLE_REGISTRIRAN_PARKIRAC"; 90 } 96 session=null; 97 } 98 99 public ParkingSession getSession() { 100 return session; 101 } 102 103 public void setSession(ParkingSession session) { 104 this.session = session; 105 } 106 107 public boolean isLocked() { 108 return locked; 109 } 110 111 public void setLocked(boolean locked) { 112 this.locked = locked; 113 } 114 115 public void setEnabled(boolean enabled) { 116 this.enabled = enabled; 117 } 118 91 119 92 120 public int getRegParkId() { -
sources/app/src/main/java/parkup/entities/Vraboten.java
r8588fcb r9ff45d6 4 4 import org.springframework.security.core.userdetails.UserDetails; 5 5 import parkup.data.VrabotenDemo; 6 import parkup.data.enumarations.EmployeeStatus; 6 7 7 8 import javax.persistence.*; … … 57 58 58 59 @ManyToMany(cascade = {CascadeType.ALL}) 59 @JoinColumn(name = "zona", nullable = false)60 60 private List<ParkingZone> parkingZones; 61 61 62 62 @Column(name = "status") 63 private String status; 63 private EmployeeStatus status; 64 65 public void setLocked(boolean locked) { 66 this.locked = locked; 67 } 64 68 65 69 @Column(name="locked") … … 73 77 this.role = "ROLE_VRABOTEN"; 74 78 this.parkingZones = new ArrayList<ParkingZone>(); 75 this.enabled = false;76 this.status = "neRaboti";79 this.enabled = true; 80 this.status = EmployeeStatus.NOT_WORKING; 77 81 } 78 82 … … 86 90 this.parkingZones = parkingZones; 87 91 this.role = "ROLE_VRABOTEN"; 88 this.enabled = false;89 this.status = "neRaboti";92 this.enabled = true; 93 this.status = EmployeeStatus.NOT_WORKING; 90 94 } 91 95 … … 98 102 this.parkingZones = parkingZones; 99 103 this.role = "ROLE_VRABOTEN"; 100 this.enabled = false;101 this.status = "neRaboti";104 this.enabled = true; 105 this.status = EmployeeStatus.NOT_WORKING; 102 106 } 103 107 … … 109 113 this.mobile=mobile; 110 114 this.parkingZones=new ArrayList<>(); 111 this.enabled=false;112 this.status="neRaboti";113 115 this.role="ROLE_VRABOTEN"; 116 this.enabled=true; 117 this.status = EmployeeStatus.NOT_WORKING; 114 118 } 115 119 … … 204 208 public void setParkingZones(List<ParkingZone> parkingZones) {this.parkingZones = parkingZones;} 205 209 206 public StringgetStatus() {return status;}207 208 public void setStatus( Stringstatus) {this.status = status;}210 public EmployeeStatus getStatus() {return status;} 211 212 public void setStatus(EmployeeStatus status) {this.status = status;} 209 213 210 214 public boolean isAccount() {return enabled;}
Note:
See TracChangeset
for help on using the changeset viewer.