Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,12 @@
<artifactId>slf4j-simple</artifactId>
<version>1.7.25</version>
</dependency>
<!-- XML parsing -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.11.0</version>
</dependency>
</dependencies>

<build>
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/io/delivery/config/AppConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,9 @@ public ClientWeather clientWeather() {
public ClientRussianPost clientRussianPost() {
return new ClientRussianPost();
}

@Bean
FeedBackDao feedbackDao() {
return new FeedBackDaoImpl(FeedBack.class);
}
}

5 changes: 5 additions & 0 deletions src/main/java/io/delivery/controller/AppController.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,9 @@ public ModelAndView getOperationHistory(@PathVariable("barcode") String barcode)
modelAndView.addObject("info", clientRussianPost.result(barcode));
return modelAndView;
}

@RequestMapping(value = "/feedback")
public String feedBack() {
return "feedback";
}
}
43 changes: 43 additions & 0 deletions src/main/java/io/delivery/controller/FeedBackController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package io.delivery.controller;

import io.delivery.entity.FeedBack;
import io.delivery.service.FeedbackService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@Controller
@RequestMapping("/feedback")
public class FeedBackController {
@Autowired
private FeedbackService feedbackService;

@RequestMapping(value = "/all", method = RequestMethod.GET)
@ResponseBody
public List<FeedBack> getAllFeedbacks() {
return feedbackService.getFeedbackList();
}

@RequestMapping(value = "/add", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
@ResponseBody
public FeedBack addFeedBack(@RequestBody FeedBack feedBack) {
feedbackService.create(feedBack);
return feedBack;
}

@RequestMapping(value = "/update", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
@ResponseBody
public FeedBack updateFeedBack(@RequestBody FeedBack feedBack) {
feedbackService.updateFeedBack(feedBack);
return feedBack;
}

@RequestMapping(value = "/delete/{id}", method = RequestMethod.DELETE, produces = "application/json;charset=UTF-8")
@ResponseBody
public FeedBack deleteFeedBack(@PathVariable(value = "id") String inputId) {
FeedBack foundFeedback = feedbackService.findById(Long.parseLong(inputId));
return feedbackService.deleteFeedBack(foundFeedback);
}
}
7 changes: 7 additions & 0 deletions src/main/java/io/delivery/dao/FeedBackDao.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package io.delivery.dao;


import io.delivery.entity.FeedBack;

public interface FeedBackDao extends BasicDao<FeedBack> {
}
10 changes: 10 additions & 0 deletions src/main/java/io/delivery/dao/impl/FeedBackDaoImpl.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package io.delivery.dao.impl;

import io.delivery.dao.FeedBackDao;
import io.delivery.entity.FeedBack;

public class FeedBackDaoImpl extends BasicDaoImpl<FeedBack> implements FeedBackDao {
public FeedBackDaoImpl(Class<FeedBack> entityClass) {
super(entityClass);
}
}
58 changes: 58 additions & 0 deletions src/main/java/io/delivery/entity/FeedBack.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package io.delivery.entity;

import javax.persistence.*;
import java.util.Date;

@Entity
@Table(name = "feedbacks")
public class FeedBack {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Transient
private Long userId;
@Column(name = "feedback_date")
private Date date;
@Column(name = "feedback_text")
private String feedBackText;

public FeedBack() {
}

public FeedBack(String feedBackText) {
this.date = new Date();
this.feedBackText = feedBackText;
}

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public Long getUserId() {
return userId;
}

public void setUserId(Long userId) {
this.userId = userId;
}

public Date getDate() {
return date;
}

public void setDate(Date date) {
this.date = date;
}

public String getFeedBackText() {
return feedBackText;
}

public void setFeedBackText(String feedBackText) {
this.feedBackText = feedBackText;
}
}
36 changes: 36 additions & 0 deletions src/main/java/io/delivery/service/FeedbackService.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package io.delivery.service;

import io.delivery.entity.FeedBack;

import java.util.List;

public interface FeedbackService {
/**
* Receive all documents from db
*
* @return document list
*/
List<FeedBack> getFeedbackList();

/**
* Create feedBack at database
*
* @param feedBack - current document for creation
* @return created feedBack
*/
FeedBack create(FeedBack feedBack);

/**
* @param feedBack - document for update
* @return document
*/
FeedBack updateFeedBack(FeedBack feedBack);

/**
* @param feedBack = feedBack for delete
* @return deleted feedBack
*/
FeedBack deleteFeedBack(FeedBack feedBack);

FeedBack findById(long id);
}
40 changes: 40 additions & 0 deletions src/main/java/io/delivery/service/impl/FeedBackServiceImp.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package io.delivery.service.impl;

import io.delivery.dao.FeedBackDao;
import io.delivery.entity.FeedBack;
import io.delivery.service.FeedbackService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("feedBackService")
public class FeedBackServiceImp implements FeedbackService {
@Autowired
private FeedBackDao feedbackDao;

@Override
public List<FeedBack> getFeedbackList() {
return feedbackDao.getList();
}

@Override
public FeedBack create(FeedBack feedBack) {
return feedbackDao.create(feedBack);
}

@Override
public FeedBack updateFeedBack(FeedBack feedBack) {
return feedbackDao.update(feedBack);
}

@Override
public FeedBack deleteFeedBack(FeedBack feedBack) {
return feedbackDao.delete(feedBack);
}

@Override
public FeedBack findById(long id) {
return feedbackDao.findById(id);
}
}
32 changes: 32 additions & 0 deletions src/main/java/ru/cbr/web/AllDataInfoXML.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@

package ru.cbr.web;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;


/**
* <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "")
@XmlRootElement(name = "AllDataInfoXML")
public class AllDataInfoXML {


}
Loading