Skip to content

Commit 00fd201

Browse files
kayformkayform
authored
Merge pull request #259 from experdb/develop
eXperDB-Management v13.0.1 pull request
2 parents 58dcd9b + 114d5cf commit 00fd201

45 files changed

Lines changed: 7758 additions & 3836 deletions

File tree

Some content is hidden

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

‎eXperDB-Management-WebConsole/pom.xml‎

Lines changed: 281 additions & 274 deletions
Large diffs are not rendered by default.

‎eXperDB-Management-WebConsole/src/main/java/com/experdb/management/backup/web/ExperdbBackupController.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public ModelAndView backupSetting(@ModelAttribute("historyVO") HistoryVO history
6464
// 화면접근이력 이력 남기기
6565
CmmnUtils.saveHistory(request, historyVO);
6666
historyVO.setExe_dtl_cd("DX-T0163");
67-
historyVO.setMnu_id(54);
67+
historyVO.setMnu_id(55);
6868
accessHistoryService.insertHistory(historyVO);
6969
mv.setViewName("eXperDB_Backup/backupSetting");
7070
}
@@ -98,7 +98,7 @@ public ModelAndView backupStorage(@ModelAttribute("historyVO") HistoryVO history
9898
// 화면접근이력 이력 남기기
9999
CmmnUtils.saveHistory(request, historyVO);
100100
historyVO.setExe_dtl_cd("DX-T0162");
101-
historyVO.setMnu_id(53);
101+
historyVO.setMnu_id(54);
102102
accessHistoryService.insertHistory(historyVO);
103103
mv.setViewName("eXperDB_Backup/backupStorage");
104104
}
@@ -132,7 +132,7 @@ public ModelAndView backupHistory(@ModelAttribute("historyVO") HistoryVO history
132132
// 화면접근이력 이력 남기기
133133
CmmnUtils.saveHistory(request, historyVO);
134134
historyVO.setExe_dtl_cd("DX-T0164");
135-
historyVO.setMnu_id(50);
135+
historyVO.setMnu_id(51);
136136
accessHistoryService.insertHistory(historyVO);
137137
mv.setViewName("eXperDB_Backup/backupHistory");
138138
}
@@ -165,7 +165,7 @@ public ModelAndView restoreHistory(@ModelAttribute("historyVO") HistoryVO histor
165165
// 화면접근이력 이력 남기기
166166
CmmnUtils.saveHistory(request, historyVO);
167167
historyVO.setExe_dtl_cd("DX-T0165");
168-
historyVO.setMnu_id(51);
168+
historyVO.setMnu_id(52);
169169
accessHistoryService.insertHistory(historyVO);
170170
mv.setViewName("eXperDB_Backup/restoreHistory");
171171
}
@@ -201,7 +201,7 @@ public ModelAndView backupMonitoring(@ModelAttribute("historyVO") HistoryVO hist
201201
// 화면접근이력 이력 남기기
202202
CmmnUtils.saveHistory(request, historyVO);
203203
historyVO.setExe_dtl_cd("DX-T0166");
204-
historyVO.setMnu_id(49);
204+
historyVO.setMnu_id(50);
205205
accessHistoryService.insertHistory(historyVO);
206206

207207
mv.setViewName("eXperDB_Backup/backupMonitoring");

‎eXperDB-Management-WebConsole/src/main/java/com/experdb/management/recovery/web/ExperdbRecoveryController.java‎

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.json.simple.JSONObject;
2121
import org.springframework.beans.factory.annotation.Autowired;
2222
import org.springframework.stereotype.Controller;
23+
import org.springframework.web.bind.annotation.ModelAttribute;
2324
import org.springframework.web.bind.annotation.RequestMapping;
2425
import org.springframework.web.bind.annotation.ResponseBody;
2526
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -29,6 +30,10 @@
2930
import com.experdb.management.backup.history.service.BackupJobHistoryVO;
3031
import com.experdb.management.backup.history.service.ExperdbBackupHistoryService;
3132
import com.experdb.management.recovery.service.ExperdbRecoveryService;
33+
import com.k4m.dx.tcontrol.admin.accesshistory.service.AccessHistoryService;
34+
import com.k4m.dx.tcontrol.admin.menuauthority.service.MenuAuthorityService;
35+
import com.k4m.dx.tcontrol.cmmn.CmmnUtils;
36+
import com.k4m.dx.tcontrol.common.service.HistoryVO;
3237

3338
@Controller
3439
public class ExperdbRecoveryController {
@@ -39,17 +44,42 @@ public class ExperdbRecoveryController {
3944
@Autowired
4045
private ExperdbBackupHistoryService experdbBackupHistoryService;
4146

47+
@Autowired
48+
private MenuAuthorityService menuAuthorityService;
49+
50+
@Autowired
51+
private AccessHistoryService accessHistoryService;
52+
53+
private List<Map<String, Object>> menuAut;
4254
/**
4355
* 완전 복구 View page
4456
* @param historyVO, request
4557
* @return ModelAndView
4658
* @throws Exception
4759
*/
4860
@RequestMapping(value = "/experdb/completeRecovery.do")
49-
public ModelAndView completeRecovery(){
61+
public ModelAndView completeRecovery(@ModelAttribute("historyVO") HistoryVO historyVO, HttpServletRequest request){
5062
ModelAndView mv = new ModelAndView();
5163

52-
mv.setViewName("/eXperDB_Recovery/completeRecovery");
64+
try {
65+
CmmnUtils cu = new CmmnUtils();
66+
menuAut = cu.selectMenuAut(menuAuthorityService, "MN0002101");
67+
68+
if (menuAut.get(0).get("read_aut_yn").equals("N")) {
69+
mv.setViewName("error/autError");
70+
}else{
71+
mv.addObject("read_aut_yn", menuAut.get(0).get("read_aut_yn"));
72+
mv.addObject("wrt_aut_yn", menuAut.get(0).get("wrt_aut_yn"));
73+
// 화면접근이력 이력 남기기
74+
CmmnUtils.saveHistory(request, historyVO);
75+
historyVO.setExe_dtl_cd("DX-T0178");
76+
historyVO.setMnu_id(57);
77+
accessHistoryService.insertHistory(historyVO);
78+
mv.setViewName("/eXperDB_Recovery/completeRecovery");
79+
}
80+
} catch (Exception e) {
81+
e.printStackTrace();
82+
}
5383
return mv;
5484
}
5585

@@ -137,10 +167,28 @@ public ModelAndView completeRecovery(){
137167
* @throws Exception
138168
*/
139169
@RequestMapping(value = "/experdb/timeRecovery.do")
140-
public ModelAndView timeRecovery(){
170+
public ModelAndView timeRecovery(@ModelAttribute("historyVO") HistoryVO historyVO, HttpServletRequest request){
141171
ModelAndView mv = new ModelAndView();
142172

143-
mv.setViewName("/eXperDB_Recovery/timeRecovery");
173+
try {
174+
CmmnUtils cu = new CmmnUtils();
175+
menuAut = cu.selectMenuAut(menuAuthorityService, "MN0002102");
176+
177+
if (menuAut.get(0).get("read_aut_yn").equals("N")) {
178+
mv.setViewName("error/autError");
179+
}else{
180+
mv.addObject("read_aut_yn", menuAut.get(0).get("read_aut_yn"));
181+
mv.addObject("wrt_aut_yn", menuAut.get(0).get("wrt_aut_yn"));
182+
// 화면접근이력 이력 남기기
183+
CmmnUtils.saveHistory(request, historyVO);
184+
historyVO.setExe_dtl_cd("DX-T0179");
185+
historyVO.setMnu_id(58);
186+
accessHistoryService.insertHistory(historyVO);
187+
mv.setViewName("/eXperDB_Recovery/timeRecovery");
188+
}
189+
} catch (Exception e) {
190+
e.printStackTrace();
191+
}
144192
return mv;
145193
}
146194

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/admin/dbauthority/web/DbSvrAuthorityController.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ public List<Map<String, Object>> selectTreeDBSvrList(HttpServletRequest request)
338338
String scale_yn_chk = "";
339339
String transfer_ora_chk = "";
340340
String transfer_mon_menu = "";
341+
String bnr_yn_chk="";
341342

342343
if (props.get("scale") != null) {
343344
scale_yn_chk = props.get("scale").toString();
@@ -351,9 +352,14 @@ public List<Map<String, Object>> selectTreeDBSvrList(HttpServletRequest request)
351352
transfer_mon_menu = props.get("transfer_mon_menu").toString();
352353
}
353354

355+
if (props.get("bnr.useyn") != null) {
356+
bnr_yn_chk = props.get("bnr.useyn").toString();
357+
}
358+
354359
result.put("scale_yn_chk", scale_yn_chk);
355360
result.put("transfer_ora_chk", transfer_ora_chk);
356361
result.put("transfer_mon_menu", transfer_mon_menu);
362+
result.put("bnr_yn_chk", bnr_yn_chk);
357363
} catch (Exception e) {
358364
e.printStackTrace();
359365
}

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/backup/web/DumpController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public ModelAndView dumpList(@ModelAttribute("historyVO") HistoryVO historyVO,@M
119119
}
120120

121121
mv.addObject("db_svr_id",workVO.getDb_svr_id());
122-
mv.setViewName("backup/dumpList");
122+
mv.setViewName("dump/dumpList");
123123
}
124124
return mv;
125125
}
@@ -174,7 +174,7 @@ public ModelAndView rmanLogList(@ModelAttribute("historyVO") HistoryVO historyVO
174174
}
175175

176176
mv.addObject("db_svr_id",workVO.getDb_svr_id());
177-
mv.setViewName("backup/dumpLogList");
177+
mv.setViewName("dump/dumpLogList");
178178
}
179179
return mv;
180180
}

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/cmmn/WebConsoleSetting.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class WebConsoleSetting {
1515

1616
public static void main(String[] args) throws Exception {
1717
String strLanguage ="";
18-
String strVersion ="eXperDB-Management-WebConsole-12.1.3";
18+
String strVersion ="eXperDB-Management-WebConsole-13.0.1";
1919

2020
String strDatabaseIp = "";
2121
String strDatabasePort = "";

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/cmmn/serviceproxy/EncryptCommonService.java‎

Lines changed: 73 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,73 @@
1-
package com.k4m.dx.tcontrol.cmmn.serviceproxy;
2-
3-
import java.util.HashMap;
4-
5-
import org.json.simple.JSONObject;
6-
import org.springframework.http.ResponseEntity;
7-
8-
9-
/**
10-
* @author 박태혁
11-
* @see
12-
*
13-
* <pre>
14-
* == 개정이력(Modification Information) ==
15-
*
16-
* 수정일 수정자 수정내용
17-
* ------- -------- ---------------------------
18-
* 2018.04.23 박태혁 최초 생성
19-
* </pre>
20-
*/
21-
public class EncryptCommonService {
22-
23-
protected String restIp = "";
24-
protected int restPort = 0;
25-
26-
public EncryptCommonService(String restIp, int restPort) {
27-
this.restIp = restIp;
28-
this.restPort = restPort;
29-
}
30-
31-
public JSONObject callService(String serviceName, String serviceCommand, HashMap header, String parameters) throws Exception {
32-
33-
34-
ExperDBRestApiHandler handler = new ExperDBRestApiHandler(restIp, restPort);
35-
36-
JSONObject resultList = handler.getRestRequest(serviceName, serviceCommand, header, parameters);
37-
38-
return resultList;
39-
}
40-
41-
public ResponseEntity<String> callLoginService(String serviceName, String serviceCommand, HashMap header, String parameters) throws Exception {
42-
43-
44-
ExperDBRestApiHandler handler = new ExperDBRestApiHandler(restIp, restPort);
45-
46-
ResponseEntity<String> resultList = handler.getResponseEntity(serviceName, serviceCommand, header, parameters);
47-
48-
return resultList;
49-
}
50-
51-
52-
}
1+
package com.k4m.dx.tcontrol.cmmn.serviceproxy;
2+
3+
import java.io.File;
4+
import java.util.HashMap;
5+
import java.util.Map;
6+
7+
import org.json.simple.JSONObject;
8+
import org.springframework.http.ResponseEntity;
9+
import org.springframework.web.multipart.MultipartFile;
10+
11+
import com.k4m.dx.tcontrol.cmmn.rest.RequestResult;
12+
13+
14+
/**
15+
* @author 박태혁
16+
* @see
17+
*
18+
* <pre>
19+
* == 개정이력(Modification Information) ==
20+
*
21+
* 수정일 수정자 수정내용
22+
* ------- -------- ---------------------------
23+
* 2018.04.23 박태혁 최초 생성
24+
* 2021.12.01 신예은 Encrypt backup/restore 기능을 위한 service 추가 생성
25+
* </pre>
26+
*/
27+
public class EncryptCommonService {
28+
29+
protected String restIp = "";
30+
protected int restPort = 0;
31+
32+
public EncryptCommonService(String restIp, int restPort) {
33+
this.restIp = restIp;
34+
this.restPort = restPort;
35+
}
36+
37+
public JSONObject callService(String serviceName, String serviceCommand, HashMap header, String parameters) throws Exception {
38+
39+
40+
ExperDBRestApiHandler handler = new ExperDBRestApiHandler(restIp, restPort);
41+
42+
JSONObject resultList = handler.getRestRequest(serviceName, serviceCommand, header, parameters);
43+
44+
return resultList;
45+
}
46+
47+
public ResponseEntity<String> callLoginService(String serviceName, String serviceCommand, HashMap header, String parameters) throws Exception {
48+
49+
50+
ExperDBRestApiHandler handler = new ExperDBRestApiHandler(restIp, restPort);
51+
52+
ResponseEntity<String> resultList = handler.getResponseEntity(serviceName, serviceCommand, header, parameters);
53+
54+
return resultList;
55+
}
56+
57+
public JSONObject callEncryptBackupService(String serviceName, String serviceCommand, HashMap<String, String> header, String parameters) throws Exception {
58+
ExperDBRestApiHandler handler = new ExperDBRestApiHandler(restIp, restPort);
59+
JSONObject result = handler.getEncryptBackupRestRequest(serviceName, serviceCommand, header, parameters);
60+
61+
return result;
62+
63+
}
64+
65+
public RequestResult callEncryptRestoreService(String serviceName, String serviceCommand, HashMap<String, String> header, HashMap<String, String> body, MultipartFile mFile) throws Exception{
66+
ExperDBRestApiHandler handler = new ExperDBRestApiHandler(restIp, restPort);
67+
RequestResult result = handler.getEncryptRestoreRestRequest(serviceName, serviceCommand, header, body, mFile);
68+
69+
return result;
70+
}
71+
72+
73+
}

0 commit comments

Comments
 (0)