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
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.createBP(bean);
return new ResponseEntity(this.gson.toJson(bean), HttpStatus.OK);
}
}
......
......@@ -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> {
......
......@@ -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();
......
......@@ -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
......
......@@ -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_GENERATOR", sequenceName = "AVB_BUSINESS_PARAMETER_AUD_SEQ", initialValue = 1, allocationSize = 1)
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_BUSINESS_PARAMETER_CONFIG_GENERATOR")
@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
......
......@@ -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
......
......@@ -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
......
......@@ -230,8 +230,8 @@ public class BusinessParameterService extends XDFService<BusinessParameter, Busi
}
}
@Override
public BusinessParameterBean create(BusinessParameterBean bean) {
//@Override
public BusinessParameterBean createBP(BusinessParameterBean bean) {
BusinessParameter model = new BusinessParameter();
BusinessParameterConfiguration businessParameterConfiguration = new BusinessParameterConfiguration();
if (this.existsByUK(bean)) {
......
......@@ -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);
}
......
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