wiadomosci do drzwi
This commit is contained in:
1 parent
eb926fc81f
commit
e893a95eee
5 files changed
+147
-10
No files matched your search
@@ -0,0 +1,56 @@
|
||||
package application.controllers;
|
||||
|
||||
import application.model.Door;
|
||||
import application.model.DoorMessage;
|
||||
import application.repositories.DoorRepository;
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
/**
|
||||
* Created by lukasgol on 12.06.14.
|
||||
*/
|
||||
|
||||
@Controller
|
||||
@RequestMapping(value = "/doors")
|
||||
public class DoorController {
|
||||
@Autowired
|
||||
DoorRepository doorRepository;
|
||||
|
||||
@RequestMapping
|
||||
public
|
||||
@ResponseBody
|
||||
String listDoorsJson(ModelMap model) throws JSONException {
|
||||
JSONArray doorArray = new JSONArray();
|
||||
for (Door door : doorRepository.findAll()) {
|
||||
JSONObject doorJSON = new JSONObject();
|
||||
doorJSON.put("doorId", door.getDoorId());
|
||||
doorJSON.put("message", door.getDoorMessage());
|
||||
doorArray.put(doorJSON);
|
||||
}
|
||||
return doorArray.toString();
|
||||
}
|
||||
|
||||
@RequestMapping("/{doorId}/message")
|
||||
@ResponseBody
|
||||
public String getUser(@PathVariable("doorId") Long doorId)throws JSONException{
|
||||
Door door = doorRepository.findOne(doorId);
|
||||
DoorMessage message= door.getDoorMessage();
|
||||
JSONObject loginResponse = new JSONObject();
|
||||
loginResponse.put("success", true);
|
||||
loginResponse.put("doorId", door.getDoorId());
|
||||
JSONObject jsonmessage = new JSONObject();
|
||||
jsonmessage.put("dateTime",message.getDateTime() );
|
||||
jsonmessage.put("message",message.getMessage() );
|
||||
jsonmessage.put("serverMessageId",message.getServerMessageId() );
|
||||
loginResponse.put("serverMessage", jsonmessage);
|
||||
|
||||
return loginResponse.toString();
|
||||
}
|
||||
}
|
||||
@@ -135,16 +135,6 @@ public class UserController {
|
||||
return "User created" + marcin.getUserId();
|
||||
}
|
||||
|
||||
@RequestMapping("/change")
|
||||
@ResponseBody
|
||||
public String change() {
|
||||
User marcin = userRepository.findOne((long) 1);
|
||||
Set set =marcin.getMessages();
|
||||
set.add(new Message("lala"));
|
||||
userRepository.save(marcin);
|
||||
|
||||
return "User changed" + marcin.getUserId();
|
||||
}
|
||||
|
||||
@RequestMapping("/{userId}")
|
||||
@ResponseBody
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
package application.model;
|
||||
|
||||
import javax.persistence.*;
|
||||
|
||||
/**
|
||||
* Created by lukasgol on 12.06.14.
|
||||
*/
|
||||
@Entity(name = "door")
|
||||
|
||||
public class Door {
|
||||
|
||||
@Id
|
||||
@Column(name = "doorId")
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
private Long doorId;
|
||||
|
||||
@OneToOne(cascade=CascadeType.ALL, fetch=FetchType.EAGER)
|
||||
DoorMessage doorMessage;
|
||||
|
||||
public Door(DoorMessage doorMessage) {
|
||||
this.doorMessage = doorMessage;
|
||||
}
|
||||
|
||||
public Door() {
|
||||
}
|
||||
|
||||
public Long getDoorId() {
|
||||
return doorId;
|
||||
}
|
||||
|
||||
public DoorMessage getDoorMessage() {
|
||||
return doorMessage;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package application.model;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* Created by lukasgol on 12.06.14.
|
||||
*/
|
||||
@Entity (name = "doorMesssage")
|
||||
public class DoorMessage {
|
||||
|
||||
@Id
|
||||
@Column(name = "ID")
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
private Long serverMessageId;
|
||||
|
||||
@Basic
|
||||
public String dateTime;
|
||||
|
||||
public DoorMessage() {
|
||||
}
|
||||
|
||||
@Basic
|
||||
public String message;
|
||||
|
||||
public DoorMessage(String message) {
|
||||
this.message = message;
|
||||
dateTime=new Date().toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(){
|
||||
return dateTime+" || "+message;
|
||||
}
|
||||
|
||||
public Long getServerMessageId() {
|
||||
return serverMessageId;
|
||||
}
|
||||
|
||||
public String getDateTime() {
|
||||
return dateTime;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package application.repositories;
|
||||
|
||||
import application.model.Door;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
|
||||
/**
|
||||
* Created by lukasgol on 12.06.14.
|
||||
*/
|
||||
public interface DoorRepository extends CrudRepository<Door, Long> {
|
||||
}
|
||||
Reference in new issue
Block a user