- api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정

이민희

2022-03-17 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1

 src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js

@@ -25,8 +25,10 @@
                    getStatusListCallBack : getStatusListCallBack,
                    addTel : addTel,
                    addMail : addMail,
                    addIpRange : addIpRange,
                    removeTelInput : removeTelInput,
                    removeMailInput : removeMailInput
                    removeMailInput : removeMailInput,
                    removeIpRangeInput : removeIpRangeInput
                };

                $scope.vm = {
@@ -55,9 +57,13 @@
                        statusId : "",
                        status : "", //상태
                        inputTels : [0],
                        tels : {},
                        tels : [],
                        inputMails : [0],
                        emails : {}
                        emails : [],
                        inputIpStarts : [0], //ip 시작점
                        ipStarts : [],
                        inputIpEnds : [0], //ip 종료점
                        ipEnds : []
                    },
                    typeCategory : {
                        companyType : "COMPANYTYPE",
@@ -270,8 +276,30 @@
                            }
                            return url;
                        })(),
                        ipStart : $scope.vm.form.ipStart, // ip시작주소
                        ipEnd : $scope.vm.form.ipEnd, // ip종료주소
                        ipStarts : (function () {
                            var ipStarts = [];
                            if ($scope.vm.form.ipStarts != null) {
                                angular.forEach($scope.vm.form.ipStarts, function (ipS) {
                                    ipStarts.push(ipS);
                                });
                                ipStarts  = ipStarts.filter(function(item) { //쓰레기 데이터 필터링
                                    return item !== null && item !== undefined && item !== '';
                                });
                            }
                            return ipStarts;
                        })(),
                        ipEnds : (function () {
                            var ipEnds = [];
                            if ($scope.vm.form.ipEnds != null) {
                                angular.forEach($scope.vm.form.ipEnds, function (ipE) {
                                    ipEnds.push(ipE);
                                });
                                ipEnds  = ipEnds.filter(function(item) { //쓰레기 데이터 필터링
                                    return item !== null && item !== undefined && item !== '';
                                });
                            }
                            return ipEnds;
                        })(),
                        memo : $scope.vm.form.memo,
                        companyTypeId : (function () {
                            var companyTypeId = null;
@@ -321,6 +349,13 @@
                        statusName : $scope.vm.form.status
                    };

                    //  ip 대역대 유효성 체크
                    let result = ipRangeChk(content.ipStarts, content.ipEnds);
                    if (!result) {
                        $rootScope.spinner = false;
                        return;
                    }

                    CompanyField.modify($resourceProvider.getContent(
                        content,
                        $resourceProvider.getPageContent(0, 0))).then(function (result) {
@@ -337,6 +372,57 @@
                        $rootScope.spinner = false;
                    });

                }

                //  ip 대역대 유효성 검사
                function ipRangeChk(ipStarts, ipEnds) {
                    let result = true;

                    if ($rootScope.isDefined(ipStarts) && $rootScope.isDefined(ipEnds)) {
                        if (ipStarts.length !== ipEnds.length) {
                            SweetAlert.warning($filter("translate")("companyField.ipRangeError"), $filter("translate")("companyField.ipRangeNotEnter"));
                            result = false;
                            return;
                        }

                        let ipStartArr = [];
                        let ipEndArr = [];

                        for (let i=0; i<ipStarts.length; i++) {
                            let ipStart = ipToLong(ipStarts[i]);
                            let ipEnd = ipToLong(ipEnds[i]);
                            if (ipEnd < ipStart) {
                                SweetAlert.warning($filter("translate")("companyField.ipRangeError"), $filter("translate")("companyField.ipStartNotLargerThanEnd"));
                                result = false;
                                return;
                            }
                            ipStartArr.push(ipStart);
                            ipEndArr.push(ipEnd);
                        }

                        for (let i=0; i<ipStartArr.length; i++) {
                            if ($rootScope.isDefined(ipStartArr[i+1])) {
                                if(((ipStartArr[i] >= ipStartArr[i+1] && ipStartArr[i] <= ipEndArr[i+1]) || (ipEndArr[i] >= ipStartArr[i+1] && ipEndArr[i] <= ipEndArr[i+1]))
                                    || (ipStartArr[i+1] >= ipStartArr[i] && ipStartArr[i+1] <= ipEndArr[i]) || (ipEndArr[i+1] >= ipStartArr[i] && ipEndArr[i+1] <= ipEndArr[i])) {
                                    SweetAlert.warning($filter("translate")("companyField.ipRangeError"), $filter("translate")("companyField.ipRangeNotOverlap"));
                                    result = false;
                                    return;
                                }
                            }
                        }
                    }
                    return result;
                }

                //  ip 주소 숫자로 변환
                function ipToLong(ip) {
                    let result = 0;
                    let ipArr = ip.split(".");

                    for (let i=0; i<ipArr.length; i++) {
                        result += parseInt(ipArr[i]) * Math.pow(256, 3-i);
                    }
                    return result;
                }

                // 메일 주소 input 창 추가 버튼
@@ -377,14 +463,53 @@
                    }
                }

                // IPRange input 창 추가 버튼
                function addIpRange() {
                    var arrayFull = true;      // 배열이 가득 차 있는지 여부
                    var startIdx = 0;
                    var endIdx = 0;
                    $scope.vm.form.inputIpStarts.forEach(function (start) {
                        if (!$rootScope.isDefined($scope.vm.form.ipStarts[startIdx])) {
                            arrayFull = false;
                        }
                        startIdx++;
                    });

                    $scope.vm.form.inputIpEnds.forEach(function (start) {
                        if (!$rootScope.isDefined($scope.vm.form.ipEnds[endIdx])) {
                            arrayFull = false;
                        }
                        endIdx++;
                    });

                    if (arrayFull) {
                        $scope.vm.form.inputIpStarts.push(startIdx);
                        $scope.vm.form.ipStarts[startIdx] = "";
                        $scope.vm.form.inputIpEnds.push(endIdx);
                        $scope.vm.form.ipEnds[endIdx] = "";
                    } else {
                        SweetAlert.warning($filter("translate")("companyField.writeCompanyIpRange"), $filter("translate")("companyField.writeIpRange")); // 추가버튼 경고
                    }
                }

                // 연락처 input 삭제
                function removeTelInput(index) {
                    $scope.vm.form.inputTels.splice(index, 1);
                    $scope.vm.form.tels.splice(index, 1);
                }

                // 이메일 주소 input 삭제
                function removeMailInput(index) {
                    $scope.vm.form.inputMails.splice(index, 1);
                    $scope.vm.form.emails.splice(index, 1);
                }

                // ipRange input 삭제
                function removeIpRangeInput(index) {
                    $scope.vm.form.inputIpStarts.splice(index, 1);
                    $scope.vm.form.ipStarts.splice(index, 1);
                    $scope.vm.form.inputIpEnds.splice(index, 1);
                    $scope.vm.form.ipEnds.splice(index, 1);
                }

                //  팝업 창 닫기
@@ -453,6 +578,48 @@
                                    $scope.vm.form.emails = angular.copy(inputMails);
                                }

                                if (result.data.content.ipStart != null) {
                                    var inputIpStarts = $scope.vm.form.inputIpStarts;
                                    var ipStarts = result.data.content.ipStart
                                    if (result.data.content.ipStart.indexOf("[") !== -1){
                                        ipStarts = result.data.content.ipStart.substr(1, result.data.content.ipStart.indexOf("]")-1);
                                    }
                                    var ipStartArr = ipStarts.split(",");
                                    angular.forEach(ipStartArr, function (ipS) {
                                        var ipStart = ipS.trim();
                                        inputIpStarts.push(ipStart);
                                    });
                                    inputIpStarts = inputIpStarts.filter(function(item) {
                                        return item !== null && item !== undefined && item !== '';
                                    });
                                    if(inputIpStarts[0] === 0 || inputIpStarts[0] === "") { // 첫번째 배열은 공백으로
                                        inputIpStarts.shift();
                                    }
                                    inputIpStarts.push("");
                                    $scope.vm.form.ipStarts = angular.copy(inputIpStarts);
                                }

                                if (result.data.content.ipEnd != null) {
                                    var inputIpEnds = $scope.vm.form.inputIpEnds;
                                    var ipEnds = result.data.content.ipEnd
                                    if (result.data.content.ipEnd.indexOf("[") !== -1){
                                        ipEnds = result.data.content.ipEnd.substr(1, result.data.content.ipEnd.indexOf("]")-1);
                                    }
                                    var ipEndArr = ipEnds.split(",");
                                    angular.forEach(ipEndArr, function (ipS) {
                                        var ipEnd = ipS.trim();
                                        inputIpEnds.push(ipEnd);
                                    });
                                    inputIpEnds = inputIpEnds.filter(function(item) {
                                        return item !== null && item !== undefined && item !== '';
                                    });
                                    if(inputIpEnds[0] === 0 || inputIpEnds[0] === "") { // 첫번째 배열은 공백으로
                                        inputIpEnds.shift();
                                    }
                                    inputIpEnds.push("");
                                    $scope.vm.form.ipEnds = angular.copy(inputIpEnds);
                                }

                                $scope.vm.form.url = result.data.content.url;
                                $scope.vm.form.ipStart = result.data.content.ipStart;
                                $scope.vm.form.ipEnd = result.data.content.ipEnd;