Commit b5175844 authored by Roberto Loayza's avatar Roberto Loayza

Actualizacion de mantenimiento

parent 5cd90dcd
...@@ -205,7 +205,7 @@ public class BusinessParameterController extends XDFController<BusinessParameter ...@@ -205,7 +205,7 @@ public class BusinessParameterController extends XDFController<BusinessParameter
if (this.service.validateKey(bean)) { if (this.service.validateKey(bean)) {
throw new ReferentialIntegrityException("Ya existe un identificador con el mismo nombre"); throw new ReferentialIntegrityException("Ya existe un identificador con el mismo nombre");
} else { } else {
bean = this.service.create(bean); bean = this.service.createBP(bean);
return new ResponseEntity(this.gson.toJson(bean), HttpStatus.OK); return new ResponseEntity(this.gson.toJson(bean), HttpStatus.OK);
} }
} }
......
...@@ -20,8 +20,8 @@ import java.util.List; ...@@ -20,8 +20,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@RestController() @RestController()
@RequestMapping("/calendar-exception") @RequestMapping("/service/settings/calendar-exception")
@ProgramSecurity("calendar-exception") @ProgramSecurity("CALENDAR-EXCEPTION")
@Log4j2 @Log4j2
public class CalendarExceptionController extends XDFController<CalendarExceptionBean, BigInteger> { public class CalendarExceptionController extends XDFController<CalendarExceptionBean, BigInteger> {
......
...@@ -59,6 +59,7 @@ public class GoalController extends XDFController<GoalBean, Long> { ...@@ -59,6 +59,7 @@ public class GoalController extends XDFController<GoalBean, Long> {
String info = ""; String info = "";
try{ try{
goalService.updateGoalForActions(body, id); goalService.updateGoalForActions(body, id);
info = "Ok";
return new ResponseEntity(gson.toJson(info), HttpStatus.OK); return new ResponseEntity(gson.toJson(info), HttpStatus.OK);
} catch (Exception e) { } catch (Exception e) {
info = e.getMessage(); info = e.getMessage();
......
...@@ -15,7 +15,9 @@ import java.math.BigInteger; ...@@ -15,7 +15,9 @@ import java.math.BigInteger;
@Entity @Entity
@Table(name = "AVB_BUSINESS_PARAMETER") @Table(name = "AVB_BUSINESS_PARAMETER")
@NamedQuery(name = "BusinessParameter.findByPK", query = "Select u from BusinessParameter u where u.id = ?1") @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 { public class BusinessParameter implements Serializable {
@Id @Id
......
...@@ -11,7 +11,6 @@ import java.io.Serializable; ...@@ -11,7 +11,6 @@ import java.io.Serializable;
import java.math.BigInteger; import java.math.BigInteger;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
@Audited @Audited
@Entity @Entity
@Table(name = "AVB_BUSINESS_PARAMETER_CONFIG") @Table(name = "AVB_BUSINESS_PARAMETER_CONFIG")
...@@ -21,8 +20,8 @@ public class BusinessParameterConfiguration implements Serializable, Comparable< ...@@ -21,8 +20,8 @@ public class BusinessParameterConfiguration implements Serializable, Comparable<
@Id @Id
@Column(name = "BUPC_ID") @Column(name = "BUPC_ID")
@SequenceGenerator(name = "AVB_BUSINESS_PARAMETER_CONFIG_GENERATOR", sequenceName = "AVB_BUSINESS_PARAMETER_AUD_SEQ", initialValue = 1, allocationSize = 1) @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_GENERATOR") @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_BUSINESS_PARAMETER_CONFIG_GEN")
private BigInteger id; private BigInteger id;
@Version @Version
......
...@@ -28,8 +28,8 @@ public class CalendarExceptionFull implements Serializable { ...@@ -28,8 +28,8 @@ public class CalendarExceptionFull implements Serializable {
@Id @Id
@Column(name = "CALE_EXC_ID") @Column(name = "CALE_EXC_ID")
// @SequenceGenerator(name = "AVB_CALENDAR_EXCEPTION_GENERATOR", sequenceName = "AVB_CALENDAR_EXCEPTION_SEQ", initialValue = 1, allocationSize = 1) @SequenceGenerator(name = "AVB_CALENDAR_EXCEPTION_GENERATOR", sequenceName = "AVB_CALENDAR_EXCEPTION_SEQ", initialValue = 1, allocationSize = 1)
// @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_CALENDAR_EXCEPTION_GENERATOR") @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_CALENDAR_EXCEPTION_GENERATOR")
private BigInteger id; private BigInteger id;
@Version @Version
......
...@@ -25,8 +25,8 @@ public class SchedulerTask implements Serializable { ...@@ -25,8 +25,8 @@ public class SchedulerTask implements Serializable {
@Id @Id
@Column(name = "SHTA_ID") @Column(name = "SHTA_ID")
// @SequenceGenerator(name = "AVB_SCHEDULER_TASK_GENERATOR", sequenceName = "AVB_SCHEDULER_TASK_SEQ", initialValue = 1, allocationSize = 1) @SequenceGenerator(name = "AVB_SCHEDULER_TASK_GENERATOR", sequenceName = "AVB_SCHEDULER_TASK_SEQ", initialValue = 1, allocationSize = 1)
// @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_SCHEDULER_TASK_GENERATOR") @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_SCHEDULER_TASK_GENERATOR")
private BigInteger id; private BigInteger id;
@Version @Version
......
...@@ -230,8 +230,8 @@ public class BusinessParameterService extends XDFService<BusinessParameter, Busi ...@@ -230,8 +230,8 @@ public class BusinessParameterService extends XDFService<BusinessParameter, Busi
} }
} }
@Override //@Override
public BusinessParameterBean create(BusinessParameterBean bean) { public BusinessParameterBean createBP(BusinessParameterBean bean) {
BusinessParameter model = new BusinessParameter(); BusinessParameter model = new BusinessParameter();
BusinessParameterConfiguration businessParameterConfiguration = new BusinessParameterConfiguration(); BusinessParameterConfiguration businessParameterConfiguration = new BusinessParameterConfiguration();
if (this.existsByUK(bean)) { if (this.existsByUK(bean)) {
......
...@@ -128,7 +128,6 @@ public class GoalForActionService extends XDFService<GoalForActions, GoalForActi ...@@ -128,7 +128,6 @@ public class GoalForActionService extends XDFService<GoalForActions, GoalForActi
} }
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("IdAction", String.valueOf(action.getId())); map.put("IdAction", String.valueOf(action.getId()));
map.put("desc", action.getIdentifier());
list.add(map); list.add(map);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment