[agent-pipeline] pipe-20260328153638-axu2 round-1
This commit is contained in:
@@ -25,7 +25,7 @@ public class NumberingRuleController {
|
||||
/** GET / → 회사별 채번 규칙 전체 목록 */
|
||||
@GetMapping
|
||||
public ResponseEntity<ApiResponse<List<Map<String, Object>>>> getRuleList(
|
||||
@RequestAttribute("companyCode") String companyCode) {
|
||||
@RequestAttribute("company_code") String companyCode) {
|
||||
List<Map<String, Object>> list = numberingRuleService.getRuleList(companyCode);
|
||||
return ResponseEntity.ok(ApiResponse.success(list, "채번 규칙 목록을 조회했습니다."));
|
||||
}
|
||||
@@ -33,7 +33,7 @@ public class NumberingRuleController {
|
||||
/** GET /available → 메뉴 기반 사용 가능 규칙 (menuObjid 없음) */
|
||||
@GetMapping("/available")
|
||||
public ResponseEntity<ApiResponse<List<Map<String, Object>>>> getAvailableRulesForMenu(
|
||||
@RequestAttribute("companyCode") String companyCode) {
|
||||
@RequestAttribute("company_code") String companyCode) {
|
||||
List<Map<String, Object>> list = numberingRuleService.getAvailableRulesForMenu(companyCode, null);
|
||||
return ResponseEntity.ok(ApiResponse.success(list, "사용 가능한 채번 규칙을 조회했습니다."));
|
||||
}
|
||||
@@ -41,7 +41,7 @@ public class NumberingRuleController {
|
||||
/** GET /available/{menuObjid} → 메뉴 기반 사용 가능 규칙 */
|
||||
@GetMapping("/available/{menuObjid}")
|
||||
public ResponseEntity<ApiResponse<List<Map<String, Object>>>> getAvailableRulesForMenuWithId(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@PathVariable Integer menuObjid) {
|
||||
List<Map<String, Object>> list = numberingRuleService.getAvailableRulesForMenu(companyCode, menuObjid);
|
||||
return ResponseEntity.ok(ApiResponse.success(list, "사용 가능한 채번 규칙을 조회했습니다."));
|
||||
@@ -50,7 +50,7 @@ public class NumberingRuleController {
|
||||
/** GET /available-for-screen?tableName= → 화면 기반 사용 가능 규칙 */
|
||||
@GetMapping("/available-for-screen")
|
||||
public ResponseEntity<ApiResponse<List<Map<String, Object>>>> getAvailableRulesForScreen(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@RequestParam(required = false) String tableName) {
|
||||
List<Map<String, Object>> list = numberingRuleService.getAvailableRulesForScreen(companyCode, tableName);
|
||||
return ResponseEntity.ok(ApiResponse.success(list, "화면별 채번 규칙을 조회했습니다."));
|
||||
@@ -59,7 +59,7 @@ public class NumberingRuleController {
|
||||
/** GET /by-column/{tableName}/{columnName} → 테이블+컬럼 기반 규칙 조회 */
|
||||
@GetMapping("/by-column/{tableName}/{columnName}")
|
||||
public ResponseEntity<ApiResponse<Map<String, Object>>> getNumberingRuleByColumn(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@PathVariable String tableName,
|
||||
@PathVariable String columnName) {
|
||||
Map<String, Object> rule = numberingRuleService.getNumberingRuleByColumn(
|
||||
@@ -77,7 +77,7 @@ public class NumberingRuleController {
|
||||
/** GET /test/list → 테스트용 규칙 목록 */
|
||||
@GetMapping("/test/list")
|
||||
public ResponseEntity<ApiResponse<List<Map<String, Object>>>> getRulesFromTest(
|
||||
@RequestAttribute("companyCode") String companyCode) {
|
||||
@RequestAttribute("company_code") String companyCode) {
|
||||
List<Map<String, Object>> list = numberingRuleService.getRulesFromTest(companyCode, null);
|
||||
return ResponseEntity.ok(ApiResponse.success(list, "테스트 채번 규칙 목록을 조회했습니다."));
|
||||
}
|
||||
@@ -85,7 +85,7 @@ public class NumberingRuleController {
|
||||
/** GET /test/list/{menuObjid} → 테스트용 규칙 목록 (메뉴 필터) */
|
||||
@GetMapping("/test/list/{menuObjid}")
|
||||
public ResponseEntity<ApiResponse<List<Map<String, Object>>>> getRulesFromTestWithMenu(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@PathVariable Integer menuObjid) {
|
||||
List<Map<String, Object>> list = numberingRuleService.getRulesFromTest(companyCode, menuObjid);
|
||||
return ResponseEntity.ok(ApiResponse.success(list, "테스트 채번 규칙 목록을 조회했습니다."));
|
||||
@@ -94,7 +94,7 @@ public class NumberingRuleController {
|
||||
/** GET /test/by-column/{tableName}/{columnName} → 테스트 테이블+컬럼 기반 조회 */
|
||||
@GetMapping("/test/by-column/{tableName}/{columnName}")
|
||||
public ResponseEntity<ApiResponse<Map<String, Object>>> getTestRuleByColumn(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@PathVariable String tableName,
|
||||
@PathVariable String columnName) {
|
||||
Map<String, Object> rule = numberingRuleService.getNumberingRuleByColumn(
|
||||
@@ -108,9 +108,9 @@ public class NumberingRuleController {
|
||||
/** POST /test/save → UPSERT */
|
||||
@PostMapping("/test/save")
|
||||
public ResponseEntity<ApiResponse<Map<String, Object>>> saveRuleToTest(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@RequestBody Map<String, Object> body) {
|
||||
if (body.get("ruleId") == null || body.get("ruleName") == null) {
|
||||
if (body.get("rule_id") == null || body.get("rule_name") == null) {
|
||||
return ResponseEntity.badRequest().body(ApiResponse.error("ruleId와 ruleName이 필요합니다."));
|
||||
}
|
||||
Map<String, Object> result = numberingRuleService.saveRuleToTest(body, companyCode);
|
||||
@@ -120,7 +120,7 @@ public class NumberingRuleController {
|
||||
/** DELETE /test/{ruleId} → 테스트 규칙 삭제 */
|
||||
@DeleteMapping("/test/{ruleId}")
|
||||
public ResponseEntity<ApiResponse<Void>> deleteRuleFromTest(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@PathVariable String ruleId) {
|
||||
numberingRuleService.deleteRuleFromTest(ruleId, companyCode);
|
||||
return ResponseEntity.ok(ApiResponse.success(null, "테스트 채번 규칙이 삭제되었습니다."));
|
||||
@@ -129,12 +129,12 @@ public class NumberingRuleController {
|
||||
/** POST /test/{ruleId}/preview → 테스트 미리보기 */
|
||||
@PostMapping("/test/{ruleId}/preview")
|
||||
public ResponseEntity<ApiResponse<Map<String, Object>>> previewCodeFromTest(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@PathVariable String ruleId,
|
||||
@RequestBody(required = false) Map<String, Object> body) {
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, Object> formData = body != null ? (Map<String, Object>) body.get("formData") : null;
|
||||
String manualInputValue = body != null ? (String) body.get("manualInputValue") : null;
|
||||
Map<String, Object> formData = body != null ? (Map<String, Object>) body.get("form_data") : null;
|
||||
String manualInputValue = body != null ? (String) body.get("manual_input_value") : null;
|
||||
String code = numberingRuleService.previewCode(ruleId, companyCode, formData, manualInputValue);
|
||||
return ResponseEntity.ok(ApiResponse.success(Map.of("code", code), "미리보기 생성이 완료되었습니다."));
|
||||
}
|
||||
@@ -146,7 +146,7 @@ public class NumberingRuleController {
|
||||
/** GET /{ruleId} → 단건 조회 */
|
||||
@GetMapping("/{ruleId}")
|
||||
public ResponseEntity<ApiResponse<Map<String, Object>>> getRuleById(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@PathVariable String ruleId) {
|
||||
Map<String, Object> rule = numberingRuleService.getRuleById(ruleId, companyCode);
|
||||
if (rule == null) {
|
||||
@@ -158,13 +158,13 @@ public class NumberingRuleController {
|
||||
/** POST / → 규칙 생성 */
|
||||
@PostMapping
|
||||
public ResponseEntity<ApiResponse<Map<String, Object>>> createRule(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute(value = "userId", required = false) String userId,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@RequestAttribute(value = "user_id", required = false) String userId,
|
||||
@RequestBody Map<String, Object> body) {
|
||||
if (body.get("ruleId") == null || body.get("ruleName") == null || body.get("parts") == null) {
|
||||
if (body.get("rule_id") == null || body.get("rule_name") == null || body.get("parts") == null) {
|
||||
return ResponseEntity.badRequest().body(ApiResponse.error("ruleId, ruleName, parts가 필요합니다."));
|
||||
}
|
||||
if (userId != null) body.put("userId", userId);
|
||||
if (userId != null) body.put("user_id", userId);
|
||||
Map<String, Object> result = numberingRuleService.createRule(body, companyCode);
|
||||
return ResponseEntity.status(201).body(ApiResponse.success(result, "채번 규칙이 생성되었습니다."));
|
||||
}
|
||||
@@ -172,7 +172,7 @@ public class NumberingRuleController {
|
||||
/** PUT /{ruleId} → 규칙 수정 */
|
||||
@PutMapping("/{ruleId}")
|
||||
public ResponseEntity<ApiResponse<Map<String, Object>>> updateRule(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@PathVariable String ruleId,
|
||||
@RequestBody Map<String, Object> body) {
|
||||
Map<String, Object> result = numberingRuleService.updateRule(ruleId, body, companyCode);
|
||||
@@ -182,7 +182,7 @@ public class NumberingRuleController {
|
||||
/** DELETE /{ruleId} → 규칙 삭제 */
|
||||
@DeleteMapping("/{ruleId}")
|
||||
public ResponseEntity<ApiResponse<Void>> deleteRule(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@PathVariable String ruleId) {
|
||||
numberingRuleService.deleteRule(ruleId, companyCode);
|
||||
return ResponseEntity.ok(ApiResponse.success(null, "채번 규칙이 삭제되었습니다."));
|
||||
@@ -195,12 +195,12 @@ public class NumberingRuleController {
|
||||
/** POST /{ruleId}/preview → 미리보기 (순번 증가 없음) */
|
||||
@PostMapping("/{ruleId}/preview")
|
||||
public ResponseEntity<ApiResponse<Map<String, Object>>> previewCode(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@PathVariable String ruleId,
|
||||
@RequestBody(required = false) Map<String, Object> body) {
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, Object> formData = body != null ? (Map<String, Object>) body.get("formData") : null;
|
||||
String manualInputValue = body != null ? (String) body.get("manualInputValue") : null;
|
||||
Map<String, Object> formData = body != null ? (Map<String, Object>) body.get("form_data") : null;
|
||||
String manualInputValue = body != null ? (String) body.get("manual_input_value") : null;
|
||||
String code = numberingRuleService.previewCode(ruleId, companyCode, formData, manualInputValue);
|
||||
return ResponseEntity.ok(ApiResponse.success(Map.of("code", code), "미리보기 생성이 완료되었습니다."));
|
||||
}
|
||||
@@ -208,12 +208,12 @@ public class NumberingRuleController {
|
||||
/** POST /{ruleId}/allocate → 코드 할당 (순번 증가) */
|
||||
@PostMapping("/{ruleId}/allocate")
|
||||
public ResponseEntity<ApiResponse<Map<String, Object>>> allocateCode(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@PathVariable String ruleId,
|
||||
@RequestBody(required = false) Map<String, Object> body) {
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, Object> formData = body != null ? (Map<String, Object>) body.get("formData") : null;
|
||||
String userInputCode = body != null ? (String) body.get("userInputCode") : null;
|
||||
Map<String, Object> formData = body != null ? (Map<String, Object>) body.get("form_data") : null;
|
||||
String userInputCode = body != null ? (String) body.get("user_input_code") : null;
|
||||
String code = numberingRuleService.allocateCode(ruleId, companyCode, formData, userInputCode);
|
||||
return ResponseEntity.ok(ApiResponse.success(Map.of("code", code), "코드 할당이 완료되었습니다."));
|
||||
}
|
||||
@@ -221,7 +221,7 @@ public class NumberingRuleController {
|
||||
/** POST /{ruleId}/generate (deprecated) → allocateCode 위임 */
|
||||
@PostMapping("/{ruleId}/generate")
|
||||
public ResponseEntity<ApiResponse<Map<String, Object>>> generateCode(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@PathVariable String ruleId) {
|
||||
String code = numberingRuleService.generateCode(ruleId, companyCode);
|
||||
return ResponseEntity.ok(ApiResponse.success(Map.of("code", code), "코드 생성이 완료되었습니다."));
|
||||
@@ -230,7 +230,7 @@ public class NumberingRuleController {
|
||||
/** POST /{ruleId}/reset → 순번 초기화 */
|
||||
@PostMapping("/{ruleId}/reset")
|
||||
public ResponseEntity<ApiResponse<Void>> resetSequence(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@PathVariable String ruleId) {
|
||||
numberingRuleService.resetSequence(ruleId, companyCode);
|
||||
return ResponseEntity.ok(ApiResponse.success(null, "시퀀스가 초기화되었습니다."));
|
||||
@@ -243,10 +243,10 @@ public class NumberingRuleController {
|
||||
/** POST /copy-for-company → 회사간 규칙 복제 (SUPER_ADMIN) */
|
||||
@PostMapping("/copy-for-company")
|
||||
public ResponseEntity<ApiResponse<Map<String, Object>>> copyRulesForCompany(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestAttribute("company_code") String companyCode,
|
||||
@RequestBody Map<String, Object> body) {
|
||||
String sourceCompanyCode = (String) body.get("sourceCompanyCode");
|
||||
String targetCompanyCode = (String) body.get("targetCompanyCode");
|
||||
String sourceCompanyCode = (String) body.get("source_company_code");
|
||||
String targetCompanyCode = (String) body.get("target_company_code");
|
||||
if (sourceCompanyCode == null || targetCompanyCode == null) {
|
||||
return ResponseEntity.badRequest()
|
||||
.body(ApiResponse.error("sourceCompanyCode와 targetCompanyCode가 필요합니다."));
|
||||
|
||||
Reference in New Issue
Block a user