fix: 계측 정보 지표침하판 부정보 단위 로딩 안 되는 버그 수정 건

list.txt

@@ -1,2 +1,3 @@
-src\main\resources\egovframework\mapper\sgis\app\AppMainMapper.xml
+src\main\webapp\com\js\main.map.js
-src\main\webapp\WEB-INF\jsp\sgis\popup\cordinateSaupMap.jsp
+src\main\webapp\WEB-INF\jsp\tiles\attribute\app.submenu.jsp
+src\main\webapp\WEB-INF\jsp\sgis\app\constInfo\popup\includeSurSetSubInfo.jsp

src/main/java/sgis/adm/web/AdmMainController.java

@@ -107,7 +107,7 @@ public class AdmMainController extends BaseController {
    //비밀번호초기화
    @RequestMapping(value="/app/adm/pwInit.do")
    @ResponseBody
-   public String pwInit(@RequestParam HashMap<String,Object> param, ModelMap model,HttpServletRequest request, HttpServletResponse response, Member m) throws Exception{
+   public JSONObject pwInit(@RequestParam HashMap<String,Object> param, ModelMap model,HttpServletRequest request, HttpServletResponse response, Member m) throws Exception{
 
 		String initPw = "";
 	   	String retStr = "";
@@ -133,13 +133,15 @@ public class AdmMainController extends BaseController {
 	   		retStr = "fail";
 	   	}
 
-   		return "{\"result\":\""+retStr+"\"}";
+	   	JSONObject json = new JSONObject();
+   		json.put("result", retStr);
+   		return json;
    };
 
    //관리자 회원가입
    @RequestMapping(value="/app/adm/newAdmInsert.do")
    @ResponseBody
-   public String newAdmInsert(@RequestParam HashMap<String,Object> param, ModelMap model,HttpServletRequest request, HttpServletResponse response, Member m) throws Exception{
+   public JSONObject newAdmInsert(@RequestParam HashMap<String,Object> param, ModelMap model,HttpServletRequest request, HttpServletResponse response, Member m) throws Exception{
 
 	   String retStr = "";
 
@@ -161,13 +163,15 @@ public class AdmMainController extends BaseController {
 	   retStr = "fail";
 	   }
 
-	   return "{\"result\":\""+retStr+"\"}";
+	   JSONObject json = new JSONObject();
+  		json.put("result", retStr);
+  		return json;
    };
 
    //관리자 회원정보 수정
    @RequestMapping(value="/app/adm/updateUser.do")
    @ResponseBody
-   public String updateUser(@RequestParam HashMap<String,Object> param, ModelMap model,HttpServletRequest request, HttpServletResponse response, Member m) throws Exception{
+   public JSONObject updateUser(@RequestParam HashMap<String,Object> param, ModelMap model,HttpServletRequest request, HttpServletResponse response, Member m) throws Exception{
 
 	   String retStr = "";
 
@@ -188,13 +192,15 @@ public class AdmMainController extends BaseController {
 	   retStr = "fail";
 	   }
 
-	   return "{\"result\":\""+retStr+"\"}";
+	   JSONObject json = new JSONObject();
+  		json.put("result", retStr);
+  		return json;
    };
 
    //관리자 회원정보 삭제
    @RequestMapping(value="/app/adm/deleteUser.do")
    @ResponseBody
-   public String deleteUser(@RequestParam HashMap<String,Object> param, ModelMap model,HttpServletRequest request, HttpServletResponse response, Member m) throws Exception{
+   public JSONObject deleteUser(@RequestParam HashMap<String,Object> param, ModelMap model,HttpServletRequest request, HttpServletResponse response, Member m) throws Exception{
 
 	   String retStr = "";
 
@@ -215,7 +221,9 @@ public class AdmMainController extends BaseController {
 	   retStr = "fail";
 	   }
 
-	   return "{\"result\":\""+retStr+"\"}";
+	   JSONObject json = new JSONObject();
+	   json.put("result", retStr);
+	   return json;
    };
 
    @RequestMapping(value="/app/adm/deleteListUser.do", method=RequestMethod.POST)
@@ -252,7 +260,7 @@ public class AdmMainController extends BaseController {
    //관리자 회원정보 삭제
    @RequestMapping(value="/app/adm/deleteListUser.do")
    @ResponseBody
-   public String deleteListUser(@RequestParam HashMap<String,Object> param, ModelMap model,HttpServletRequest request, HttpServletResponse response, Member m) throws Exception{
+   public JSONObject deleteListUser(@RequestParam HashMap<String,Object> param, ModelMap model,HttpServletRequest request, HttpServletResponse response, Member m) throws Exception{
 
 	   String retStr = "";
 
@@ -273,6 +281,8 @@ public class AdmMainController extends BaseController {
 	   retStr = "fail";
 	   }
 
-	   return "{\"result\":\""+retStr+"\"}";
+	   JSONObject json = new JSONObject();
+	   json.put("result", retStr);
+	   return json;
    };
 }

src/main/java/sgis/app/service/impl/AppInstrumentServiceImpl.java

@@ -422,6 +422,7 @@ public class AppInstrumentServiceImpl implements AppInstrumentService{
 	  			List<?> unitCodeList = ComCodeMapper.selectComCodeList(codeVO);
 	  			List<Map<String, Object>> listMap = (List<Map<String, Object>>) unitCodeList;
 	  			for(int k=0; k < unitCodeList.size(); k++) {
+	  				//단위를 설정한다. 단위는 우측 쿼리 참고 요망: select	cc2.* from COMTB_CODE02 cc2 where cc2.cd_grp = 'unit_code' and cc2.code_val = '11';
 	  				if(StringUtil.nullToBlank((String)params.get("mUnit")).equals(listMap.get(k).get("label"))) {
 	  					params.put("mUnit", (String) listMap.get(k).get("code"));
 	  				}

src/main/java/sgis/app/web/AppBasicController.java

@@ -233,7 +233,7 @@ public class AppBasicController extends BaseController {
 
     //표준관입시험 정보 저장
   	@RequestMapping(value="/app/basic/insertSptInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertSptInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertSptInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -282,7 +282,9 @@ public class AppBasicController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//사업 기본현장 시험정보(TCR/RQD)
@@ -316,7 +318,7 @@ public class AppBasicController extends BaseController {
 
     // TCR/RQD 시험 정보 저장
   	@RequestMapping(value="/app/basic/insertTcrrqdInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertTcrrqdInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertTcrrqdInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -364,7 +366,9 @@ public class AppBasicController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//사업 기본현장 시험정보(DSF)
@@ -398,7 +402,7 @@ public class AppBasicController extends BaseController {
 
     // TCR/RQD 시험 정보 저장
   	@RequestMapping(value="/app/basic/insertDsfInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertDsfInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertDsfInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -445,7 +449,9 @@ public class AppBasicController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//사업 기본현장 시험정보(공내재하)
@@ -489,7 +495,7 @@ public class AppBasicController extends BaseController {
     // 공내재하시험 정보 저장
    	@RequestMapping(value="/app/basic/insertFieldPressuremeterInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertFieldPressuremeterInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertFieldPressuremeterInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -542,7 +548,9 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//사업 기본현장 시험정보(공내재하)
@@ -576,7 +584,7 @@ public class AppBasicController extends BaseController {
     // 절리정보시험 정보 저장
    	@RequestMapping(value="/app/basic/insertSlickensideInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertSlickensideInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertSlickensideInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -627,7 +635,9 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//사업 기본현장 시험정보(Q)
@@ -662,7 +672,7 @@ public class AppBasicController extends BaseController {
     // Q시험 정보 저장
    	@RequestMapping(value="/app/basic/insertQInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertQInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertQInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -717,7 +727,9 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//사업 기본현장 시험정보(RMR)
@@ -752,7 +764,7 @@ public class AppBasicController extends BaseController {
     //RMR 시험 정보 저장
    	@RequestMapping(value="/app/basic/insertRmrInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertRmrInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertRmrInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -813,7 +825,9 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//사업 기본현장 시험정보(현장수압시험)
@@ -848,7 +862,7 @@ public class AppBasicController extends BaseController {
 	// 현장수압시험 주정보 저장
    	@RequestMapping(value="/app/basic/insertFieldWaterPressureInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertFieldWaterPressureInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertFieldWaterPressureInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -906,13 +920,15 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	// 현장수압시험 주정보 삭제
    	@RequestMapping(value="/app/basic/deleteFieldWaterPressureInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String deleteFieldWaterPressureInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject deleteFieldWaterPressureInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -982,13 +998,15 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	// 현장수압시험 주정보 저장여부
    	@RequestMapping(value="/app/basic/confirmWpInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String confirmWpInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject confirmWpInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1004,7 +1022,9 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
     // 현장수압시험 부정보
@@ -1054,7 +1074,7 @@ public class AppBasicController extends BaseController {
     // 현장수압시험 부정보 저장
     @RequestMapping(value="/app/basic/insertFieldWpSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertFieldWpSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertFieldWpSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1104,7 +1124,9 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//사업 기본현장 시험정보(현장투수시험)
@@ -1139,7 +1161,7 @@ public class AppBasicController extends BaseController {
     // 현장투수시험 주정보 저장
    	@RequestMapping(value="/app/basic/insertFieldPermeablityInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertFieldPermeablityInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertFieldPermeablityInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1191,13 +1213,15 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	// 현장투수시험 주정보 삭제
    	@RequestMapping(value="/app/basic/deleteFieldPermeablityInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String deleteFieldPermeablityInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject deleteFieldPermeablityInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1265,13 +1289,15 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	// 현장투수시험 주정보 저장여부
    	@RequestMapping(value="/app/basic/confirmPreInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String confirmPreInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject confirmPreInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1287,7 +1313,9 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	// 현장투수시험 부정보
@@ -1337,7 +1365,7 @@ public class AppBasicController extends BaseController {
     // 현장투수시험 부정보 저장
     @RequestMapping(value="/app/basic/insertFieldPerSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertFieldPerSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertFieldPerSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1375,7 +1403,9 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//사업 기본현장 시험정보(콘관입시험)
@@ -1411,7 +1441,7 @@ public class AppBasicController extends BaseController {
     // 콘관입시험 주정보 저장
    	@RequestMapping(value="/app/basic/insertFieldConePenetrationInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertFieldConePenetrationInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertFieldConePenetrationInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1484,13 +1514,15 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	// 콘관입시험 주정보 삭제
    	@RequestMapping(value="/app/basic/deleteFieldConePenetrationInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String deleteFieldConePenetrationInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject deleteFieldConePenetrationInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1536,7 +1568,9 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//사업 기본현장 시험정보(베인시험)
@@ -1572,7 +1606,7 @@ public class AppBasicController extends BaseController {
     // 베인시험 정보 저장
    	@RequestMapping(value="/app/basic/insertFieldVaneInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertFieldVaneInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertFieldVaneInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1626,7 +1660,9 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//사업 기본현장 시험정보(간극수압소산 시험)
@@ -1662,7 +1698,7 @@ public class AppBasicController extends BaseController {
     // 간극수압소산시험 정보 저장
    	@RequestMapping(value="/app/basic/insertFieldPoreWaterPressureInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertFieldPoreWaterPressureInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertFieldPoreWaterPressureInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1706,7 +1742,9 @@ public class AppBasicController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
 }

src/main/java/sgis/app/web/AppGpController.java

@@ -97,7 +97,7 @@ public class AppGpController extends BaseController {
 
     //물리검층_PS검층 저장
   	@RequestMapping(value="/app/gpInfo/insertBoreholeWaveInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertBoreholeWaveInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertBoreholeWaveInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -168,7 +168,9 @@ public class AppGpController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//물리검층_하향식탄성파
@@ -211,7 +213,7 @@ public class AppGpController extends BaseController {
 
 	//물리검층_하향식탄성파 저장
 	@RequestMapping(value="/app/gpInfo/insertDownholeInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertDownholeInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertDownholeInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
 		String retStr = "";
 
@@ -282,7 +284,9 @@ public class AppGpController extends BaseController {
 			retStr = "fail";
 		}
 
-		return "{\"result\":\""+retStr+"\"}";
+		JSONObject json = new JSONObject();
+		   json.put("result", retStr);
+		   return json;
 	};
 
 	//물리검층_밀도검층
@@ -327,7 +331,7 @@ public class AppGpController extends BaseController {
 
 	//물리검층_밀도검층 저장
 	@RequestMapping(value="/app/gpInfo/insertDensityInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertDensityInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertDensityInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
 		String retStr = "";
 
@@ -389,6 +393,8 @@ public class AppGpController extends BaseController {
 			retStr = "fail";
 		}
 
-		return "{\"result\":\""+retStr+"\"}";
+		JSONObject json = new JSONObject();
+		   json.put("result", retStr);
+		   return json;
 	};
 }

src/main/java/sgis/app/web/AppInstrumentController.java

@@ -176,53 +176,55 @@ public class AppInstrumentController  extends BaseController{
         response.getWriter().print(json);
     };
 
-    //계측정보 저장
+//계측정보 저장
-  	@RequestMapping(value="/app/const/insertSurSetInfo.do", method=RequestMethod.POST)
+@RequestMapping(value="/app/const/insertSurSetInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertSurSetInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+public @ResponseBody JSONObject insertSurSetInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
 
 
-  		String retStr = "";
+	String retStr = "";
 
-  		try {
+	try {
-  			SessionVO sessionVO = getSessionInfo();
+		SessionVO sessionVO = getSessionInfo();
-			String sysRegId = sessionVO.getsUserId();		//사용자 ID
+		String sysRegId = sessionVO.getsUserId();		//사용자 ID
-  			int cnt = Integer.parseInt((String)params.get("itemCnt"));
+		int cnt = Integer.parseInt((String)params.get("itemCnt"));
 
-  	    	EgovMap saupDetailInfo = AppMainService.selectAppSaupDetail(params);
+    	EgovMap saupDetailInfo = AppMainService.selectAppSaupDetail(params);
 
-  	        //기존데이터 삭제
+        //기존데이터 삭제
-  			AppInstrumentService.deleteSurSetInfo(params);
+		AppInstrumentService.deleteSurSetInfo(params);
 
-  			for(int i=0;i<cnt;i++){
+		for(int i=0;i<cnt;i++){
 
-  	        	HashMap<String, Object> insertMap = new HashMap<String, Object>();
+        	HashMap<String, Object> insertMap = new HashMap<String, Object>();
-  	        	// data정보
+        	// data정보
-  	        	insertMap.put("businessName", saupDetailInfo.get("businessName"));
+        	insertMap.put("businessName", saupDetailInfo.get("businessName"));
-  	        	insertMap.put("businessCode", params.get("businessCode"));
+        	insertMap.put("businessCode", params.get("businessCode"));
-        		insertMap.put("surSetCode", params.get("surSetCode_"+ i));
+    		insertMap.put("surSetCode", params.get("surSetCode_"+ i));
-        		insertMap.put("zoneCode", params.get("zoneCode_" + i ));
+    		insertMap.put("zoneCode", params.get("zoneCode_" + i ));
-   	        	insertMap.put("epsgCodeType", params.get("epsgCodeType_"+i));
+        	insertMap.put("epsgCodeType", params.get("epsgCodeType_"+i));
-   	        	insertMap.put("pointX", Float.valueOf((String)params.get("pointX_"+i)));
+        	insertMap.put("pointX", Float.valueOf((String)params.get("pointX_"+i)));
-   	        	insertMap.put("pointY", Float.valueOf((String)params.get("pointY_"+i)));
+        	insertMap.put("pointY", Float.valueOf((String)params.get("pointY_"+i)));
-   	        	insertMap.put("sysRegId", sysRegId);
+        	insertMap.put("sysRegId", sysRegId);
-   	        	insertMap.put("consCode", params.get("consCode_"+i));
+        	insertMap.put("consCode", params.get("consCode_"+i));
-              	AppInstrumentService.insertSurSetInfo(insertMap);
+          	AppInstrumentService.insertSurSetInfo(insertMap);
-  	        }
+        }
 
-  	        retStr = "success";
+        retStr = "success";
 
-  		}catch (Exception e) {
+	}catch (Exception e) {
-  			// TODO: handle exception
+		// TODO: handle exception
-  			retStr = "fail";
+		retStr = "fail";
-  		}
+	}
 
-  		return "{\"result\":\""+retStr+"\"}";
+	JSONObject json = new JSONObject();
-	};
+	json.put("result", retStr);
+	return json;
+};
 
    	@RequestMapping(value="/app/const/deleteSurSetInfo.do", method=RequestMethod.POST)
    	@ResponseBody
-   	public String deleteSurSetInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+   	public JSONObject deleteSurSetInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -264,13 +266,15 @@ public class AppInstrumentController  extends BaseController{
 				retStr = "fail";
     		}
 
-        	return "{\"result\":\""+retStr+"\"}";
+	   		JSONObject json = new JSONObject();
+	   		json.put("result", retStr);
+	   		return json;
    	};
 
 	// 지표침하판 주정보 저장여부
    	@RequestMapping(value="/app/const/confirmSurSetInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String confirmSurSetInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject confirmSurSetInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
    		try {
@@ -287,7 +291,10 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+   		json.put("result", retStr);
+   		return json;
+
  	};
 
 	//지표침하판 부정보
@@ -321,7 +328,7 @@ public class AppInstrumentController  extends BaseController{
     //지표침하판 부정보 저장
     @RequestMapping(value="/app/const/insertSurSetSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertSurSetSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertSurSetSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -376,7 +383,9 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+   		json.put("result", retStr);
+   		return json;
  	};
 
     @RequestMapping(value="/app/const/selectsurPinInfo.do")
@@ -410,7 +419,7 @@ public class AppInstrumentController  extends BaseController{
 
     //계측정보 저장
   	@RequestMapping(value="/app/const/insertSurPinInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertSurPinInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertSurPinInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -449,12 +458,14 @@ public class AppInstrumentController  extends BaseController{
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+   		json.put("result", retStr);
+   		return json;
 	};
 
    	@RequestMapping(value="/app/const/deleteSurPinInfo.do", method=RequestMethod.POST)
    	@ResponseBody
-   	public String deleteSurPinInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+   	public JSONObject deleteSurPinInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -502,13 +513,15 @@ public class AppInstrumentController  extends BaseController{
 				retStr = "fail";
     		}
 
-        	return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+   		json.put("result", retStr);
+   		return json;
    	};
 
 	// 지표침하핀 주정보 저장여부
    	@RequestMapping(value="/app/const/confirmSurPinInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String confirmSurPinInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject confirmSurPinInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
     	model.put("params", params);
 
@@ -527,7 +540,9 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+   		json.put("result", retStr);
+   		return json;
  	};
 
 	//지표침하핀 부정보
@@ -560,7 +575,7 @@ public class AppInstrumentController  extends BaseController{
     //지표침하핀 부정보 저장
     @RequestMapping(value="/app/const/insertSurPinSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertSurPinSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertSurPinSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -610,7 +625,9 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
     @RequestMapping(value="/app/const/selectverIncInfo.do")
@@ -643,7 +660,7 @@ public class AppInstrumentController  extends BaseController{
 
     //계측정보 저장
    	@RequestMapping(value="/app/const/insertVerIncInfo.do", method=RequestMethod.POST)
- 	public @ResponseBody String insertVerIncInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public @ResponseBody JSONObject insertVerIncInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -685,12 +702,14 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
    	@RequestMapping(value="/app/const/deleteVerIncInfo.do", method=RequestMethod.POST)
    	@ResponseBody
-   	public String deleteVerIncInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+   	public JSONObject deleteVerIncInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -740,13 +759,15 @@ public class AppInstrumentController  extends BaseController{
 				retStr = "fail";
     		}
 
-        	return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
    	};
 
 	// 지중경사계 주정보 저장여부
    	@RequestMapping(value="/app/const/confirmVerIncInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String confirmVerIncInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject confirmVerIncInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
     	model.put("params", params);
 
@@ -765,7 +786,9 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
 	//지중경사계 부정보
@@ -798,7 +821,7 @@ public class AppInstrumentController  extends BaseController{
     //지중경사계 부정보 저장
     @RequestMapping(value="/app/const/insertVerIncSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertVerIncSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertVerIncSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -831,7 +854,9 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
 
@@ -865,7 +890,7 @@ public class AppInstrumentController  extends BaseController{
 
     //계측정보 저장
    	@RequestMapping(value="/app/const/insertSetExtInfo.do", method=RequestMethod.POST)
- 	public @ResponseBody String insertSetExtInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public @ResponseBody JSONObject insertSetExtInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -905,12 +930,14 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
    	@RequestMapping(value="/app/const/deleteSetExtInfo.do", method=RequestMethod.POST)
    	@ResponseBody
-   	public String deleteSetExtInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+   	public JSONObject deleteSetExtInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -958,13 +985,15 @@ public class AppInstrumentController  extends BaseController{
 				retStr = "fail";
     		}
 
-        	return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
    	};
 
 	//층별침하계 주정보 저장여부
    	@RequestMapping(value="/app/const/confirmSetExtInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String confirmSetExtInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject confirmSetExtInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
     	model.put("params", params);
 
@@ -983,7 +1012,9 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
 	//층별침하계 부정보
@@ -1017,7 +1048,7 @@ public class AppInstrumentController  extends BaseController{
     //층별침하계 부정보 저장
     @RequestMapping(value="/app/const/insertSetExtSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertSetExtSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertSetExtSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1061,7 +1092,9 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
     @RequestMapping(value="/app/const/selectwatPreInfo.do")
@@ -1094,7 +1127,7 @@ public class AppInstrumentController  extends BaseController{
 
     //계측정보 저장
    	@RequestMapping(value="/app/const/insertWatPreInfo.do", method=RequestMethod.POST)
- 	public @ResponseBody String insertwatPreInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public @ResponseBody JSONObject insertwatPreInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1135,12 +1168,14 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
    	@RequestMapping(value="/app/const/deleteWatPreInfo.do", method=RequestMethod.POST)
    	@ResponseBody
-   	public String deleteWatPreInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+   	public JSONObject deleteWatPreInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1189,13 +1224,15 @@ public class AppInstrumentController  extends BaseController{
 				retStr = "fail";
     		}
 
-        	return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
    	};
 
 	//층별침하계 주정보 저장여부
    	@RequestMapping(value="/app/const/confirmWatPreInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String confirmWatPreInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject confirmWatPreInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
     	model.put("params", params);
 
@@ -1214,7 +1251,9 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
 	//간극수압계 부정보
@@ -1248,7 +1287,7 @@ public class AppInstrumentController  extends BaseController{
     //간극수압계 부정보 저장
     @RequestMapping(value="/app/const/insertWatPreSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertWatPreSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertWatPreSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1286,7 +1325,9 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
     @RequestMapping(value="/app/const/selectwatLevInfo.do")
@@ -1319,7 +1360,7 @@ public class AppInstrumentController  extends BaseController{
 
     //계측정보 저장
    	@RequestMapping(value="/app/const/insertWatLevInfo.do", method=RequestMethod.POST)
- 	public @ResponseBody String insertwatLevInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public @ResponseBody JSONObject insertwatLevInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1360,12 +1401,14 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
    	@RequestMapping(value="/app/const/deleteWatLevInfo.do", method=RequestMethod.POST)
    	@ResponseBody
-   	public String deleteWatLevInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+   	public JSONObject deleteWatLevInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1414,13 +1457,15 @@ public class AppInstrumentController  extends BaseController{
 				retStr = "fail";
     		}
 
-        	return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
    	};
 
 	//층별침하계 주정보 저장여부
    	@RequestMapping(value="/app/const/confirmWatLevInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String confirmWatLevInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject confirmWatLevInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
     	model.put("params", params);
 
@@ -1439,7 +1484,9 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
 	//층별침하계 부정보
@@ -1473,7 +1520,7 @@ public class AppInstrumentController  extends BaseController{
     //지하수위계 부정보 저장
     @RequestMapping(value="/app/const/insertWatLevSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertWatLevSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertWatLevSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1508,7 +1555,9 @@ public class AppInstrumentController  extends BaseController{
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
 

src/main/java/sgis/app/web/AppLineController.java

@@ -147,7 +147,7 @@ public class AppLineController extends BaseController {
 
     //지표물리탐사_전기비저항탐사 저장
   	@RequestMapping(value="/app/line/insertResistivityInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertResistivityInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertResistivityInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -202,7 +202,9 @@ public class AppLineController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//지표물리탐사_굴절법탄성파
@@ -256,7 +258,7 @@ public class AppLineController extends BaseController {
 
     //지표물리탐사_굴절법탄성파 저장
   	@RequestMapping(value="/app/line/insertRefractionInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertRefractionInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertRefractionInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -311,6 +313,8 @@ public class AppLineController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 }

src/main/java/sgis/app/web/AppRockController.java

@@ -86,7 +86,7 @@ public class AppRockController extends BaseController {
     //샘플정보 입력 시 샘플정보 생성
    	@RequestMapping(value="/app/rock/insertRockUniaxialSampleInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertRockUniaxialSampleInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertRockUniaxialSampleInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
    		SessionVO sessionVO = getSessionInfo();
@@ -137,7 +137,9 @@ public class AppRockController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
     //일축압축시험 데이터 호출
@@ -167,7 +169,7 @@ public class AppRockController extends BaseController {
 
     //입도분석 정보 저장
   	@RequestMapping(value="/app/rock/insertRockUniaxialInfoInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertRockUniaxialInfoInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertRockUniaxialInfoInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -230,7 +232,9 @@ public class AppRockController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//암석_삼축압축
@@ -258,7 +262,7 @@ public class AppRockController extends BaseController {
     //샘플정보 입력 시 샘플정보 생성
    	@RequestMapping(value="/app/rock/insertRockTriaxialSampleInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertRockTriaxialSampleInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertRockTriaxialSampleInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -317,7 +321,9 @@ public class AppRockController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//삼축압축시험 데이터 호출
@@ -347,7 +353,7 @@ public class AppRockController extends BaseController {
 
     //삼축압축시험 정보 저장
   	@RequestMapping(value="/app/rock/insertRockTriaxialInfoInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertRockTriaxialInfoInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertRockTriaxialInfoInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -442,7 +448,9 @@ public class AppRockController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//암석_점하중
@@ -470,7 +478,7 @@ public class AppRockController extends BaseController {
     //샘플정보 입력 시 샘플정보 생성
    	@RequestMapping(value="/app/rock/insertRockPointloadSampleInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertRockPointloadSampleInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertRockPointloadSampleInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -518,7 +526,9 @@ public class AppRockController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//점하중시험 데이터 호출
@@ -548,7 +558,7 @@ public class AppRockController extends BaseController {
 
     //점하중시험 정보 저장
   	@RequestMapping(value="/app/rock/insertRockPointloadInfoInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertRockPointloadInfoInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertRockPointloadInfoInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -611,7 +621,9 @@ public class AppRockController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//암석_절리면전단
@@ -639,7 +651,7 @@ public class AppRockController extends BaseController {
     //샘플정보 입력 시 샘플정보 생성
    	@RequestMapping(value="/app/rock/insertRockJointshearSampleInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertRockJointshearSampleInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertRockJointshearSampleInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -689,7 +701,9 @@ public class AppRockController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//절리면전단시험 데이터 호출
@@ -719,7 +733,7 @@ public class AppRockController extends BaseController {
 
     //절리면전단시험 정보 저장
   	@RequestMapping(value="/app/rock/insertRockJointshearInfoInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertRockJointshearInfoInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertRockJointshearInfoInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -791,13 +805,15 @@ public class AppRockController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	 //암석 주정보 저장여부
    	@RequestMapping(value="/app/rock/confirmInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String confirmInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject confirmInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -820,7 +836,9 @@ public class AppRockController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
 	//암석_공진주
@@ -855,7 +873,7 @@ public class AppRockController extends BaseController {
     //암석_공진주 주정보 저장
    	@RequestMapping(value="/app/rock/insertRockResonantUsualInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertRockResonantUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertRockResonantUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -919,13 +937,15 @@ public class AppRockController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//암석_공진주 주정보 삭제
    	@RequestMapping(value="/app/rock/deleteRockResonantUsualInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String deleteRockResonantUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject deleteRockResonantUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -991,7 +1011,9 @@ public class AppRockController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
     //암석_공진주 부정보
@@ -1050,7 +1072,7 @@ public class AppRockController extends BaseController {
     //암석_공진주 시험정보_부정보 저장
     @RequestMapping(value="/app/rock/insertResonantUsualSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertResonantUsualSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertResonantUsualSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1097,7 +1119,9 @@ public class AppRockController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
 
@@ -1133,7 +1157,7 @@ public class AppRockController extends BaseController {
     //암석_반복삼축 주정보 저장
    	@RequestMapping(value="/app/rock/insertRockRepeatedTriaxialUsualInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String insertRockRepeatedTriaxialUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertRockRepeatedTriaxialUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1193,13 +1217,15 @@ public class AppRockController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//암석_반복삼축 주정보 삭제
    	@RequestMapping(value="/app/rock/deleteRockRepeatedTriaxialUsualInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String deleteRockRepeatedTriaxialUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject deleteRockRepeatedTriaxialUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1267,7 +1293,9 @@ public class AppRockController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//암석_반복삼축 부정보
@@ -1327,7 +1355,7 @@ public class AppRockController extends BaseController {
     //암석_반복삼축 시험정보_부정보 저장
     @RequestMapping(value="/app/rock/insertRepeatedTriaxialUsualSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertRepeatedTriaxialUsualSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertRepeatedTriaxialUsualSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1363,7 +1391,9 @@ public class AppRockController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
 }

src/main/java/sgis/app/web/AppSGPlanController.java

@@ -96,7 +96,7 @@ public class AppSGPlanController extends BaseController{
 
     //성토 정보 저장
     @RequestMapping(value="/app/const/insertSgImpPlanInfo.do", method=RequestMethod.POST)
-    public @ResponseBody String insertPbdLawInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+    public @ResponseBody JSONObject insertPbdLawInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
     	String retStr = "";
 
   		try {
@@ -134,12 +134,14 @@ public class AppSGPlanController extends BaseController{
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
    	@RequestMapping(value="/app/const/deleteSgImpPlanInfo.do", method=RequestMethod.POST)
    	@ResponseBody
-   	public String deletePbdLawInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+   	public JSONObject deletePbdLawInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -174,7 +176,9 @@ public class AppSGPlanController extends BaseController{
 				retStr = "fail";
     		}
 
-        	return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
    	};
 
 }

src/main/java/sgis/app/web/AppSandController.java

@@ -140,7 +140,7 @@ public class AppSandController extends BaseController {
 
     //입도분석 정보 저장
   	@RequestMapping(value="/app/sand/insertClasInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertClasInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertClasInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -202,7 +202,9 @@ public class AppSandController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//CBR
@@ -288,7 +290,7 @@ public class AppSandController extends BaseController {
 
     //CBR 정보 저장
   	@RequestMapping(value="/app/sand/insertCbrInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertCbrInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertCbrInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -354,7 +356,9 @@ public class AppSandController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//압밀시험
@@ -434,7 +438,7 @@ public class AppSandController extends BaseController {
 
     //압밀시험 정보 저장
   	@RequestMapping(value="/app/sand/insertConsolidationInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertConsolidationInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertConsolidationInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -502,7 +506,9 @@ public class AppSandController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//압밀시험 부정보
@@ -540,7 +546,7 @@ public class AppSandController extends BaseController {
     //압밀시험 부정보 저장
     @RequestMapping(value="/app/sand/insertConsolidationSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertConsolidationSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertConsolidationSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -607,7 +613,9 @@ public class AppSandController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//일축압축
@@ -691,7 +699,7 @@ public class AppSandController extends BaseController {
 
     //일축압축 정보 저장
   	@RequestMapping(value="/app/sand/insertUnconfinedUsualInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertUnconfinedUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertUnconfinedUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -770,7 +778,9 @@ public class AppSandController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//삼축압축
@@ -847,7 +857,7 @@ public class AppSandController extends BaseController {
 
     //삼축압축 정보 저장
   	@RequestMapping(value="/app/sand/insertTriaxialUsualInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertTriaxialUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertTriaxialUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -900,7 +910,9 @@ public class AppSandController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//삼축압축 CU부정보
@@ -949,7 +961,7 @@ public class AppSandController extends BaseController {
     //삼축압축 부정보 저장
     @RequestMapping(value="/app/sand/insertTriaxialUsualSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertTriaxialUsualSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertTriaxialUsualSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1038,7 +1050,9 @@ public class AppSandController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//공진주
@@ -1084,7 +1098,7 @@ public class AppSandController extends BaseController {
 
     //공진주 정보 저장
   	@RequestMapping(value="/app/sand/insertResonantUsualInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertResonantUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertResonantUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -1145,13 +1159,15 @@ public class AppSandController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	// 공진주 주정보 저장여부
    	@RequestMapping(value="/app/sand/confirmResoInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String confirmResoInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject confirmResoInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1168,7 +1184,9 @@ public class AppSandController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
 	//공진주 부정보
@@ -1208,7 +1226,7 @@ public class AppSandController extends BaseController {
     //공진주 부정보 저장
     @RequestMapping(value="/app/sand/insertResonantUsualSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertResonantUsualSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertResonantUsualSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1257,7 +1275,9 @@ public class AppSandController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
  	//반복삼축
@@ -1303,7 +1323,7 @@ public class AppSandController extends BaseController {
 
     //반복삼축 정보 저장
   	@RequestMapping(value="/app/sand/insertRepeatedTriaxialUsualInfo.do", method=RequestMethod.POST)
-	public @ResponseBody String insertRepeatedTriaxialUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public @ResponseBody JSONObject insertRepeatedTriaxialUsualInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
   		String retStr = "";
 
@@ -1365,13 +1385,15 @@ public class AppSandController extends BaseController {
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 
 	//반복삼축 주정보 저장여부
    	@RequestMapping(value="/app/sand/confirmRtriInfo.do", method=RequestMethod.POST)
    	@ResponseBody
- 	public String confirmRtriInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject confirmRtriInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1388,7 +1410,9 @@ public class AppSandController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
 	//반복삼축 부정보
@@ -1421,7 +1445,7 @@ public class AppSandController extends BaseController {
     //반복삼축 부정보 저장
     @RequestMapping(value="/app/sand/insertRepeatedTriaxialUsualSubInfo.do", produces="application/json;charset=utf-8")
    	@ResponseBody
- 	public String insertRepeatedTriaxialUsualSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+ 	public JSONObject insertRepeatedTriaxialUsualSubInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
 
    		String retStr = "";
 
@@ -1454,7 +1478,9 @@ public class AppSandController extends BaseController {
    			retStr = "fail";
    		}
 
-   		return "{\"result\":\""+retStr+"\"}";
+   		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
  	};
 
 }

src/main/java/sgis/app/web/AppSoftGroundController.java

@@ -79,7 +79,7 @@ public class AppSoftGroundController extends BaseController{
     };
 
     @RequestMapping(value="/app/const/insertSoftGroundInfo.do", method=RequestMethod.POST)
-    public @ResponseBody String insertSoftGroundInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
+    public @ResponseBody JSONObject insertSoftGroundInfo(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
     	String retStr = "";
   		try {
   			SessionVO sessionVO = getSessionInfo();
@@ -136,6 +136,8 @@ public class AppSoftGroundController extends BaseController{
   			retStr = "fail";
   		}
 
-  		return "{\"result\":\""+retStr+"\"}";
+  		JSONObject json = new JSONObject();
+ 	   json.put("result", retStr);
+ 	   return json;
 	};
 }

src/main/java/sgis/com/util/ExcelUtil.java

@@ -3494,6 +3494,9 @@ public class ExcelUtil {
 					for(int r = 3 ; r < 300; r++) {
 						//한 줄씩 읽고 데이터 저장
 						Row rowList = sheet.getRow(r);
+						if( rowList == null ) {
+							break;
+						}
 						Cell depth = rowList.getCell(0);
 
 						if (rowList != null && checkedCellType(depth) != "") {
@@ -3507,6 +3510,9 @@ public class ExcelUtil {
 							}
 							logger.debug("excelReadSetValue ============resultList "+listNum+" valueMap "+valueMap);
 
+							if( listNum == 205 ) {
+								logger.debug("excelReadSetValue ============resultList "+listNum+" valueMap "+valueMap);
+							}
 							valueMap.put("projectCode", params.get("projectCode"));
 							valueMap.put("businessCode", params.get("businessCode"));
 							valueMap.put("consCode" , params.get("etcCode"));
@@ -3864,11 +3870,13 @@ public class ExcelUtil {
 		}else if(cellType == cellType.ERROR) {
 			value = "" + cellData.getErrorCellValue();
 		//	break;
-		}else if(cellType == cellType.FORMULA) {
+		}else if(cellType == cellType.FORMULA) { // 여기를 타면 엑셀 셀 번호가 그대로 리턴된다. 그럴 필요가 있나?
 			value = cellData.getCellFormula();
 		//	break;
 		}else if(cellType == cellType.NUMERIC) {
-			if(HSSFDateUtil.isInternalDateFormat(cellData.getCellStyle().getDataFormat())) {
+			short dataFormat = cellData.getCellStyle().getDataFormat();
+			System.out.println("cellData.getCellStyle().getDataFormat(): " + dataFormat);
+			if(HSSFDateUtil.isInternalDateFormat(dataFormat)) {
 				value = sdf.format(cellData.getDateCellValue());
 			}
 			else {

src/main/java/sgis/map/web/MapMainController.java

@@ -3,6 +3,7 @@ package sgis.map.web;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -304,43 +305,101 @@ public class MapMainController extends BaseController  {
 
     @SuppressWarnings("unchecked")
     @RequestMapping(value = "/map/makePredictionData.do", method = {RequestMethod.POST, RequestMethod.GET})
-	public void makePredictionData(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception {
+    public void makePredictionData(@RequestParam HashMap<String,Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
 
-    	request.setCharacterEncoding("UTF-8");
+        request.setCharacterEncoding("UTF-8");
-    	response.setContentType("text/html;charset=UTF-8");
+        response.setContentType("text/html;charset=UTF-8");
 
-    	String pyPath = "";
+        String pyPath = getPropertyValue("Globals.File.PyPath") + "controller.py";
-    	pyPath = getPropertyValue("Globals.File.PyPath") + "controller.py";
+        String businessCode = (String) params.get("businessCode");
 
-    	//환경변수, python path, parameter
+        // 1. consCode null 체크 및 기본값 로직 적용
-		ProcessBuilder pb = new ProcessBuilder("python3", pyPath, (String) params.get("businessCode"), (String) params.get("consCode") );
+        String consCode = (String) params.get("consCode");
-		Process p = pb.start();
+        if( consCode == null || consCode.trim().isEmpty() ) {
-		BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream(), "euc-kr"));
+            System.out.println("DEBUG: consCode가 없어서 기본값 CONS001로 설정합니다.");
+            consCode = "CONS001";
+        }
 
-		HashMap<String, String> resultMap = new HashMap<String, String>();
+        // 2. 명령어 리스트 구성
+        List<String> cmdList = new ArrayList<>();
+        cmdList.add("py");
+        cmdList.add(pyPath);
+        cmdList.add(businessCode);
+        cmdList.add(consCode);
 
-		try {
+        System.out.println("========== Python 실행 시작 ==========");
-			String line = "";
+        System.out.println("실행 명령어 List: " + cmdList.toString());
-			while((line = br.readLine()) != null) {
-				System.out.println(line);
-			}
-			resultMap.put("dataList1", "suss");
-		} finally {
-			try {
-				if (br != null) {
-					br.close();
-				}
-			}catch (Exception e) {
-				// TODO: handle exception
-				e.printStackTrace();
-			}
-		}
 
-    	JSONObject json = new JSONObject();
+        ProcessBuilder pb = new ProcessBuilder(cmdList);
-    	json.putAll( resultMap );
-    	response.getWriter().print(json);
 
-  	}
+        // 3. 에러 스트림 병합 (로그 확인용)
+        pb.redirectErrorStream(true);
+
+        Process p = null;
+        BufferedReader br = null;
+        HashMap<String, String> resultMap = new HashMap<String, String>();
+
+        String validationErrorMsg = ""; // 유효성 에러 메시지 저장용 변수
+
+        try {
+            p = pb.start();
+
+            // 인코딩은 Windows 콘솔 기본값(euc-kr)에 맞춤
+            br = new BufferedReader(new InputStreamReader(p.getInputStream(), "euc-kr"));
+
+            String line;
+            StringBuilder outputBuilder = new StringBuilder();
+
+            while((line = br.readLine()) != null) {
+                // 디버깅 로그 출력
+                System.out.println("[Python Log] " + line);
+                outputBuilder.append(line).append("\n");
+
+                // 파이썬 출력 내용 중 에러 메시지가 있는지 확인
+                if(line.contains("누적침하량이 유효하지 않습니다.")) {
+                    validationErrorMsg = "누적침하량이 유효하지 않습니다.";
+                }
+            }
+
+            // 프로세스 종료 코드 확인
+            int exitCode = p.waitFor();
+            System.out.println("Process exit code: " + exitCode);
+
+            if(exitCode == 0) {
+                // 프론트엔드 호환성을 위해 기존 키값(dataList1) 추가
+                resultMap.put("dataList1", "suss");
+
+                resultMap.put("result", "success");
+                resultMap.put("msg", "정상적으로 생성되었습니다.");
+            } else {
+                resultMap.put("result", "fail");
+                // 특정 에러 메시지가 발견되었다면 그 메시지를, 아니면 기본 에러 메시지 사용
+                if (!validationErrorMsg.isEmpty()) {
+                    resultMap.put("msg", validationErrorMsg);
+                } else {
+                    resultMap.put("msg", "Python 실행 중 오류가 발생했습니다. (Exit Code: " + exitCode + ")");
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultMap.put("result", "error");
+            resultMap.put("msg", "Java 프로세스 실행 에러: " + e.getMessage());
+        } finally {
+            if (br != null) {
+                try { br.close(); } catch (Exception e) {}
+            }
+            if (p != null && p.isAlive()) {
+                p.destroy();
+            }
+        }
+
+        System.out.println("========== Python 실행 종료 ==========");
+
+        JSONObject json = new JSONObject();
+        json.putAll( resultMap );
+        response.getWriter().print(json);
+    }
 
     @SuppressWarnings("unchecked")
     @RequestMapping(value = "/map/predictionGraphInfo.do", method = {RequestMethod.POST, RequestMethod.GET})

src/main/webapp/WEB-INF/jsp/sgis/app/constInfo/popup/includeSurSetSubInfo.jsp

@@ -158,7 +158,7 @@ var columns = [
 		editor: chooseEditor,
 		width: "10%",
 		attributes: { style:"text-align: right" },
-		headerTemplate: '<div>기간별침하량(-)<select id="subDropdownList" onchange="selectChange()"><option value="unit">침하량 단위</option><option value="cm">cm</option><option value="m">m</option></select></div>',
+		headerTemplate: '<div>기간별침하량(-)<select id="subDropdownList" onchange="selectChange()" onclick="event.stopPropagation()"><option value="unit">침하량 단위</option><option value="cm">cm</option><option value="m">m</option></select></div>',
 		template: "<div class='td-data'>#= (subByPeriod == null) ? '0' : subByPeriod #</div>",
 	},
 	{
@@ -167,7 +167,7 @@ var columns = [
 		editor: chooseEditor,
 		width: "10%",
 		attributes: { style:"text-align: rig ht" },
-		headerTemplate: '<div>누적침하량(-)<select id="subDropdownList2" onchange="selectChange()"><option value="unit">침하량 단위</option><option value="cm">cm</option><option value="m">m</option></select></div>',
+		headerTemplate: '<div>누적침하량(-)<select id="subDropdownList2" onchange="selectChange()" onclick="event.stopPropagation()"><option value="unit">침하량 단위</option><option value="cm">cm</option><option value="m">m</option></select></div>',
 		template: "<div class='td-data'>#= (amountCumSub == null) ? '0' : amountCumSub #</div>",
 	},
 	{
@@ -209,7 +209,7 @@ var dataParams = {
 		consCode : consCode,
 }
 
-function selectChange(){
+function selectChange(e){
 	document.subForm.setUnit.value = document.getElementById("subDropdownList").value;
 	document.subForm.setUnit2.value= document.getElementById("subDropdownList2").value;
 }

src/main/webapp/WEB-INF/jsp/tiles/attribute/app.submenu.jsp

@@ -1227,6 +1227,13 @@ function popupSearchKendoGrid(dataList) {
 
 function onPopupDataBound(e) {
 	var grid = $("#business_search_popup_grid").data("kendoGrid");
+	if( typeof grid == 'undefined' ) {
+		//grid = $("#basicGrid").data("kendoGrid");
+		//grid = $("#subGrid").data("kendoGrid");
+		if( e ) {
+			grid = $("#" + e.sender.element[0].id + "").data("kendoGrid");
+		}
+	}
 	var rows = this.items();
 
 	//grid.refresh();

src/main/webapp/com/js/main.map.js

@@ -1,6 +1,5 @@
 // 지도 전역 변수
 var map;
-//아으아아아
 // 지도 배경 레이어 정의
 var vworldBaseLayer;
 var vworldSatelliteLayer;
@@ -921,7 +920,7 @@ function menutoolsEvent() {
 		map.getView().setZoom(14);
 
 		setTimeout(function(){
-			map.updateSize();    
+			map.updateSize();
 		}, 200);
 	});
 
@@ -932,7 +931,7 @@ function menutoolsEvent() {
 		view.setZoom(zoom + 1);
 
 		setTimeout(function(){
-			map.updateSize();    
+			map.updateSize();
 		}, 200);
 
 	});
@@ -1221,7 +1220,6 @@ function addInteraction2(){
 }
 
 function selectFeatureInfo(){
-	debugger;  //thkim
 	var businessCode = document.mapForm.businessCode.value;
 	var holeCode = document.mapForm.holeCode.value;
 	var consCode = document.mapForm.consCode.value;
@@ -3558,6 +3556,10 @@ function instrumentationInfo(consCode, businessCode){
 			if(graphData.length > 0){
 				instrumentationGraphInfoPopupData.center();
 				instrumentationGraphInfoPopupData.open();
+				var form = document.forms["mapForm"];
+				if (form && form.elements["consCode"]) {
+				    form.elements["consCode"].value = consCode;
+				}
 			}else{
 				alert("등록된 계측데이터가 없습니다.");
 			}
@@ -3801,6 +3803,13 @@ function makePredictionData(){
 	let businessCode =  document.mapForm.businessCode.value;
 	let consCode = document.mapForm.consCode.value;
 
+	// 1. 계측 데이터 개수 확인 (차트에 사용된 arrFillingData 배열 활용)
+    // instrumentationInfo 함수가 실행되어 팝업이 열린 상태에서 실행되므로 arrFillingData를 참조합니다.
+    if (typeof arrFillingData === "undefined" || arrFillingData.length < 2) {
+        alert("예측을 위해서 최소 계측데이터가 2개 이상 필요합니다.");
+        return; // 데이터가 부족하면 여기서 함수 종료
+    }
+
 	if(confirm("예측데이터를 생성하시겠습니까?")){
 		$.ajax({
 			url : "/map/makePredictionData.do",
@@ -3813,15 +3822,15 @@ function makePredictionData(){
 				consCode : consCode,
 			},
 			success : function(data){
-
+				loading("#instrumentationGraphInfoPopup","false");
 				resultData = $.parseJSON(data);
 				let result = resultData.dataList1;
 
+
 				if(result == "suss"){
-					loading("#instrumentationGraphInfoPopup","false");
 					alert("예측데이터 생성에 성공했습니다.");
 				}else{
-					alert("예측데이터 생성에 실패했습니다.");
+					alert("예측데이터 생성에 실패했습니다.\n\n원인:[" + resultData.msg + "]");
 				}
 
 			},

src/main/webapp/com/js/map.js

@@ -399,8 +399,8 @@ $(window).scroll(function() {
 
 //브라우저 리사이즈 시, 업데이트
 $(window).resize(function(){
-    setTimeout(function(){
+        setTimeout(function(){
-		map.updateSize();    
+		map.updateSize();
 	}, 200);
 });
 /*==============================================================*/