Browse Source

entity 수정 및 controller 직렬화/역직렬화

pull/2/head
지대한 1 year ago
parent
commit
82c7f168fd
  1. 55
      pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java
  2. 5
      pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRqModel.java
  3. 10
      pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AnctCstmerRlModel.java
  4. 4
      pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java
  5. 5
      pav-server/src/main/java/com/palnet/biz/api/acnt/terms/model/AcntTermsRsModel.java
  6. 27
      pav-server/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java
  7. 5
      pav-server/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryDetailModel.java
  8. 16
      pav-server/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryModel.java
  9. 16
      pav-server/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryRsModel.java
  10. 4
      pav-server/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightMapper.java
  11. 12
      pav-server/src/main/java/com/palnet/biz/config/JsonConfig.java
  12. 22
      pav-server/src/main/java/com/palnet/biz/config/StringToInstantBinding.java
  13. 18
      pav-server/src/main/java/com/palnet/biz/config/WebMvcConfig.java
  14. 44
      pav-server/src/main/java/com/palnet/biz/config/convert/InstantDateStrDeserializer.java
  15. 40
      pav-server/src/main/java/com/palnet/biz/config/convert/InstantDateStrSerializer.java
  16. 47
      pav-server/src/main/java/com/palnet/biz/config/convert/InstantDatetimeStrDeserializer.java
  17. 40
      pav-server/src/main/java/com/palnet/biz/config/convert/InstantDatetimeStrSerializer.java
  18. 70
      pav-server/src/main/java/com/palnet/biz/config/convert/InstantStringDeserializer.java
  19. 39
      pav-server/src/main/java/com/palnet/biz/config/convert/StringToInstantBinding.java
  20. 9
      pav-server/src/main/java/com/palnet/biz/jpa/entity/ComArcrftBas.java
  21. 78
      pav-server/src/main/java/com/palnet/biz/jpa/entity/ComAuthBas.java
  22. 81
      pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdBas.java
  23. 73
      pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdGroupBas.java
  24. 62
      pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtg.java
  25. 12
      pav-server/src/main/java/com/palnet/biz/jpa/entity/ComIdntfBas.java
  26. 78
      pav-server/src/main/java/com/palnet/biz/jpa/entity/ComSiteBas.java
  27. 78
      pav-server/src/main/java/com/palnet/biz/jpa/entity/ComTrmnlBas.java
  28. 8
      pav-server/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlBas.java
  29. 192
      pav-server/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstry.java
  30. 144
      pav-server/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstryArea.java
  31. 3
      pav-server/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlWarnLog.java
  32. 7
      pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanArcrft.java
  33. 6
      pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanArea.java
  34. 7
      pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanAreaCoord.java
  35. 6
      pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java
  36. 11
      pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanCtrCntrlRel.java
  37. 7
      pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanPilot.java
  38. 2
      pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCrtfyhpBas.java
  39. 2
      pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrBas.java
  40. 53
      pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrConectHist.java
  41. 137
      pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrDtl.java
  42. 92
      pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrGroup.java
  43. 76
      pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyGroupBas.java
  44. 69
      pav-server/src/main/java/com/palnet/biz/jpa/entity/PtySnsLoginRel.java
  45. 73
      pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsAgreeTxn.java
  46. 81
      pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsBas.java
  47. 65
      pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsDtl.java
  48. 9
      pav-server/src/main/java/com/palnet/biz/jpa/entity/SuredataEntity.java
  49. 15
      pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
  50. 8
      pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java
  51. 109
      pav-server/src/main/java/com/palnet/comn/utils/InstantUtils.java

55
pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java

@ -1,50 +1,28 @@
package com.palnet.biz.api.acnt.cstmr.controller;
import java.security.Principal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrEmModel;
import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel;
import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrPwModel;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.enums.ParameterIn;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRqModel;
import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRsModel;
import com.palnet.biz.api.acnt.cstmr.model.AnctCstmerRlModel;
import com.palnet.biz.api.acnt.cstmr.model.*;
import com.palnet.biz.api.acnt.cstmr.service.AcntCstmrService;
import com.palnet.biz.api.acnt.jwt.model.JwtUserModel;
import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel;
import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel;
import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel;
import com.palnet.biz.api.anls.hstry.service.AnlsHstryService;
import com.palnet.biz.api.comn.response.BasicResponse;
import com.palnet.biz.api.comn.response.ErrorResponse;
import com.palnet.biz.api.comn.response.SuccessResponse;
import com.palnet.biz.api.ctr.cntrl.service.CtrCntrlService;
import com.palnet.biz.jpa.entity.PtyCstmrBas;
import com.palnet.biz.jpa.entity.PtyCstmrDtl;
import com.palnet.biz.sample.entity.SampleEntity;
import com.palnet.biz.sample.service.SampleService;
import com.palnet.comn.exception.CustomException;
import com.palnet.comn.model.GPHistoryModel;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.time.ZoneId;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Log4j2
@RestController
@ -66,7 +44,10 @@ public class AcntCstmrController {
try {
// result = service.list(rq);
log.debug(">>> bd : {}", rq.getBrthdyDate());
log.debug(">>> bd : {}", rq.getBrthdyDate().atZone(ZoneId.of("Asia/Seoul")).toLocalDateTime());
log.debug(">>> td : {}", rq.getTestDt());
log.debug(">>> td : {}", rq.getTestDt().atZone(ZoneId.of("Asia/Seoul")).toLocalDateTime());
result = service.register(rq);
} catch (Exception e) {

5
pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRqModel.java

@ -2,6 +2,8 @@ package com.palnet.biz.api.acnt.cstmr.model;
import lombok.Data;
import java.time.Instant;
@Data
public class AcntCstmrRqModel{
@ -31,7 +33,8 @@ public class AcntCstmrRqModel{
private String memberName;
private String brthdyDate;
private Instant brthdyDate;
private Instant testDt;
private String email;

10
pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AnctCstmerRlModel.java

@ -1,15 +1,19 @@
package com.palnet.biz.api.acnt.cstmr.model;
import java.time.Instant;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.palnet.biz.config.convert.InstantDateStrSerializer;
import lombok.Data;
import java.time.Instant;
@Data
public class AnctCstmerRlModel {
private String memberName;
// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
@JsonSerialize(using = InstantDateStrSerializer.class)
private Instant brthdyDate;
private String genderCd;

4
pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java

@ -100,7 +100,7 @@ public class AcntCstmrService {
// rq.setMemberName(EncryptUtils.encrypt(rq.getMemberName()));
rq.setHpno(EncryptUtils.encrypt(rq.getHpno()));
rq.setEmail(EncryptUtils.encrypt(rq.getEmail()));
rq.setBrthdyDate(rq.getBrthdyDate().replaceAll("-", ""));
// rq.setBrthdyDate(rq.getBrthdyDate().replaceAll("-", ""));
//처리 2. 마스터 정보 저장
@ -162,7 +162,7 @@ public class AcntCstmrService {
dtlEntity.setCntryCd(rq.getCntryCd());
dtlEntity.setGenderCd(rq.getGenderCd());
dtlEntity.setMemberName(rq.getMemberName());
dtlEntity.setBrthdyDate(DateUtils.stringToDate(rq.getBrthdyDate()));
dtlEntity.setBrthdyDate(rq.getBrthdyDate());
dtlEntity.setEmail(rq.getEmail());
dtlEntity.setHpno(rq.getHpno());
dtlEntity.setClncd(rq.getClncd());

5
pav-server/src/main/java/com/palnet/biz/api/acnt/terms/model/AcntTermsRsModel.java

@ -1,10 +1,9 @@
package com.palnet.biz.api.acnt.terms.model;
import java.time.Instant;
import java.util.Date;
import lombok.Data;
import java.time.Instant;
@Data
public class AcntTermsRsModel{

27
pav-server/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java

@ -1,11 +1,19 @@
package com.palnet.biz.api.anls.hstry.controller;
import java.util.List;
import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel;
import com.palnet.biz.api.anls.hstry.model.AnlsHstryGroupModel;
import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel;
import com.palnet.biz.api.anls.hstry.service.AnlsHstryService;
import com.palnet.biz.api.comn.model.ComnPagingRs;
import com.palnet.biz.api.comn.response.BasicResponse;
import com.palnet.biz.api.comn.response.ErrorResponse;
import com.palnet.biz.api.comn.response.SuccessResponse;
import com.palnet.comn.code.RSErrorCode;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@ -15,20 +23,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel;
import com.palnet.biz.api.anls.hstry.model.AnlsHstryGroupModel;
import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel;
import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel;
import com.palnet.biz.api.anls.hstry.model.AnlsHstryRsModel;
import com.palnet.biz.api.anls.hstry.service.AnlsHstryService;
import com.palnet.biz.api.comn.response.BasicResponse;
import com.palnet.biz.api.comn.response.ErrorResponse;
import com.palnet.biz.api.comn.response.SuccessResponse;
import com.palnet.comn.code.RSErrorCode;
import com.palnet.comn.utils.JsonUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import java.util.List;
@Log4j2
@RestController

5
pav-server/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryDetailModel.java

@ -1,10 +1,9 @@
package com.palnet.biz.api.anls.hstry.model;
import java.time.Instant;
import java.util.Date;
import lombok.Data;
import java.time.Instant;
@Data
public class AnlsHstryDetailModel{

16
pav-server/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryModel.java

@ -1,21 +1,9 @@
package com.palnet.biz.api.anls.hstry.model;
import java.time.Instant;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.persistence.Column;
import javax.persistence.Id;
import com.palnet.comn.utils.DateUtils;
import io.netty.util.internal.StringUtil;
import lombok.Data;
import java.time.Instant;
@Data
public class AnlsHstryModel{

16
pav-server/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryRsModel.java

@ -1,21 +1,9 @@
package com.palnet.biz.api.anls.hstry.model;
import java.time.Instant;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.persistence.Column;
import javax.persistence.Id;
import com.palnet.comn.utils.DateUtils;
import io.netty.util.internal.StringUtil;
import lombok.Data;
import java.time.Instant;
@Data
public class AnlsHstryRsModel{

4
pav-server/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightMapper.java

@ -2,7 +2,9 @@ package com.palnet.biz.api.bas.flight.service;
import com.palnet.biz.api.bas.flight.model.*;
import com.palnet.biz.jpa.entity.*;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.MappingTarget;
import org.mapstruct.Named;
import org.mapstruct.factory.Mappers;
import java.util.List;

12
pav-server/src/main/java/com/palnet/biz/config/JsonConfig.java

@ -2,7 +2,6 @@ package com.palnet.biz.config;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
@ -10,12 +9,15 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
import com.palnet.biz.config.convert.InstantDateStrSerializer;
import com.palnet.biz.config.convert.InstantDatetimeStrSerializer;
import com.palnet.biz.config.convert.InstantStringDeserializer;
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
import java.time.Instant;
import java.time.format.DateTimeFormatter;
import java.util.TimeZone;
@ -33,17 +35,21 @@ public class JsonConfig {
public Jackson2ObjectMapperBuilderCustomizer jsonCustomizer() {
return builder -> {
builder.timeZone(TimeZone.getTimeZone("Asia/Seoul"));
builder.simpleDateFormat(dateTimeFormat);
builder.serializers(new LocalTimeSerializer(DateTimeFormatter.ofPattern(timeFormat)));
builder.serializers(new LocalDateSerializer(DateTimeFormatter.ofPattern(dateFormat)));
builder.serializers(new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(dateTimeFormat)));
builder.serializerByType(Instant.class, new InstantDatetimeStrSerializer());
// builder.serializerByType(Instant.class, new InstantDateStrSerializer());
builder.serializationInclusion(JsonInclude.Include.NON_NULL);
builder.serializationInclusion(JsonInclude.Include.NON_EMPTY);
builder.deserializers(new LocalTimeDeserializer(DateTimeFormatter.ofPattern(timeFormat)));
builder.deserializers(new LocalDateDeserializer(DateTimeFormatter.ofPattern(dateFormat)));
builder.deserializers(new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(dateTimeFormat)));
builder.deserializerByType(Instant.class, new InstantStringDeserializer());
// builder.deserializerByType(Instant.class, new InstantDatetimeStrDeserializer());
// builder.deserializerByType(Instant.class, new InstantDateStrDeserializer());
builder.featuresToDisable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
builder.featuresToDisable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE);

22
pav-server/src/main/java/com/palnet/biz/config/StringToInstantBinding.java

@ -1,22 +0,0 @@
package com.palnet.biz.config;
import com.palnet.comn.utils.DateUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.convert.converter.Converter;
import java.time.Instant;
@Slf4j
public class StringToInstantBinding implements Converter<String, Instant> {
@Override
public Instant convert(String date) {
log.error("StringToInstantBinding - convert()");
log.error("date -> {}", date);
return DateUtils.stringToInstant(date);
}
}

18
pav-server/src/main/java/com/palnet/biz/config/WebMvcConfig.java

@ -1,32 +1,18 @@
package com.palnet.biz.config;
import java.time.format.DateTimeFormatter;
import java.util.List;
import com.palnet.biz.config.convert.StringToInstantBinding;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.format.FormatterRegistry;
import org.springframework.format.datetime.standard.DateTimeFormatterRegistrar;
import org.springframework.http.HttpMethod;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
@Configuration
public class WebMvcConfig implements WebMvcConfigurer{
@ -106,7 +92,7 @@ public class WebMvcConfig implements WebMvcConfigurer{
registrar.setDateTimeFormatter(DateTimeFormatter.ofPattern(dateTimeFormat));
registrar.registerFormatters(registry);
registry.addConverter(new StringToInstantBinding());
// registry.addConverter(new StringToInstantBinding());
/* ISO 타입.
registrar.setUseIsoFormat(true);

44
pav-server/src/main/java/com/palnet/biz/config/convert/InstantDateStrDeserializer.java

@ -0,0 +1,44 @@
package com.palnet.biz.config.convert;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
/**
* packageName : com.palnet.biz.config.convert
* fileName : InstantDatetimeStrSerializer
* author : dhji
* date : 2023-09-14(014)
* description :
* ===========================================================
* DATE AUTHOR NOTE
* -----------------------------------------------------------
* 2023-09-14(014) dhji 최초 생성
*/
@Slf4j
public class InstantDateStrDeserializer extends JsonDeserializer<Instant> {
private static final String ZONE = "Asia/Seoul";
private static final String FORMAT = "yyyy-MM-dd";
@Override
public Instant deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
try {
String dateString = p.getValueAsString();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(FORMAT);
LocalDate localDate = LocalDate.parse(dateString, formatter);
return localDate.atStartOfDay(ZoneId.of(ZONE)).toInstant();
} catch (Exception e) {
log.error("ERROR : ", e);
return null;
}
}
}

40
pav-server/src/main/java/com/palnet/biz/config/convert/InstantDateStrSerializer.java

@ -0,0 +1,40 @@
package com.palnet.biz.config.convert;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
/**
* packageName : com.palnet.biz.config.convert
* fileName : InstantDatetimeStrSerializer
* author : dhji
* date : 2023-09-14(014)
* description :
* ===========================================================
* DATE AUTHOR NOTE
* -----------------------------------------------------------
* 2023-09-14(014) dhji 최초 생성
*/
@Slf4j
public class InstantDateStrSerializer extends JsonSerializer<Instant> {
private static final String ZONE = "Asia/Seoul";
private static final String FORMAT = "yyyy-MM-dd";
@Override
public void serialize(Instant value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
try {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(FORMAT)
.withZone(ZoneId.of(ZONE));
String str = formatter.format(value);
gen.writeString(str);
} catch (Exception e) {
log.error("ERROR : ", e);
}
}
}

47
pav-server/src/main/java/com/palnet/biz/config/convert/InstantDatetimeStrDeserializer.java

@ -0,0 +1,47 @@
package com.palnet.biz.config.convert;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
/**
* packageName : com.palnet.biz.config.convert
* fileName : InstantDatetimeStrSerializer
* author : dhji
* date : 2023-09-14(014)
* description :
* ===========================================================
* DATE AUTHOR NOTE
* -----------------------------------------------------------
* 2023-09-14(014) dhji 최초 생성
*/
@Slf4j
public class InstantDatetimeStrDeserializer extends JsonDeserializer<Instant> {
private static final String ZONE = "Asia/Seoul";
private static final String FORMAT = "yyyy-MM-dd HH:mm:ss";
@Override
public Instant deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
try {
String dateString = p.getValueAsString();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(FORMAT);
LocalDateTime localDateTime = LocalDateTime.parse(dateString, formatter);
return localDateTime.atZone(ZoneId.of(ZONE)).toInstant();
} catch (Exception e) {
log.error("ERROR : ", e);
return null;
}
}
}

40
pav-server/src/main/java/com/palnet/biz/config/convert/InstantDatetimeStrSerializer.java

@ -0,0 +1,40 @@
package com.palnet.biz.config.convert;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
/**
* packageName : com.palnet.biz.config.convert
* fileName : InstantDatetimeStrSerializer
* author : dhji
* date : 2023-09-14(014)
* description :
* ===========================================================
* DATE AUTHOR NOTE
* -----------------------------------------------------------
* 2023-09-14(014) dhji 최초 생성
*/
@Slf4j
public class InstantDatetimeStrSerializer extends JsonSerializer<Instant> {
private static final String ZONE = "Asia/Seoul";
private static final String FORMAT = "yyyy-MM-dd HH:mm:ss";
@Override
public void serialize(Instant value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
try {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(FORMAT)
.withZone(ZoneId.of(ZONE));
String str = formatter.format(value);
gen.writeString(str);
} catch (Exception e) {
log.error("ERROR : ", e);
}
}
}

70
pav-server/src/main/java/com/palnet/biz/config/convert/InstantStringDeserializer.java

@ -0,0 +1,70 @@
package com.palnet.biz.config.convert;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
/**
* packageName : com.palnet.biz.config.convert
* fileName : InstantDatetimeStrSerializer
* author : dhji
* date : 2023-09-14(014)
* description :
* ===========================================================
* DATE AUTHOR NOTE
* -----------------------------------------------------------
* 2023-09-14(014) dhji 최초 생성
*/
@Slf4j
public class InstantStringDeserializer extends JsonDeserializer<Instant> {
private static final String ZONE = "Asia/Seoul";
private static final String DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
private static final String DATE_FORMAT = "yyyy-MM-dd";
@Override
public Instant deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
try {
String dateString = p.getValueAsString();
if(isValidFormat(dateString, DATETIME_FORMAT)){
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATETIME_FORMAT);
LocalDateTime localDateTime = LocalDateTime.parse(dateString, formatter);
return localDateTime.atZone(ZoneId.of(ZONE)).toInstant();
} else if (isValidFormat(dateString, DATE_FORMAT)) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATE_FORMAT);
LocalDate localDate = LocalDate.parse(dateString, formatter);
return localDate.atStartOfDay(ZoneId.of(ZONE)).toInstant();
} else {
return Instant.parse(dateString);
}
} catch (Exception e) {
log.error("ERROR : ", e);
return null;
}
}
// string validate format
public boolean isValidFormat(String dateString, String format) {
SimpleDateFormat dateFormat = new SimpleDateFormat(format);
dateFormat.setLenient(false); // 엄격한 날짜 파싱을 위해 lenient 모드를 비활성화합니다.
try {
dateFormat.parse(dateString);
return true; // 파싱에 성공하면 유효한 형식입니다.
} catch (ParseException e) {
return false; // 파싱에 실패하면 유효하지 않은 형식입니다.
}
}
}

39
pav-server/src/main/java/com/palnet/biz/config/convert/StringToInstantBinding.java

@ -0,0 +1,39 @@
package com.palnet.biz.config.convert;
import com.palnet.comn.utils.InstantUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.convert.converter.Converter;
import java.time.Instant;
import java.time.format.DateTimeParseException;
@Slf4j
public class StringToInstantBinding implements Converter<String, Instant> {
private final String DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
private final String DATE_FORMAT = "yyyy-MM-dd";
// 현재 서울기준으로 설정 TODO 프론트에서 ISO 형식으로 보낼경우 제거
private final String ZONE = "Asia/Seoul";
@Override
public Instant convert(String date) {
log.error("StringToInstantBinding - convert()");
log.error("date -> {}", date);
if(InstantUtils.isValidFormat(date, DATETIME_FORMAT)) {
return InstantUtils.fromDatetimeString(date);
} else if(InstantUtils.isValidFormat(date, DATE_FORMAT)){
return InstantUtils.fromDateString(date);
} else {
try {
return Instant.parse(date);
} catch (DateTimeParseException e) {
log.error("ERROR : ", e);
}
}
return null;
}
}

9
pav-server/src/main/java/com/palnet/biz/jpa/entity/ComArcrftBas.java

@ -1,22 +1,19 @@
package com.palnet.biz.jpa.entity;
import java.io.Serializable;
import javax.persistence.*;
import lombok.Data;
import java.math.BigDecimal;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Date;
/**
* The persistent class for the COM_ARCRFT_BAS database table.
*
*/
@Data
@Entity
@Table(name="COM_ARCRFT_BAS")
@Data
@NamedQuery(name="ComArcrftBas.findAll", query="SELECT c FROM ComArcrftBas c")
public class ComArcrftBas implements Serializable {
private static final long serialVersionUID = 1L;

78
pav-server/src/main/java/com/palnet/biz/jpa/entity/ComAuthBas.java

@ -1,5 +1,7 @@
package com.palnet.biz.jpa.entity;
import lombok.Data;
import java.io.Serializable;
import java.time.Instant;
@ -10,6 +12,7 @@ import javax.persistence.*;
* The persistent class for the COM_AUTH_BAS database table.
*
*/
@Data
@Entity
@Table(name="COM_AUTH_BAS")
@NamedQuery(name="ComAuthBas.findAll", query="SELECT c FROM ComAuthBas c")
@ -47,79 +50,4 @@ public class ComAuthBas implements Serializable {
@Column(name="USE_YN")
private String useYn;
public ComAuthBas() {
}
public String getAuthId() {
return this.authId;
}
public void setAuthId(String authId) {
this.authId = authId;
}
public String getAuthNm() {
return this.authNm;
}
public void setAuthNm(String authNm) {
this.authNm = authNm;
}
public Instant getCreateDt() {
return this.createDt;
}
public void setCreateDt(Instant createDt) {
this.createDt = createDt;
}
public String getCreateUserId() {
return this.createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public String getRm() {
return this.rm;
}
public void setRm(String rm) {
this.rm = rm;
}
public String getSiteCd() {
return this.siteCd;
}
public void setSiteCd(String siteCd) {
this.siteCd = siteCd;
}
public Instant getUpdateDt() {
return this.updateDt;
}
public void setUpdateDt(Instant updateDt) {
this.updateDt = updateDt;
}
public String getUpdateUserId() {
return this.updateUserId;
}
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
public String getUseYn() {
return this.useYn;
}
public void setUseYn(String useYn) {
this.useYn = useYn;
}
}

81
pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdBas.java

@ -1,15 +1,17 @@
package com.palnet.biz.jpa.entity;
import java.io.Serializable;
import java.time.Instant;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
/**
* The persistent class for the COM_CD_BAS database table.
*
*/
@Data
@Entity
@Table(name="COM_CD_BAS")
@NamedQuery(name="ComCdBas.findAll", query="SELECT c FROM ComCdBas c")
@ -45,79 +47,4 @@ public class ComCdBas implements Serializable {
@Column(name="USE_YN")
private String useYn;
public ComCdBas() {
}
public ComCdBasPK getId() {
return this.id;
}
public void setId(ComCdBasPK id) {
this.id = id;
}
public String getAddInfoValue() {
return this.addInfoValue;
}
public void setAddInfoValue(String addInfoValue) {
this.addInfoValue = addInfoValue;
}
public Instant getCreateDt() {
return this.createDt;
}
public void setCreateDt(Instant createDt) {
this.createDt = createDt;
}
public String getCreateUserId() {
return this.createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public byte getSortOrdr() {
return this.sortOrdr;
}
public void setSortOrdr(byte sortOrdr) {
this.sortOrdr = sortOrdr;
}
public Instant getUpdteDt() {
return this.updteDt;
}
public void setUpdteDt(Instant updteDt) {
this.updteDt = updteDt;
}
public String getUpdteUserId() {
return this.updteUserId;
}
public void setUpdteUserId(String updteUserId) {
this.updteUserId = updteUserId;
}
public String getUpperCd() {
return this.upperCd;
}
public void setUpperCd(String upperCd) {
this.upperCd = upperCd;
}
public String getUseYn() {
return this.useYn;
}
public void setUseYn(String useYn) {
this.useYn = useYn;
}
}

73
pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdGroupBas.java

@ -1,15 +1,17 @@
package com.palnet.biz.jpa.entity;
import java.io.Serializable;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Date;
/**
* The persistent class for the COM_CD_GROUP_BAS database table.
*
*/
@Data
@Entity
@Table(name="COM_CD_GROUP_BAS")
@NamedQuery(name="ComCdGroupBas.findAll", query="SELECT c FROM ComCdGroupBas c")
@ -43,71 +45,4 @@ public class ComCdGroupBas implements Serializable {
@Column(name="UPDTE_USER_ID")
private String updteUserId;
public ComCdGroupBas() {
}
public String getGroupCd() {
return this.groupCd;
}
public void setGroupCd(String groupCd) {
this.groupCd = groupCd;
}
public Instant getCreateDt() {
return this.createDt;
}
public void setCreateDt(Instant createDt) {
this.createDt = createDt;
}
public String getCreateUserId() {
return this.createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public String getGroupCdNm() {
return this.groupCdNm;
}
public void setGroupCdNm(String groupCdNm) {
this.groupCdNm = groupCdNm;
}
public String getRm() {
return this.rm;
}
public void setRm(String rm) {
this.rm = rm;
}
public String getSiteCd() {
return this.siteCd;
}
public void setSiteCd(String siteCd) {
this.siteCd = siteCd;
}
public Instant getUpdteDt() {
return this.updteDt;
}
public void setUpdteDt(Instant updteDt) {
this.updteDt = updteDt;
}
public String getUpdteUserId() {
return this.updteUserId;
}
public void setUpdteUserId(String updteUserId) {
this.updteUserId = updteUserId;
}
}

62
pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtg.java

@ -1,5 +1,7 @@
package com.palnet.biz.jpa.entity;
import lombok.Data;
import java.io.Serializable;
import java.time. Instant;
@ -9,6 +11,7 @@ import javax.persistence.*;
* The persistent class for the COM_CD_LANG_CTG database table.
*
*/
@Data
@Entity
@Table(name="COM_CD_LANG_CTG")
@NamedQuery(name="ComCdLangCtg.findAll", query="SELECT c FROM ComCdLangCtg c")
@ -39,63 +42,4 @@ public class ComCdLangCtg implements Serializable {
@Column(name="UPDTE_USER_ID")
private String updteUserId;
public ComCdLangCtg() {
}
public ComCdLangCtgPK getId() {
return this.id;
}
public void setId(ComCdLangCtgPK id) {
this.id = id;
}
public String getCdNm() {
return this.cdNm;
}
public void setCdNm(String cdNm) {
this.cdNm = cdNm;
}
public Instant getCreateDt() {
return this.createDt;
}
public void setCreateDt(Instant createDt) {
this.createDt = createDt;
}
public String getCreateUserId() {
return this.createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public String getRm() {
return this.rm;
}
public void setRm(String rm) {
this.rm = rm;
}
public Instant getUpdteDt() {
return this.updteDt;
}
public void setUpdteDt(Instant updteDt) {
this.updteDt = updteDt;
}
public String getUpdteUserId() {
return this.updteUserId;
}
public void setUpdteUserId(String updteUserId) {
this.updteUserId = updteUserId;
}
}

12
pav-server/src/main/java/com/palnet/biz/jpa/entity/ComIdntfBas.java

@ -1,21 +1,19 @@
package com.palnet.biz.jpa.entity;
import java.io.Serializable;
import javax.persistence.*;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Date;
/**
* The persistent class for the COM_IDNTF_BAS database table.
*
*/
@Data
@Entity
@Table(name="COM_IDNTF_BAS")
@Data
@NamedQuery(name="ComIdntfBas.findAll", query="SELECT c FROM ComIdntfBas c")
public class ComIdntfBas implements Serializable {
private static final long serialVersionUID = 1L;
@ -47,8 +45,4 @@ public class ComIdntfBas implements Serializable {
@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
private Instant updateDt;
public ComIdntfBas() {
}
}

78
pav-server/src/main/java/com/palnet/biz/jpa/entity/ComSiteBas.java

@ -1,5 +1,7 @@
package com.palnet.biz.jpa.entity;
import lombok.Data;
import java.io.Serializable;
import java.time.Instant;
@ -10,6 +12,7 @@ import javax.persistence.*;
* The persistent class for the COM_SITE_BAS database table.
*
*/
@Data
@Entity
@Table(name="COM_SITE_BAS")
@NamedQuery(name="ComSiteBas.findAll", query="SELECT c FROM ComSiteBas c")
@ -47,79 +50,4 @@ public class ComSiteBas implements Serializable {
@Column(name="USE_YN")
private String useYn;
public ComSiteBas() {
}
public String getSiteCd() {
return this.siteCd;
}
public void setSiteCd(String siteCd) {
this.siteCd = siteCd;
}
public Instant getCreateDt() {
return this.createDt;
}
public void setCreateDt(Instant createDt) {
this.createDt = createDt;
}
public String getCreateUserId() {
return this.createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public String getSiteDesc() {
return this.siteDesc;
}
public void setSiteDesc(String siteDesc) {
this.siteDesc = siteDesc;
}
public String getSiteNm() {
return this.siteNm;
}
public void setSiteNm(String siteNm) {
this.siteNm = siteNm;
}
public String getSiteUrl() {
return this.siteUrl;
}
public void setSiteUrl(String siteUrl) {
this.siteUrl = siteUrl;
}
public Instant getUpdateDt() {
return this.updateDt;
}
public void setUpdateDt(Instant updateDt) {
this.updateDt = updateDt;
}
public String getUpdateUserId() {
return this.updateUserId;
}
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
public String getUseYn() {
return this.useYn;
}
public void setUseYn(String useYn) {
this.useYn = useYn;
}
}

78
pav-server/src/main/java/com/palnet/biz/jpa/entity/ComTrmnlBas.java

@ -1,5 +1,7 @@
package com.palnet.biz.jpa.entity;
import lombok.Data;
import java.io.Serializable;
import java.time.Instant;
@ -9,6 +11,7 @@ import javax.persistence.*;
* The persistent class for the COM_TRMNL_BAS database table.
*
*/
@Data
@Entity
@Table(name="COM_TRMNL_BAS")
@NamedQuery(name="ComTrmnlBas.findAll", query="SELECT c FROM ComTrmnlBas c")
@ -45,79 +48,4 @@ public class ComTrmnlBas implements Serializable {
@Column(name="USE_YN")
private String useYn;
public ComTrmnlBas() {
}
public String getTrmnlId() {
return this.trmnlId;
}
public void setTrmnlId(String trmnlId) {
this.trmnlId = trmnlId;
}
public String getAuthKey() {
return this.authKey;
}
public void setAuthKey(String authKey) {
this.authKey = authKey;
}
public Instant getCreateDt() {
return this.createDt;
}
public void setCreateDt(Instant createDt) {
this.createDt = createDt;
}
public String getCreateUserId() {
return this.createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public String getDescSn() {
return this.descSn;
}
public void setDescSn(String descSn) {
this.descSn = descSn;
}
public String getTrmnlNm() {
return this.trmnlNm;
}
public void setTrmnlNm(String trmnlNm) {
this.trmnlNm = trmnlNm;
}
public Instant getUpdateDate() {
return this.updateDt;
}
public void setUpdateDate(Instant updateDt) {
this.updateDt = updateDt;
}
public String getUpdateUserId() {
return this.updateUserId;
}
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
public String getUseYn() {
return this.useYn;
}
public void setUseYn(String useYn) {
this.useYn = useYn;
}
}

8
pav-server/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlBas.java

@ -1,21 +1,19 @@
package com.palnet.biz.jpa.entity;
import java.io.Serializable;
import javax.persistence.*;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Date;
/**
* The persistent class for the CTR_CNTRL_BAS database table.
*
*/
@Data
@Entity
@Table(name="CTR_CNTRL_BAS")
@Data
@NamedQuery(name="CtrCntrlBas.findAll", query="SELECT c FROM CtrCntrlBas c")
public class CtrCntrlBas implements Serializable {
private static final long serialVersionUID = 1L;

192
pav-server/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstry.java

@ -1,15 +1,17 @@
package com.palnet.biz.jpa.entity;
import java.io.Serializable;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Date;
/**
* The persistent class for the CTR_CNTRL_HSTRY database table.
*
*/
@Data
@Entity
@Table(name="CTR_CNTRL_HSTRY")
@NamedQuery(name="CtrCntrlHstry.findAll", query="SELECT c FROM CtrCntrlHstry c")
@ -86,190 +88,4 @@ public class CtrCntrlHstry implements Serializable {
@Column(name="SENSOR_DUST")
private Double sensorDust;
public CtrCntrlHstry() {
}
public int getHstrySno() {
return this.hstrySno;
}
public void setHstrySno(int hstrySno) {
this.hstrySno = hstrySno;
}
public double getBttrLvl() {
return this.bttrLvl;
}
public void setBttrLvl(double bttrLvl) {
this.bttrLvl = bttrLvl;
}
public double getBttrVltg() {
return this.bttrVltg;
}
public void setBttrVltg(double bttrVltg) {
this.bttrVltg = bttrVltg;
}
public String getCntrlId() {
return this.cntrlId;
}
public void setCntrlId(String cntrlId) {
this.cntrlId = cntrlId;
}
public double getElev() {
return this.elev;
}
public void setElev(double elev) {
this.elev = elev;
}
public String getElevType() {
return this.elevType;
}
public void setElevType(String elevType) {
this.elevType = elevType;
}
public double getHeading() {
return this.heading;
}
public void setHeading(double heading) {
this.heading = heading;
}
public double getLat() {
return this.lat;
}
public void setLat(double lat) {
this.lat = lat;
}
public double getLon() {
return this.lon;
}
public void setLon(double lon) {
this.lon = lon;
}
public String getMssgTypeCd() {
return this.mssgTypeCd;
}
public void setMssgTypeCd(String mssgTypeCd) {
this.mssgTypeCd = mssgTypeCd;
}
public double getMvDstnc() {
return this.mvDstnc;
}
public void setMvDstnc(double mvDstnc) {
this.mvDstnc = mvDstnc;
}
public String getMvDstncType() {
return this.mvDstncType;
}
public void setMvDstncType(String mvDstncType) {
this.mvDstncType = mvDstncType;
}
public double getSpeed() {
return this.speed;
}
public void setSpeed(double speed) {
this.speed = speed;
}
public String getSpeedType() {
return this.speedType;
}
public void setSpeedType(String speedType) {
this.speedType = speedType;
}
public Instant getSrvrRcvDt() {
return this.srvrRcvDt;
}
public void setSrvrRcvDt(Instant srvrRcvDt) {
this.srvrRcvDt = srvrRcvDt;
}
public String getStatusCd() {
return this.statusCd;
}
public void setStatusCd(String statusCd) {
this.statusCd = statusCd;
}
public String getTrmnlId() {
return this.trmnlId;
}
public void setTrmnlId(String trmnlId) {
this.trmnlId = trmnlId;
}
public Instant getTrmnlRcvDt() {
return this.trmnlRcvDt;
}
public void setTrmnlRcvDt(Instant trmnlRcvDt) {
this.trmnlRcvDt = trmnlRcvDt;
}
public Double getSensorCo(){
return sensorCo;
}
public void setSensorCo(Double sensorCo){
this.sensorCo = sensorCo;
}
public Double getSensorSo2(){
return sensorSo2;
}
public void setSensorSo2(Double sensorSo2){
this.sensorSo2 = sensorSo2;
}
public Double getSensorNo2(){
return sensorNo2;
}
public void setSensorNo2(Double sensorNo2){
this.sensorNo2 = sensorNo2;
}
public Double getSensorO3(){
return sensorO3;
}
public void setSensorO3(Double sensorO3){
this.sensorO3 = sensorO3;
}
public Double getSensorDust(){
return sensorDust;
}
public void setSensorDust(Double sensorDust){
this.sensorDust = sensorDust;
}
}

144
pav-server/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstryArea.java

@ -1,15 +1,17 @@
package com.palnet.biz.jpa.entity;
import java.io.Serializable;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Date;
/**
* The persistent class for the CTR_CNTRL_HSTRY_AREA database table.
*
*/
@Data
@Entity
@Table(name="CTR_CNTRL_HSTRY_AREA")
@NamedQuery(name="CtrCntrlHstryArea.findAll", query="SELECT c FROM CtrCntrlHstryArea c")
@ -71,143 +73,5 @@ public class CtrCntrlHstryArea implements Serializable {
@Column(name="ZIP_CD")
private String zipCd;
public CtrCntrlHstryArea() {
}
public int getHstryAreaSno() {
return this.hstryAreaSno;
}
public void setHstryAreaSno(int hstryAreaSno) {
this.hstryAreaSno = hstryAreaSno;
}
public String getActnType() {
return this.actnType;
}
public void setActnType(String actnType) {
this.actnType = actnType;
}
public String getAreaNm() {
return this.areaNm;
}
public void setAreaNm(String areaNm) {
this.areaNm = areaNm;
}
public String getAreaType() {
return this.areaType;
}
public void setAreaType(String areaType) {
this.areaType = areaType;
}
public String getArea1() {
return this.area1;
}
public void setArea1(String area1) {
this.area1 = area1;
}
public String getArea2() {
return this.area2;
}
public void setArea2(String area2) {
this.area2 = area2;
}
public String getArea3() {
return this.area3;
}
public void setArea3(String area3) {
this.area3 = area3;
}
public String getCntrlId() {
return this.cntrlId;
}
public void setCntrlId(String cntrlId) {
this.cntrlId = cntrlId;
}
public Instant getCreateDt() {
return this.createDt;
}
public void setCreateDt(Instant createDt) {
this.createDt = createDt;
}
public int getHstrySno() {
return this.hstrySno;
}
public void setHstrySno(int hstrySno) {
this.hstrySno = hstrySno;
}
public String getLandNm() {
return this.landNm;
}
public void setLandNm(String landNm) {
this.landNm = landNm;
}
public String getLandNum() {
return this.landNum;
}
public void setLandNum(String landNum) {
this.landNum = landNum;
}
public double getLat() {
return this.lat;
}
public void setLat(double lat) {
this.lat = lat;
}
public double getLon() {
return this.lon;
}
public void setLon(double lon) {
this.lon = lon;
}
public String getPrcsYn() {
return this.prcsYn;
}
public void setPrcsYn(String prcsYn) {
this.prcsYn = prcsYn;
}
public Instant getUpdateDt() {
return this.updateDt;
}
public void setUpdateDt(Instant updateDt) {
this.updateDt = updateDt;
}
public String getZipCd() {
return this.zipCd;
}
public void setZipCd(String zipCd) {
this.zipCd = zipCd;
}
}

3
pav-server/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlWarnLog.java

@ -4,11 +4,10 @@ import lombok.Data;
import javax.persistence.*;
import java.time.Instant;
import java.util.Date;
@Data
@Entity
@Table(name = "CTR_CNTRL_WARN_LOG")
@Data
public class CtrCntrlWarnLog {
@Id

7
pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanArcrft.java

@ -1,18 +1,15 @@
package com.palnet.biz.jpa.entity;
import lombok.Getter;
import lombok.Setter;
import lombok.Data;
import org.hibernate.annotations.CreationTimestamp;
import org.hibernate.annotations.UpdateTimestamp;
import javax.persistence.*;
import java.time.Instant;
@Data
@Table(name = "FLT_PLAN_ARCRFT")
@Entity
@Getter
@Setter
public class FltPlanArcrft {
@Id

6
pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanArea.java

@ -1,17 +1,15 @@
package com.palnet.biz.jpa.entity;
import lombok.Getter;
import lombok.Setter;
import lombok.Data;
import org.hibernate.annotations.CreationTimestamp;
import org.hibernate.annotations.UpdateTimestamp;
import javax.persistence.*;
import java.time.Instant;
@Data
@Table(name = "FLT_PLAN_AREA")
@Entity
@Getter
@Setter
public class FltPlanArea {
@Id

7
pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanAreaCoord.java

@ -1,17 +1,14 @@
package com.palnet.biz.jpa.entity;
import lombok.Getter;
import lombok.Setter;
import lombok.Data;
import org.hibernate.annotations.CreationTimestamp;
import javax.persistence.*;
import java.time.Instant;
@Data
@Table(name = "FLT_PLAN_AREA_COORD")
@Entity
@Getter
@Setter
public class FltPlanAreaCoord {
@Id

6
pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java

@ -1,17 +1,15 @@
package com.palnet.biz.jpa.entity;
import lombok.Getter;
import lombok.Setter;
import lombok.Data;
import org.hibernate.annotations.CreationTimestamp;
import org.hibernate.annotations.UpdateTimestamp;
import javax.persistence.*;
import java.time.Instant;
@Data
@Table(name = "FLT_PLAN_BAS")
@Entity
@Getter
@Setter
public class FltPlanBas {
@Id

11
pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanCtrCntrlRel.java

@ -1,14 +1,15 @@
package com.palnet.biz.jpa.entity;
import lombok.Getter;
import lombok.Setter;
import lombok.Data;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
@Data
@Entity
@Table(name = "FLT_PLAN_CTR_CNTRL_REL")
@Getter
@Setter
public class FltPlanCtrCntrlRel {
@Column(name = "CNTRL_ID")

7
pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanPilot.java

@ -1,18 +1,15 @@
package com.palnet.biz.jpa.entity;
import lombok.Getter;
import lombok.Setter;
import lombok.Data;
import org.hibernate.annotations.CreationTimestamp;
import org.hibernate.annotations.UpdateTimestamp;
import javax.persistence.*;
import java.time.Instant;
import java.util.Date;
@Data
@Table(name = "FLT_PLAN_PILOT")
@Entity
@Getter
@Setter
public class FltPlanPilot {
@Id

2
pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCrtfyhpBas.java

@ -13,10 +13,10 @@ import java.util.Date;
* The persistent class for the PTY_CRTFYHP_BAS database table.
*
*/
@Data
@Entity
@Table(name="PTY_CRTFYHP_BAS")
@NamedQuery(name="PtyCrtfyhpBas.findAll", query="SELECT p FROM PtyCrtfyhpBas p")
@Data
public class PtyCrtfyhpBas implements Serializable {
private static final long serialVersionUID = 1L;

2
pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrBas.java

@ -13,10 +13,10 @@ import java.util.Date;
* The persistent class for the PTY_CSTMR_BAS database table.
*
*/
@Data
@Entity
@Table(name="PTY_CSTMR_BAS")
@NamedQuery(name="PtyCstmrBas.findAll", query="SELECT p FROM PtyCstmrBas p")
@Data
public class PtyCstmrBas implements Serializable {
private static final long serialVersionUID = 1L;

53
pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrConectHist.java

@ -1,5 +1,7 @@
package com.palnet.biz.jpa.entity;
import lombok.Data;
import java.io.Serializable;
import java.time.Instant;
@ -9,6 +11,7 @@ import javax.persistence.*;
* The persistent class for the PTY_CSTMR_CONECT_HIST database table.
*
*/
@Data
@Entity
@Table(name="PTY_CSTMR_CONECT_HIST")
@NamedQuery(name="PtyCstmrConectHist.findAll", query="SELECT p FROM PtyCstmrConectHist p")
@ -35,55 +38,5 @@ public class PtyCstmrConectHist implements Serializable {
@Column(name="CSTMR_SNO")
private int cstmrSno;
public PtyCstmrConectHist() {
}
public int getCstmrConectHistSno() {
return this.cstmrConectHistSno;
}
public void setCstmrConectHistSno(int cstmrConectHistSno) {
this.cstmrConectHistSno = cstmrConectHistSno;
}
public Instant getConectDt() {
return this.conectDt;
}
public void setConectDt(Instant conectDt) {
this.conectDt = conectDt;
}
public String getConectErrorCd() {
return this.conectErrorCd;
}
public void setConectErrorCd(String conectErrorCd) {
this.conectErrorCd = conectErrorCd;
}
public String getConectIp() {
return this.conectIp;
}
public void setConectIp(String conectIp) {
this.conectIp = conectIp;
}
public String getConectSucesYn() {
return this.conectSucesYn;
}
public void setConectSucesYn(String conectSucesYn) {
this.conectSucesYn = conectSucesYn;
}
public int getCstmrSno() {
return this.cstmrSno;
}
public void setCstmrSno(int cstmrSno) {
this.cstmrSno = cstmrSno;
}
}

137
pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrDtl.java

@ -1,15 +1,17 @@
package com.palnet.biz.jpa.entity;
import java.io.Serializable;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Date;
/**
* The persistent class for the PTY_CSTMR_DTL database table.
*
*/
@Data
@Entity
@Table(name="PTY_CSTMR_DTL")
@NamedQuery(name="PtyCstmrDtl.findAll", query="SELECT p FROM PtyCstmrDtl p")
@ -67,136 +69,5 @@ public class PtyCstmrDtl implements Serializable {
@Column(name="ZIP")
private String zip;
public PtyCstmrDtl() {
}
public int getCstmrSno() {
return this.cstmrSno;
}
public void setCstmrSno(int cstmrSno) {
this.cstmrSno = cstmrSno;
}
public String getAddr() {
return this.addr;
}
public void setAddr(String addr) {
this.addr = addr;
}
public String getAddrDtlCn() {
return this.addrDtlCn;
}
public void setAddrDtlCn(String addrDtlCn) {
this.addrDtlCn = addrDtlCn;
}
public Instant getBrthdyDate()
{
return this.brthdyDate;
}
public void setBrthdyDate(Instant brthdyDate) {
this.brthdyDate = brthdyDate;
}
public String getClncd() {
return this.clncd;
}
public void setClncd(String clncd) {
this.clncd = clncd;
}
public String getCntryCd() {
return this.cntryCd;
}
public void setCntryCd(String cntryCd) {
this.cntryCd = cntryCd;
}
public String getEmail() {
return this.email;
}
public void setEmail(String email) {
this.email = email;
}
public String getGenderCd() {
return this.genderCd;
}
public void setGenderCd(String genderCd) {
this.genderCd = genderCd;
}
public String getHpno() {
return this.hpno;
}
public void setHpno(String hpno) {
this.hpno = hpno;
}
public String getIpinCi() {
return this.ipinCi;
}
public void setIpinCi(String ipinCi) {
this.ipinCi = ipinCi;
}
public String getIpinDi() {
return this.ipinDi;
}
public void setIpinDi(String ipinDi) {
this.ipinDi = ipinDi;
}
public String getJoinCrtfyCd() {
return this.joinCrtfyCd;
}
public void setJoinCrtfyCd(String joinCrtfyCd) {
this.joinCrtfyCd = joinCrtfyCd;
}
public String getMemberName() {
return this.memberName;
}
public void setMemberName(String memberName) {
this.memberName = memberName;
}
public Instant getUpdateDt() {
return this.updateDt;
}
public void setUpdateDt(Instant updateDt) {
this.updateDt = updateDt;
}
public String getUpdateUserId() {
return this.updateUserId;
}
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
public String getZip() {
return this.zip;
}
public void setZip(String zip) {
this.zip = zip;
}
}

92
pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrGroup.java

@ -1,15 +1,17 @@
package com.palnet.biz.jpa.entity;
import java.io.Serializable;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Date;
/**
* The persistent class for the PTY_CSTMR_GROUP database table.
*
*/
@Data
@Entity
@Table(name="PTY_CSTMR_GROUP")
@NamedQuery(name="PtyCstmrGroup.findAll", query="SELECT p FROM PtyCstmrGroup p")
@ -53,91 +55,5 @@ public class PtyCstmrGroup implements Serializable {
@Column(name="TRMNL_ID")
private String trmnlId;
public PtyCstmrGroup() {
}
public int getCstmrGroupSno() {
return this.cstmrGroupSno;
}
public void setCstmrGroupSno(int cstmrGroupSno) {
this.cstmrGroupSno = cstmrGroupSno;
}
public Instant getAprvlDt() {
return this.aprvlDt;
}
public void setAprvlDt(Instant aprvlDt) {
this.aprvlDt = aprvlDt;
}
public String getAprvlUserId() {
return this.aprvlUserId;
}
public void setAprvlUserId(String aprvlUserId) {
this.aprvlUserId = aprvlUserId;
}
public String getAprvlYn() {
return this.aprvlYn;
}
public void setAprvlYn(String aprvlYn) {
this.aprvlYn = aprvlYn;
}
public int getCstmrSno() {
return this.cstmrSno;
}
public void setCstmrSno(int cstmrSno) {
this.cstmrSno = cstmrSno;
}
public String getGroupAuthCd() {
return this.groupAuthCd;
}
public void setGroupAuthCd(String groupAuthCd) {
this.groupAuthCd = groupAuthCd;
}
public String getGroupId() {
return this.groupId;
}
public void setGroupId(String groupId) {
this.groupId = groupId;
}
public Instant getJoinDt() {
return this.joinDt;
}
public void setJoinDt(Instant joinDt) {
this.joinDt = joinDt;
}
public String getJoinYn() {
return this.joinYn;
}
public void setJoinYn(String joinYn) {
this.joinYn = joinYn;
}
public Instant getWthdrwDt() {
return this.wthdrwDt;
}
public void setWthdrwDt(Instant wthdrwDt) {
this.wthdrwDt = wthdrwDt;
}
public String getTrmnlId() { return this.trmnlId; }
public void setTrmnlId(String trmnlId) { this.trmnlId = trmnlId; }
}

76
pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyGroupBas.java

@ -1,98 +1,44 @@
package com.palnet.biz.jpa.entity;
import java.io.Serializable;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Date;
/**
* The persistent class for the PTY_GROUP_BAS database table.
*
*/
@Data
@Entity
@Table(name="PTY_GROUP_BAS")
@NamedQuery(name="PtyGroupBas.findAll", query="SELECT p FROM PtyGroupBas p")
public class PtyGroupBas implements Serializable {
private static final long serialVersionUID = 1L;
private String groupId;
private Instant createDt;
private String groupNm;
private String groupTypeCd;
private Instant updateDt;
private String useYn;
private String trmnlId;
public PtyGroupBas() {
}
@Id
@Column(name="GROUP_ID")
public String getGroupId() {
return this.groupId;
}
public void setGroupId(String groupId) {
this.groupId = groupId;
}
private String groupId;
// @Temporal(TemporalType.TIMESTAMP)
@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
public Instant getCreateDt() {
return this.createDt;
}
public void setCreateDt(Instant createDt) {
this.createDt = createDt;
}
private Instant createDt;
@Column(name="GROUP_NM")
public String getGroupNm() {
return this.groupNm;
}
public void setGroupNm(String groupNm) {
this.groupNm = groupNm;
}
private String groupNm;
@Column(name="GROUP_TYPE_CD")
public String getGroupTypeCd() {
return this.groupTypeCd;
}
public void setGroupTypeCd(String groupTypeCd) {
this.groupTypeCd = groupTypeCd;
}
private String groupTypeCd;
// @Temporal(TemporalType.TIMESTAMP)
@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
public Instant getUpdateDt() {
return this.updateDt;
}
public void setUpdateDt(Instant updateDt) {
this.updateDt = updateDt;
}
private Instant updateDt;
@Column(name="USE_YN")
public String getUseYn() {
return this.useYn;
}
public void setUseYn(String useYn) {
this.useYn = useYn;
}
private String useYn;
@Column(name="TRMNL_ID")
public String getTrmnlId() { return this.trmnlId;}
public void setTrmnlId(String trmnlId) { this.trmnlId = trmnlId; }
private String trmnlId;
}

69
pav-server/src/main/java/com/palnet/biz/jpa/entity/PtySnsLoginRel.java

@ -1,5 +1,7 @@
package com.palnet.biz.jpa.entity;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
@ -9,6 +11,7 @@ import java.time.Instant;
* The persistent class for the PTY_SNS_LOGIN_REL database table.
*
*/
@Data
@Entity
@Table(name="PTY_SNS_LOGIN_REL")
@NamedQuery(name="PtySnsLoginRel.findAll", query="SELECT p FROM PtySnsLoginRel p")
@ -42,71 +45,5 @@ public class PtySnsLoginRel implements Serializable {
@Column(name="WTHDR_DT", columnDefinition = "TIMESTAMP")
private Instant wthdrDt;
public PtySnsLoginRel() {
}
public int getSnsLoginSno() {
return this.snsLoginSno;
}
public void setSnsLoginSno(int snsLoginSno) {
this.snsLoginSno = snsLoginSno;
}
public int getCstmrSno() {
return this.cstmrSno;
}
public void setCstmrSno(int cstmrSno) {
this.cstmrSno = cstmrSno;
}
public Instant getLinkDt() {
return this.linkDt;
}
public void setLinkDt(Instant linkDt) {
this.linkDt = linkDt;
}
public String getLinkIp() {
return this.linkIp;
}
public void setLinkIp(String linkIp) {
this.linkIp = linkIp;
}
public String getLinkYn() {
return this.linkYn;
}
public void setLinkYn(String linkYn) {
this.linkYn = linkYn;
}
public String getSnsCd() {
return this.snsCd;
}
public void setSnsCd(String snsCd) {
this.snsCd = snsCd;
}
public String getSnsIdntfrId() {
return this.snsIdntfrId;
}
public void setSnsIdntfrId(String snsIdntfrId) {
this.snsIdntfrId = snsIdntfrId;
}
public Instant getWthdrDt() {
return this.wthdrDt;
}
public void setWthdrDt(Instant wthdrDt) {
this.wthdrDt = wthdrDt;
}
}

73
pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsAgreeTxn.java

@ -1,15 +1,17 @@
package com.palnet.biz.jpa.entity;
import java.io.Serializable;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Date;
/**
* The persistent class for the PTY_TERMS_AGREE_TXN database table.
*
*/
@Data
@Entity
@Table(name="PTY_TERMS_AGREE_TXN")
@NamedQuery(name="PtyTermsAgreeTxn.findAll", query="SELECT p FROM PtyTermsAgreeTxn p")
@ -44,71 +46,4 @@ public class PtyTermsAgreeTxn implements Serializable {
@Column(name="UPDATE_USER_ID")
private String updateUserId;
public PtyTermsAgreeTxn() {
}
public int getAgreeSno() {
return this.agreeSno;
}
public void setAgreeSno(int agreeSno) {
this.agreeSno = agreeSno;
}
public Instant getAgreeDt() {
return this.agreeDt;
}
public void setAgreeDt(Instant agreeDt) {
this.agreeDt = agreeDt;
}
public String getAgreeYn() {
return this.agreeYn;
}
public void setAgreeYn(String agreeYn) {
this.agreeYn = agreeYn;
}
public int getCstmrSno() {
return this.cstmrSno;
}
public void setCstmrSno(int cstmrSno) {
this.cstmrSno = cstmrSno;
}
public String getProcIp() {
return this.procIp;
}
public void setProcIp(String procIp) {
this.procIp = procIp;
}
public int getTermsSno() {
return this.termsSno;
}
public void setTermsSno(int termsSno) {
this.termsSno = termsSno;
}
public Instant getUpdateDt() {
return this.updateDt;
}
public void setUpdateDt(Instant updateDt) {
this.updateDt = updateDt;
}
public String getUpdateUserId() {
return this.updateUserId;
}
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
}

81
pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsBas.java

@ -1,15 +1,17 @@
package com.palnet.biz.jpa.entity;
import java.io.Serializable;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Date;
/**
* The persistent class for the PTY_TERMS_BAS database table.
*
*/
@Data
@Entity
@Table(name="PTY_TERMS_BAS")
@NamedQuery(name="PtyTermsBas.findAll", query="SELECT p FROM PtyTermsBas p")
@ -47,79 +49,4 @@ public class PtyTermsBas implements Serializable {
@Column(name="UPDATE_USER_ID")
private String updateUserId;
public PtyTermsBas() {
}
public int getTermsSno() {
return this.termsSno;
}
public void setTermsSno(int termsSno) {
this.termsSno = termsSno;
}
public Instant getCreateDt() {
return this.createDt;
}
public void setCreateDt(Instant createDt) {
this.createDt = createDt;
}
public String getCreateUserId() {
return this.createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public Instant getEstbshDate() {
return this.estbshDate;
}
public void setEstbshDate(Instant estbshDate) {
this.estbshDate = estbshDate;
}
public String getLastTxnYn() {
return this.lastTxnYn;
}
public void setLastTxnYn(String lastTxnYn) {
this.lastTxnYn = lastTxnYn;
}
public String getSiteCd() {
return this.siteCd;
}
public void setSiteCd(String siteCd) {
this.siteCd = siteCd;
}
public String getTermsCtgryCd() {
return this.termsCtgryCd;
}
public void setTermsCtgryCd(String termsCtgryCd) {
this.termsCtgryCd = termsCtgryCd;
}
public Instant getUpdateDt() {
return this.updateDt;
}
public void setUpdateDt(Instant updateDt) {
this.updateDt = updateDt;
}
public String getUpdateUserId() {
return this.updateUserId;
}
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
}

65
pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsDtl.java

@ -1,15 +1,17 @@
package com.palnet.biz.jpa.entity;
import java.io.Serializable;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Date;
/**
* The persistent class for the PTY_TERMS_DTL database table.
*
*/
@Data
@Entity
@Table(name="PTY_TERMS_DTL")
@NamedQuery(name="PtyTermsDtl.findAll", query="SELECT p FROM PtyTermsDtl p")
@ -41,63 +43,4 @@ public class PtyTermsDtl implements Serializable {
@Column(name="TERMS_TITLE_NM")
private String termsTitleNm;
public PtyTermsDtl() {
}
public PtyTermsDtlPK getId() {
return this.id;
}
public void setId(PtyTermsDtlPK id) {
this.id = id;
}
public Instant getCreateDt() {
return this.createDt;
}
public void setCreateDt(Instant createDt) {
this.createDt = createDt;
}
public String getCreateUserId() {
return this.createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public String getRm() {
return this.rm;
}
public void setRm(String rm) {
this.rm = rm;
}
public String getSimpleCn() {
return this.simpleCn;
}
public void setSimpleCn(String simpleCn) {
this.simpleCn = simpleCn;
}
public String getTermsCn() {
return this.termsCn;
}
public void setTermsCn(String termsCn) {
this.termsCn = termsCn;
}
public String getTermsTitleNm() {
return this.termsTitleNm;
}
public void setTermsTitleNm(String termsTitleNm) {
this.termsTitleNm = termsTitleNm;
}
}

9
pav-server/src/main/java/com/palnet/biz/jpa/entity/SuredataEntity.java

@ -4,12 +4,8 @@ package com.palnet.biz.jpa.entity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.CreationTimestamp;
import org.hibernate.annotations.UpdateTimestamp;
import javax.persistence.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Entity
@Table(name = "SUREData")
@ -56,9 +52,4 @@ public class SuredataEntity {
@Column(name = "KIND")
private String kind;
////
//// @CreationTimestamp
//// @Column(name = "CREAT_DT", updatable = false)
// private LocalDateTime creatDt;
}

15
pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

@ -16,6 +16,7 @@ import com.palnet.biz.api.main.dash.model.MainDashStcsModel;
import com.palnet.biz.jpa.entity.*;
import com.palnet.comn.model.GPHistoryModel;
import com.palnet.comn.utils.DateUtils;
import com.palnet.comn.utils.InstantUtils;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.ConstantImpl;
import com.querydsl.core.types.Projections;
@ -32,6 +33,7 @@ import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Repository;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Calendar;
@ -60,17 +62,16 @@ public class CtrCntrlQueryRepository{
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
Calendar end = Calendar.getInstance();
end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate())));
end.add(Calendar.DATE, 1);
Date endDate = end.getTime();
// Calendar end = Calendar.getInstance();
// end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate())));
// end.add(Calendar.DATE, 1);
// Date endDate = end.getTime();
BooleanBuilder builder = new BooleanBuilder();
builder.and(qCntrlBasEntity.statusCd.eq("99"));
builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant()));
builder.and(qCntrlBasEntity.cntrlStDt.after(InstantUtils.fromDatetimeString(rq.getStDate())));
builder.and(qCntrlBasEntity.cntrlEndDt.before(InstantUtils.fromDateString(rq.getEndDate()).plus(Duration.ofHours(1))));
builder.and(qCntrlBasEntity.statusCd.eq("99"));
builder.and(qFltPlanBas.aprvlYn.eq("Y"));

8
pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java

@ -1,20 +1,17 @@
package com.palnet.biz.jpa.repository.pty;
import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrPwModel;
import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRqModel;
import com.palnet.biz.api.acnt.cstmr.model.AnctCstmerRlModel;
import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel;
import com.palnet.biz.jpa.entity.*;
import org.springframework.stereotype.Repository;
import com.palnet.biz.api.acnt.jwt.model.JwtProfileRsModel;
import com.palnet.biz.api.acnt.jwt.model.JwtUserModel;
import com.palnet.biz.jpa.entity.*;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Projections;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Repository;
import java.util.ArrayList;
import java.util.List;
@ -242,6 +239,7 @@ public class PtyCstmrQueryRepository{
dtl.cntryCd,
dtl.email,
dtl.hpno,
dtl.updateDt,
bas.userId
))
.from(bas)

109
pav-server/src/main/java/com/palnet/comn/utils/InstantUtils.java

@ -0,0 +1,109 @@
package com.palnet.comn.utils;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.format.DateTimeFormatter;
/**
* packageName : com.palnet.comn.utils
* fileName : InstantUtils
* author : dhji
* date : 2023-09-14(014)
* description :
* ===========================================================
* DATE AUTHOR NOTE
* -----------------------------------------------------------
* 2023-09-14(014) dhji 최초 생성
*/
public class InstantUtils {
private static final String DEFAULT_ZONE = "Asia/Seoul";
private static final String DEFAULT_DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
// instant to string (datetime)
public static String toDatetimeString(Instant instant) {
return toDatetimeStringByZoneAndFormat(instant, DEFAULT_ZONE, DEFAULT_DATETIME_FORMAT);
}
public static String toDatetimeStringByZone(Instant instant, String zone) {
return toDatetimeStringByZoneAndFormat(instant, zone, DEFAULT_DATETIME_FORMAT);
}
public static String toDatetimeStringByFormat(Instant instant, String format) {
return toDatetimeStringByZoneAndFormat(instant, DEFAULT_ZONE, format);
}
public static String toDatetimeStringByZoneAndFormat(Instant instant, String zone, String format) {
// Instant 객체를 원하는 형식의 문자열로 포맷팅
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format)
.withZone(ZoneId.of(zone));
return formatter.format(instant);
}
// string to instant(datetime)
public static Instant fromDatetimeString(String dateString) {
return fromDatetimeStringByZoneAndFormat(dateString, DEFAULT_ZONE, DEFAULT_DATETIME_FORMAT);
}
public static Instant fromDatetimeStringByZone(String dateString, String zone) {
return fromDatetimeStringByZoneAndFormat(dateString, zone, DEFAULT_DATETIME_FORMAT);
}
public static Instant fromDatetimeStringByFormat(String dateString, String format) {
return fromDatetimeStringByZoneAndFormat(dateString, DEFAULT_ZONE, format);
}
public static Instant fromDatetimeStringByZoneAndFormat(String dateString, String zone, String format) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
LocalDateTime localDateTime = LocalDateTime.parse(dateString, formatter);
return localDateTime.atZone(ZoneId.of(zone)).toInstant();
}
// instant to string (date)
public static String toDateString(Instant instant) {
return toDateStringByZoneAndFormat(instant, DEFAULT_ZONE, DEFAULT_DATE_FORMAT);
}
public static String toDateStringByZone(Instant instant, String zone) {
return toDateStringByZoneAndFormat(instant, zone, DEFAULT_DATE_FORMAT);
}
public static String toDateStringByFormat(Instant instant, String format) {
return toDateStringByZoneAndFormat(instant, DEFAULT_ZONE, format);
}
public static String toDateStringByZoneAndFormat(Instant instant, String zone, String format) {
// Instant 객체를 원하는 형식의 문자열로 포맷팅
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format)
.withZone(ZoneId.of(zone));
return formatter.format(instant);
}
// string to instant(date)
public static Instant fromDateString(String dateString) {
return fromDateStringByZoneAndFormat(dateString, DEFAULT_ZONE, DEFAULT_DATE_FORMAT);
}
public static Instant fromDateStringByZone(String dateString, String zone) {
return fromDateStringByZoneAndFormat(dateString, zone, DEFAULT_DATE_FORMAT);
}
public static Instant fromDateStringByFormat(String dateString, String format) {
return fromDateStringByZoneAndFormat(dateString, DEFAULT_ZONE, format);
}
public static Instant fromDateStringByZoneAndFormat(String dateString, String zone, String format) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
LocalDate localDate = LocalDate.parse(dateString, formatter);
return localDate.atStartOfDay(ZoneId.of(zone)).toInstant();
}
// string validate format
public static boolean isValidFormat(String dateString, String format) {
SimpleDateFormat dateFormat = new SimpleDateFormat(format);
dateFormat.setLenient(false); // 엄격한 날짜 파싱을 위해 lenient 모드를 비활성화합니다.
try {
dateFormat.parse(dateString);
return true; // 파싱에 성공하면 유효한 형식입니다.
} catch (ParseException e) {
return false; // 파싱에 실패하면 유효하지 않은 형식입니다.
}
}
}
Loading…
Cancel
Save