Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
ejercicio2-framework-back
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Josue
ejercicio2-framework-back
Commits
b5175844
Commit
b5175844
authored
Dec 11, 2021
by
Roberto Loayza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Actualizacion de mantenimiento
parent
5cd90dcd
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
14 deletions
+15
-14
BusinessParameterController.java
...ytesw/bytebot/controller/BusinessParameterController.java
+1
-1
CalendarExceptionController.java
...ytesw/bytebot/controller/CalendarExceptionController.java
+2
-2
GoalController.java
...in/java/com/bytesw/bytebot/controller/GoalController.java
+1
-0
BusinessParameter.java
...main/java/com/bytesw/bytebot/model/BusinessParameter.java
+3
-1
BusinessParameterConfiguration.java
.../bytesw/bytebot/model/BusinessParameterConfiguration.java
+2
-3
CalendarExceptionFull.java
.../java/com/bytesw/bytebot/model/CalendarExceptionFull.java
+2
-2
SchedulerTask.java
src/main/java/com/bytesw/bytebot/model/SchedulerTask.java
+2
-2
BusinessParameterService.java
.../com/bytesw/bytebot/service/BusinessParameterService.java
+2
-2
GoalForActionService.java
...java/com/bytesw/bytebot/service/GoalForActionService.java
+0
-1
No files found.
src/main/java/com/bytesw/bytebot/controller/BusinessParameterController.java
View file @
b5175844
...
...
@@ -205,7 +205,7 @@ public class BusinessParameterController extends XDFController<BusinessParameter
if
(
this
.
service
.
validateKey
(
bean
))
{
throw
new
ReferentialIntegrityException
(
"Ya existe un identificador con el mismo nombre"
);
}
else
{
bean
=
this
.
service
.
create
(
bean
);
bean
=
this
.
service
.
create
BP
(
bean
);
return
new
ResponseEntity
(
this
.
gson
.
toJson
(
bean
),
HttpStatus
.
OK
);
}
}
...
...
src/main/java/com/bytesw/bytebot/controller/CalendarExceptionController.java
View file @
b5175844
...
...
@@ -20,8 +20,8 @@ import java.util.List;
import
java.util.Map
;
@RestController
()
@RequestMapping
(
"/calendar-exception"
)
@ProgramSecurity
(
"
calendar-exception
"
)
@RequestMapping
(
"/
service/settings/
calendar-exception"
)
@ProgramSecurity
(
"
CALENDAR-EXCEPTION
"
)
@Log4j2
public
class
CalendarExceptionController
extends
XDFController
<
CalendarExceptionBean
,
BigInteger
>
{
...
...
src/main/java/com/bytesw/bytebot/controller/GoalController.java
View file @
b5175844
...
...
@@ -59,6 +59,7 @@ public class GoalController extends XDFController<GoalBean, Long> {
String
info
=
""
;
try
{
goalService
.
updateGoalForActions
(
body
,
id
);
info
=
"Ok"
;
return
new
ResponseEntity
(
gson
.
toJson
(
info
),
HttpStatus
.
OK
);
}
catch
(
Exception
e
)
{
info
=
e
.
getMessage
();
...
...
src/main/java/com/bytesw/bytebot/model/BusinessParameter.java
View file @
b5175844
...
...
@@ -15,7 +15,9 @@ import java.math.BigInteger;
@Entity
@Table
(
name
=
"AVB_BUSINESS_PARAMETER"
)
@NamedQuery
(
name
=
"BusinessParameter.findByPK"
,
query
=
"Select u from BusinessParameter u where u.id = ?1"
)
@Getter
@Setter
@EqualsAndHashCode
@ToString
(
exclude
=
"id"
)
@Getter
@Setter
@EqualsAndHashCode
@ToString
(
exclude
=
"id"
)
public
class
BusinessParameter
implements
Serializable
{
@Id
...
...
src/main/java/com/bytesw/bytebot/model/BusinessParameterConfiguration.java
View file @
b5175844
...
...
@@ -11,7 +11,6 @@ import java.io.Serializable;
import
java.math.BigInteger
;
import
java.time.OffsetDateTime
;
@Audited
@Entity
@Table
(
name
=
"AVB_BUSINESS_PARAMETER_CONFIG"
)
...
...
@@ -21,8 +20,8 @@ public class BusinessParameterConfiguration implements Serializable, Comparable<
@Id
@Column
(
name
=
"BUPC_ID"
)
@SequenceGenerator
(
name
=
"AVB_BUSINESS_PARAMETER_CONFIG_GEN
ERATOR"
,
sequenceName
=
"AVB_BUSINESS_PARAMETER_AUD
_SEQ"
,
initialValue
=
1
,
allocationSize
=
1
)
@GeneratedValue
(
strategy
=
GenerationType
.
SEQUENCE
,
generator
=
"AVB_BUSINESS_PARAMETER_CONFIG_GEN
ERATOR
"
)
@SequenceGenerator
(
name
=
"AVB_BUSINESS_PARAMETER_CONFIG_GEN
"
,
sequenceName
=
"AVB_BUSINESS_PARAMETER_CONFIG
_SEQ"
,
initialValue
=
1
,
allocationSize
=
1
)
@GeneratedValue
(
strategy
=
GenerationType
.
SEQUENCE
,
generator
=
"AVB_BUSINESS_PARAMETER_CONFIG_GEN"
)
private
BigInteger
id
;
@Version
...
...
src/main/java/com/bytesw/bytebot/model/CalendarExceptionFull.java
View file @
b5175844
...
...
@@ -28,8 +28,8 @@ public class CalendarExceptionFull implements Serializable {
@Id
@Column
(
name
=
"CALE_EXC_ID"
)
//
@SequenceGenerator(name = "AVB_CALENDAR_EXCEPTION_GENERATOR", sequenceName = "AVB_CALENDAR_EXCEPTION_SEQ", initialValue = 1, allocationSize = 1)
//
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_CALENDAR_EXCEPTION_GENERATOR")
@SequenceGenerator
(
name
=
"AVB_CALENDAR_EXCEPTION_GENERATOR"
,
sequenceName
=
"AVB_CALENDAR_EXCEPTION_SEQ"
,
initialValue
=
1
,
allocationSize
=
1
)
@GeneratedValue
(
strategy
=
GenerationType
.
SEQUENCE
,
generator
=
"AVB_CALENDAR_EXCEPTION_GENERATOR"
)
private
BigInteger
id
;
@Version
...
...
src/main/java/com/bytesw/bytebot/model/SchedulerTask.java
View file @
b5175844
...
...
@@ -25,8 +25,8 @@ public class SchedulerTask implements Serializable {
@Id
@Column
(
name
=
"SHTA_ID"
)
//
@SequenceGenerator(name = "AVB_SCHEDULER_TASK_GENERATOR", sequenceName = "AVB_SCHEDULER_TASK_SEQ", initialValue = 1, allocationSize = 1)
//
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_SCHEDULER_TASK_GENERATOR")
@SequenceGenerator
(
name
=
"AVB_SCHEDULER_TASK_GENERATOR"
,
sequenceName
=
"AVB_SCHEDULER_TASK_SEQ"
,
initialValue
=
1
,
allocationSize
=
1
)
@GeneratedValue
(
strategy
=
GenerationType
.
SEQUENCE
,
generator
=
"AVB_SCHEDULER_TASK_GENERATOR"
)
private
BigInteger
id
;
@Version
...
...
src/main/java/com/bytesw/bytebot/service/BusinessParameterService.java
View file @
b5175844
...
...
@@ -230,8 +230,8 @@ public class BusinessParameterService extends XDFService<BusinessParameter, Busi
}
}
@Override
public
BusinessParameterBean
create
(
BusinessParameterBean
bean
)
{
//
@Override
public
BusinessParameterBean
create
BP
(
BusinessParameterBean
bean
)
{
BusinessParameter
model
=
new
BusinessParameter
();
BusinessParameterConfiguration
businessParameterConfiguration
=
new
BusinessParameterConfiguration
();
if
(
this
.
existsByUK
(
bean
))
{
...
...
src/main/java/com/bytesw/bytebot/service/GoalForActionService.java
View file @
b5175844
...
...
@@ -128,7 +128,6 @@ public class GoalForActionService extends XDFService<GoalForActions, GoalForActi
}
Map
<
String
,
String
>
map
=
new
HashMap
<>();
map
.
put
(
"IdAction"
,
String
.
valueOf
(
action
.
getId
()));
map
.
put
(
"desc"
,
action
.
getIdentifier
());
list
.
add
(
map
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment