|
20 | 20 | import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
|
21 | 21 | import com.singer.common.util.Constants.USER_CODE;
|
22 | 22 | import com.singer.application.service.comm.CommService;
|
23 | | -import com.singer.domain.entity.CommVo; |
| 23 | +import com.singer.domain.entity.CommEntity; |
24 | 24 |
|
25 | 25 | import lombok.extern.slf4j.Slf4j;
|
26 | 26 |
|
@@ -52,120 +52,120 @@ public ModelAndView toShowcode() throws Exception {
|
52 | 52 |
|
53 | 53 | @ResponseBody
|
54 | 54 | @RequestMapping(value = "/comm/code/{codegrp}", method = RequestMethod.GET)
|
55 | | - public ResponseEntity<CommVo> toSelectCommCode(@ModelAttribute CommVo commVo) throws Exception { |
| 55 | + public ResponseEntity<CommEntity> toSelectCommCode(@ModelAttribute CommEntity commVo) throws Exception { |
56 | 56 | log.debug("CommVo : " + commVo);
|
57 | 57 |
|
58 | | - List<CommVo> list = commService.selectCode(commVo); |
| 58 | + List<CommEntity> list = commService.selectCode(commVo); |
59 | 59 | commVo.setCommList(list);
|
60 | 60 |
|
61 | | - return new ResponseEntity<CommVo>(commVo, HttpStatus.OK); |
| 61 | + return new ResponseEntity<CommEntity>(commVo, HttpStatus.OK); |
62 | 62 | }
|
63 | 63 |
|
64 | 64 | @ResponseBody
|
65 | 65 | @RequestMapping(value = "/comm/codeGrp", method = RequestMethod.GET)
|
66 | | - public ResponseEntity<CommVo> toSelectCommCodeGrp(@ModelAttribute CommVo commVo) throws Exception { |
| 66 | + public ResponseEntity<CommEntity> toSelectCommCodeGrp(@ModelAttribute CommEntity commVo) throws Exception { |
67 | 67 |
|
68 | 68 | log.debug("CommVo : " + commVo);
|
69 | 69 |
|
70 | | - List<CommVo> list = commService.selectCodeGrp(commVo); |
| 70 | + List<CommEntity> list = commService.selectCodeGrp(commVo); |
71 | 71 | commVo.setCommList(list);
|
72 | 72 |
|
73 | | - return new ResponseEntity<CommVo>(commVo, HttpStatus.OK); |
| 73 | + return new ResponseEntity<CommEntity>(commVo, HttpStatus.OK); |
74 | 74 | }
|
75 | 75 |
|
76 | 76 | @ResponseBody
|
77 | 77 | @RequestMapping(value = "/comm/menu", method = RequestMethod.GET)
|
78 | | - public ResponseEntity<CommVo> toSelectMenu(HttpServletRequest request) throws Exception { |
79 | | - CommVo commVo = new CommVo(); |
| 78 | + public ResponseEntity<CommEntity> toSelectMenu(HttpServletRequest request) throws Exception { |
| 79 | + CommEntity commVo = new CommEntity(); |
80 | 80 |
|
81 | | - List<CommVo> menuList = getMenuList(request); |
| 81 | + List<CommEntity> menuList = getMenuList(request); |
82 | 82 | commVo.setCommList(menuList);
|
83 | 83 |
|
84 | | - return new ResponseEntity<CommVo>(commVo, HttpStatus.OK); |
| 84 | + return new ResponseEntity<CommEntity>(commVo, HttpStatus.OK); |
85 | 85 | }
|
86 | 86 |
|
87 | 87 | @ResponseBody
|
88 | 88 | @RequestMapping(value = "/comm/menu", method = RequestMethod.POST)
|
89 | | - public ResponseEntity<CommVo> toInsertMenu(@RequestBody CommVo commVo, HttpServletRequest request) |
| 89 | + public ResponseEntity<CommEntity> toInsertMenu(@RequestBody CommEntity commVo, HttpServletRequest request) |
90 | 90 | throws Exception {
|
91 | 91 |
|
92 | 92 | log.debug("CommVo : " + commVo);
|
93 | 93 |
|
94 | 94 | USER_CODE authlevel = getUsertype(request);
|
95 | 95 | String userid = getSessionId(request);
|
96 | | - List<CommVo> list = commService.insertMenu(commVo, userid, authlevel); |
| 96 | + List<CommEntity> list = commService.insertMenu(commVo, userid, authlevel); |
97 | 97 | commVo.setCommList(list);
|
98 | 98 |
|
99 | | - return new ResponseEntity<CommVo>(commVo, HttpStatus.CREATED); |
| 99 | + return new ResponseEntity<CommEntity>(commVo, HttpStatus.CREATED); |
100 | 100 | }
|
101 | 101 |
|
102 | 102 | @ResponseBody
|
103 | 103 | @RequestMapping(value = "/comm/menu/{menucd}", method = RequestMethod.DELETE)
|
104 | | - public ResponseEntity<CommVo> toDeleteMenu(@ModelAttribute CommVo commVo, HttpServletRequest request) |
| 104 | + public ResponseEntity<CommEntity> toDeleteMenu(@ModelAttribute CommEntity commVo, HttpServletRequest request) |
105 | 105 | throws Exception {
|
106 | 106 |
|
107 | 107 | log.debug("enter deleteMenu.do");
|
108 | 108 | log.debug("CommVo : " + commVo);
|
109 | 109 |
|
110 | 110 | USER_CODE authlevel = getUsertype(request);
|
111 | | - List<CommVo> list = commService.deleteMenu(commVo, authlevel); |
| 111 | + List<CommEntity> list = commService.deleteMenu(commVo, authlevel); |
112 | 112 | commVo.setCommList(list);
|
113 | 113 |
|
114 | 114 | log.debug("exit deleteMenu.do");
|
115 | | - return new ResponseEntity<CommVo>(commVo, HttpStatus.OK); |
| 115 | + return new ResponseEntity<CommEntity>(commVo, HttpStatus.OK); |
116 | 116 | }
|
117 | 117 |
|
118 | 118 | @ResponseBody
|
119 | 119 | @RequestMapping(value = "/comm/menu", method = RequestMethod.PUT)
|
120 | | - public ResponseEntity<CommVo> toUpdateMenu(@RequestBody CommVo commVo, HttpServletRequest request) |
| 120 | + public ResponseEntity<CommEntity> toUpdateMenu(@RequestBody CommEntity commVo, HttpServletRequest request) |
121 | 121 | throws Exception {
|
122 | 122 |
|
123 | 123 | log.debug("CommVo : " + commVo);
|
124 | 124 |
|
125 | 125 | USER_CODE authlevel = getUsertype(request);
|
126 | 126 | String userid = getSessionId(request);
|
127 | | - List<CommVo> list = commService.updateMenu(commVo, userid, authlevel); |
| 127 | + List<CommEntity> list = commService.updateMenu(commVo, userid, authlevel); |
128 | 128 | commVo.setCommList(list);
|
129 | 129 |
|
130 | | - return new ResponseEntity<CommVo>(commVo, HttpStatus.OK); |
| 130 | + return new ResponseEntity<CommEntity>(commVo, HttpStatus.OK); |
131 | 131 | }
|
132 | 132 |
|
133 | 133 | @ResponseBody
|
134 | 134 | @RequestMapping(value = "/comm/code", method = RequestMethod.POST)
|
135 | | - public ResponseEntity<CommVo> toInsertCode(@RequestBody CommVo commVo, HttpServletRequest request) |
| 135 | + public ResponseEntity<CommEntity> toInsertCode(@RequestBody CommEntity commVo, HttpServletRequest request) |
136 | 136 | throws Exception {
|
137 | 137 |
|
138 | 138 | log.debug("CommVo : " + commVo);
|
139 | 139 |
|
140 | 140 | String userid = getSessionId(request);
|
141 | | - List<CommVo> list = commService.insertCode(commVo, userid); |
| 141 | + List<CommEntity> list = commService.insertCode(commVo, userid); |
142 | 142 | commVo.setCommList(list);
|
143 | 143 |
|
144 | | - return new ResponseEntity<CommVo>(commVo, HttpStatus.CREATED); |
| 144 | + return new ResponseEntity<CommEntity>(commVo, HttpStatus.CREATED); |
145 | 145 | }
|
146 | 146 |
|
147 | 147 | @ResponseBody
|
148 | 148 | @RequestMapping(value = "/comm/code/{codegrp}/{codecd}", method = RequestMethod.DELETE)
|
149 | | - public ResponseEntity<CommVo> toDeleteCode(@ModelAttribute CommVo commVo, HttpServletRequest request) |
| 149 | + public ResponseEntity<CommEntity> toDeleteCode(@ModelAttribute CommEntity commVo, HttpServletRequest request) |
150 | 150 | throws Exception {
|
151 | 151 |
|
152 | 152 | log.debug("CommVo : " + commVo);
|
153 | 153 |
|
154 | | - List<CommVo> list = commService.deleteCode(commVo); |
| 154 | + List<CommEntity> list = commService.deleteCode(commVo); |
155 | 155 | commVo.setCommList(list);
|
156 | 156 |
|
157 | | - return new ResponseEntity<CommVo>(commVo, HttpStatus.OK); |
| 157 | + return new ResponseEntity<CommEntity>(commVo, HttpStatus.OK); |
158 | 158 | }
|
159 | 159 |
|
160 | 160 | @ResponseBody
|
161 | 161 | @RequestMapping(value = "/comm/code", method = RequestMethod.PUT)
|
162 | | - public ResponseEntity<CommVo> toUpdateCode(CommVo commVo, HttpServletRequest request) throws Exception { |
| 162 | + public ResponseEntity<CommEntity> toUpdateCode(CommEntity commVo, HttpServletRequest request) throws Exception { |
163 | 163 |
|
164 | 164 | log.debug("CommVo : " + commVo);
|
165 | 165 |
|
166 | 166 | commService.updateCode(commVo);
|
167 | 167 |
|
168 | | - return new ResponseEntity<CommVo>(commVo, HttpStatus.OK); |
| 168 | + return new ResponseEntity<CommEntity>(commVo, HttpStatus.OK); |
169 | 169 | }
|
170 | 170 |
|
171 | 171 | @RequestMapping(value = "/authExpire")
|
|
0 commit comments