jpa id 오류 수정

src/main/java/com/eactive/eai/rms/data/entity/man/user/UserAthrRoleChgHistory.java

@@ -27,7 +27,7 @@ import lombok.NonNull;
 @Entity
 @Table(name = "TB_APIMS_USER_ATHR_ROLE_CHG_H")
 @org.hibernate.annotations.Table(appliesTo = "TB_APIMS_USER_ATHR_ROLE_CHG_H", comment = "사용자 권한 ROLE 변경 이력")
-public class UserAthrRoleChgHistory extends AbstractEntity<String> implements Serializable {
+public class UserAthrRoleChgHistory extends AbstractEntity<Integer> implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
@@ -76,8 +76,8 @@ public class UserAthrRoleChgHistory extends AbstractEntity<String> implements Se
 	private LocalDateTime crtnDttm;
 
 	@Override
-	public @NonNull String getId() {
-		return Integer.toString(chgLogId);
+	public @NonNull Integer getId() {
+		return chgLogId;
 	}
 
 }

src/main/java/com/eactive/eai/rms/data/entity/man/user/UserAthrRoleChgHistoryRepository.java

@@ -4,6 +4,6 @@ import com.eactive.eai.rms.data.EMSDataSource;
 import com.eactive.eai.data.jpa.BaseRepository;
 
 @EMSDataSource
-public interface UserAthrRoleChgHistoryRepository extends  BaseRepository<UserAthrRoleChgHistory, String> {
+public interface UserAthrRoleChgHistoryRepository extends BaseRepository<UserAthrRoleChgHistory, Integer> {
 
 }

src/main/java/com/eactive/eai/rms/data/entity/man/user/UserAthrRoleChgHistoryService.java

@@ -11,7 +11,7 @@ import com.querydsl.core.types.dsl.BooleanExpression;
 @Service
 @Transactional(transactionManager = "transactionManagerForEMS")
 public class UserAthrRoleChgHistoryService
-		extends AbstractEMSDataSerivce<UserAthrRoleChgHistory, String, UserAthrRoleChgHistoryRepository> {
+		extends AbstractEMSDataSerivce<UserAthrRoleChgHistory, Integer, UserAthrRoleChgHistoryRepository> {
 
 	public Page<UserAthrRoleChgHistory> findAll(Pageable pageable, String userId) {
 

src/main/java/com/eactive/eai/rms/data/entity/man/user/UserLoginHistoryRepository.java

@@ -4,6 +4,6 @@ import com.eactive.eai.data.jpa.BaseRepository;
 import com.eactive.eai.rms.data.EMSDataSource;
 
 @EMSDataSource
-public interface UserLoginHistoryRepository extends BaseRepository<UserLoginHistory, String> {
+public interface UserLoginHistoryRepository extends BaseRepository<UserLoginHistory, Integer> {
 
 }

src/main/java/com/eactive/eai/rms/data/entity/man/user/UserLoginHistoryService.java

@@ -18,7 +18,7 @@ import com.eactive.apim.portal.user.entity.QUserInfo;
 
 @Service
 @Transactional(transactionManager = "transactionManagerForEMS")
-public class UserLoginHistoryService extends AbstractEMSDataSerivce<UserLoginHistory, String, UserLoginHistoryRepository>  {
+public class UserLoginHistoryService extends AbstractEMSDataSerivce<UserLoginHistory, Integer, UserLoginHistoryRepository>  {
 
 	final String START_HHmmss = " 00:00:00";
 	final String END_HHmmss = " 23:59:59";

src/main/java/com/eactive/eai/rms/data/entity/onl/statistics/DailyStatistics.java

@@ -23,13 +23,13 @@ import lombok.EqualsAndHashCode;
 @Entity
 @Table(name = "tseaist02")
 @org.hibernate.annotations.Table(appliesTo = "tseaist02", comment = "시간대별통계")
-public class DailyStatistics extends AbstractEntity<HourlyStatisticsId>
+public class DailyStatistics extends AbstractEntity<DailyStatisticsId>
 						implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
 	@EmbeddedId
-	private HourlyStatisticsId id;
+	private DailyStatisticsId id;
 
 	@Column(precision = 10)
 	@Comment("0시 오류건수")

src/main/java/com/eactive/eai/rms/data/entity/onl/statistics/HourlyStatisticsRepository.java

@@ -2,6 +2,6 @@ package com.eactive.eai.rms.data.entity.onl.statistics;
 
 import com.eactive.eai.data.jpa.BaseRepository;
 
-interface HourlyStatisticsRepository extends BaseRepository<DailyStatistics, DailyStatisticsId> {
+interface HourlyStatisticsRepository extends BaseRepository<HourlyStatistics, HourlyStatisticsId> {
 
 }

src/main/java/com/eactive/eai/rms/data/entity/onl/statistics/HourlyStatisticsService.java

@@ -8,6 +8,6 @@ import com.eactive.eai.data.jpa.AbstractDataService;
 @Service
 @Transactional
 public class HourlyStatisticsService
-		extends AbstractDataService<DailyStatistics, DailyStatisticsId, HourlyStatisticsRepository> {
+		extends AbstractDataService<HourlyStatistics, HourlyStatisticsId, HourlyStatisticsRepository> {
 
 }

src/main/java/com/eactive/eai/rms/data/entity/onl/statistics/YearlyStatistics.java

@@ -23,13 +23,13 @@ import lombok.EqualsAndHashCode;
 @Entity
 @Table(name = "tseaist04")
 @org.hibernate.annotations.Table(appliesTo = "tseaist04", comment = "년별 통계")
-public class YearlyStatistics extends AbstractEntity<MonthlyStatisticsId>
+public class YearlyStatistics extends AbstractEntity<YearlyStatisticsId>
 						implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
 	@EmbeddedId
-	private MonthlyStatisticsId id;
+	private YearlyStatisticsId id;
 
 	@Column(precision = 10)
 	@Comment("10월 오류건수")

src/main/java/com/eactive/eai/rms/data/entity/onl/statistics/YearlyStatisticsRepository.java

@@ -2,6 +2,6 @@ package com.eactive.eai.rms.data.entity.onl.statistics;
 
 import com.eactive.eai.data.jpa.BaseRepository;
 
-interface YearlyStatisticsRepository extends BaseRepository<YearlyStatistics, YearlyStatisticsId>{
+interface YearlyStatisticsRepository extends BaseRepository<YearlyStatistics, YearlyStatisticsId> {
 
 }