diff --git a/src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java b/src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java index 570caf8b..d8344bbe 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java +++ b/src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java @@ -6,6 +6,7 @@ import com.dbnt.faisp.fipTarget.model.PartInfo; import com.dbnt.faisp.fipTarget.model.PartInfoFile; import com.dbnt.faisp.fipTarget.model.PartWork; import com.dbnt.faisp.fipTarget.model.PartWorkFile; +import com.dbnt.faisp.fipTarget.model.ShipInfo; import com.dbnt.faisp.fipTarget.model.VulnFile; import com.dbnt.faisp.fipTarget.model.Vulnerable; import com.dbnt.faisp.fipTarget.service.FipTargetService; @@ -466,8 +467,33 @@ public class FipTargetController { public void deleteVulnerable(@RequestBody Vulnerable vulnerable) { fipTargetService.deleteVulnerable(vulnerable); } -//외사취약지 끝 + //외사취약지 끝 + //국제여객선 시작 + @GetMapping("/ipShipList") + public ModelAndView ipShipList(@AuthenticationPrincipal UserInfo loginUser,ShipInfo shipInfo, HttpServletResponse response) { + ModelAndView mav = new ModelAndView("fipTarget/ipShipList"); + shipInfo.setDownOrganCdList(loginUser.getDownOrganCdList()); + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/target/ipShipList?siType="+shipInfo.getSiType()).get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); + shipInfo.setQueryInfo(); + + shipInfo.setPaginationInfo(); + mav.addObject("uesrId", loginUser.getUserId()); + mav.addObject("searchParams", shipInfo); + return mav; + } + @GetMapping("/ipShipEditModal") + public ModelAndView ipShipEditModal(@AuthenticationPrincipal UserInfo loginUser,ShipInfo shipInfo) { + ModelAndView mav = new ModelAndView("fipTarget/ipShipEditModal"); + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/target/partWorkList").get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); + + + return mav; + } diff --git a/src/main/java/com/dbnt/faisp/fipTarget/model/ShipInfo.java b/src/main/java/com/dbnt/faisp/fipTarget/model/ShipInfo.java new file mode 100644 index 00000000..79470223 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/fipTarget/model/ShipInfo.java @@ -0,0 +1,130 @@ +package com.dbnt.faisp.fipTarget.model; + +import com.dbnt.faisp.config.BaseModel; + +import lombok.AllArgsConstructor; +import lombok.Data; +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 org.springframework.web.multipart.MultipartFile; + +import javax.persistence.*; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; + + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@IdClass(ShipInfo.ShipInfoId.class) +@Table(name = "ship_info") +public class ShipInfo extends BaseModel implements Serializable{ + @Id + @Column(name = "si_seq") + private Integer siSeq; + @Id + @Column(name = "si_type") + private String siType; + @Id + @Column(name = "version_no") + private Integer versionNo; + @Column(name = "start_point") + private String startPoint; + @Column(name = "end_point") + private Integer endPoint; + @Column(name = "distance_nm") + private String distanceNm; + @Column(name = "distance_km") + private String distanceKm; + @Column(name = "owner_nm") + private String ownerNm; + @Column(name = "ship_nm") + private String shipNm; + @Column(name = "operation_cnt") + private String operationCnt; + @Column(name = "ship_weight") + private Integer shipWeight; + @Column(name = "passenger_cnt") + private Integer passengerCnt; + @Column(name = "freight_cnt") + private Integer freightCnt; + @Column(name = "close_yn") + private String closeYn; + @Column(name = "description") + private String description; + @Column(name = "wrt_organ") + private String wrtOrgan; + @Column(name = "wrt_part") + private String wrtPart; + @Column(name = "wrt_user_seq") + private Integer wrtUserSeq; + @Column(name = "wrt_title") + private String wrtTitle; + @Column(name = "wrt_nm") + private String wrtNm; + @Column(name = "wrt_dt") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime wrtDt; + + @Transient + private String excel; + + +@Override +public String toString() { + return "ShipInfo [siSeq=" + siSeq + ", siType=" + siType + ", versionNo=" + versionNo + ", startPoint=" + startPoint + + ", endPoint=" + endPoint + ", distanceNm=" + distanceNm + ", distanceKm=" + distanceKm + ", ownerNm=" + + ownerNm + ", shipNm=" + shipNm + ", operationCnt=" + operationCnt + ", shipWeight=" + shipWeight + + ", passengerCnt=" + passengerCnt + ", freightCnt=" + freightCnt + ", description=" + description + + ", wrtOrgan=" + wrtOrgan + ", wrtPart=" + wrtPart + ", wrtUserSeq=" + wrtUserSeq + ", wrtTitle=" + + wrtTitle + ", wrtNm=" + wrtNm + ", wrtDt=" + wrtDt + ", excel=" + excel + "]"; +} + + + + +@Embeddable +@Data +@NoArgsConstructor +@AllArgsConstructor +public static class ShipInfoId implements Serializable { + private Integer siSeq; + private String siType; + private Integer versionNo; +} + + + + + + + + + + + + + + + + + + + + + + + + +} diff --git a/src/main/resources/static/js/fipTarget/shipInfo.js b/src/main/resources/static/js/fipTarget/shipInfo.js new file mode 100644 index 00000000..aebfe764 --- /dev/null +++ b/src/main/resources/static/js/fipTarget/shipInfo.js @@ -0,0 +1,25 @@ +$(document).on('click', '#krcnTab', function (){ + location.href="/target/ipShipList?siType=KRCN"; +}) + +$(document).on('click', '#krjpruTab', function (){ + location.href="/target/ipShipList?siType=KRJPRU"; +}) + +$(document).on('click', '#addKRCN', function (){ + const siType = 'KRCN'; + $.ajax({ + url: '/target/ipShipEditModal', + data: {siType: siType}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#ipShipModalContent").empty().append(html); + $("#ipShipModal").modal('show'); + + }, + error:function(){ + + } + }); +}) \ No newline at end of file diff --git a/src/main/resources/templates/fipTarget/ipShipEditModal.html b/src/main/resources/templates/fipTarget/ipShipEditModal.html new file mode 100644 index 00000000..34f4e272 --- /dev/null +++ b/src/main/resources/templates/fipTarget/ipShipEditModal.html @@ -0,0 +1,83 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/fipTarget/ipShipList.html b/src/main/resources/templates/fipTarget/ipShipList.html new file mode 100644 index 00000000..073586e4 --- /dev/null +++ b/src/main/resources/templates/fipTarget/ipShipList.html @@ -0,0 +1,117 @@ + + + + + +
+
+

국제여객선 목록

+ + +
+
+
+ +
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
항로사업자
(한국대리점)
선명국제
총톤수
수송능력운항횟수휴항최종수정일
+
+
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+ + + +
+ \ No newline at end of file