DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: DBNT:a10b140410a3cb38fbf3c7f9446a5268ab10d74d
Branches Tags
DBNT:master
...
compare: DBNT:8e7fe9473a049e76d6c183e08a33487934566531
Branches Tags
DBNT:master

2 Commits
a10b140410 ... 8e7fe9473a

Author SHA1 Message Date
jiHyung 8e7fe9473a Merge branch 'master' of http://118.219.150.34:50501/DBNT/FAISP 
 Conflicts:
	src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java
	src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java
	src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java
 2022-10-27 09:15:12 +09:00
jiHyung 4dffe4b055 병합 2022-10-27 09:12:31 +09:00
9 changed files with 25 additions and 46 deletions
Show Stats Expand all files Collapse all files

8
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java
View File

@ -1,10 +1,10 @@
package com.dbnt.faisp.main.faStatistics.crackdownsStatus;
import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus;
import com.dbnt.faisp.faStatistics.crackdownStatus.model.FishingBoat;
import com.dbnt.faisp.faStatistics.crackdownStatus.model.ProcessResult;
import com.dbnt.faisp.faStatistics.crackdownStatus.service.CrackdownStatusService;
import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.CrackdownStatus;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.ProcessResult;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.CrackdownStatusService;
import com.dbnt.faisp.main.userInfo.model.UserInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.annotation.AuthenticationPrincipal;

1
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java
View File

@ -2,6 +2,7 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.CrackdownStatus;
import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;

17
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/FishingBoat.java
View File

@ -1,13 +1,14 @@
package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
import com.dbnt.faisp.config.BaseModel;
import lombok.*;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.*;
import java.io.Serializable;
import java.time.LocalDateTime;
@Getter
@ -17,14 +18,13 @@ import java.time.LocalDateTime;
@DynamicInsert
@DynamicUpdate
@Table(name = "fishing_boat")
@IdClass(FishingBoat.FishingBoatId.class)
public class FishingBoat extends BaseModel {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "fb_key")
private Integer fbKey;
@Id
@Column(name = "cds_key")
private Integer cdsKey;
@ -122,13 +122,4 @@ public class FishingBoat extends BaseModel {
@Transient
private String boatMaterialEtc;
@Embeddable
@Data
@NoArgsConstructor
@AllArgsConstructor
public static class FishingBoatId implements Serializable {
private Integer fbKey;
private Integer cdsKey;
}
}

17
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/ProcessResult.java
View File

@ -1,13 +1,14 @@
package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
import com.dbnt.faisp.config.BaseModel;
import lombok.*;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.*;
import java.io.Serializable;
import java.time.LocalDateTime;
@Getter
@ -17,14 +18,13 @@ import java.time.LocalDateTime;
@DynamicInsert
@DynamicUpdate
@Table(name = "process_result")
@IdClass(ProcessResult.ProcessResultId.class)
public class ProcessResult extends BaseModel {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "pr_key")
private Integer prKey;
@Id
@Column(name = "cds_key")
private Integer cdsKey;
@ -131,13 +131,4 @@ public class ProcessResult extends BaseModel {
@Transient
private String processStatusEtc;
@Embeddable
@Data
@NoArgsConstructor
@AllArgsConstructor
public static class ProcessResultId implements Serializable {
private Integer prKey;
private Integer cdsKey;
}
}

17
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Sailor.java
View File

@ -1,13 +1,14 @@
package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
import com.dbnt.faisp.config.BaseModel;
import lombok.*;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.*;
import java.io.Serializable;
import java.time.LocalDateTime;
@Getter
@ -17,14 +18,13 @@ import java.time.LocalDateTime;
@DynamicInsert
@DynamicUpdate
@Table(name = "sailor")
@IdClass(Sailor.SailorId.class)
public class Sailor extends BaseModel {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "sailor_key")
private Integer sailorKey;
@Id
@Column(name = "fb_key")
private Integer fbKey;
@ -88,13 +88,4 @@ public class Sailor extends BaseModel {
@Column(name = "wrt_dt")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private LocalDateTime wrtDt;
@Embeddable
@Data
@NoArgsConstructor
@AllArgsConstructor
public static class SailorId implements Serializable {
private Integer sailorKey;
private Integer fbKey;
}
}

2
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatRepository.java
View File

@ -3,6 +3,6 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
import org.springframework.data.jpa.repository.JpaRepository;
public interface FishingBoatRepository extends JpaRepository<FishingBoat, FishingBoat.FishingBoatId> {
public interface FishingBoatRepository extends JpaRepository<FishingBoat, Integer> {
}

2
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultRepository.java
View File

@ -3,6 +3,6 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.ProcessResult;
import org.springframework.data.jpa.repository.JpaRepository;
public interface ProcessResultRepository extends JpaRepository<ProcessResult, ProcessResult.ProcessResultId> {
public interface ProcessResultRepository extends JpaRepository<ProcessResult, Integer> {
}

2
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorRepository.java
View File

@ -3,6 +3,6 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Sailor;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SailorRepository extends JpaRepository<Sailor, Sailor.SailorId> {
public interface SailorRepository extends JpaRepository<Sailor, Integer> {
}

5
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java
View File

@ -9,6 +9,11 @@ import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Violation;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*;
import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo;
import com.dbnt.faisp.faStatistics.crackdownStatus.mapper.CrackdownStatusMapper;
import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus;
import com.dbnt.faisp.faStatistics.crackdownStatus.model.Sailor;
import com.dbnt.faisp.faStatistics.crackdownStatus.model.Violation;
import com.dbnt.faisp.faStatistics.crackdownStatus.repository.*;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;