Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
d824b6d
CRUD 1 com css e rodando na Azure
brunohenriquechagas May 13, 2022
b7f2fc4
CRUD 1 90% BALA
brunohenriquechagas May 13, 2022
1845cfc
ajustando-css-telacadastro
RaulPetersonSantos May 16, 2022
a306d5d
rotas-cadastro-maquina
RaulPetersonSantos May 17, 2022
0d4737a
Fix variaveis
RaulPetersonSantos May 21, 2022
e17228b
quase-cadastrando
RaulPetersonSantos May 21, 2022
c332116
tentando fazer o cadastro da maquina
brunohenriquechagas May 21, 2022
ddecdd1
Merge branch 'maquina-css' of https://github.com/NetoOSantos/Keep-Swi…
RaulPetersonSantos May 22, 2022
0f09aeb
ajustando-campos-de-cadastro
RaulPetersonSantos May 22, 2022
c882bed
corrigindo-rotas
RaulPetersonSantos May 23, 2022
57a7d97
fix-resolvendo cadastro de maquina
May 23, 2022
ffb722c
fazendo classes para inovação
brunohenriquechagas May 24, 2022
a9abdf5
precisa do crud de maquina
brunohenriquechagas May 24, 2022
7f11d50
tentando puxar id da maquina no login
brunohenriquechagas May 24, 2022
43d9368
adicionando-rota-delete-maqauina
RaulPetersonSantos May 24, 2022
d3f9fbc
insert de idMaquina arrumado
brunohenriquechagas May 25, 2022
88f830f
dockerfile Bruno
brunohenriquechagas May 25, 2022
15abffe
dockerfile Bruno
brunohenriquechagas May 25, 2022
3f5140c
alertas funcionando
brunohenriquechagas May 25, 2022
afbcfee
metodos inovacao
brunohenriquechagas May 25, 2022
28843aa
inovação
brunohenriquechagas May 25, 2022
6b2cfa8
jar-marise
RaulPetersonSantos May 25, 2022
78cd0b4
inovação inserindo em lista usuários ociosos
brunohenriquechagas May 25, 2022
094cf5c
inovação tentando puxar processos
brunohenriquechagas May 26, 2022
3f6e5fc
puxando top 10 processos
brunohenriquechagas May 26, 2022
e230808
delete-maquina
RaulPetersonSantos May 26, 2022
8d82bbc
cadastro funcionario arrumado
brunohenriquechagas May 26, 2022
e5c851a
organizando conexão
May 27, 2022
4636749
fix - resolvendo conflitos telegraminserindo hora em processos
May 27, 2022
4f406a2
fix resolvendo conflitos
May 27, 2022
22a80e1
fix-resolvendo mais conflitos
May 27, 2022
b587346
rotas-funcionando
RaulPetersonSantos May 27, 2022
072c9ba
teste
May 27, 2022
642010c
resolvendo conflitos
May 27, 2022
103a24b
organização do codigo
May 27, 2022
2263c46
subindo novamente jar
May 27, 2022
ed58625
subindo novamente jar
May 27, 2022
f6c4930
conexão com azure e docker funcionando, precisando apenas arrumar o bot
May 27, 2022
86fc493
conexão com azure e docker funcionando, precisando apenas arrumar o bot
May 27, 2022
c756adb
Fix-conflitos
RaulPetersonSantos May 29, 2022
7cf457e
Css-funcionario-maquina
RaulPetersonSantos May 29, 2022
4ba49d5
fix - input
RaulPetersonSantos May 29, 2022
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
12 changes: 12 additions & 0 deletions JAR-inicial/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

# Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
# Click nbfs://nbhost/SystemFileSystem/Templates/Other/Dockerfile to edit this template

FROM alpine:latest

CMD ["/bin/sh"]

FROM openjdk:keepSwimmingJava
ADD /target/Swing-1.0-SNAPSHOT-jar-with-dependencies.jar Swing-1.0-SNAPSHOT-jar-with-dependencies.jar
expose 8080
ENTRYPOINT java -jar Swing-1.0-SNAPSHOT-jar-with-dependencies.jar
7 changes: 6 additions & 1 deletion JAR-inicial/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,15 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>7.2.2.jre8</version>
<version>7.2.2.jre8</version>
<!-- ou versão 7.2.2.jre11, se sua JDK for a 11 -->
<!-- ou versão que já existir na .m2 local -->
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
<version>1.41.2</version>
</dependency>

</dependencies>

Expand Down
62 changes: 37 additions & 25 deletions JAR-inicial/sql.sql
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
create database keepSwimming;
<<<<<<< HEAD
//create database keepSwimming;


=======
>>>>>>> 8d82bbcbc0777436c8ae76173cde357a100ac8a0
use keepSwimming;

create table empresa(
idEmpresa int primary key auto_increment,
create table [dbo].[Empresa](
idEmpresa int primary key IDENTITY(100,1),
cnpj char(18),
nome varchar(50),
email varchar (45),
cep char(9),
senha varchar(100)
)auto_increment 100;
);

INSERT INTO empresa VALUES
(null,"03.778.130/0001-48", "Keep Swimming", 'Keep@hotmail.com', 06126020,'123');

CREATE TABLE FUNCIONARIO (
idFuncionario INT PRIMARY KEY AUTO_INCREMENT,
CREATE TABLE [dbo].[FUNCIONARIO] (
idFuncionario INT PRIMARY KEY IDENTITY,
fkGestor Int,
fkEmpresa Int,
Nome varchar(50),
Expand All @@ -24,56 +28,64 @@ CREATE TABLE FUNCIONARIO (
Cargo VARCHAR(50),
foreign key (fkGestor) references FUNCIONARIO(idFuncionario),
foreign key (fkEmpresa) references empresa(idEmpresa)
on delete cascade
);

INSERT INTO FUNCIONARIO VALUES (null, null, 100, 'Gerson', 'Gerson@hotmail.com', '123', 'Gestor');
INSERT INTO FUNCIONARIO VALUES (null, 1, 100, "Bruno", "bruno@hotmail.com", '123', 'Desenvolvedor');
INSERT INTO [dbo].[FUNCIONARIO] VALUES (null, 100, 'Gerson', 'Gerson@hotmail.com', '123', 'Gestor');
INSERT INTO [dbo].[FUNCIONARIO] VALUES ( 1, 100, 'Bruno', 'bruno@hotmail.com', '123', 'Desenvolvedor');

CREATE TABLE Maquina (
idMaquina INT PRIMARY KEY AUTO_INCREMENT,
CREATE TABLE [dbo].[Maquina] (
idMaquina INT PRIMARY KEY IDENTITY,
fkUsuario INT,
sistemaOperacional varchar(50),
fabricante varchar(50),
arquitetura int,
hostName varchar(50),
permissoes varchar(50),
foreign key (fkUsuario) references FUNCIONARIO(idFuncionario)
on delete cascade
);

CREATE TABLE Processos (
idProcesso INT PRIMARY KEY AUTO_INCREMENT,
CREATE TABLE [dbo].[Processos] (
idProcesso INT PRIMARY KEY IDENTITY,
fkMaquina INT,
PID INT ,
Nome varchar(45),
usoCPU DOUBLE,
usoMemoria DOUBLE,
usoCPU FLOAT,
usoMemoria FLOAT,
bytesUtilizados INT,
memVirtualUtilizada DOUBLE,
memVirtualUtilizada FLOAT,
totalProcessos int,
threads int,
foreign key (fkMaquina) references Maquina(idMaquina)
on delete cascade
);

CREATE TABLE ComponentesHardware (
ID INT PRIMARY KEY AUTO_INCREMENT,
CREATE TABLE [dbo].[ComponentesHardware] (
ID INT PRIMARY KEY IDENTITY,
fkMaquina INT,
nomeDisco varchar(45),
tamanhoDisco DOUBLE,
tamanhoDisco FLOAT,
modeloDisco varchar(100),
qtdDiscos int,
memoriaTotal Double,
memoriaTotal FLOAT,
processadorNome varchar(50),
foreign key (fkMaquina) references Maquina(idMaquina)
);

CREATE TABLE Historico (
ID INT PRIMARY KEY AUTO_INCREMENT,
CREATE TABLE [dbo].[Historico] (
ID INT PRIMARY KEY IDENTITY,
fkMaquina INT,
data datetime,
tempoInicializado varchar(45),
tempoDeAtividade varchar(45),
temperaturaAtual varchar(45),
memoriaEmUso Double,
memoriaDisponivel Double,
processadorUso Double,
memoriaEmUso FLOAT,
memoriaDisponivel FLOAT,
processadorUso FLOAT,
foreign key (fkMaquina) references Maquina(idMaquina)
);
<<<<<<< HEAD
=======
on delete cascade
>>>>>>> 8d82bbcbc0777436c8ae76173cde357a100ac8a0
);
12 changes: 12 additions & 0 deletions JAR-inicial/src/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

# Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
# Click nbfs://nbhost/SystemFileSystem/Templates/Other/Dockerfile to edit this template



CMD ["/bin/sh"]

FROM openjdk:8-jre-alpine
ADD /target/Swing-1.0-SNAPSHOT-jar-with-dependencies.jar Swing-1.0-SNAPSHOT-jar-with-dependencies.jar
expose 8080
ENTRYPOINT java -jar Swing-1.0-SNAPSHOT-jar-with-dependencies.jar
59 changes: 32 additions & 27 deletions JAR-inicial/src/main/java/com/mycompany/swing/Connection.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,47 @@
import javax.sql.DataSource;
import org.apache.commons.dbcp2.BasicDataSource;


/**
*
* @author WalderleyNeto e Bruno Henrrigue
*/
public class Connection {

private BasicDataSource datasource;
private BasicDataSource dataSourceLocal;

public Connection() {
this.datasource = new BasicDataSource();

// this.datasource.setDriverClassName("org.h2.Driver");
this.datasource.setDriverClassName("com.mysql.cj.jdbc.Driver");
//this.datasource.setDriverClassName("com.microsoft.sqlserver.jdbc.SQLServerDriver");

// this.datasource.setUrl("jdbc:h2:file:/home/aluno/.m2/repository/com/h2database/h2/1.4.199/meu_banco");
// usuário padrao H2
// this.datasource.setUsername("sa");
// this.datasource.setPassword("");


this.datasource.setUrl("jdbc:sqlserver://keepswimming.database.windows.net:1433;database=KeepSwimming;"
+ "user=KeepSwimmin@keepswimming;password=2ads@grupo8;encrypt=true;trustServerCertificate=false;"
+ "hostNameInCertificate=*.database.windows.net;loginTimeout=30;");
this.datasource.setUsername("KeepSwimmin@keepswimming");
this.datasource.setPassword("2ads@grupo8");


this.dataSourceLocal.setUrl("jdbc:mysql://localhost:3306/KeepSwimming");
this.dataSourceLocal.setUsername("urubu100");
this.dataSourceLocal.setPassword("urubu100");

// Conexão com banco AZURE
datasource = new BasicDataSource();
datasource.setDriverClassName("com.microsoft.sqlserver.jdbc.SQLServerDriver");
datasource.setUrl("jdbc:sqlserver://keepswimming.database.windows.net:1433;"
+ "database=KeepSwimming;user=KeepSwimmin@keepswimming;password=2ads@grupo8;"
+ "encrypt=true;trustServerCertificate=false;"
+ "hostNameInCertificate=*.database.windows.net;loginTimeout=30;");
datasource.setUsername("KeepSwimmin@keepswimming");
datasource.setPassword("2ads@grupo8");

// Conexão com banco H2
// this.datasource.setUrl("jdbc:h2:file:/home/aluno/.m2/repository"
// + "/com/h2database/h2/1.4.199/meu_banco");
// this.datasource.setDriverClassName("org.h2.Driver");
// this.datasource.setUsername("sa");
// this.datasource.setPassword("");
}

public Connection(Boolean mysql){

// Conexão com banco MySQL Local
datasource = new BasicDataSource();
datasource.setDriverClassName("com.mysql.cj.jdbc.Driver");
datasource.setUrl("jdbc:mysql://172.17.0.2:3306/keep?autoReconnect=true&useSSL=false");
datasource.setUsername("root");
datasource.setPassword("root");

}

public BasicDataSource getDatasource() {
return datasource;
}

DataSource getDatasourceLocal() {
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
}
}
6 changes: 0 additions & 6 deletions JAR-inicial/src/main/java/com/mycompany/swing/EnviaToken.form
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,9 @@
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="99" green="0" red="66" type="rgb"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[383, 450]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[383, 450]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[385, 450]"/>
</Property>
<Property name="resizable" type="boolean" value="false"/>
</Properties>
<SyntheticProperties>
Expand Down
24 changes: 11 additions & 13 deletions JAR-inicial/src/main/java/com/mycompany/swing/EnviaToken.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,14 @@
* @author lucas.alves@VALEMOBI.CORP
*/
public class EnviaToken extends javax.swing.JFrame {
public Funcionario funcionario;
private String guardaCodig ="";

public void setIdsFuncionario(Funcionario idsFuncionario)
{
this.funcionario = idsFuncionario;
}

public Boolean getPassou() {
return passou;
}
Expand Down Expand Up @@ -84,7 +90,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
}
});
getContentPane().add(btnConfereToken);
btnConfereToken.setBounds(140, 250, 83, 22);
btnConfereToken.setBounds(140, 250, 83, 24);

jLabel2.setBackground(new java.awt.Color(255, 255, 255));
jLabel2.setForeground(new java.awt.Color(255, 255, 255));
Expand All @@ -111,13 +117,12 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
}// </editor-fold>//GEN-END:initComponents

private void btnReenviaCodigoActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnReenviaCodigoActionPerformed
emiteCodigo ();
emiteCodigo();
System.out.println(getGuardaCodig());

try {
TelegramBotsApi telegramBotsApi = new TelegramBotsApi(DefaultBotSession.class);
telegramBotsApi.registerBot(new KeepSwimming_TelegramBot(true));

telegramBotsApi.registerBot(new KeepSwimming_TelegramBot(true));
KeepSwimming_TelegramBot.sendToTelegramToken(guardaCodig);

} catch (TelegramApiException e) {
Expand All @@ -132,8 +137,8 @@ private void btnConfereTokenActionPerformed(java.awt.event.ActionEvent evt) {//G
lblRespostaToken.setText("Digite um token valido para continuar!!");
}
else if(usarioDigitou.equalsIgnoreCase(guardaCodig)){
// new TelaUsuarioLogado().setVisible(true);
new TelaPrincipal().setVisible(true);
// new TelaUsuarioLogado().setVisible(true);
new TelaPrincipal(funcionario).setVisible(true);
this.dispose();
}

Expand All @@ -150,8 +155,6 @@ public void emiteCodigo (){
*/
public static void main(String args[]) {



try {
for (javax.swing.UIManager.LookAndFeelInfo info : javax.swing.UIManager.getInstalledLookAndFeels()) {
if ("Nimbus".equals(info.getName())) {
Expand All @@ -170,11 +173,6 @@ public static void main(String args[]) {
}
//</editor-fold>






/* Create and display the form */
java.awt.EventQueue.invokeLater(new Runnable() {
public void run() {
Expand Down
17 changes: 16 additions & 1 deletion JAR-inicial/src/main/java/com/mycompany/swing/Funcionario.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,29 @@


public class Funcionario {
public int ID;
public Integer idFuncionario;
public String EMAIL;
public String SENHA;


public Funcionario() {
}

public Integer getIdFuncionario() {
return idFuncionario;
}

public void setIdFuncionario(Integer idFuncionario) {
this.idFuncionario = idFuncionario;
}

@Override
public String toString() {
return "Funcionario{" + "idFuncionario=" + idFuncionario + ", EMAIL=" + EMAIL + ", SENHA=" + SENHA + '}';
}



public String getEMAIL() {
return EMAIL;
}
Expand Down
Loading