Merge pull request #40 from KBDS-Dreamverse/feat/#21

Feat/#21

src/main/java/com/kbds/itamserveradmin/domain/asset/controller/AssetController.java

@@ -1,7 +1,24 @@
 package com.kbds.itamserveradmin.domain.asset.controller;
-import org.springframework.web.bind.annotation.RestController;
+import com.kbds.itamserveradmin.domain.asset.dto.AssetRes;
+import com.kbds.itamserveradmin.domain.asset.service.AssetService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
+@RequiredArgsConstructor
+@RequestMapping("/kbitam")
 public class AssetController {
 
+    public final AssetService assetService;
+
+    @GetMapping("/{dept}/{cont-id}/info")
+    public ResponseEntity<AssetRes> info(@PathVariable("cont-id") String contId, @PathVariable String dept){
+        AssetRes assetRes = assetService.getInfo(contId);
+        if (assetRes == null){
+            return ResponseEntity.notFound().build();
+        }
+        return ResponseEntity.ok(assetRes);
+    }
 }

src/main/java/com/kbds/itamserveradmin/domain/asset/dto/AssetRes.java

@@ -1,8 +1,38 @@
 package com.kbds.itamserveradmin.domain.asset.dto;
+import com.kbds.itamserveradmin.domain.asset.entity.Asset;
+import com.kbds.itamserveradmin.domain.asset.entity.AstTag;
+import com.kbds.itamserveradmin.domain.corporation.entity.Corporation;
+import com.kbds.itamserveradmin.domain.user.entity.User;
 import lombok.Builder;
 import lombok.Data;
 
 @Data
 @Builder
 public class AssetRes {
+
+    private String astId;
+    private String astName;
+    private Boolean isAstInternal;
+    private AstTag astTag;
+    private Corporation corp;
+    private User user;
+    private String astSwCtgy;
+    private String astPrice;
+    private String astVer;
+    private Boolean isAstInstallFile;
+    private String astSpd;
+    private String astDpd;
+
+    public static AssetRes assetInfo (Asset asset){
+        return AssetRes.builder()
+                .astId(asset.getAstId())
+                .astName(asset.getAstName())
+                .astTag(asset.getAstTag()) //자산태그
+                .astDpd(asset.getAstDpd()) //상세설명
+                .astSpd(asset.getAstSpd()) //간략설명
+                .astVer(asset.getAstVer())
+                .astPrice(asset.getAstPrice())
+                .build();
+    }
+
 }

src/main/java/com/kbds/itamserveradmin/domain/asset/entity/Asset.java

@@ -2,19 +2,17 @@
 
 import com.kbds.itamserveradmin.domain.corporation.entity.Corporation;
 import com.kbds.itamserveradmin.domain.user.entity.User;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 
 import javax.persistence.*;
 
 @Entity
 @Data
+@Builder
+@Getter
 @NoArgsConstructor
 @AllArgsConstructor
-@Builder
 public class Asset {
 
     @Id

src/main/java/com/kbds/itamserveradmin/domain/asset/entity/AstTag.java

@@ -8,8 +8,7 @@
 @AllArgsConstructor
 public enum AstTag {
 
-    DAS("데이타시스템"), BNK("국민은행"), ISR("손해보험"), CRD("국민카드"), STK("증권"), LIF("라이프"),
-    ASM("자산운용"), CAP("캐피탈"), RET("부동산신탁"), SAV("저축은행"), INV("인베스트먼트");
+    BANK("은행"), INSURANCE("보험"), INVESTMENT("투자"), CAPITAL("캐피탈"), REAL_ESTATE("부동산");
 
     @JsonValue
     private String value;

src/main/java/com/kbds/itamserveradmin/domain/asset/service/AssetService.java

@@ -1,10 +1,25 @@
 package com.kbds.itamserveradmin.domain.asset.service;
 
+import com.kbds.itamserveradmin.domain.asset.dto.AssetRes;
+import com.kbds.itamserveradmin.domain.asset.entity.Asset;
+import com.kbds.itamserveradmin.domain.contract.service.ContractService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 
 @Service
 @RequiredArgsConstructor
 public class AssetService {
 
+    private final ContractService contractService;
+
+    @Transactional
+    public AssetRes getInfo(String contId) {
+        Asset asset = contractService.getAstIdByContId(contId);
+        if (asset == null) {
+            return null;
+        }
+        return AssetRes.assetInfo(asset);
+    }
 }

src/main/java/com/kbds/itamserveradmin/domain/assetRequest/controller/AssetRequestController.java

@@ -14,47 +14,47 @@
 public class AssetRequestController {
 
 
-    private final AssetRequestService assetRequestService;
-
-    @Autowired
-    public AssetRequestController(AssetRequestService assetRequestService) {
-        this.assetRequestService = assetRequestService;
-    }
-
-
-    @PostMapping("/test")
-    @ResponseBody
-    public ResponseEntity<String> test(){
-        boolean test = true;
-        System.out.println("시작");
-
-        if(test) {
-            throw new BaseException(ErrorCode.INTERNAL_SERVER_ERROR);
-        }
-
-        return ResponseEntity.ok("성공");
-
-    }
-
-
-    @PostMapping("/kbitam/{dept}/{contId}/request")
-    @ResponseBody
-    public ResponseEntity<String> requestAsset(@PathVariable String dept,
-                                               @PathVariable String contId,
-                                               @RequestBody AssetRequestReq req){
-
-//        System.out.println("dept :"+dept+"  conId:"+contId);
-//        System.out.println(req.getContId());
-//        System.out.println(req.getAstReqStartDate());
-//        System.out.println(req.getAstReqEndDate());
-//        System.out.println(req.getAstReqEndDate());
-//        System.out.println(req.getAstReqMgDate());
-//        System.out.println(req.getAstReqReason());
-//        System.out.println(req.getUserId());
-
-
-        return ResponseEntity.ok("성공");
-
-
-    }
+//    private final AssetRequestService assetRequestService;
+//
+//    @Autowired
+//    public AssetRequestController(AssetRequestService assetRequestService) {
+//        this.assetRequestService = assetRequestService;
+//    }
+//
+//
+//    @PostMapping("/test")
+//    @ResponseBody
+//    public ResponseEntity<String> test(){
+//        boolean test = true;
+//        System.out.println("시작");
+//
+//        if(test) {
+//            throw new BaseException(ErrorCode.INTERNAL_SERVER_ERROR);
+//        }
+//
+//        return ResponseEntity.ok("성공");
+//
+//    }
+//
+//
+//    @PostMapping("/kbitam/{dept}/{contId}/request")
+//    @ResponseBody
+//    public ResponseEntity<String> requestAsset(@PathVariable String dept,
+//                                               @PathVariable String contId,
+//                                               @RequestBody AssetRequestReq req){
+//
+////        System.out.println("dept :"+dept+"  conId:"+contId);
+////        System.out.println(req.getContId());
+////        System.out.println(req.getAstReqStartDate());
+////        System.out.println(req.getAstReqEndDate());
+////        System.out.println(req.getAstReqEndDate());
+////        System.out.println(req.getAstReqMgDate());
+////        System.out.println(req.getAstReqReason());
+////        System.out.println(req.getUserId());
+//
+//
+//        return ResponseEntity.ok("성공");
+//
+//
+//    }
 }

src/main/java/com/kbds/itamserveradmin/domain/contract/entity/Contract.java

@@ -11,8 +11,7 @@
 
 import javax.persistence.*;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+
 
 @Entity
 @Data
@@ -32,7 +31,7 @@ public class Contract {
     @JoinColumn(name = "corp_id")
     private Corporation corp;
 
-    @OneToOne
+    @OneToOne(optional = false)
     private NewAssetRequest newAstReq;
 
     @ManyToOne(fetch = FetchType.LAZY)

src/main/java/com/kbds/itamserveradmin/domain/contract/repository/ContractRepository.java

@@ -4,4 +4,5 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ContractRepository extends JpaRepository<Contract, String> {
+    Contract findByContId (String contId);
 }

src/main/java/com/kbds/itamserveradmin/domain/contract/service/ContractService.java

@@ -77,7 +77,14 @@ public static List<String> parseContLicTag(String contLicTag) {
 
         return licenseTypes;
     }
-
+    //Ast id 찾는 메서드
+    public Asset getAstIdByContId(String contId){
+        Contract contract = contractRepository.findByContId(contId);
+        if (contract == null){
+            return null;
+        }
+        return contract.getAst();
+    }
     /**
      * DashBoard에 보여줄 데이터 가져오는 메서드
      * @param contId
@@ -182,6 +189,4 @@ public CalKeyRes getCalKey(String userId, String contId) {
                 .build();
     }
 
-
-
 }

src/main/java/com/kbds/itamserveradmin/domain/department/repository/DepartmentAssetRepository.java

@@ -3,6 +3,8 @@
 import com.kbds.itamserveradmin.domain.department.entity.DepartmentAsset;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface DepartmentAssetRepository extends JpaRepository<DepartmentAsset,String> {
+import java.util.List;
 
+public interface DepartmentAssetRepository extends JpaRepository<DepartmentAsset,String> {
+//    List<DepartmentAsset> findBy (Iterable<String> strings);
 }

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9000
+  port: 8080
   servlet:
     context-path: /
     encoding:
@@ -8,21 +8,23 @@ server:
       force: true
 
 spring:
+  jackson:
+    property-naming-strategy: SNAKE_CASE
 
   application:
     name : itam-server-admin
 
   datasource:
     platform: mysql
-    url: jdbc:mysql://localhost:3306/kb?serverTimezone=Asia/Seoul&characterEncoding=UTF-8
+    url: jdbc:mysql://localhost:3306/kbds?serverTimezone=Asia/Seoul&characterEncoding=UTF-8
     username: root
-    password: Whdlrgus99@
+    password: 1234
     driver-class-name: com.mysql.cj.jdbc.Driver # mysql 8버전
 
 
   jpa:
     hibernate:
-      ddl-auto: create # create, update, none
+      ddl-auto: update # create, update, none
       #naming:
         #entity만들때, 변수명 그대로 데이터베이스 필드에 넣어주겠다.
         #만약, org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy 전략을 사용하겠다고 하면,