Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit bd55a4b

Browse files
committed
20221107 dto, entity 분리작업중, ConfigurationProperties 읽기 기능 추가
1 parent a52aa49 commit bd55a4b

File tree

118 files changed

+1851
-1613
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+1851
-1613
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ target/
99
build/
1010
buildSrc/.gradle
1111
buildSrc/build
12+
.metadata/
1213

1314
### STS ###
1415
.apt_generated

‎src/main/java/com/singer/SpringWebServerOracleApplication.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
56

7+
@ConfigurationPropertiesScan
68
@SpringBootApplication
79
public class SpringWebServerOracleApplication {
810

‎src/main/java/com/singer/application/controller/BaseController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import javax.servlet.http.HttpSession;
77

88
import com.singer.common.util.Constants.USER_CODE;
9-
import com.singer.domain.vo.CommVo;
9+
import com.singer.domain.entity.CommVo;
1010

1111
public class BaseController {
1212

‎src/main/java/com/singer/application/controller/ErrorController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.springframework.web.bind.annotation.RequestMapping;
1111
import org.springframework.web.servlet.ModelAndView;
1212

13-
import com.singer.domain.vo.CommVo;
13+
import com.singer.domain.entity.CommVo;
1414

1515
@Controller
1616
public class ErrorController {

‎src/main/java/com/singer/application/controller/comm/CommController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
2424
import com.singer.common.util.Constants.USER_CODE;
2525
import com.singer.application.service.comm.CommService;
26-
import com.singer.domain.vo.CommVo;
26+
import com.singer.domain.entity.CommVo;
2727

2828
@Controller
2929
@JsonAutoDetect(fieldVisibility = Visibility.ANY)

‎src/main/java/com/singer/application/controller/comm/StreamController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@
1919
import org.springframework.web.bind.annotation.RequestMapping;
2020
import org.springframework.web.bind.annotation.RequestMethod;
2121

22-
import com.singer.infrastructure.util.PropertyUtil;
22+
import com.singer.infrastructure.config.S3Properties;
2323

2424
@Controller
2525
public class StreamController extends BaseController {
2626

2727
private final Log log = LogFactory.getLog(StreamController.class);
2828

2929
@Autowired
30-
private PropertyUtilpropertyUtil;
30+
private S3Propertiess3Properties;
3131

3232
@RequestMapping(value = "/comm/videoStreaming", method = RequestMethod.GET)
3333
public ResponseEntity<ResourceRegion> videoStreaming(@RequestHeader HttpHeaders headers) throws IOException {
3434
log.info("videoStreaming!!!");
3535

36-
String streamurl = propertyUtil.getS3StreamPath();
36+
String streamurl = s3Properties.getStreamPath();
3737
UrlResource video = new UrlResource(streamurl);
3838
ResourceRegion region = getResourceRegion(video, headers);
3939

‎src/main/java/com/singer/application/controller/sb/SB01Controller.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.singer.application.controller.sb;
22

33
import com.singer.application.controller.BaseController;
4+
import com.singer.application.service.sb.SB01Service;
45
import java.io.InputStream;
56
import java.util.List;
67

@@ -23,8 +24,7 @@
2324
import org.springframework.web.servlet.ModelAndView;
2425

2526
import com.singer.common.util.Constants.RESULT_CODE;
26-
import com.singer.application.service.sb.SB01Service;
27-
import com.singer.domain.vo.sb.SB01Vo;
27+
import com.singer.domain.entity.sb.SB01Vo;
2828

2929
import lombok.Cleanup;
3030

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
package com.singer.application.controller.sb;
22

33
import com.singer.application.controller.BaseController;
4-
import java.util.List;
4+
import com.singer.application.dto.sb.SB02ListResponse;
5+
import com.singer.application.dto.sb.SB02Request;
6+
import com.singer.application.dto.sb.SB02Response;
7+
import com.singer.application.service.sb.SB02Service;
58

69
import org.springframework.beans.factory.annotation.Autowired;
710
import javax.servlet.http.HttpServletRequest;
@@ -12,60 +15,58 @@
1215
import org.springframework.http.HttpStatus;
1316
import org.springframework.http.ResponseEntity;
1417
import org.springframework.stereotype.Controller;
15-
import org.springframework.web.bind.annotation.ModelAttribute;
18+
import org.springframework.web.bind.annotation.PathVariable;
1619
import org.springframework.web.bind.annotation.RequestBody;
1720
import org.springframework.web.bind.annotation.RequestMapping;
1821
import org.springframework.web.bind.annotation.RequestMethod;
1922
import org.springframework.web.bind.annotation.ResponseBody;
2023

21-
import com.singer.application.service.sb.SB02Service;
22-
import com.singer.domain.vo.sb.SB02Vo;
23-
2424
@RequestMapping("/sb01")
2525
@Controller
2626
public class SB02Controller extends BaseController {
2727

28-
private final Log log = LogFactory.getLog(SB02Controller.class);
28+
private final Log log = LogFactory.getLog(SB02Controller.class);
2929

30-
@Autowired
31-
private SB02Service sb02Service;
30+
@Autowired
31+
private SB02Service sb02Service;
3232

33-
@ResponseBody
34-
@RequestMapping(value = "/sb02/{seq01}/{parents}/{nowPage}", method = RequestMethod.GET)
35-
public ResponseEntity<SB02Vo> selectSB02Vo(@ModelAttribute SB02Vo sb02Vo, HttpServletRequest request)
36-
throws Exception {
37-
log.debug("enter sb02 get");
33+
@ResponseBody
34+
@RequestMapping(value = "/sb02/{seq01}/{parents}/{nowPage}", method = RequestMethod.GET)
35+
public ResponseEntity<SB02ListResponse> selectSB02Vo(@PathVariable int seq01,
36+
@PathVariable int parents, @PathVariable int nowPage, HttpServletRequest request)
37+
throws Exception {
38+
log.debug("enter sb02 get");
3839

39-
String userid = getSessionId(request);
40-
List<SB02Vo> list = sb02Service.selectSB02Vo(sb02Vo, userid);
41-
sb02Vo.setList(list);
40+
String userid = getSessionId(request);
41+
SB02ListResponse listResponse = sb02Service.selectSB02Vo(seq01, parents, nowPage, userid);
4242

43-
log.debug("exit sb02 get");
44-
return new ResponseEntity<SB02Vo>(sb02Vo, HttpStatus.OK);
45-
}
43+
log.debug("exit sb02 get");
44+
return new ResponseEntity<SB02ListResponse>(listResponse, HttpStatus.OK);
45+
}
4646

47-
@ResponseBody
48-
@RequestMapping(value = "/sb02", method = RequestMethod.POST)
49-
public ResponseEntity<SB02Vo> insertSB02Vo(@RequestBody @Valid SB02Vosb02Vo, HttpServletRequest request)
50-
throws Exception {
51-
log.debug("enter sb02 post");
47+
@ResponseBody
48+
@RequestMapping(value = "/sb02", method = RequestMethod.POST)
49+
public ResponseEntity<SB02Response> insertSB02Vo(@RequestBody @Valid SB02Requestsb02Request, HttpServletRequest request)
50+
throws Exception {
51+
log.debug("enter sb02 post");
5252

53-
String userid = getSessionId(request);
54-
sb02Service.insertSB02Vo(sb02Vo, userid);
53+
String userid = getSessionId(request);
54+
SB02Responsesb02Response = sb02Service.insertSB02Vo(sb02Request, userid);
5555

56-
log.debug("exit sb02 post");
57-
return new ResponseEntity<SB02Vo>(sb02Vo, HttpStatus.OK);
58-
}
56+
log.debug("exit sb02 post");
57+
return new ResponseEntity<SB02Response>(sb02Response, HttpStatus.OK);
58+
}
5959

60-
@ResponseBody
61-
@RequestMapping(value = "/sb02/{seq}/{seq01}/{parents}", method = RequestMethod.DELETE)
62-
public ResponseEntity<SB02Vo> deleteSB02Vo(@ModelAttribute SB02Vo sb02Vo, HttpServletRequest request)
63-
throws Exception {
64-
log.debug("enter sb02 delete");
60+
@ResponseBody
61+
@RequestMapping(value = "/sb02/{seq}/{seq01}/{parents}", method = RequestMethod.DELETE)
62+
public ResponseEntity<SB02Response> deleteSB02Vo(@PathVariable int seq,
63+
@PathVariable int seq01, @PathVariable int parents, HttpServletRequest request)
64+
throws Exception {
65+
log.debug("enter sb02 delete");
6566

66-
sb02Service.deleteSB02Vo(sb02Vo);
67+
sb02Service.deleteSB02Vo(seq, seq01, parents);
6768

68-
log.debug("exit sb02 delete");
69-
return new ResponseEntity<SB02Vo>(HttpStatus.NO_CONTENT);
70-
}
69+
log.debug("exit sb02 delete");
70+
return new ResponseEntity<SB02Response>(HttpStatus.NO_CONTENT);
71+
}
7172
}

‎src/main/java/com/singer/application/controller/sf/SF01Controller.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.singer.application.controller.sf;
22

33
import com.singer.application.controller.BaseController;
4+
import com.singer.application.service.sf.SF01Service;
45
import java.util.HashMap;
56
import java.util.List;
67

@@ -22,8 +23,7 @@
2223
import org.springframework.web.servlet.ModelAndView;
2324

2425
import com.singer.common.util.Constants.RESULT_CODE;
25-
import com.singer.application.service.sf.SF01Service;
26-
import com.singer.domain.vo.sf.SF01Vo;
26+
import com.singer.domain.entity.sf.SF01Vo;
2727

2828
@Controller
2929
public class SF01Controller extends BaseController {
Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package com.singer.application.controller.sf;
22

33
import com.singer.application.controller.BaseController;
4-
import java.util.List;
4+
import com.singer.application.dto.sf.SF02ListResponse;
5+
import com.singer.application.dto.sf.SF02Request;
6+
import com.singer.application.dto.sf.SF02Response;
57

68
import org.springframework.beans.factory.annotation.Autowired;
79
import javax.servlet.http.HttpServletRequest;
@@ -12,61 +14,62 @@
1214
import org.springframework.http.HttpStatus;
1315
import org.springframework.http.ResponseEntity;
1416
import org.springframework.stereotype.Controller;
15-
import org.springframework.web.bind.annotation.ModelAttribute;
17+
import org.springframework.web.bind.annotation.PathVariable;
1618
import org.springframework.web.bind.annotation.RequestBody;
1719
import org.springframework.web.bind.annotation.RequestMapping;
1820
import org.springframework.web.bind.annotation.RequestMethod;
1921
import org.springframework.web.bind.annotation.ResponseBody;
2022

2123
import com.singer.application.service.sf.SF02Service;
22-
import com.singer.domain.vo.sf.SF02Vo;
2324

2425
@RequestMapping("/sf01")
2526
@Controller
2627
public class SF02Controller extends BaseController {
2728

28-
private final Log log = LogFactory.getLog(SF02Controller.class);
29+
private final Log log = LogFactory.getLog(SF02Controller.class);
2930

30-
@Autowired
31-
private SF02Service sf02Service;
31+
@Autowired
32+
private SF02Service sf02Service;
3233

33-
@ResponseBody
34-
@RequestMapping(value = "/sf02/{seq01}/{parents}/{nowPage}", method = RequestMethod.GET)
35-
public ResponseEntity<SF02Vo> selectSF02Vo(@ModelAttribute SF02Vo sf02Vo, HttpServletRequest request)
36-
throws Exception {
37-
log.debug("enter sf02 get");
34+
@ResponseBody
35+
@RequestMapping(value = "/sf02/{seq01}/{parents}/{nowPage}", method = RequestMethod.GET)
36+
public ResponseEntity<SF02ListResponse> selectSF02Vo(@PathVariable int seq01,
37+
@PathVariable int parents, @PathVariable int nowPage, HttpServletRequest request)
38+
throws Exception {
39+
log.debug("enter sf02 get");
3840

39-
String userid = getSessionId(request);
40-
List<SF02Vo> list = sf02Service.selectSF02Vo(sf02Vo, userid);
41-
sf02Vo.setList(list);
41+
String userid = getSessionId(request);
42+
SF02ListResponse listResponse = sf02Service.selectSF02Vo(seq01, parents, nowPage, userid);
4243

43-
log.debug("exit sf02 get");
44-
return new ResponseEntity<SF02Vo>(sf02Vo, HttpStatus.OK);
45-
}
44+
log.debug("exit sf02 get");
45+
return new ResponseEntity<SF02ListResponse>(listResponse, HttpStatus.OK);
46+
}
4647

47-
@ResponseBody
48-
@RequestMapping(value = "/sf02", method = RequestMethod.POST)
49-
public ResponseEntity<SF02Vo> insertSF02Vo(@RequestBody @Valid SF02Vo sf02Vo, HttpServletRequest request)
50-
throws Exception {
51-
log.debug("enter sf02 post");
48+
@ResponseBody
49+
@RequestMapping(value = "/sf02", method = RequestMethod.POST)
50+
public ResponseEntity<SF02Response> insertSF02Vo(@RequestBody @Valid SF02Request sf02Request,
51+
HttpServletRequest request)
52+
throws Exception {
53+
log.debug("enter sf02 post");
5254

53-
String userid = getSessionId(request);
54-
sf02Service.insertSF02Vo(sf02Vo, userid);
55+
String userid = getSessionId(request);
56+
SF02Responsesf02Response = sf02Service.insertSF02Vo(sf02Request, userid);
5557

56-
log.debug("exit sf02 post");
57-
return new ResponseEntity<SF02Vo>(sf02Vo, HttpStatus.CREATED);
58-
}
58+
log.debug("exit sf02 post");
59+
return new ResponseEntity<SF02Response>(sf02Response, HttpStatus.CREATED);
60+
}
5961

60-
@ResponseBody
61-
@RequestMapping(value = "/sf02/{seq}/{seq01}/{parents}", method = RequestMethod.DELETE)
62-
public ResponseEntity<SF02Vo> deleteSF02Vo(@ModelAttribute SF02Vo sf02Vo, HttpServletRequest request)
63-
throws Exception {
64-
log.debug("enter sf02 delete");
62+
@ResponseBody
63+
@RequestMapping(value = "/sf02/{seq}/{seq01}/{parents}", method = RequestMethod.DELETE)
64+
public ResponseEntity<SF02Response> deleteSF02Vo(@PathVariable int seq,
65+
@PathVariable int seq01, @PathVariable int parents, HttpServletRequest request)
66+
throws Exception {
67+
log.debug("enter sf02 delete");
6568

66-
sf02Service.deleteSF02Vo(sf02Vo);
69+
sf02Service.deleteSF02Vo(seq, seq01, parents);
6770

68-
log.debug("exit sf02 delete");
69-
return new ResponseEntity<SF02Vo>(HttpStatus.NO_CONTENT);
70-
}
71+
log.debug("exit sf02 delete");
72+
return new ResponseEntity<SF02Response>(HttpStatus.NO_CONTENT);
73+
}
7174

7275
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /