From 107ab8e67d089738ad8b3a1ff0efc96680a13cf6 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 09 12월 2021 14:29:47 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
index d3fb15f..110f026 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
@@ -4,6 +4,7 @@
import kr.wisestone.owl.common.ExcelConditionCheck;
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MsgConstants;
+import kr.wisestone.owl.domain.CompanyField;
import kr.wisestone.owl.domain.IspField;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.IspFieldMapper;
@@ -18,6 +19,7 @@
import kr.wisestone.owl.web.condition.IspFieldCondition;
import kr.wisestone.owl.web.form.IspFieldForm;
import kr.wisestone.owl.web.view.ExcelView;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -56,6 +58,9 @@
// Isp 異붽�
@Override
public IspField add(IspFieldForm IspFieldForm) {
+ // url �쑀�슚�꽦 泥댄겕
+ this.verifyUrl(IspFieldForm.getUrl(), null);
+
IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
ispFieldRepository.saveAndFlush(IspField);
return IspField;
@@ -72,6 +77,26 @@
Long totalIspCount = this.ispFieldMapper.count(condition);
return this.convertIspVoToMap(results, totalIspCount, pageable, resJsonData);
+ }
+
+ // url �쑀�슚�꽦 泥댄겕
+ private void verifyUrl(String url, Long id) {
+ if (StringUtils.isEmpty(url)) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_NOT_URL));
+ }
+ IspField ispField;
+
+ if(id == null){
+ ispField = this.ispFieldRepository.findByUrl(url);
+ } else {
+ ispField = this.ispFieldRepository.findByUrlAndIdNot(url,id);
+ }
+
+ if (ispField != null) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_USED_URL));
+ }
}
@@ -91,6 +116,9 @@
// Isp �젙濡쒕�� �닔�젙�븳�떎.
@Override
public void modify(IspFieldForm IspFieldForm) {
+ // url �쑀�슚�꽦 泥댄겕
+ this.verifyUrl(IspFieldForm.getUrl(), IspFieldForm.getId());
+
IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
ispFieldRepository.saveAndFlush(IspField);
}
--
Gitblit v1.8.0