dev vds,dsrc control

src/main/java/com/its/op/controller/its/rse/TbRseCtrlHsController.java

@@ -6,9 +6,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
 import java.util.List;
 
 @Api(tags = "14.RSE-1.RSE 관리-RSE 제어 이력")
@@ -28,38 +30,8 @@ public class TbRseCtrlHsController {
 
     @ApiOperation(value = "RSE 제어 이력 개별조회(TB_RSE_CTRL_HS)", response = TbRseCtrlHsDto.class)
     @GetMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
-    public TbRseCtrlHsDto findById(@PathVariable final TbRseCtrlHsKey id) {
+    public TbRseCtrlHsDto findById(@PathVariable final Long id) {
         return this.service.findById(id);
     }
 
-    @ApiOperation(value = "RSE 제어 이력 정보변경(TB_RSE_CTRL_HS)", response = TbRseCtrlHsDto.class)
-    @PutMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
-    public TbRseCtrlHsDto updateById(@PathVariable final TbRseCtrlHsKey id, @RequestBody @Valid final TbRseCtrlHsDto.TbRseCtrlHsUpdReq req) {
-        return this.service.updateById(id, req);
-    }
-
-    @ApiOperation(value = "RSE 제어 이력 정보변경/생성-목록(TB_RSE_CTRL_HS)", response = TbRseCtrlHsDto.class, responseContainer = "ArrayList")
-    @PostMapping(value = "", produces = {"application/json; charset=utf8"})
-    public List<TbRseCtrlHsDto> mergeInfoList(@RequestBody @Valid final List<TbRseCtrlHsDto.TbRseCtrlHsUpdReq> listReq) {
-        return this.service.mergeInfoList(listReq);
-    }
-
-    @ApiOperation(value = "RSE 제어 이력 정보변경/생성-개별(TB_RSE_CTRL_HS)", response = TbRseCtrlHsDto.class)
-    @PostMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
-    public TbRseCtrlHsDto mergeInfo(@PathVariable("id") TbRseCtrlHsKey id, @RequestBody @Valid final TbRseCtrlHsDto.TbRseCtrlHsUpdReq req) {
-        return this.service.mergeInfo(req);
-    }
-
-    @ApiOperation(value = "RSE 제어 이력 정보삭제-개별(TB_RSE_CTRL_HS)", response = TbRseCtrlHsDto.class)
-    @DeleteMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
-    public TbRseCtrlHsDto deleteDataById(@PathVariable("id") TbRseCtrlHsKey id) {
-        return this.service.deleteById(id);
-    }
-
-    @ApiOperation(value = "RSE 제어 이력 정보삭제-목록(TB_RSE_CTRL_HS)", response = TbRseCtrlHsDto.class, responseContainer = "ArrayList")
-    @DeleteMapping(value = "", produces = {"application/json; charset=utf8"})
-    public List<TbRseCtrlHsDto> deleteDataByIds(@RequestBody @Valid final List<TbRseCtrlHsKey> ids) {
-        return this.service.deleteByIds(ids);
-    }
-
 }

src/main/java/com/its/op/service/its/rse/TbRseCtrlHsService.java

@@ -21,7 +21,7 @@ public class TbRseCtrlHsService {
     private final TbRseCtrlHsRepository repo;
 
     // 데이터 1건 조회, 없으면 exception
-    private TbRseCtrlHs requireOne(TbRseCtrlHsKey id) throws NoSuchElementException {
+    private TbRseCtrlHs requireOne(Long id) throws NoSuchElementException {
         Optional<TbRseCtrlHs> info = this.repo.findById(id);
         if (info.isPresent()) {
             return info.get();
@@ -46,60 +46,9 @@ public class TbRseCtrlHsService {
 
     // 데이터 1건 조회(기존 데이터가 반드시 존재해야 함)
     @Transactional(readOnly = true)
-    public TbRseCtrlHsDto findById(TbRseCtrlHsKey id) {
+    public TbRseCtrlHsDto findById(Long id) {
         TbRseCtrlHs entity = requireOne(id);
         return entity.toDto();
     }
 
-    // 데이터 변경
-    @Transactional
-    public TbRseCtrlHsDto updateById(TbRseCtrlHsKey id, TbRseCtrlHsDto.TbRseCtrlHsUpdReq req) {
-        TbRseCtrlHs entity = requireOne(id);
-        entity.updateInfo(req);
-        this.repo.save(entity);
-        return entity.toDto();
-    }
-
-    // 데이터 변경 또는 생성-목록(데이터가 존재하면 업데이트 없으면 신규로 생성)
-    @Transactional
-    public List<TbRseCtrlHsDto> mergeInfoList(List<TbRseCtrlHsDto.TbRseCtrlHsUpdReq> reqList) {
-        List<TbRseCtrlHsDto> result = new ArrayList<>();
-        for (TbRseCtrlHsDto.TbRseCtrlHsUpdReq req : reqList) {
-            TbRseCtrlHs obj = req.toEntity();
-            this.repo.save(obj);
-            result.add(obj.toDto());
-        }
-        return result;
-    }
-
-    // 데이터 변경 또는 생성-개별(데이터가 존재하면 업데이트 없으면 신규로 생성)
-    @Transactional
-    public TbRseCtrlHsDto mergeInfo(TbRseCtrlHsDto.TbRseCtrlHsUpdReq req) {
-        TbRseCtrlHs obj = req.toEntity();
-        this.repo.save(obj);
-        return obj.toDto();
-    }
-
-    // 정보 삭제-개별, 데이터 존재하지 않으면 Exception
-    @Transactional
-    public TbRseCtrlHsDto deleteById(TbRseCtrlHsKey id) {
-        TbRseCtrlHs entity = requireOne(id);
-        this.repo.deleteById(id);
-        return entity.toDto();
-    }
-
-    // 정보 삭제-목록, 존재하는 데이터 만 삭제
-    @Transactional
-    public List<TbRseCtrlHsDto> deleteByIds(List<TbRseCtrlHsKey> ids) {
-        List<TbRseCtrlHsDto> result = new ArrayList<>();
-        for (TbRseCtrlHsKey id : ids) {
-            Optional<TbRseCtrlHs> obj = this.repo.findById(id);
-            if (obj.isPresent()) {
-                this.repo.deleteById(id);
-                result.add(obj.get().toDto());
-            }
-        }
-        return result;
-    }
-
 }