Godfather-Bots/autoresponder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Работа с базой и перемещение файлов

Browse Source
This commit is contained in:
Mark Struchkov 2018-12-31 12:35:16 +03:00
parent 58d2e7d3bc
commit da8b5cba11
47 changed files with 200 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/sadtech/consultant/entity/Message.java → core/src/main/java/org/sadtech/consultant/database/entity/Message.java
View File

@ -1,8 +1,9 @@
package org.sadtech.consultant.entity;
package org.sadtech.consultant.database.entity;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@Data
@ -10,9 +11,11 @@ import javax.persistence.Id;
public class Message {
@Id
@GeneratedValue
private Long idMess;
private Long idUser;
private String text;
private String date;
}

4
core/src/main/java/org/sadtech/consultant/entity/NextUnit.java → core/src/main/java/org/sadtech/consultant/database/entity/NextUnit.java
View File

@ -1,13 +1,15 @@
package org.sadtech.consultant.entity;
package org.sadtech.consultant.database.entity;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Id;
@Entity
@Data
public class NextUnit {
@Id
private Long id;
private Long idNext;

2
core/src/main/java/org/sadtech/consultant/entity/SaveUnit.java → core/src/main/java/org/sadtech/consultant/database/entity/SaveUnit.java
View File

@ -1,4 +1,4 @@
package org.sadtech.consultant.entity;
package org.sadtech.consultant.database.entity;
import lombok.Data;

2
core/src/main/java/org/sadtech/consultant/entity/SocialNetworks.java → core/src/main/java/org/sadtech/consultant/database/entity/SocialNetworks.java
View File

@ -1,4 +1,4 @@
package org.sadtech.consultant.entity;
package org.sadtech.consultant.database.entity;
import lombok.Data;

2
core/src/main/java/org/sadtech/consultant/entity/Unit.java → core/src/main/java/org/sadtech/consultant/database/entity/Unit.java
View File

@ -1,4 +1,4 @@
package org.sadtech.consultant.entity;
package org.sadtech.consultant.database.entity;
import lombok.Data;

5
core/src/main/java/org/sadtech/consultant/entity/User.java → core/src/main/java/org/sadtech/consultant/database/entity/User.java
View File

@ -1,9 +1,8 @@
package org.sadtech.consultant.entity;
package org.sadtech.consultant.database.entity;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import java.util.List;
@ -17,7 +16,7 @@ public class User {
private String token;
private String lastName;
private String city;
private List<SocialNetworks> socialNetworks;
// private List<SocialNetworks> socialNetworks;
}

4
core/src/main/java/org/sadtech/consultant/repository/MessageRepository.java → core/src/main/java/org/sadtech/consultant/database/repository/MessageRepository.java
View File

@ -1,6 +1,6 @@
package org.sadtech.consultant.repository;
package org.sadtech.consultant.database.repository;
import org.sadtech.consultant.entity.Message;
import org.sadtech.consultant.database.entity.Message;
import org.springframework.data.jpa.repository.JpaRepository;
public interface MessageRepository extends JpaRepository<Message, Long> {

4
core/src/main/java/org/sadtech/consultant/repository/NextUnitRepositoriy.java → core/src/main/java/org/sadtech/consultant/database/repository/NextUnitRepositoriy.java
View File

@ -1,6 +1,6 @@
package org.sadtech.consultant.repository;
package org.sadtech.consultant.database.repository;
import org.sadtech.consultant.entity.NextUnit;
import org.sadtech.consultant.database.entity.NextUnit;
import org.springframework.data.jpa.repository.JpaRepository;
public interface NextUnitRepositoriy extends JpaRepository<NextUnit, Long> {

4
core/src/main/java/org/sadtech/consultant/repository/SaveUnitRepositoriy.java → core/src/main/java/org/sadtech/consultant/database/repository/SaveUnitRepositoriy.java
View File

@ -1,6 +1,6 @@
package org.sadtech.consultant.repository;
package org.sadtech.consultant.database.repository;
import org.sadtech.consultant.entity.SaveUnit;
import org.sadtech.consultant.database.entity.SaveUnit;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SaveUnitRepositoriy extends JpaRepository<SaveUnit, Long> {

4
core/src/main/java/org/sadtech/consultant/repository/SocialNetworksRepositoriy.java → core/src/main/java/org/sadtech/consultant/database/repository/SocialNetworksRepositoriy.java
View File

@ -1,6 +1,6 @@
package org.sadtech.consultant.repository;
package org.sadtech.consultant.database.repository;
import org.sadtech.consultant.entity.SocialNetworks;
import org.sadtech.consultant.database.entity.SocialNetworks;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SocialNetworksRepositoriy extends JpaRepository<SocialNetworks, Long> {

4
core/src/main/java/org/sadtech/consultant/repository/UnitRepositoriy.java → core/src/main/java/org/sadtech/consultant/database/repository/UnitRepositoriy.java
View File

@ -1,6 +1,6 @@
package org.sadtech.consultant.repository;
package org.sadtech.consultant.database.repository;
import org.sadtech.consultant.entity.Unit;
import org.sadtech.consultant.database.entity.Unit;
import org.springframework.data.jpa.repository.JpaRepository;
public interface UnitRepositoriy extends JpaRepository<Unit, Long> {

4
core/src/main/java/org/sadtech/consultant/repository/UserRepositoriy.java → core/src/main/java/org/sadtech/consultant/database/repository/UserRepositoriy.java
View File

@ -1,6 +1,6 @@
package org.sadtech.consultant.repository;
package org.sadtech.consultant.database.repository;
import org.sadtech.consultant.entity.User;
import org.sadtech.consultant.database.entity.User;
import org.springframework.data.jpa.repository.JpaRepository;
public interface UserRepositoriy extends JpaRepository<User, Long> {

8
core/src/main/java/org/sadtech/consultant/database/service/MessageService.java Normal file
View File

@ -0,0 +1,8 @@
package org.sadtech.consultant.database.service;
import org.sadtech.consultant.database.entity.Message;
public interface MessageService {
void addMessage(Message message);
}

4
core/src/main/java/org/sadtech/consultant/database/service/NextUnitService.java Normal file
View File

@ -0,0 +1,4 @@
package org.sadtech.consultant.database.service;
public interface NextUnitService {
}

4
core/src/main/java/org/sadtech/consultant/database/service/SaveUnitService.java Normal file
View File

@ -0,0 +1,4 @@
package org.sadtech.consultant.database.service;
public interface SaveUnitService {
}

4
core/src/main/java/org/sadtech/consultant/database/service/SocialNetworksService.java Normal file
View File

@ -0,0 +1,4 @@
package org.sadtech.consultant.database.service;
public interface SocialNetworksService {
}

10
core/src/main/java/org/sadtech/consultant/database/service/UnitService.java Normal file
View File

@ -0,0 +1,10 @@
package org.sadtech.consultant.database.service;
import org.sadtech.consultant.database.entity.Unit;
public interface UnitService {
void addUnit(Unit unit);
void removeUnit(Long id);
}

10
core/src/main/java/org/sadtech/consultant/database/service/UserService.java Normal file
View File

@ -0,0 +1,10 @@
package org.sadtech.consultant.database.service;
import org.sadtech.consultant.database.entity.User;
public interface UserService {
void addUser(User user);
void removeUser(Long id);
}

18
core/src/main/java/org/sadtech/consultant/database/service/impl/MessageServiceImpl.java Normal file
View File

@ -0,0 +1,18 @@
package org.sadtech.consultant.database.service.impl;
import org.sadtech.consultant.database.entity.Message;
import org.sadtech.consultant.database.repository.MessageRepository;
import org.sadtech.consultant.database.service.MessageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class MessageServiceImpl implements MessageService {
@Autowired
private MessageRepository repository;
public void addMessage(Message message) {
repository.saveAndFlush(message);
}
}

6
core/src/main/java/org/sadtech/consultant/service/impl/NextUnitServiceImpl.java → core/src/main/java/org/sadtech/consultant/database/service/impl/NextUnitServiceImpl.java
View File

@ -1,7 +1,7 @@
package org.sadtech.consultant.service.impl;
package org.sadtech.consultant.database.service.impl;
import org.sadtech.consultant.repository.NextUnitRepositoriy;
import org.sadtech.consultant.service.NextUnitService;
import org.sadtech.consultant.database.repository.NextUnitRepositoriy;
import org.sadtech.consultant.database.service.NextUnitService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

6
core/src/main/java/org/sadtech/consultant/service/impl/SaveUnitServiceImpl.java → core/src/main/java/org/sadtech/consultant/database/service/impl/SaveUnitServiceImpl.java
View File

@ -1,7 +1,7 @@
package org.sadtech.consultant.service.impl;
package org.sadtech.consultant.database.service.impl;
import org.sadtech.consultant.repository.SaveUnitRepositoriy;
import org.sadtech.consultant.service.SaveUnitService;
import org.sadtech.consultant.database.repository.SaveUnitRepositoriy;
import org.sadtech.consultant.database.service.SaveUnitService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

6
core/src/main/java/org/sadtech/consultant/service/impl/SocialNetworksServiceImpl.java → core/src/main/java/org/sadtech/consultant/database/service/impl/SocialNetworksServiceImpl.java
View File

@ -1,7 +1,7 @@
package org.sadtech.consultant.service.impl;
package org.sadtech.consultant.database.service.impl;
import org.sadtech.consultant.repository.SocialNetworksRepositoriy;
import org.sadtech.consultant.service.SocialNetworksService;
import org.sadtech.consultant.database.repository.SocialNetworksRepositoriy;
import org.sadtech.consultant.database.service.SocialNetworksService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

8
core/src/main/java/org/sadtech/consultant/service/impl/UnitServiceImpl.java → core/src/main/java/org/sadtech/consultant/database/service/impl/UnitServiceImpl.java
View File

@ -1,8 +1,8 @@
package org.sadtech.consultant.service.impl;
package org.sadtech.consultant.database.service.impl;
import org.sadtech.consultant.entity.Unit;
import org.sadtech.consultant.repository.UnitRepositoriy;
import org.sadtech.consultant.service.UnitService;
import org.sadtech.consultant.database.entity.Unit;
import org.sadtech.consultant.database.repository.UnitRepositoriy;
import org.sadtech.consultant.database.service.UnitService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

8
core/src/main/java/org/sadtech/consultant/service/impl/UserServiceImpl.java → core/src/main/java/org/sadtech/consultant/database/service/impl/UserServiceImpl.java
View File

@ -1,8 +1,8 @@
package org.sadtech.consultant.service.impl;
package org.sadtech.consultant.database.service.impl;
import org.sadtech.consultant.entity.User;
import org.sadtech.consultant.repository.UserRepositoriy;
import org.sadtech.consultant.service.UserService;
import org.sadtech.consultant.database.entity.User;
import org.sadtech.consultant.database.repository.UserRepositoriy;
import org.sadtech.consultant.database.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

8
core/src/main/java/org/sadtech/consultant/service/MessageService.java
View File

@ -1,8 +0,0 @@
package org.sadtech.consultant.service;
import org.sadtech.consultant.entity.Message;
public interface MessageService {
void addMessage(Message message);
}

4
core/src/main/java/org/sadtech/consultant/service/NextUnitService.java
View File

@ -1,4 +0,0 @@
package org.sadtech.consultant.service;
public interface NextUnitService {
}

4
core/src/main/java/org/sadtech/consultant/service/SaveUnitService.java
View File

@ -1,4 +0,0 @@
package org.sadtech.consultant.service;
public interface SaveUnitService {
}

4
core/src/main/java/org/sadtech/consultant/service/SocialNetworksService.java
View File

@ -1,4 +0,0 @@
package org.sadtech.consultant.service;
public interface SocialNetworksService {
}

10
core/src/main/java/org/sadtech/consultant/service/UnitService.java
View File

@ -1,10 +0,0 @@
package org.sadtech.consultant.service;
import org.sadtech.consultant.entity.Unit;
public interface UnitService {
void addUnit(Unit unit);
void removeUnit(Long id);
}

10
core/src/main/java/org/sadtech/consultant/service/UserService.java
View File

@ -1,10 +0,0 @@
package org.sadtech.consultant.service;
import org.sadtech.consultant.entity.User;
public interface UserService {
void addUser(User user);
void removeUser(Long id);
}

16
core/src/main/java/org/sadtech/consultant/service/impl/MessageServiceImpl.java
View File

@ -1,16 +0,0 @@
package org.sadtech.consultant.service.impl;
import org.sadtech.consultant.entity.Message;
import org.sadtech.consultant.repository.MessageRepository;
import org.sadtech.consultant.service.MessageService;
import org.springframework.beans.factory.annotation.Autowired;
public class MessageServiceImpl implements MessageService {
@Autowired
private MessageRepository repository;
public void addMessage(Message message) {
repository.saveAndFlush(message);
}
}

31
vk-bot/pom.xml
View File

@ -18,8 +18,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>6</source>
<target>6</target>
<source>7</source>
<target>7</target>
</configuration>
</plugin>
@ -45,7 +45,7 @@
<spring.data>2.1.3.RELEASE</spring.data>
<javax.servlet>3.1.0</javax.servlet>
<javax.persistance>1.0.2</javax.persistance>
<javax.persistance>2.2</javax.persistance>
<hibernate.entitymanager>5.4.0.Final</hibernate.entitymanager>
<hibernate.core>5.2.10.Final</hibernate.core>
@ -81,6 +81,10 @@
<version>${log4j}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@ -111,6 +115,11 @@
<artifactId>spring-data-jpa</artifactId>
<version>${spring.data}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>5.1.3.RELEASE</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@ -138,19 +147,21 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<artifactId>javax.persistence-api</artifactId>
<version>${javax.persistance}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${hibernate.entitymanager}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@ -158,6 +169,18 @@
<version>${hibernate.core}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>1.7.13</version>
</dependency>
<dependency>
<groupId>org.sadtech</groupId>
<artifactId>consultant-core</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

20
vk-bot/src/main/java/org/sadtech/vkbot/config/TestMain.java → vk-bot/src/main/java/org/sadtech/vkbot/Main.java
View File

@ -1,21 +1,27 @@
package org.sadtech.vkbot.config;
package org.sadtech.vkbot;
import lombok.extern.log4j.Log4j;
import org.sadtech.vkbot.config.DataConfig;
import org.sadtech.vkbot.config.SpringConfigVk;
import org.sadtech.vkbot.listener.EventListenable;
import org.sadtech.vkbot.listener.Observable;
import org.sadtech.vkbot.listener.handlers.Handled;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@Log4j
public class TestMain {
public class Main {
public static void main(String[] args) throws Exception {
Main main = new Main();
main.run();
}
public void run() throws Exception {
log.info("\n\n\n\n=== Запуск прогарммы ===\n\n");
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SpringConfigVk.class);
context.register(DataConfig.class);
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SpringConfigVk.class, DataConfig.class);
EventListenable eventListener = context.getBean(EventListenable.class);
eventListener.listen();
Observable dispetcherHandler = context.getBean(Observable.class);
dispetcherHandler.packaging();
Handled dispetcherHandler = context.getBean(Handled.class);
dispetcherHandler.sortAndSend();
log.info("\n\n=== Конец программы ===\n\n");
}

7
vk-bot/src/main/java/org/sadtech/vkbot/config/DataConfig.java
View File

@ -4,8 +4,6 @@ import org.hibernate.jpa.HibernatePersistenceProvider;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@ -16,8 +14,7 @@ import java.util.Properties;
@Configuration
@EnableTransactionManagement
@EnableJpaRepositories("org.sadtech.vkbot.repo")
@PropertySource("classpath:config.properties")
public class DataConfig {
@Value("${db.driver}")
@ -38,7 +35,7 @@ public class DataConfig {
@Value("${db.hibernate.hbm2ddl.auto}")
private String PROPERTY_NAME_HIBERNATE_HBM2DDL_AUTO;
@Bean(name = "entityManagerFactory")
@Bean
public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
LocalContainerEntityManagerFactoryBean entityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean();
entityManagerFactoryBean.setDataSource(dataSource());

7
vk-bot/src/main/java/org/sadtech/vkbot/config/SpringConfigVk.java
View File

@ -9,10 +9,7 @@ import com.vk.api.sdk.exceptions.ClientException;
import com.vk.api.sdk.httpclient.HttpTransportClient;
import com.vk.api.sdk.objects.groups.responses.GetLongPollServerResponse;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.*;
import org.springframework.core.task.TaskExecutor;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
@ -23,9 +20,9 @@ import java.util.concurrent.Executors;
@Configuration
@EnableAsync
@Import({DataConfig.class})
@PropertySource("classpath:config.properties")
@ComponentScan("org.sadtech.vkbot.listener")
@EnableScheduling
public class SpringConfigVk {
@Value("${vk.groupID}")

16
vk-bot/src/main/java/org/sadtech/vkbot/entity/User.java
View File

@ -1,16 +0,0 @@
package org.sadtech.vkbot.entity;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Id;
@Entity
@Data
public class User {
@Id
private long id;
private String name;
}

1
vk-bot/src/main/java/org/sadtech/vkbot/listener/Observable.java
View File

@ -6,5 +6,4 @@ public interface Observable {
// void removeObserver(Observer o);
void notifyObservers();
void packaging() throws Exception;
}

2
vk-bot/src/main/java/org/sadtech/vkbot/listener/Observer.java
View File

@ -5,5 +5,5 @@ import com.google.gson.JsonObject;
import java.util.List;
public interface Observer {
void update(List<JsonObject> jsonObjects);
void update(JsonObject object);
}

2
vk-bot/src/main/java/org/sadtech/vkbot/listener/data/impl/ResponseDataVk.java
View File

@ -10,7 +10,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
@Component
public class ResponseDataVk implements ResponsibleData {
private Queue<JsonObject> jsonObjects = new ConcurrentLinkedQueue<JsonObject>();
private Queue<JsonObject> jsonObjects = new ConcurrentLinkedQueue<>();
@Override
public void add(JsonObject jsonObject) {

7
vk-bot/src/main/java/org/sadtech/vkbot/listener/handlers/Handled.java Normal file
View File

@ -0,0 +1,7 @@
package org.sadtech.vkbot.listener.handlers;
public interface Handled {
void sortAndSend() throws Exception;
}

21
vk-bot/src/main/java/org/sadtech/vkbot/listener/handlers/MessageHandlerVk.java
View File

@ -1,21 +0,0 @@
package org.sadtech.vkbot.listener.handlers;
import com.google.gson.JsonObject;
import org.sadtech.vkbot.listener.Observer;
import java.util.List;
public class MessageHandlerVk implements Observer {
private DispetcherHandler dispetcherHandler;
public MessageHandlerVk(DispetcherHandler dispetcherHandler) {
this.dispetcherHandler = dispetcherHandler;
dispetcherHandler.registerObserver(this);
}
@Override
public void update(List<JsonObject> jsonObjects) {
}
}

16
vk-bot/src/main/java/org/sadtech/vkbot/listener/handlers/DispetcherHandler.java → vk-bot/src/main/java/org/sadtech/vkbot/listener/handlers/impl/DispetcherHandlerVk.java
View File

@ -1,12 +1,12 @@
package org.sadtech.vkbot.listener.handlers;
package org.sadtech.vkbot.listener.handlers.impl;
import com.google.gson.JsonObject;
import lombok.extern.log4j.Log4j;
import org.sadtech.vkbot.listener.Observable;
import org.sadtech.vkbot.listener.Observer;
import org.sadtech.vkbot.listener.data.ResponsibleData;
import org.sadtech.vkbot.listener.handlers.Handled;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@ -14,20 +14,22 @@ import java.util.List;
@Log4j
@Component
public class DispetcherHandler implements Observable {
public class DispetcherHandlerVk implements Observable, Handled {
private ResponsibleData date;
private List<Observer> observers = new ArrayList<Observer>();
private JsonObject event;
public DispetcherHandler(ResponsibleData date) {
public DispetcherHandlerVk(ResponsibleData date) {
this.date = date;
}
@Async
public void packaging() {
public void sortAndSend() {
while (true) {
if (date.getJsonObjects().peek() != null) {
log.info(date.getJsonObjects().poll());
event = date.getJsonObjects().poll();
notifyObservers();
}
}
}
@ -40,7 +42,7 @@ public class DispetcherHandler implements Observable {
@Override
public void notifyObservers() {
for (Observer observer : observers) {
//observer.update();
observer.update(event);
}
}
}

39
vk-bot/src/main/java/org/sadtech/vkbot/listener/handlers/impl/MessageHandlerVk.java Normal file
View File

@ -0,0 +1,39 @@
package org.sadtech.vkbot.listener.handlers.impl;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.vk.api.sdk.objects.messages.Message;
import lombok.extern.log4j.Log4j;
import org.sadtech.consultant.database.service.MessageService;
import org.sadtech.consultant.database.service.impl.MessageServiceImpl;
import org.sadtech.vkbot.listener.Observable;
import org.sadtech.vkbot.listener.Observer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Log4j
@Component
public class MessageHandlerVk implements Observer {
private Observable dispetcherHandler;
// @Autowired
// private MessageService service;
public MessageHandlerVk(Observable dispetcherHandler) {
this.dispetcherHandler = dispetcherHandler;
dispetcherHandler.registerObserver(this);
}
@Override
public void update(JsonObject object) {
if (object.get("type").toString().equals("\"message_new\"")) {
Gson gson = new Gson();
Message message = gson.fromJson(object.getAsJsonObject("object"), Message.class);
send(message);
}
}
private void send(Message message) {
log.info(message.getBody());
}
}

2
vk-bot/src/main/java/org/sadtech/vkbot/listener/impl/EventListenerVk.java
View File

@ -59,8 +59,6 @@ public class EventListenerVk implements EventListenable {
String test = "{\"one_time\":false,\"buttons\":[[{\"action\":{\"type\":\"text\",\"payload\":\"{\\\"button\\\": \\\"1\\\"}\",\"label\":\"Red2\"},\"color\":\"negative\"},{\"action\":{\"type\":\"text\",\"payload\":\"{\\\"button\\\": \\\"2\\\"}\",\"label\":\"Green\"},\"color\":\"positive\"}],[{\"action\":{\"type\":\"text\",\"payload\":\"{\\\"button\\\": \\\"3\\\"}\",\"label\":\"White\"},\"color\":\"default\"},{\"action\":{\"type\":\"text\",\"payload\":\"{\\\"button\\\": \\\"4\\\"}\",\"label\":\"Blue\"},\"color\":\"primary\"}]]}";
vk.messages().send(actor).peerId(244319573).keyboard(test).message("Сообщение получено").execute();
}
longPollEventsQuery = longPoll.getEvents(server.getServer(), server.getKey(), eventsResponse.getTs()).waitTime(20);
} while (true);

9
vk-bot/src/main/java/org/sadtech/vkbot/repo/UserRepository.java
View File

@ -1,9 +0,0 @@
package org.sadtech.vkbot.repo;
import org.sadtech.vkbot.entity.User;
import org.springframework.data.jpa.repository.JpaRepository;
public interface UserRepository extends JpaRepository<User, Long> {
}

11
vk-bot/src/main/java/org/sadtech/vkbot/service/UserService.java
View File

@ -1,11 +0,0 @@
package org.sadtech.vkbot.service;
import org.sadtech.vkbot.entity.User;
public interface UserService {
User addUser(User user);
void removeUser(long id);
}

26
vk-bot/src/main/java/org/sadtech/vkbot/service/impl/UserServiceImpl.java
View File

@ -1,26 +0,0 @@
package org.sadtech.vkbot.service.impl;
import org.sadtech.vkbot.entity.User;
import org.sadtech.vkbot.repo.UserRepository;
import org.sadtech.vkbot.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class UserServiceImpl implements UserService {
@Autowired
private UserRepository userRepository;
@Override
public User addUser(User user) {
User savedUser = userRepository.saveAndFlush(user);
return savedUser;
}
@Override
public void removeUser(long id) {
userRepository.deleteById(id);
}
}