이미지 편집기 차적조회 기능 추가

src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java

@@ -49,7 +49,7 @@ public class Sprt03Controller extends ApplicationController {
 		mav.setViewName("fims/sprt/sprt03020-main");
 		mav.addObject("openerPageName", openerPageName);
 
-		if(fileId != null && !fileId.equals("")) {
+		if(!ifEmpty(fileId, ()->"").equals("")) {
 			mav.addObject("fileId", fileId);
 
 			FileQuery fileQuery = new FileQuery();

src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp

@@ -76,65 +76,88 @@
 <script>
 var openerPageName = "${openerPageName}";
 
-    //FIXME: pw instance 변수명 변경시 paintweb.js의 imageSaveTo() 내의 2564 line if(pw.image.modified) 변경 필요
-    var pw;
-    var originalInfomation = {};
-    var editableImage = null;
-	var isNumberPlate = false;
 
-    const initEditor = () => {
+var pw;
+var originalInfomation = {};
+var editableImage = null;
+var isNumberPlate = false;
    
-        pw = new PaintWeb();
+const initEditor = () => {
-        pw.config.imageLoad = editableImage;
-        pw.config.guiPlaceholder = document.getElementById('paintWebTarget');
-        pw.config.imageSave = fnImageSaveTo;
-        pw.config.afterImageSave = fnAfterImageSave;
    	
-        pw.init();
+    pw = new PaintWeb();
-    };
+    pw.config.imageLoad = editableImage;
+    pw.config.guiPlaceholder = document.getElementById('paintWebTarget');
+    pw.config.imageSave = fnImageSaveTo;
+    pw.config.afterImageSave = fnAfterImageSave;
 
-    function fnImageSaveTo(file, imgWidth, imgHeight, doc, _self){
+    pw.init();
+};
    
-    	console.log(doc);
+function fnImageSaveTo(file, imgWidth, imgHeight, doc, _self){
-    	console.log(_self);
    	
-        if(isNumberPlate){
+   	console.log(doc);
-            if(!confirm('번호판 이미지를 추가하시겠습니까?'))  return;
+   	console.log(_self);
-        }else{
-            if(!confirm('편집한 단속이미지를 저장하시겠습니까?'))  return;
-        }
        
-        window.opener.pageObject[openerPageName].editPhotoCallback(file, originalInfomation, isNumberPlate);
+    if(isNumberPlate){
-        return true;
+        if(!confirm('번호판 이미지를 추가하시겠습니까?'))  return;
-    };
+    }else{
+        if(!confirm('편집한 단속이미지를 저장하시겠습니까?'))  return;
+    }
 
-    function fnAfterImageSave(){
+    window.opener.pageObject[openerPageName].editPhotoCallback(file, originalInfomation, isNumberPlate);
-        window.close();
+    return true;
-    };
+};
 
-    $(document).ready(function(){
+function fnAfterImageSave(){
+	window.close();
+};
 
-    	var fileInfo = [${fileInfo}];
+$(document).ready(function(){
 
-    	if(fileInfo.length > 0){
+  	var fileInfo = [${fileInfo}];
-    		originalInfomation = fileInfo[0];
   	
-    		var fileUrl = fileInfo[0].URL;
+   	if(fileInfo.length > 0){
-    		var fullSrc = "${pageContext.request.contextPath}" + "/" + fileUrl;
+   		originalInfomation = fileInfo[0];
    		
-    		editableImage = document.getElementById('editableImage');
+   		var fileUrl = fileInfo[0].URL;
-    		editableImage.src = fullSrc;
+   		var fullSrc = "${pageContext.request.contextPath}" + "/" + fileUrl;
-    		editableImage.onload = function () {
-                initEditor();
-                editableImage.style.display = 'none';
-            }
 		
+   		editableImage = document.getElementById('editableImage');
+   		editableImage.src = fullSrc;
+   		editableImage.onload = function () {
+	        initEditor();
+	        editableImage.style.display = 'none';
 	        
-    	} else {
+	        var vhclInfo = window.opener.pageObject[openerPageName].carInfoFunc();
-    		alert("사진 파일이 없습니다.");
+	        $("input[name='vhrno']").val(vhclInfo.vhrno);
-    	}
+	        $("input[name='vhclNm']").val(vhclInfo.vhclNm);
+	        $("input[name='vhclColor']").val(vhclInfo.vhclColor);
 	        
-    });
+	        $("input[name='vhrno']").on("keyup",function(e){
+	        	if(e.key == "Enter"){
+
+	        		window.opener.pageObject[openerPageName].carLinkFunc(this.value).then(function(result){
+
+		        		if(result.vhrno == null || result.vhrno == ""){
+		        	        $("input[name='vhclNm']").val("");
+		        	        $("input[name='vhclColor']").val("");
+		        	        alert("차량조회 결과가 없습니다.");
+		        		} else {
+		        			$("input[name='vhrno']").val(result.vhrno);
+		        	        $("input[name='vhclNm']").val(result.vhclNm);
+		        	        $("input[name='vhclColor']").val(result.vhclColor);
+		        		}
+		        		
+	        		});
+	        		
+	        	}
+	        });
+       }
+   	} else {
+   		alert("사진 파일이 없습니다.");
+   	}
+
+});
 </script>
 
 </body>

src/main/webapp/WEB-INF/jsp/index.jsp

@@ -94,7 +94,23 @@
     	var MY_INFO = {};
     	var PARAM_TASK = "${param.taskSeCd}";
     	
-    	
+    	async function getVhclInfo(sggCd, vhrno, levy_stdde){
+    		return new Promise((resolve, reject) => {
+    			json.post({
+    				url: wctx.url("/payer/vehicle.do"),
+    				data: {
+    					sggCd : sggCd,
+    					vhrno : vhrno,
+    					levy_stdde : levy_stdde
+    				},
+    				success: function(resp, textStatus, jqXHR) {
+    					resolve(resp);
+    				},
+    				error: function(jqXHR, textStatus, error) {
+    				}
+    			});
+    		});
+    	};
     	
 		async function fnGetAllTask(){
     		return new Promise((resolve, reject) => {

src/main/webapp/resources/js/fims/photo-main.js

@@ -1,10 +1,13 @@
-function settingPhotoMain(pageName, crdnIdElementId){
+function settingPhotoMain(pageName, crdnIdElementId, carInfoFunc, carLinkFunc){
 	
 	var $P = pageObject[pageName];
 	
 	$P.existFileArr = [];
 	$P.localUploadArr = [];
 
+	$P.carInfoFunc = carInfoFunc;
+	$P.carLinkFunc = carLinkFunc;
+
 	//드래그앤드롭
 	Sortable.create(document.getElementById("dragAndDrop--"+pageName), {
 		onEnd : function(evt){

src/main/webapp/resources/lib/fims/biz/paintweb/layout.js

@@ -79,9 +79,9 @@ let xhtml = `<div xmlns="http://www.w3.org/1999/xhtml">
         <!--<li data-pwTool="eraser">Eraser</li>-->
         <!-- <li data-pwCommand="imageClear">Clear image</li> -->
         <li>
-        	<label class="w-px-60 pe-2 text-sm-end">차량번호</label><input type='text' class='form-control-sm my-1' /><br />
+        	<label class="w-px-60 pe-2 text-sm-end">차량번호</label><input type='text' name='vhrno' class='form-control-sm my-1' /><br />
-        	<label class="w-px-60 pe-2 text-sm-end">차량명</label><input type='text' class='form-control-sm my-1' /><br />
+        	<label class="w-px-60 pe-2 text-sm-end">차량명</label><input type='text' name='vhclNm' class='form-control-sm my-1' disabled /><br />
-        	<label class="w-px-60 pe-2 text-sm-end">색상</label><input type='text' class='form-control-sm my-1' />
+        	<label class="w-px-60 pe-2 text-sm-end">색상</label><input type='text' name='vhclColor' class='form-control-sm my-1' disabled />
         </li>
         
         <li class="paintweb_toolSeparator">&#160;</li>