From f448d6541a4e590d6bce46b8eca0871eaf291ab8 Mon Sep 17 00:00:00 2001 From: DyCTaTOR <125912249+DyCTaTOR@users.noreply.github.com> Date: Tue, 16 Apr 2024 12:12:07 +0400 Subject: [PATCH] g --- data.mv.db | Bin 69632 -> 86016 bytes data.trace.db | 32 ++++++++++++++++++ .../demo/entrysData/api/EntrysDataDto.java | 11 +++--- .../entrysData/model/EntrysDataEntity.java | 4 +-- .../entrysData/service/EntrysDataService.java | 1 + 5 files changed, 41 insertions(+), 7 deletions(-) diff --git a/data.mv.db b/data.mv.db index 794d3046a5c9e02710b2a0df92dd98d674de87f2..a74977e5f820ad7d1f2dfce212674baebe5b2c52 100644 GIT binary patch literal 86016 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 OPki_V4vz)@|NjBRZp%mj literal 69632 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.java:61) + at org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSource.initializeRemoteInstance(JDBCDataSource.java:119) + at org.jkiss.dbeaver.ext.generic.model.GenericDataSource.(GenericDataSource.java:124) + at org.jkiss.dbeaver.ext.h2.model.H2DataSource.(H2DataSource.java:43) + at org.jkiss.dbeaver.ext.h2.model.H2MetaModel.createDataSourceImpl(H2MetaModel.java:55) + at org.jkiss.dbeaver.ext.generic.GenericDataSourceProvider.openDataSource(GenericDataSourceProvider.java:106) + at org.jkiss.dbeaver.registry.DataSourceDescriptor.openDataSource(DataSourceDescriptor.java:1402) + at org.jkiss.dbeaver.registry.DataSourceDescriptor.connect0(DataSourceDescriptor.java:1239) + at org.jkiss.dbeaver.registry.DataSourceDescriptor.connect(DataSourceDescriptor.java:1025) + at org.jkiss.dbeaver.runtime.jobs.ConnectJob.run(ConnectJob.java:77) + at org.jkiss.dbeaver.runtime.jobs.ConnectJob.runSync(ConnectJob.java:104) + at org.jkiss.dbeaver.ui.actions.datasource.DataSourceHandler.connectToDataSource(DataSourceHandler.java:117) + at org.jkiss.dbeaver.ui.actions.datasource.UIServiceConnectionsImpl.initConnection(UIServiceConnectionsImpl.java:87) + at org.jkiss.dbeaver.model.DBUtils.initDataSource(DBUtils.java:2488) + at org.jkiss.dbeaver.model.navigator.DBNDataSource.initializeNode(DBNDataSource.java:158) + at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.getChildren(DBNDatabaseNode.java:227) + at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.getChildren(DBNDatabaseNode.java:1) + at org.jkiss.dbeaver.model.navigator.DBNUtils.getNodeChildrenFiltered(DBNUtils.java:91) + at org.jkiss.dbeaver.ui.navigator.database.load.TreeLoadService.evaluate(TreeLoadService.java:49) + at org.jkiss.dbeaver.ui.navigator.database.load.TreeLoadService.evaluate(TreeLoadService.java:1) + at org.jkiss.dbeaver.ui.LoadingJob.run(LoadingJob.java:89) + at org.jkiss.dbeaver.ui.LoadingJob.run(LoadingJob.java:73) + at org.jkiss.dbeaver.model.runtime.AbstractJob.run(AbstractJob.java:114) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:63) diff --git a/src/main/java/com/example/demo/entrysData/api/EntrysDataDto.java b/src/main/java/com/example/demo/entrysData/api/EntrysDataDto.java index ba751de..6b8bd63 100644 --- a/src/main/java/com/example/demo/entrysData/api/EntrysDataDto.java +++ b/src/main/java/com/example/demo/entrysData/api/EntrysDataDto.java @@ -3,21 +3,22 @@ package com.example.demo.entrysData.api; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; public class EntrysDataDto { - @JsonProperty(access = JsonProperty.Access.READ_ONLY) private Long id; - @NotNull + @NotBlank private String login; @NotNull private String role; - @NotNull + @NotBlank private String password; @NotNull @Min(1) private Long departmentId; + @JsonProperty(access = JsonProperty.Access.READ_ONLY) public Long getId() { return id; } @@ -39,8 +40,8 @@ public class EntrysDataDto { return role; } - public void setRole(String role) { - this.role = role; + public void setRole() { + this.role = "user"; } public String getPassword() { diff --git a/src/main/java/com/example/demo/entrysData/model/EntrysDataEntity.java b/src/main/java/com/example/demo/entrysData/model/EntrysDataEntity.java index 2f65200..d1d109a 100644 --- a/src/main/java/com/example/demo/entrysData/model/EntrysDataEntity.java +++ b/src/main/java/com/example/demo/entrysData/model/EntrysDataEntity.java @@ -54,8 +54,8 @@ public class EntrysDataEntity extends BaseEntity { return role; } - public void setRole(String role) { - this.role = role; + public void setRole() { + this.role = "user"; } public DepartmentEntity getDepartment() { diff --git a/src/main/java/com/example/demo/entrysData/service/EntrysDataService.java b/src/main/java/com/example/demo/entrysData/service/EntrysDataService.java index 9a2b462..6816a13 100644 --- a/src/main/java/com/example/demo/entrysData/service/EntrysDataService.java +++ b/src/main/java/com/example/demo/entrysData/service/EntrysDataService.java @@ -56,6 +56,7 @@ public class EntrysDataService { existsEntity.setLogin(entity.getLogin()); existsEntity.setPassword(entity.getPassword()); existsEntity.setDepartment(entity.getDepartment()); + existsEntity.setRole(); return repository.save(existsEntity); }